Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
b3f899b4
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看板
提交
b3f899b4
编写于
7月 31, 2015
作者:
A
aivanov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8130776: Remove EmbeddedFrame.requestFocusToEmbedder() method
Reviewed-by: serb, ant
上级
e6af9cc0
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
1 addition
and
52 deletion
+1
-52
src/share/classes/sun/applet/AppletPanel.java
src/share/classes/sun/applet/AppletPanel.java
+1
-6
src/share/classes/sun/awt/EmbeddedFrame.java
src/share/classes/sun/awt/EmbeddedFrame.java
+0
-9
src/windows/classes/sun/awt/windows/WEmbeddedFrame.java
src/windows/classes/sun/awt/windows/WEmbeddedFrame.java
+0
-8
src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java
src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java
+0
-6
src/windows/native/sun/windows/awt_Frame.cpp
src/windows/native/sun/windows/awt_Frame.cpp
+0
-23
未找到文件。
src/share/classes/sun/applet/AppletPanel.java
浏览文件 @
b3f899b4
...
...
@@ -682,12 +682,7 @@ abstract class AppletPanel extends Panel implements AppletStub, Runnable {
if
(
toFocus
!=
null
)
{
if
(
parent
instanceof
EmbeddedFrame
)
{
// JDK-8056915: Try to request focus to the embedder first and
// activate the embedded frame through it
if
(!((
EmbeddedFrame
)
parent
).
requestFocusToEmbedder
())
{
// Otherwise activate the embedded frame directly
((
EmbeddedFrame
)
parent
).
synthesizeWindowActivation
(
true
);
}
((
EmbeddedFrame
)
parent
).
synthesizeWindowActivation
(
true
);
}
// EmbeddedFrame might have focus before the applet was added.
// Thus after its activation the most recent focus owner will be
...
...
src/share/classes/sun/awt/EmbeddedFrame.java
浏览文件 @
b3f899b4
...
...
@@ -360,15 +360,6 @@ public abstract class EmbeddedFrame extends Frame
*/
public
void
synthesizeWindowActivation
(
boolean
doActivate
)
{}
/**
* Requests the focus to the embedder.
*
* @return {@code true} if focus request was successful, and {@code false} otherwise.
*/
public
boolean
requestFocusToEmbedder
()
{
return
false
;
}
/**
* Moves this embedded frame to a new location. The top-left corner of
* the new location is specified by the <code>x</code> and <code>y</code>
...
...
src/windows/classes/sun/awt/windows/WEmbeddedFrame.java
浏览文件 @
b3f899b4
...
...
@@ -248,14 +248,6 @@ public class WEmbeddedFrame extends EmbeddedFrame {
}
}
@SuppressWarnings
(
"deprecation"
)
public
boolean
requestFocusToEmbedder
()
{
if
(
isEmbeddedInIE
)
{
return
((
WEmbeddedFramePeer
)
getPeer
()).
requestFocusToEmbedder
();
}
return
false
;
}
public
void
registerAccelerator
(
AWTKeyStroke
stroke
)
{}
public
void
unregisterAccelerator
(
AWTKeyStroke
stroke
)
{}
...
...
src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java
浏览文件 @
b3f899b4
...
...
@@ -79,10 +79,4 @@ public class WEmbeddedFramePeer extends WFramePeer {
return
!
Win32GraphicsEnvironment
.
isDWMCompositionEnabled
();
}
/**
* Sets the focus to plugin control window, the parent of embedded frame.
* Eventually, it will synthesizeWindowActivation to activate the embedded frame,
* if plugin control window gets the focus.
*/
public
native
boolean
requestFocusToEmbedder
();
}
src/windows/native/sun/windows/awt_Frame.cpp
浏览文件 @
b3f899b4
...
...
@@ -1961,29 +1961,6 @@ Java_sun_awt_windows_WFramePeer_synthesizeWmActivate(JNIEnv *env, jobject self,
CATCH_BAD_ALLOC
;
}
JNIEXPORT
jboolean
JNICALL
Java_sun_awt_windows_WEmbeddedFramePeer_requestFocusToEmbedder
(
JNIEnv
*
env
,
jobject
self
)
{
jboolean
result
=
JNI_FALSE
;
TRY
;
AwtFrame
*
frame
=
NULL
;
PDATA
pData
;
JNI_CHECK_PEER_GOTO
(
self
,
ret
);
frame
=
(
AwtFrame
*
)
pData
;
// JDK-8056915: During initial applet activation, set focus to plugin control window
HWND
hwndParent
=
::
GetParent
(
frame
->
GetHWnd
());
result
=
SetFocusToPluginControl
(
hwndParent
);
CATCH_BAD_ALLOC_RET
(
JNI_FALSE
);
ret:
return
result
;
}
}
/* extern "C" */
static
bool
SetFocusToPluginControl
(
HWND
hwndPlugin
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录