Commit e630e667 authored by andersca's avatar andersca

2006-06-28 Anders Carlsson <acarlsson@apple.com>

        Reviewed by Geoff.

        http://bugzilla.opendarwin.org/show_bug.cgi?id=8636
        REGRESSION: JavaScript access to Java applet causes hang (_webViewURL not implemented)
        
        * bindings/jni/jni_objc.mm:
        (KJS::Bindings::dispatchJNICall):
        Just pass nil as the calling URL. This will cause the Java plugin to use the URL of the page
        containing the applet (which is what we used to do).



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@15070 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent b12fa148
2006-06-28 Anders Carlsson <acarlsson@apple.com>
Reviewed by Geoff.
http://bugzilla.opendarwin.org/show_bug.cgi?id=8636
REGRESSION: JavaScript access to Java applet causes hang (_webViewURL not implemented)
* bindings/jni/jni_objc.mm:
(KJS::Bindings::dispatchJNICall):
Just pass nil as the calling URL. This will cause the Java plugin to use the URL of the page
containing the applet (which is what we used to do).
2006-06-27 Timothy Hatcher <timothy@apple.com>
Reviewed by Darin.
......
......@@ -40,10 +40,6 @@ using namespace KJS::Bindings;
exceptionDescription:(NSString **)exceptionString;
@end
@interface NSObject (WebPrivate)
- (NSURL *)_webViewURL;
@end
bool KJS::Bindings::dispatchJNICall (const void *targetAppletView, jobject obj, bool isStatic, JNIType returnType, jmethodID methodID, jvalue *args, jvalue &result, const char*, JSValue *&exceptionDescription)
{
id view = (id)targetAppletView;
......@@ -51,11 +47,11 @@ bool KJS::Bindings::dispatchJNICall (const void *targetAppletView, jobject obj,
if ([view respondsToSelector:@selector(webPlugInCallJava:isStatic:returnType:method:arguments:callingURL:exceptionDescription:)]) {
NSString *_exceptionDescription = 0;
// Always just pass the URL of the page that contains the applet. The
// execution restrictions implemented in WebCore will guarantee
// that only appropriate JavaScript can reference the applet.
NSURL *_callingURL = [view _webViewURL];
result = [view webPlugInCallJava:obj isStatic:isStatic returnType:returnType method:methodID arguments:args callingURL:_callingURL exceptionDescription:&_exceptionDescription];
// Passing nil as the calling URL will cause the Java plugin to use the URL
// of the page that contains the applet. The execution restrictions
// implemented in WebCore will guarantee that only appropriate JavaScript
// can reference the applet.
result = [view webPlugInCallJava:obj isStatic:isStatic returnType:returnType method:methodID arguments:args callingURL:nil exceptionDescription:&_exceptionDescription];
if (_exceptionDescription != 0) {
exceptionDescription = convertNSStringToString(_exceptionDescription);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment