infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-01 03:30:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

8130776: Remove EmbeddedFrame.requestFocusToEmbedder() method

Browse Source 
Reviewed-by: serb, ant
This commit is contained in:
Alexey Ivanov 2015-07-22 17:33:17 +03:00
parent 9a85aed6c8
commit 0dea9d5c85
5 changed files with 1 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java
View File

@ -687,12 +687,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

9
jdk/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java
View File

@ -356,15 +356,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>

9
jdk/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java
View File

@ -251,15 +251,6 @@ public class WEmbeddedFrame extends EmbeddedFrame {
}
}
public boolean requestFocusToEmbedder() {
if (isEmbeddedInIE) {
final WEmbeddedFramePeer peer = AWTAccessor.getComponentAccessor()
.getPeer(this);
return peer.requestFocusToEmbedder();
}
return false;
}
public void registerAccelerator(AWTKeyStroke stroke) {}
public void unregisterAccelerator(AWTKeyStroke stroke) {}

6
jdk/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java
View File

@ -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();
}

23
jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp
View File

@ -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)