Changeset 63763 in webkit

Timestamp:

Jul 20, 2010 12:23:58 PM (14 years ago)

Author:

Joseph Pecoraro

Message:

2010-07-20 Joseph Pecoraro <Joseph Pecoraro>

Reviewed by Geoffrey Garen.

WebScriptObject Should Allow Safely Checking For Key Existence
​https://bugs.webkit.org/show_bug.cgi?id=42613

• platform/mac/fast/objc/script-tests/TEMPLATE.html: Added.
• platform/mac/fast/objc/script-tests/webScriptObject-hasWebScriptKey.js: Added.
• platform/mac/fast/objc/webScriptObject-hasWebScriptKey-expected.txt: Added.
• platform/mac/fast/objc/webScriptObject-hasWebScriptKey.html: Added.

2010-07-20 Joseph Pecoraro <Joseph Pecoraro>

Reviewed by Geoffrey Garen.

WebScriptObject Should Allow Safely Checking For Key Existence
​https://bugs.webkit.org/show_bug.cgi?id=42613

Test: platform/mac/fast/objc/webScriptObject-hasWebScriptKey.html

Add private API "hasWebScriptKey" to check for key existence in
a WebScriptObject. Like JavaScript's in syntax. This is intended
to be made public eventually.

• bindings/objc/WebScriptObject.mm: (-[WebScriptObject hasWebScriptKey:]):
• bindings/objc/WebScriptObjectPrivate.h:

2010-07-20 Joseph Pecoraro <Joseph Pecoraro>

Reviewed by Geoffrey Garen.

WebScriptObject Should Allow Safely Checking For Key Existence
​https://bugs.webkit.org/show_bug.cgi?id=42613

Normal ObjCController workflow for a WebScriptObject test.

• DumpRenderTree/mac/ObjCController.m: (+[ObjCController isSelectorExcludedFromWebScript:]): (+[ObjCController webScriptNameForSelector:]): (-[ObjCController testHasWebScriptKey:]):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/fast/objc/script-tests (added)
• LayoutTests/platform/mac/fast/objc/script-tests/TEMPLATE.html (added)
• LayoutTests/platform/mac/fast/objc/script-tests/webScriptObject-hasWebScriptKey.js (added)
• LayoutTests/platform/mac/fast/objc/webScriptObject-hasWebScriptKey-expected.txt (added)
• LayoutTests/platform/mac/fast/objc/webScriptObject-hasWebScriptKey.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/objc/WebScriptObject.mm (modified) (1 diff)
• WebCore/bindings/objc/WebScriptObjectPrivate.h (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/mac/ObjCController.m (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-07-20  Joseph Pecoraro  <joepeck@webkit.org>
+
+        Reviewed by Geoffrey Garen.
+
+        WebScriptObject Should Allow Safely Checking For Key Existence
+        https://bugs.webkit.org/show_bug.cgi?id=42613
+
+        * platform/mac/fast/objc/script-tests/TEMPLATE.html: Added.
+        * platform/mac/fast/objc/script-tests/webScriptObject-hasWebScriptKey.js: Added.
+        * platform/mac/fast/objc/webScriptObject-hasWebScriptKey-expected.txt: Added.
+        * platform/mac/fast/objc/webScriptObject-hasWebScriptKey.html: Added.
+
 2010-07-20  Stephen White  <senorblanco@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-20  Joseph Pecoraro  <joepeck@webkit.org>
+
+        Reviewed by Geoffrey Garen.
+
+        WebScriptObject Should Allow Safely Checking For Key Existence
+        https://bugs.webkit.org/show_bug.cgi?id=42613
+
+        Test: platform/mac/fast/objc/webScriptObject-hasWebScriptKey.html
+
+        Add private API "hasWebScriptKey" to check for key existence in
+        a WebScriptObject. Like JavaScript's `in` syntax. This is intended
+        to be made public eventually.
+
+        * bindings/objc/WebScriptObject.mm:
+        (-[WebScriptObject hasWebScriptKey:]):
+        * bindings/objc/WebScriptObjectPrivate.h:
+
 2010-07-20  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/bindings/objc/WebScriptObject.mm

@@ -434 +434 @@
 }
 
+- (BOOL)hasWebScriptKey:(NSString *)key
+{
+    if (![self _isSafeScript])
+        return NO;
+
+    ExecState* exec = [self _rootObject]->globalObject()->globalExec();
+    ASSERT(!exec->hadException());
+
+    JSLock lock(SilenceAssertionsOnly);
+    BOOL result = [self _imp]->hasProperty(exec, Identifier(exec, stringToUString(String(key))));
+
+    if (exec->hadException()) {
+        addExceptionToConsole(exec);
+        exec->clearException();
+    }
+
+    _didExecute(self);
+
+    return result;
+}
+
 - (NSString *)stringRepresentation
 {

trunk/WebCore/bindings/objc/WebScriptObjectPrivate.h

@@ -60 +60 @@
 @end
 
+@interface WebScriptObject (StagedForPublic)
+/*!
+ @method hasWebScriptKey:
+ @param name The name of the property to check for.
+ @discussion Checks for the existence of the property on the object in the script environment.
+ @result Returns YES if the property exists, NO otherwise.
+ */
+- (BOOL)hasWebScriptKey:(NSString *)name;
+@end
+
 @interface WebScriptObjectPrivate : NSObject
 {

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-07-20  Joseph Pecoraro  <joepeck@webkit.org>
+
+        Reviewed by Geoffrey Garen.
+
+        WebScriptObject Should Allow Safely Checking For Key Existence
+        https://bugs.webkit.org/show_bug.cgi?id=42613
+
+        Normal ObjCController workflow for a WebScriptObject test.
+
+        * DumpRenderTree/mac/ObjCController.m:
+        (+[ObjCController isSelectorExcludedFromWebScript:]):
+        (+[ObjCController webScriptNameForSelector:]):
+        (-[ObjCController testHasWebScriptKey:]):
+
 2010-07-20  Chris Marrin  <cmarrin@apple.com>
 

trunk/WebKitTools/DumpRenderTree/mac/ObjCController.m

@@ -37 +37 @@
 #import <wtf/Assertions.h>
 
+// Remove this once hasWebScriptKey has been made public.
+@interface WebScriptObject (StagedForPublic)
+- (BOOL)hasWebScriptKey:(NSString *)name;
+@end
+
 static void* runJavaScriptThread(void* arg)
 {
@@ -67 +72 @@
             || aSelector == @selector(storeWebScriptObject:)
             || aSelector == @selector(testValueForKey)
+            || aSelector == @selector(testHasWebScriptKey:)
             || aSelector == @selector(testArray)
         )
@@ -93 +99 @@
     if (aSelector == @selector(testValueForKey))
         return @"testValueForKey";
+    if (aSelector == @selector(testHasWebScriptKey:))
+        return @"testHasWebScriptKey";
     if (aSelector == @selector(testArray))
         return @"testArray";
@@ -167 +175 @@
 }
 
+- (BOOL)testHasWebScriptKey:(NSString *)key
+{
+    ASSERT(storedWebScriptObject);
+    return [storedWebScriptObject hasWebScriptKey:key];
+}
+
 - (BOOL)testWrapperRoundTripping:(WebScriptObject *)webScriptObject
 {