Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
f9fd40e0
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f9fd40e0
编写于
2月 24, 2012
作者:
B
bagiras
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
7145980: Dispose method of window.java takes long
Reviewed-by: anthony
上级
07b734a2
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
39 addition
and
28 deletion
+39
-28
src/share/classes/java/awt/Component.java
src/share/classes/java/awt/Component.java
+3
-2
src/share/classes/java/awt/Window.java
src/share/classes/java/awt/Window.java
+36
-26
未找到文件。
src/share/classes/java/awt/Component.java
浏览文件 @
f9fd40e0
...
@@ -10070,11 +10070,12 @@ public abstract class Component implements ImageObserver, MenuContainer,
...
@@ -10070,11 +10070,12 @@ public abstract class Component implements ImageObserver, MenuContainer,
}
}
Window
window
=
getContainingWindow
();
Window
window
=
getContainingWindow
();
if
(
window
!=
null
)
{
if
(
window
!=
null
)
{
if
(!
window
.
hasHeavyweightDescendants
()
||
!
window
.
hasLightweightDescendants
())
{
if
(!
window
.
hasHeavyweightDescendants
()
||
!
window
.
hasLightweightDescendants
()
||
window
.
isDisposing
()
)
{
if
(
mixingLog
.
isLoggable
(
PlatformLogger
.
FINE
))
{
if
(
mixingLog
.
isLoggable
(
PlatformLogger
.
FINE
))
{
mixingLog
.
fine
(
"containing window = "
+
window
+
mixingLog
.
fine
(
"containing window = "
+
window
+
"; has h/w descendants = "
+
window
.
hasHeavyweightDescendants
()
+
"; has h/w descendants = "
+
window
.
hasHeavyweightDescendants
()
+
"; has l/w descendants = "
+
window
.
hasLightweightDescendants
());
"; has l/w descendants = "
+
window
.
hasLightweightDescendants
()
+
"; disposing = "
+
window
.
isDisposing
());
}
}
return
false
;
return
false
;
}
}
...
...
src/share/classes/java/awt/Window.java
浏览文件 @
f9fd40e0
...
@@ -226,6 +226,7 @@ public class Window extends Container implements Accessible {
...
@@ -226,6 +226,7 @@ public class Window extends Container implements Accessible {
static
boolean
systemSyncLWRequests
=
false
;
static
boolean
systemSyncLWRequests
=
false
;
boolean
syncLWRequests
=
false
;
boolean
syncLWRequests
=
false
;
transient
boolean
beforeFirstShow
=
true
;
transient
boolean
beforeFirstShow
=
true
;
private
transient
boolean
disposing
=
false
;
static
final
int
OPENED
=
0x01
;
static
final
int
OPENED
=
0x01
;
...
@@ -1162,36 +1163,41 @@ public class Window extends Container implements Accessible {
...
@@ -1162,36 +1163,41 @@ public class Window extends Container implements Accessible {
void
doDispose
()
{
void
doDispose
()
{
class
DisposeAction
implements
Runnable
{
class
DisposeAction
implements
Runnable
{
public
void
run
()
{
public
void
run
()
{
// Check if this window is the fullscreen window for the
disposing
=
true
;
// device. Exit the fullscreen mode prior to disposing
try
{
// of the window if that's the case.
// Check if this window is the fullscreen window for the
GraphicsDevice
gd
=
getGraphicsConfiguration
().
getDevice
();
// device. Exit the fullscreen mode prior to disposing
if
(
gd
.
getFullScreenWindow
()
==
Window
.
this
)
{
// of the window if that's the case.
gd
.
setFullScreenWindow
(
null
);
GraphicsDevice
gd
=
getGraphicsConfiguration
().
getDevice
();
}
if
(
gd
.
getFullScreenWindow
()
==
Window
.
this
)
{
gd
.
setFullScreenWindow
(
null
);
}
Object
[]
ownedWindowArray
;
Object
[]
ownedWindowArray
;
synchronized
(
ownedWindowList
)
{
synchronized
(
ownedWindowList
)
{
ownedWindowArray
=
new
Object
[
ownedWindowList
.
size
()];
ownedWindowArray
=
new
Object
[
ownedWindowList
.
size
()];
ownedWindowList
.
copyInto
(
ownedWindowArray
);
ownedWindowList
.
copyInto
(
ownedWindowArray
);
}
for
(
int
i
=
0
;
i
<
ownedWindowArray
.
length
;
i
++)
{
Window
child
=
(
Window
)
(((
WeakReference
)
(
ownedWindowArray
[
i
])).
get
());
if
(
child
!=
null
)
{
child
.
disposeImpl
();
}
}
}
for
(
int
i
=
0
;
i
<
ownedWindowArray
.
length
;
i
++)
{
hide
();
Window
child
=
(
Window
)
(((
WeakReference
)
beforeFirstShow
=
true
;
(
ownedWindowArray
[
i
])).
get
());
removeNotify
();
if
(
child
!=
null
)
{
synchronized
(
inputContextLock
)
{
child
.
disposeImpl
();
if
(
inputContext
!=
null
)
{
}
inputContext
.
dispose
();
}
inputContext
=
null
;
hide
();
beforeFirstShow
=
true
;
removeNotify
();
synchronized
(
inputContextLock
)
{
if
(
inputContext
!=
null
)
{
inputContext
.
dispose
();
inputContext
=
null
;
}
}
}
clearCurrentFocusCycleRootOnHide
();
}
finally
{
disposing
=
false
;
}
}
clearCurrentFocusCycleRootOnHide
();
}
}
}
}
DisposeAction
action
=
new
DisposeAction
();
DisposeAction
action
=
new
DisposeAction
();
...
@@ -2734,6 +2740,10 @@ public class Window extends Container implements Accessible {
...
@@ -2734,6 +2740,10 @@ public class Window extends Container implements Accessible {
return
visible
;
return
visible
;
}
}
boolean
isDisposing
()
{
return
disposing
;
}
/**
/**
* @deprecated As of J2SE 1.4, replaced by
* @deprecated As of J2SE 1.4, replaced by
* {@link Component#applyComponentOrientation Component.applyComponentOrientation}.
* {@link Component#applyComponentOrientation Component.applyComponentOrientation}.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录