Changeset 99611 in webkit

Timestamp:

Nov 8, 2011, 12:59:47 PM (14 years ago)

Author:

adamk@chromium.org

Message:

WebKitMutationObserver.observe should raise a DOMException if passed invalid arguments
​https://bugs.webkit.org/show_bug.cgi?id=71596

Reviewed by Ryosuke Niwa.

Source/WebCore:

Adds two cases where WebKitMutationObserver.observe throws an exception:

• When passed a null Node*.
• When passed options that don't make sense, e.g., 'attributeOldValue' but not 'attributes'.

• bindings/js/JSWebKitMutationObserverCustom.cpp:

(WebCore::JSWebKitMutationObserver::observe):

• bindings/v8/custom/V8WebKitMutationObserverCustom.cpp:

(WebCore::V8WebKitMutationObserver::observeCallback):

• dom/WebKitMutationObserver.cpp:

(WebCore::WebKitMutationObserver::validateOptions):
(WebCore::WebKitMutationObserver::observe):

• dom/WebKitMutationObserver.h:
• dom/WebKitMutationObserver.idl:

LayoutTests:

• fast/mutation/observe-exceptions-expected.txt:
• fast/mutation/observe-exceptions.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mutation/observe-exceptions-expected.txt (modified) (1 diff)
• LayoutTests/fast/mutation/observe-exceptions.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/JSWebKitMutationObserverCustom.cpp (modified) (1 diff)
• Source/WebCore/bindings/v8/custom/V8WebKitMutationObserverCustom.cpp (modified) (1 diff)
• Source/WebCore/dom/WebKitMutationObserver.cpp (modified) (2 diffs)
• Source/WebCore/dom/WebKitMutationObserver.h (modified) (3 diffs)
• Source/WebCore/dom/WebKitMutationObserver.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-11-08  Adam Klein  <adamk@chromium.org>
+
+        WebKitMutationObserver.observe should raise a DOMException if passed invalid arguments
+        https://bugs.webkit.org/show_bug.cgi?id=71596
+
+        Reviewed by Ryosuke Niwa.
+
+        * fast/mutation/observe-exceptions-expected.txt:
+        * fast/mutation/observe-exceptions.html:
+
 2011-11-08  Joshua Bell  <jsbell@chromium.org>
 

trunk/LayoutTests/fast/mutation/observe-exceptions-expected.txt

@@ -10 +10 @@
 PASS observer.observe(document.body, null) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
 PASS observer.observe(document.body, undefined) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS observer.observe(null, {attributes: true}) threw exception Error: NOT_FOUND_ERR: DOM Exception 8.
+PASS observer.observe(undefined, {attributes: true}) threw exception Error: NOT_FOUND_ERR: DOM Exception 8.
+PASS observer.observe(document.body, {subtree: true}) threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS observer.observe(document.body, {childList: true, attributeOldValue: true}) threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS observer.observe(document.body, {attributes: true, characterDataOldValue: true}) threw exception Error: SYNTAX_ERR: DOM Exception 12.
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/mutation/observe-exceptions.html

@@ -19 +19 @@
     shouldThrow('observer.observe(document.body, null)');
     shouldThrow('observer.observe(document.body, undefined)');
+    shouldThrow('observer.observe(null, {attributes: true})');
+    shouldThrow('observer.observe(undefined, {attributes: true})');
+    shouldThrow('observer.observe(document.body, {subtree: true})');
+    shouldThrow('observer.observe(document.body, {childList: true, attributeOldValue: true})');
+    shouldThrow('observer.observe(document.body, {attributes: true, characterDataOldValue: true})');
+    // FIXME: Uncomment the below when attributeFilter is supported.
+    //shouldThrow('observer.observe(document.body, {characterData: true, attributeFilter: ["id"]})');
 }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-08  Adam Klein  <adamk@chromium.org>
