Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell11
提交
f6e98e4a
D
dragonwell11
项目概览
openanolis
/
dragonwell11
通知
7
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell11
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f6e98e4a
编写于
6月 25, 2012
作者:
A
anthony
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
7174718: [macosx] Regression in 7u6 b12: PopupFactory leaks DefaultFrames.
Summary: Fix memory management Reviewed-by: art, serb
上级
47965642
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
26 addition
and
2 deletion
+26
-2
jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
+2
-0
jdk/src/macosx/native/sun/awt/AWTWindow.m
jdk/src/macosx/native/sun/awt/AWTWindow.m
+24
-2
未找到文件。
jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
浏览文件 @
f6e98e4a
...
...
@@ -63,6 +63,7 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
private
static
native
void
nativeSetNSWindowSecurityWarningPositioning
(
long
nsWindowPtr
,
double
x
,
double
y
,
float
biasX
,
float
biasY
);
private
static
native
void
nativeSetEnabled
(
long
nsWindowPtr
,
boolean
isEnabled
);
private
static
native
void
nativeSynthesizeMouseEnteredExitedEvents
(
long
nsWindowPtr
);
private
static
native
void
nativeDispose
(
long
nsWindowPtr
);
private
static
native
int
nativeGetNSWindowDisplayID_AppKitThread
(
long
nsWindowPtr
);
...
...
@@ -423,6 +424,7 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
EventQueue
.
invokeLater
(
new
Runnable
()
{
public
void
run
()
{
contentView
.
dispose
();
nativeDispose
(
getNSWindowPtr
());
CPlatformWindow
.
super
.
dispose
();
}
});
...
...
jdk/src/macosx/native/sun/awt/AWTWindow.m
浏览文件 @
f6e98e4a
...
...
@@ -228,6 +228,7 @@ AWT_ASSERT_APPKIT_THREAD;
}
if
(
self
.
nsWindow
==
nil
)
return
nil
;
// no hope either
[
self
.
nsWindow
release
];
// the property retains the object already
self
.
isEnabled
=
YES
;
self
.
javaPlatformWindow
=
platformWindow
;
...
...
@@ -677,9 +678,9 @@ AWT_ASSERT_NOT_APPKIT_THREAD;
styleBits:
styleBits
frameRect:
frameRect
contentView:
contentView
];
// the window is released is CPlatformWindow.nativeDispose()
if
(
window
)
CFRetain
(
window
);
[
window
release
];
// GC
if
(
window
)
CFRetain
(
window
.
nsWindow
);
}];
JNF_COCOA_EXIT
(
env
);
...
...
@@ -1160,3 +1161,24 @@ JNF_COCOA_ENTER(env);
JNF_COCOA_EXIT
(
env
);
}
JNIEXPORT
void
JNICALL
Java_sun_lwawt_macosx_CPlatformWindow_nativeDispose
(
JNIEnv
*
env
,
jclass
clazz
,
jlong
windowPtr
)
{
JNF_COCOA_ENTER
(
env
);
NSWindow
*
nsWindow
=
OBJC
(
windowPtr
);
[
JNFRunLoop
performOnMainThreadWaiting
:
NO
withBlock
:
^
(){
AWTWindow
*
window
=
(
AWTWindow
*
)[
nsWindow
delegate
];
// AWTWindow holds a reference to the NSWindow in its nsWindow
// property. Unsetting the delegate allows it to be deallocated
// which releases the reference. This, in turn, allows the window
// itself be deallocated.
[
nsWindow
setDelegate
:
nil
];
[
window
release
];
}];
JNF_COCOA_EXIT
(
env
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录