WebKit:
authorrjw <rjw@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 18 Aug 2004 23:34:39 +0000 (23:34 +0000)
committerrjw <rjw@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 18 Aug 2004 23:34:39 +0000 (23:34 +0000)
        Replace horrible pollForAppletInView: with new
        webPlugInGetApplet.  The details of how the applet instance
        is provided now belong to the Java team.  Yeh.

        Reviewed by Chris.

        * WebCoreSupport.subproj/WebBridge.m:
        (-[WebBridge getAppletInView:]):

WebCore:
        Replace horrible pollForAppletInView: with new
        webPlugInGetApplet.  The details of how the applet instance
        is provided now belong to the Java team.  Yeh.

        Reviewed by Chris.

        * kwq/KWQKHTMLPart.mm:
        (KWQKHTMLPart::getAppletInstanceForView):
        * kwq/WebCoreBridge.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7288 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog-2005-08-23
WebCore/kwq/KWQKHTMLPart.mm
WebCore/kwq/WebCoreBridge.h
WebKit/ChangeLog
WebKit/WebCoreSupport.subproj/WebBridge.m

index 5a718cb2487afd42e9ac358928065cbda56c10bd..dc45de0dc676e8f63742cd4c4b6c9cdf75d251dd 100644 (file)
@@ -1,3 +1,14 @@
+2004-08-18  Richard Williamson   <rjw@apple.com>
+
+        Replace horrible pollForAppletInView: with new
+        webPlugInGetApplet.  The details of how the applet instance
+        is provided now belong to the Java team.  Yeh.
+               
+        Reviewed by Chris.
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::getAppletInstanceForView):
+        * kwq/WebCoreBridge.h:
+
 2004-08-18  Chris Blumenberg  <cblu@apple.com>
 
        Fixed: <rdar://problem/3692199> 8A146: Safari crashes in toHTMLWithOptions, selection with no renderer (various sites)
index 7c499a11182e5f402b9f3bea346ec662fa7f4c32..7299414a97c6173ce05cf56f1f923b84ceeec4f2 100644 (file)
@@ -3542,8 +3542,13 @@ void KHTMLPart::print()
 
 KJS::Bindings::Instance *KWQKHTMLPart::getAppletInstanceForView (NSView *aView)
 {
+    jobject applet;
+    
     // Get a pointer to the actual Java applet instance.
-    jobject applet = [_bridge pollForAppletInView:aView];
+    if ([_bridge respondsToSelector:@selector(getAppletInView:)])
+        applet = [_bridge getAppletInView:aView];
+    else
+        applet = [_bridge pollForAppletInView:aView];
     
     if (applet)
         // Wrap the Java instance in a language neutral binding and hand
index d9f639e954e846fa6a4c462f1e832ea20cf27897..a1ca1015ff69d33ecf5fd234ebab9e85ea0a1456 100644 (file)
@@ -475,6 +475,9 @@ typedef enum {
 
 - (void)print;
 
+- (jobject)getAppletInView:(NSView *)view;
+
+// Deprecated, use getAppletInView: instead.
 - (jobject)pollForAppletInView:(NSView *)view;
 
 - (NSUndoManager *)undoManager;
index 31fc4315dd1ea76b79430f8ee60f19c1c8431d16..c581b51c852216d92673dd9cce8b56bf1c281855 100644 (file)
@@ -1,3 +1,14 @@
+2004-08-18  Richard Williamson   <rjw@apple.com>
+
+        Replace horrible pollForAppletInView: with new
+        webPlugInGetApplet.  The details of how the applet instance
+        is provided now belong to the Java team.  Yeh.
+               
+        Reviewed by Chris.
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge getAppletInView:]):
+
 2004-08-17  Richard Williamson   <rjw@apple.com>
 
         Fixed <rdar://problem/3759093> Need PDF context menu: "Open in Preview" or other external app
index c86524206715bc0a1b97733471ded510aef1fa2d..023b954acd814312265686ec38b0625b49b9c95f 100644 (file)
@@ -22,6 +22,7 @@
 #import <WebKit/WebHistoryItemPrivate.h>
 #import <WebKit/WebHTMLRepresentationPrivate.h>
 #import <WebKit/WebHTMLViewInternal.h>
+#import <WebKit/WebJavaPlugIn.h>
 #import <WebKit/WebJavaScriptTextInputPanel.h>
 #import <WebKit/WebKitErrorsPrivate.h>
 #import <WebKit/WebKitLogging.h>
@@ -1243,9 +1244,20 @@ static id <WebFormDelegate> formDelegate(WebBridge *self)
     }
 }
 
+- (jobject)getAppletInView:(NSView *)view
+{
+    jobject applet = 0;
+
+    if ([view respondsToSelector: @selector(webPlugInGetApplet:)])
+        applet = [view webPlugInGetApplet];
+        
+    return applet;
+}
+
 // NOTE: pollForAppletInView: will block until the block is ready to use, or
 // until a timeout is exceeded.  It will return nil if the timeour is
 // exceeded.
+// Deprecated, use getAppletInView:.
 - (jobject)pollForAppletInView: (NSView *)view
 {
     jobject applet = 0;