Changeset 97714 in webkit

Timestamp:

Oct 17, 2011 9:31:00 PM (13 years ago)

Author:

adamk@chromium.org

Message:

Parse MutationObserverOptions directly into a bitfield
​https://bugs.webkit.org/show_bug.cgi?id=70287

Reviewed by Ryosuke Niwa.

Replaces the MutationObserverOptions class with a typedef,
used to pass a bitfield composed of enums defined in
WebKitMutationObserver.h.

No new tests because no behavior should change.

• GNUmakefile.list.am:
• WebCore.gypi:
• WebCore.pro:
• WebCore.xcodeproj/project.pbxproj:
• bindings/js/JSDictionary.h: Removed now-unused method.
• bindings/js/JSWebKitMutationObserverCustom.cpp:

(WebCore::JSWebKitMutationObserver::observe):

• bindings/v8/custom/V8WebKitMutationObserverCustom.cpp:

(WebCore::V8WebKitMutationObserver::observeCallback):

• dom/MutationObserverOptions.h: Removed.
• dom/Node.cpp:

(WebCore::Node::registerMutationObserver):

• dom/Node.h:
• dom/NodeRareData.h:

(WebCore::MutationObserverEntry::MutationObserverEntry):
(WebCore::MutationObserverEntry::matches):

• dom/WebKitMutationObserver.cpp:

(WebCore::WebKitMutationObserver::observe):

• dom/WebKitMutationObserver.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.list.am (modified) (1 diff)
• WebCore.gypi (modified) (1 diff)
• WebCore.pro (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• bindings/js/JSDictionary.h (modified) (2 diffs)
• bindings/js/JSWebKitMutationObserverCustom.cpp (modified) (2 diffs)
• bindings/v8/custom/V8WebKitMutationObserverCustom.cpp (modified) (2 diffs)
• dom/MutationObserverOptions.h (deleted)
• dom/Node.cpp (modified) (1 diff)
• dom/Node.h (modified) (1 diff)
• dom/NodeRareData.h (modified) (3 diffs)
• dom/WebKitMutationObserver.cpp (modified) (2 diffs)
• dom/WebKitMutationObserver.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-17  Adam Klein  <adamk@chromium.org>
+
+        Parse MutationObserverOptions directly into a bitfield
+        https://bugs.webkit.org/show_bug.cgi?id=70287
+
+        Reviewed by Ryosuke Niwa.
+
+        Replaces the MutationObserverOptions class with a typedef,
+        used to pass a bitfield composed of enums defined in
+        WebKitMutationObserver.h.
+
+        No new tests because no behavior should change.
+
+        * GNUmakefile.list.am:
+        * WebCore.gypi:
+        * WebCore.pro:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSDictionary.h: Removed now-unused method.
+        * bindings/js/JSWebKitMutationObserverCustom.cpp:
+        (WebCore::JSWebKitMutationObserver::observe):
+        * bindings/v8/custom/V8WebKitMutationObserverCustom.cpp:
+        (WebCore::V8WebKitMutationObserver::observeCallback):
+        * dom/MutationObserverOptions.h: Removed.
+        * dom/Node.cpp:
+        (WebCore::Node::registerMutationObserver):
+        * dom/Node.h:
+        * dom/NodeRareData.h:
+        (WebCore::MutationObserverEntry::MutationObserverEntry):
+        (WebCore::MutationObserverEntry::matches):
+        * dom/WebKitMutationObserver.cpp:
+        (WebCore::WebKitMutationObserver::observe):
+        * dom/WebKitMutationObserver.h:
+
 2011-10-17  Luke Macpherson   <macpherson@chromium.org>
 

trunk/Source/WebCore/GNUmakefile.list.am

@@ -1238 +1238 @@
         Source/WebCore/dom/MutationEvent.cpp \
         Source/WebCore/dom/MutationEvent.h \
-        Source/WebCore/dom/MutationObserverOptions.h \
         Source/WebCore/dom/MutationRecord.cpp \
         Source/WebCore/dom/MutationRecord.h \

trunk/Source/WebCore/WebCore.gypi

@@ -5228 +5228 @@
             'dom/MutationEvent.cpp',
             'dom/MutationEvent.h',
-            'dom/MutationObserverOptions.h',
             'dom/MutationRecord.cpp',
             'dom/MutationRecord.h',

trunk/Source/WebCore/WebCore.pro

@@ -1556 +1556 @@
     dom/MutationCallback.h \
     dom/MutationEvent.h \
-    dom/MutationObserverOptions.h \
     dom/MutationRecord.h \
     dom/NamedNodeMap.h \

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -5470 +5470 @@
                 C6F0900E14327B6100685849 /* WebKitMutationObserver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C6F0900514327B6100685849 /* WebKitMutationObserver.cpp */; };
                 C6F0900F14327B6100685849 /* WebKitMutationObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = C6F0900614327B6100685849 /* WebKitMutationObserver.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                C6F0901114327B6100685849 /* MutationObserverOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = C6F0900814327B6100685849 /* MutationObserverOptions.h */; };
                 C6F0902814327D4F00685849 /* JSMutationCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C6F0902014327D4F00685849 /* JSMutationCallback.cpp */; };
                 C6F0902914327D4F00685849 /* JSMutationCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = C6F0902114327D4F00685849 /* JSMutationCallback.h */; };
