Changeset 20642 in webkit

Timestamp:

Mar 31, 2007 9:48:17 PM (17 years ago)

Author:

bdash

Message:

2007-03-31 Mark Rowe <​mrowe@apple.com>

Reviewed by Darin.

A more correct fix for ​http://bugs.webkit.org/show_bug.cgi?id=13129
Bug 13129: Democracy Player dies in NSException from WebScriptObject on startup

The previous attempt at a fix in r20343 attempted to conditionally expose the 'count'
method. It did not work which resulted in 'count' always being hidden. This change
disables -[WebScriptObject count] completely until it can be determined whether it is
needed and how to support it without breaking third-party applications.

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

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/objc/WebScriptObject.mm (modified) (3 diffs)
• bindings/objc/WebScriptObjectPrivate.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-03-31  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Darin.
+
+        A more correct fix for http://bugs.webkit.org/show_bug.cgi?id=13129
+        Bug 13129: Democracy Player dies in NSException from WebScriptObject on startup
+
+        The previous attempt at a fix in r20343 attempted to conditionally expose the 'count'
+        method.  It did not work which resulted in 'count' always being hidden.  This change
+        disables -[WebScriptObject count] completely until it can be determined whether it is
+        needed and how to support it without breaking third-party applications.
+
+        * bindings/objc/WebScriptObject.mm:
+        (-[WebScriptObject count]):
+        * bindings/objc/WebScriptObjectPrivate.h:
+
 2007-03-31  Nicholas Shanks  <webkit@nickshanks.com>
 

trunk/WebCore/bindings/objc/WebScriptObject.mm

@@ -498 +498 @@
 @interface WebScriptObject (WebKitCocoaBindings)
 
-- (unsigned)_count;
 - (id)objectAtIndex:(unsigned)index;
 
@@ -505 +504 @@
 @implementation WebScriptObject (WebKitCocoaBindings)
 
-- (BOOL)_shouldRespondToCount
-{
-    if (_private->shouldRespondToCountSet)
-        return _private->shouldRespondToCount;
-
-    BOOL shouldRespondToCount = YES;
- 
-    @try {
-        [self valueForKey:@"length"];
-    } @catch (id e) {
-        shouldRespondToCount = NO;
-    }
-
-    _private->shouldRespondToCount = shouldRespondToCount;
-    _private->shouldRespondToCountSet = YES;
-
-    return shouldRespondToCount;
-}
-
-- (IMP)methodForSelector:(SEL)selector
-{
-    if (selector == @selector(count:) && [self _shouldRespondToCount])
-        selector = @selector(_count:);
-
-    return [super methodForSelector:selector];
-}
-
-- (BOOL)respondsToSelector:(SEL)selector
-{
-    if (selector == @selector(count:) && [self _shouldRespondToCount])
-        selector = @selector(_count:);
-
-    return [super respondsToSelector:selector];
-}
-
-
-- (unsigned)_count
+#if 0 
+// FIXME: presence of 'count' method on WebScriptObject breaks Democracy player
+//        http://bugs.webkit.org/show_bug.cgi?id=13129
+
+- (unsigned)count
 {
     id length = [self valueForKey:@"length"];
@@ -550 +517 @@
 }
 
+#endif
+
 - (id)objectAtIndex:(unsigned)index
 {

trunk/WebCore/bindings/objc/WebScriptObjectPrivate.h

@@ -29 +29 @@
     KJS::Bindings::RootObject* originRootObject;
     BOOL isCreatedByDOMWrapper;
-    BOOL shouldRespondToCount;
-    BOOL shouldRespondToCountSet;
 }
 @end