129609

2 files changed, 8 insertions, 37 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/carbon/org/eclipse/swt/browser/Browser.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/carbon/org/eclipse/swt/browser/Browser.java
index 479c8e090b..6eabab9c11 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/carbon/org/eclipse/swt/browser/Browser.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/carbon/org/eclipse/swt/browser/Browser.java
@@ -801,12 +801,10 @@ int handleCallback(int selector, int arg0, int arg1, int arg2, int arg3) {
 		case 23: setStatusText(arg0); break;
 		case 24: webViewFocus(); break;
 		case 25: webViewUnfocus(); break;
-		case 26: ret = webViewFirstResponder(); break;
-		case 27: makeFirstResponder(arg0); break;
-		case 28: runJavaScriptAlertPanelWithMessage(arg0); break;
-		case 29: ret = runJavaScriptConfirmPanelWithMessage(arg0); break;
-		case 30: runOpenPanelForFileButtonWithResultListener(arg0); break;
-		case 31: decideDestinationWithSuggestedFilename(arg0, arg1); break;
+		case 26: runJavaScriptAlertPanelWithMessage(arg0); break;
+		case 27: ret = runJavaScriptConfirmPanelWithMessage(arg0); break;
+		case 28: runOpenPanelForFileButtonWithResultListener(arg0); break;
+		case 29: decideDestinationWithSuggestedFilename(arg0, arg1); break;
 	}
 	return ret;
 }
@@ -1626,23 +1624,6 @@ void webViewFocus() {
 void webViewUnfocus() {
 }
 
-int webViewFirstResponder() {
-	/*
-	* Note.  A web page can request focus through javascript to an internal
-	* element.  For some reason, when this occurs, Carbon SWT widget previously
-	* focused continues to believe it has focus, causing graphical problems
-	* (text widget shows flashing caret) and keyboard grab (keyboard continues
-	* to go to WebKit even if the Browser widget is hidden and another Carbon
-	* SWT widget has been selected by the user.  The workaround is to not allow
-	* WebKit to give focus to an internal element by returning 0 in this
-	* callback and by not doing anything in the makeFirstResponder callback. 
-	*/
-	return 0;
-}
-
-void makeFirstResponder(int responder) {
-}
-
 void runJavaScriptAlertPanelWithMessage(int message) {
 	int length = OS.CFStringGetLength(message);
 	char[] buffer = new char[length];
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/webkit.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/webkit.c
index ee20693b6d..235fac5911 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/webkit.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/webkit.c
@@ -194,29 +194,19 @@ JNIEXPORT jint JNICALL Java_org_eclipse_swt_browser_WebKit_sel_1registerName(JNI
 	proc((int)sender, user_data, 25, 0, 0, 0, 0);
 }
 
-- (NSResponder *)webViewFirstResponder:(WebView *)sender
-{
-	return (NSResponder *) proc((int)sender, user_data, 26, 0, 0, 0, 0);
-}
-
-- (void)webView:(WebView *)sender makeFirstResponder:(NSResponder *)responder
-{
-	proc((int)sender, user_data, 27, (int)responder, 0, 0, 0);
-}
-
 - (void)webView:(WebView *)sender runJavaScriptAlertPanelWithMessage:(NSString *)message
 {
-	proc((int)sender, user_data, 28, (int)message, 0, 0, 0);
+	proc((int)sender, user_data, 26, (int)message, 0, 0, 0);
 }
 
 - (BOOL)webView:(WebView *)sender runJavaScriptConfirmPanelWithMessage:(NSString *)message
 {
-	return (BOOL) proc((int)sender, user_data, 29, (int)message, 0, 0, 0);
+	return (BOOL) proc((int)sender, user_data, 27, (int)message, 0, 0, 0);
 }
 
 - (void)webView:(WebView *)sender runOpenPanelForFileButtonWithResultListener:(id<WebOpenPanelResultListener>)resultListener
 {
-	proc((int)sender, user_data, 30, (int)resultListener, 0, 0, 0);
+	proc((int)sender, user_data, 28, (int)resultListener, 0, 0, 0);
 }
 
 /* WebPolicyDelegate */
@@ -246,7 +236,7 @@ JNIEXPORT jint JNICALL Java_org_eclipse_swt_browser_WebKit_sel_1registerName(JNI
 
 - (void)download:(NSURLDownload *)download decideDestinationWithSuggestedFilename:(NSString *)filename
 {
-	proc((int)download, user_data, 31, (int)download, (int)filename, 0, 0);
+	proc((int)download, user_data, 29, (int)download, (int)filename, 0, 0);
 }
 
 @end