@@ -12772 +12771 @@
                 C6F0900614327B6100685849 /* WebKitMutationObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitMutationObserver.h; sourceTree = "<group>"; };
                 C6F0900714327B6100685849 /* WebKitMutationObserver.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitMutationObserver.idl; sourceTree = "<group>"; };
-                C6F0900814327B6100685849 /* MutationObserverOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MutationObserverOptions.h; sourceTree = "<group>"; };
                 C6F0902014327D4F00685849 /* JSMutationCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMutationCallback.cpp; sourceTree = "<group>"; };
                 C6F0902114327D4F00685849 /* JSMutationCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMutationCallback.h; sourceTree = "<group>"; };
@@ -21129 +21127 @@
                                 85031B340A44EFC700F992E0 /* MutationEvent.h */,
                                 93EEC1F309C2877700C515D1 /* MutationEvent.idl */,
-                                C6F0900814327B6100685849 /* MutationObserverOptions.h */,
                                 C6F08FB91430FE8F00685849 /* MutationRecord.cpp */,
                                 C6F08FBA1430FE8F00685849 /* MutationRecord.h */,
@@ -23635 +23632 @@
                                 C6F0900A14327B6100685849 /* MutationCallback.h in Headers */,
                                 85031B4A0A44EFC700F992E0 /* MutationEvent.h in Headers */,
-                                C6F0901114327B6100685849 /* MutationObserverOptions.h in Headers */,
                                 C6F08FBD1430FE8F00685849 /* MutationRecord.h in Headers */,
                                 A81872230977D3C0005826D9 /* NamedNodeMap.h in Headers */,

trunk/Source/WebCore/bindings/js/JSDictionary.h

@@ -53 +53 @@
     bool tryGetProperty(const char* propertyName, T* context, void (*setter)(T* context, const Result&));
 
-    template <typename T>
-    bool tryGetProperty(const char* propertyName, T& context, void (T::*setter)(bool));
-
 private:
     enum GetPropertyResult {
@@ -107 +104 @@
 }
 
-template <typename T>
-bool JSDictionary::tryGetProperty(const char* propertyName, T& context, void (T::*setter)(bool))
-{
-    JSC::JSValue value;
-    switch (tryGetProperty(propertyName, value)) {
-    case ExceptionThrown:
-        return false;
-    case PropertyFound: {
-        bool result;
-        convertValue(m_exec, value, result);
-
-        if (m_exec->hadException())
-            return false;
-
-        (context.*setter)(result);
-        break;
-    }
-    case NoPropertyFound:
-        break;
-    }
-
-    return true;
-}
-
 template <typename Result>
 bool JSDictionary::tryGetProperty(const char* propertyName, Result& finalResult)

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

@@ -39 +39 @@
 #include "JSMutationCallback.h"
 #include "JSNode.h"
-#include "MutationObserverOptions.h"
 #include "Node.h"
 #include "WebKitMutationObserver.h"
@@ -79 +78 @@
 
     JSDictionary dictionary(exec, optionsObject);
+    MutationObserverOptions options = 0;
+    bool option;
+    if (dictionary.tryGetProperty("childList", option) && option)
+        options |= WebKitMutationObserver::ChildList;
+    if (dictionary.tryGetProperty("attributes", option) && option)
+        options |= WebKitMutationObserver::Attributes;
+    if (dictionary.tryGetProperty("subtree", option) && option)
+        options |= WebKitMutationObserver::Subtree;
+    if (dictionary.tryGetProperty("attributeOldValue", option) && option)
+        options |= WebKitMutationObserver::AttributeOldValue;
+    if (dictionary.tryGetProperty("characterDataOldValue", option) && option)
+        options |= WebKitMutationObserver::CharacterDataOldValue;
 
-    RefPtr<MutationObserverOptions> options = MutationObserverOptions::create();
-    if (!dictionary.tryGetProperty("childList", *options, &MutationObserverOptions::setChildList)
-        || !dictionary.tryGetProperty("attributes", *options, &MutationObserverOptions::setAttributes)
-        || !dictionary.tryGetProperty("characterData", *options, &MutationObserverOptions::setCharacterData)
-        || !dictionary.tryGetProperty("subtree", *options, &MutationObserverOptions::setSubtree)
-        || !dictionary.tryGetProperty("attributeOldValue", *options, &MutationObserverOptions::setAttributeOldValue)
-        || !dictionary.tryGetProperty("characterDataOldValue", *options, &MutationObserverOptions::setCharacterDataOldValue))
+    if (exec->hadException())
         return jsUndefined();
 
-    impl()->observe(target, options.get());
+    impl()->observe(target, options);
     return jsUndefined();
 }

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

@@ -36 +36 @@
 
 #include "ExceptionCode.h"
-#include "MutationObserverOptions.h"
 #include "OptionsObject.h"
 #include "V8Binding.h"
@@ -87 +86 @@
 
     OptionsObject optionsObject(args[1]);
