WebKit:

[WebKit-https.git] / JavaScriptCore / bindings / jni / jni_objc.mm

diff --git a/JavaScriptCore/bindings/jni/jni_objc.mm b/JavaScriptCore/bindings/jni/jni_objc.mm
index 5d931b06a424b5b98ec739f2409e7630e6fd2e72..b9ad924662bb7cb6c7440a023e881cc6e4f31d0e 100644 (file)
--- a/JavaScriptCore/bindings/jni/jni_objc.mm
+++ b/JavaScriptCore/bindings/jni/jni_objc.mm
@@ -39,13 +39,21 @@ 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 *callingURL, Value &exceptionDescription)
 {
     id view = (id)targetAppletView;
     
     if ([view respondsToSelector:@selector(webPlugInCallJava:isStatic:returnType:method:arguments:callingURL:exceptionDescription:)]) {
         NSString *_exceptionDescription = 0;
-        NSURL *_callingURL = callingURL ? [NSURL URLWithString:[NSString stringWithUTF8String:callingURL]] : nil;
+
+       // 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];
         if (_exceptionDescription != 0) {
             exceptionDescription = convertNSStringToString(_exceptionDescription);