[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit ff69088ef2ede00e5ea3d707cc9ce5fc758ba01a
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jun 16 02:12:14 2004 +0000

    WebKit:
    	Fixed <rdar://problem/3695875>: Objective-C instances that are exported to JavaScript are too promiscuous
    
    	Flip the policy for exposing Objective-C methods and properties.
    
    	Reviewed by Trey.
    
    	* Plugins.subproj/WebPluginPackage.m:
    	(+[NSObject isSelectorExcludedFromWebScript:]):  Just return YES.
    	(+[NSObject isKeyExcludedFromWebScript:]):  Just return YES.
    
    JavaScriptCore:
    	Fixed <rdar://problem/3695875>: Objective-C instances that are exported to JavaScript are too promiscuous
    
    
    	No longer need to check respondsToSelector: for
    	isSelectorExcludedFromWebScript: and isKeyExcludedFromWebScript:
    	because these now have a default implementation on NSObject.
    
            Reviewed by Trey.
    
            * bindings/objc/objc_class.mm:
            (ObjcClass::methodsNamed):
            (ObjcClass::fieldNamed):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6862 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index fa34aa3..11bee84 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2004-06-15  Richard Williamson   <rjw at apple.com>
+
+	Fixed <rdar://problem/3695875>: Objective-C instances that are exported to JavaScript are too promiscuous
+
+	No longer need to check respondsToSelector: for
+	isSelectorExcludedFromWebScript: and isKeyExcludedFromWebScript:
+	because these now have a default implementation on NSObject.
+
+        Reviewed by Trey.
+
+        * bindings/objc/objc_class.mm:
+        (ObjcClass::methodsNamed):
+        (ObjcClass::fieldNamed):
+
 2004-06-14  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/JavaScriptCore/bindings/objc/objc_class.mm b/JavaScriptCore/bindings/objc/objc_class.mm
index 2a18cda..f6484c6 100644
--- a/JavaScriptCore/bindings/objc/objc_class.mm
+++ b/JavaScriptCore/bindings/objc/objc_class.mm
@@ -113,10 +113,8 @@ MethodList ObjcClass::methodsNamed(const char *_name) const
                 NSString *mappedName = 0;
             
                 // See if the class wants to exclude the selector from visibility in JavaScript.
-                if ([(id)thisClass respondsToSelector:@selector(isSelectorExcludedFromWebScript:)]) {
-                    if ([(id)thisClass isSelectorExcludedFromWebScript:objcMethod->method_name]) {
-                        continue;
-                    }
+                if ([(id)thisClass isSelectorExcludedFromWebScript:objcMethod->method_name]) {
+                    continue;
                 }
                 
                 // See if the class want to provide a different name for the selector in JavaScript.
@@ -164,10 +162,8 @@ Field *ObjcClass::fieldNamed(const char *name) const
                 NSString *mappedName = 0;
 
                 // See if the class wants to exclude the selector from visibility in JavaScript.
-                if ([(id)thisClass respondsToSelector:@selector(isKeyExcludedFromWebScript:)]) {
-                    if ([(id)thisClass isKeyExcludedFromWebScript:objcIVar->ivar_name]) {
-                        continue;
-                    }
+                if ([(id)thisClass isKeyExcludedFromWebScript:objcIVar->ivar_name]) {
+                    continue;
                 }
                 
                 // See if the class want to provide a different name for the selector in JavaScript.
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9fe4eea..06db968 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2004-06-15  Richard Williamson   <rjw at apple.com>
+
+		Fixed <rdar://problem/3695875>: Objective-C instances that are exported to JavaScript are too promiscuous
+
+		Flip the policy for exposing Objective-C methods and properties.
+		
+        Reviewed by Trey.
+
+        * Plugins.subproj/WebPluginPackage.m:
+        (+[NSObject isSelectorExcludedFromWebScript:]):  Just return YES.
+        (+[NSObject isKeyExcludedFromWebScript:]):  Just return YES.
+
 2004-06-15  Trey Matteson  <trey at apple.com>
 
 	3639321 - Harvard PIN authentication ends up sending PIN as clear text with POST action
diff --git a/WebKit/Plugins.subproj/WebPluginPackage.m b/WebKit/Plugins.subproj/WebPluginPackage.m
index 76c46c5..f1e5b63 100644
--- a/WebKit/Plugins.subproj/WebPluginPackage.m
+++ b/WebKit/Plugins.subproj/WebPluginPackage.m
@@ -83,3 +83,18 @@ extern NSString *WebPlugInContainingElementKey;
 }
 
 @end
+
+ at implementation NSObject (WebScripting)
+
++ (BOOL)isSelectorExcludedFromWebScript:(SEL)aSelector
+{
+    return YES;
+}
+
++ (BOOL)isKeyExcludedFromWebScript:(const char *)name
+{
+    return YES;
+}
+
+ at end
+

-- 
WebKit Debian packaging