+
+        WebKitMutationObserver.observe should raise a DOMException if passed invalid arguments
+        https://bugs.webkit.org/show_bug.cgi?id=71596
+
+        Reviewed by Ryosuke Niwa.
+
+        Adds two cases where WebKitMutationObserver.observe throws an exception:
+          - When passed a null Node*.
+          - When passed options that don't make sense, e.g.,
+            'attributeOldValue' but not 'attributes'.
+
+        * bindings/js/JSWebKitMutationObserverCustom.cpp:
+        (WebCore::JSWebKitMutationObserver::observe):
+        * bindings/v8/custom/V8WebKitMutationObserverCustom.cpp:
+        (WebCore::V8WebKitMutationObserver::observeCallback):
+        * dom/WebKitMutationObserver.cpp:
+        (WebCore::WebKitMutationObserver::validateOptions):
+        (WebCore::WebKitMutationObserver::observe):
+        * dom/WebKitMutationObserver.h:
+        * dom/WebKitMutationObserver.idl:
+
 2011-11-08  Joshua Bell  <jsbell@chromium.org>
 

trunk/Source/WebCore/bindings/js/JSWebKitMutationObserverCustom.cpp

@@ -94 +94 @@
         return jsUndefined();
 
-    impl()->observe(target, options);
+    ExceptionCode ec = 0;
+    impl()->observe(target, options, ec);
+    if (ec)
+        setDOMException(exec, ec);
     return jsUndefined();
 }

trunk/Source/WebCore/bindings/v8/custom/V8WebKitMutationObserverCustom.cpp

@@ -104 +104 @@
         options |= WebKitMutationObserver::CharacterDataOldValue;
 
-    imp->observe(target, options);
+    ExceptionCode ec = 0;
+    imp->observe(target, options, ec);
+    if (ec)
+        V8Proxy::setDOMException(ec);
     return v8::Handle<v8::Value>();
 }

trunk/Source/WebCore/dom/WebKitMutationObserver.cpp

@@ -36 +36 @@
 
 #include "Document.h"
+#include "ExceptionCode.h"
 #include "MutationCallback.h"
 #include "MutationObserverRegistration.h"
@@ -59 +60 @@
 }
 
-void WebKitMutationObserver::observe(Node* node, MutationObserverOptions options)
+bool WebKitMutationObserver::validateOptions(MutationObserverOptions options)
 {
+    return (options & (Attributes | CharacterData | ChildList))
+        && ((options & Attributes) || !(options & AttributeOldValue))
+        // FIXME: Uncomment the line below once attributeFilter is supported.
+        // && ((options & Attributes) || !(options & AttributeFilter))
+        && ((options & CharacterData) || !(options & CharacterDataOldValue));
+}
+
+void WebKitMutationObserver::observe(Node* node, MutationObserverOptions options, ExceptionCode& ec)
+{
+    if (!node) {
+        ec = NOT_FOUND_ERR;
+        return;
+    }
+
+    if (!validateOptions(options)) {
+        // FIXME: Revisit this once the spec specifies the exception type; SYNTAX_ERR may not be appropriate.
+        ec = SYNTAX_ERR;
+        return;
+    }
+
     MutationObserverRegistration* registration = node->registerMutationObserver(this);
     registration->resetObservation(options);

trunk/Source/WebCore/dom/WebKitMutationObserver.h

@@ -34 +34 @@
 #if ENABLE(MUTATION_OBSERVERS)
 
+#include "ExceptionCode.h"
 #include <wtf/HashSet.h>
 #include <wtf/PassRefPtr.h>
@@ -76 +77 @@
     ~WebKitMutationObserver();
 
-    void observe(Node*, MutationObserverOptions);
+    void observe(Node*, MutationObserverOptions, ExceptionCode&);
     void disconnect();
     void observationStarted(MutationObserverRegistration*);
@@ -85 +86 @@
     WebKitMutationObserver(PassRefPtr<MutationCallback>);
     void deliver();
+
+    static bool validateOptions(MutationObserverOptions);
 
     RefPtr<MutationCallback> m_callback;

trunk/Source/WebCore/dom/WebKitMutationObserver.idl

@@ -35 +35 @@
         CustomConstructor
     ] WebKitMutationObserver {
-        [Custom] void observe(in Node target, in MutationObserverOptions options);
+        [Custom] void observe(in Node target, in MutationObserverOptions options)
+            raises(DOMException);
         void disconnect();
     };