-    RefPtr<MutationObserverOptions> options = MutationObserverOptions::create();
+    unsigned options = 0;
+    bool option;
+    if (optionsObject.getKeyValue("childList", option) && option)
+        options |= WebKitMutationObserver::ChildList;
+    if (optionsObject.getKeyValue("attributes", option) && option)
+        options |= WebKitMutationObserver::Attributes;
+    if (optionsObject.getKeyValue("characterData", option) && option)
+        options |= WebKitMutationObserver::CharacterData;
+    if (optionsObject.getKeyValue("subtree", option) && option)
+        options |= WebKitMutationObserver::Subtree;
+    if (optionsObject.getKeyValue("attributeOldValue", option) && option)
+        options |= WebKitMutationObserver::AttributeOldValue;
+    if (optionsObject.getKeyValue("characterDataOldValue", option) && option)
+        options |= WebKitMutationObserver::CharacterDataOldValue;
 
-    bool option;
-    if (optionsObject.getKeyValue("childList", option))
-        options->setChildList(option);
-    if (optionsObject.getKeyValue("attributes", option))
-        options->setAttributes(option);
-    if (optionsObject.getKeyValue("characterData", option))
-        options->setCharacterData(option);
-    if (optionsObject.getKeyValue("subtree", option))
-        options->setSubtree(option);
-    if (optionsObject.getKeyValue("attributeOldValue", option))
-        options->setAttributeOldValue(option);
-    if (optionsObject.getKeyValue("characterDataOldValue", option))
-        options->setCharacterDataOldValue(option);
-
-    imp->observe(target, options.get());
+    imp->observe(target, options);
     return v8::Handle<v8::Value>();
 }

trunk/Source/WebCore/dom/Node.cpp

@@ -2706 +2706 @@
 }
 
-Node::MutationRegistrationResult Node::registerMutationObserver(PassRefPtr<WebKitMutationObserver> observer, unsigned char options)
+Node::MutationRegistrationResult Node::registerMutationObserver(PassRefPtr<WebKitMutationObserver> observer, MutationObserverOptions options)
 {
     Vector<MutationObserverEntry>* observerEntries = ensureMutationObserverEntries();

trunk/Source/WebCore/dom/Node.h

@@ -599 +599 @@
         MutationRegistrationOptionsReset
     };
-    MutationRegistrationResult registerMutationObserver(PassRefPtr<WebKitMutationObserver>, unsigned char options);
+    MutationRegistrationResult registerMutationObserver(PassRefPtr<WebKitMutationObserver>, MutationObserverOptions);
 
     void unregisterMutationObserver(PassRefPtr<WebKitMutationObserver>);

trunk/Source/WebCore/dom/NodeRareData.h

@@ -91 +91 @@
 #if ENABLE(MUTATION_OBSERVERS)
 struct MutationObserverEntry {
-    MutationObserverEntry(PassRefPtr<WebKitMutationObserver> observer, unsigned char options)
+    MutationObserverEntry(PassRefPtr<WebKitMutationObserver> observer, MutationObserverOptions options)
         : observer(observer)
         , options(options)
@@ -102 +102 @@
     }
 
-    bool matches(unsigned char options) const
+    bool matches(MutationObserverOptions options) const
     {
         return this->options & options;
@@ -108 +108 @@
 
     RefPtr<WebKitMutationObserver> observer;
-    unsigned char options;
+    MutationObserverOptions options;
 };
 

trunk/Source/WebCore/dom/WebKitMutationObserver.cpp

@@ -35 +35 @@
 #include "WebKitMutationObserver.h"
 
-#include "MutationObserverOptions.h"
 #include "MutationCallback.h"
 #include "MutationRecord.h"
@@ -57 +56 @@
 }
 
-void WebKitMutationObserver::observe(Node* node, MutationObserverOptions* options)
+void WebKitMutationObserver::observe(Node* node, MutationObserverOptions options)
 {
-    unsigned char optionFlags = 0;
+    // FIXME: More options composition work needs to be done here, e.g., validation.
 
-    // FIXME: Push composition of the optionFlags into the custom binding.
-    if (options->childList())
-        optionFlags |= ChildList;
-    if (options->attributes())
-        optionFlags |= Attributes;
-    if (options->characterData())
-        optionFlags |= CharacterData;
-    // FIXME: More options composition work needs to be done here.
-
-    if (node->registerMutationObserver(this, optionFlags) == Node::MutationObserverRegistered)
+    if (node->registerMutationObserver(this, options) == Node::MutationObserverRegistered)
         m_observedNodes.append(node);
 }

trunk/Source/WebCore/dom/WebKitMutationObserver.h

@@ -42 +42 @@
 
 class MutationCallback;
-class MutationObserverOptions;
 class MutationRecord;
 class Node;
+
+typedef unsigned char MutationObserverOptions;
 
 class WebKitMutationObserver : public RefCounted<WebKitMutationObserver> {
@@ -66 +67 @@
     ~WebKitMutationObserver();
 
-    void observe(Node*, MutationObserverOptions*);
+    void observe(Node*, MutationObserverOptions);
     void disconnect();
     void observedNodeDestructed(Node*);