Add MutationObserverInit

Source/core/dom/MutationObserver.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/dom/MutationObserver.h"
 
-#include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/Microtask.h"
 #include "core/dom/MutationCallback.h"
+#include "core/dom/MutationObserverInit.h"
 #include "core/dom/MutationObserverRegistration.h"
 #include "core/dom/MutationRecord.h"
 #include "core/dom/Node.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "wtf/MainThread.h"
 #include <algorithm>
 
 namespace blink {
 
 static unsigned s_observerPriority = 0;
@@ skipping 19 matching lines @@
 
 MutationObserver::~MutationObserver()
 {
 #if !ENABLE(OILPAN)
     ASSERT(m_registrations.isEmpty());
 #endif
     if (!m_records.isEmpty())
         InspectorInstrumentation::didClearAllMutationRecords(m_callback->executionContext(), this);
 }
 
-void MutationObserver::observe(Node* node, const Dictionary& optionsDictionary, ExceptionState& exceptionState)
+void MutationObserver::observe(Node* node, const MutationObserverInit* observerInit, ExceptionState& exceptionState)
 {
     if (!node) {
         exceptionState.throwDOMException(NotFoundError, "The provided node was null.");
         return;
     }
 
     MutationObserverOptions options = 0;
 
-    bool attributeOldValue = false;
-    bool attributeOldValuePresent = DictionaryHelper::get(optionsDictionary, "attributeOldValue", attributeOldValue);
-    if (attributeOldValue)
+    if (observerInit->hasAttributeOldValue() && observerInit->attributeOldValue())
         options |= AttributeOldValue;
 
     HashSet<AtomicString> attributeFilter;
-    bool attributeFilterPresent = DictionaryHelper::get(optionsDictionary, "attributeFilter", attributeFilter);
-    if (attributeFilterPresent)
+    if (observerInit->hasAttributeFilter()) {
+        const Vector<String>& sequence = observerInit->attributeFilter();
+        for (unsigned i = 0; i < sequence.size(); ++i)
+            attributeFilter.add(AtomicString(sequence[i]));
         options |= AttributeFilter;
+    }
 
-    bool attributes = false;
-    bool attributesPresent = DictionaryHelper::get(optionsDictionary, "attributes", attributes);
-    if (attributes || (!attributesPresent && (attributeOldValuePresent || attributeFilterPresent)))
+    bool attributes = observerInit->hasAttributes() && observerInit->attributes();
+    if (attributes || (!observerInit->hasAttributes() && (observerInit->hasAttributeOldValue() || observerInit->hasAttributeFilter())))
         options |= Attributes;
 
-    bool characterDataOldValue = false;
-    bool characterDataOldValuePresent = DictionaryHelper::get(optionsDictionary, "characterDataOldValue", characterDataOldValue);
-    if (characterDataOldValue)
+    if (observerInit->hasCharacterDataOldValue() && observerInit->characterDataOldValue())
         options |= CharacterDataOldValue;
 
-    bool characterData = false;
-    bool characterDataPresent = DictionaryHelper::get(optionsDictionary, "characterData", characterData);
-    if (characterData || (!characterDataPresent && characterDataOldValuePresent))
+    bool characterData = observerInit->hasCharacterData() && observerInit->characterData();
+    if (characterData || (!observerInit->hasCharacterData() && observerInit->hasCharacterDataOldValue()))
         options |= CharacterData;
 
-    bool childListValue = false;
-    if (DictionaryHelper::get(optionsDictionary, "childList", childListValue) && childListValue)
+    if (observerInit->childList())
         options |= ChildList;
 
-    bool subtreeValue = false;
-    if (DictionaryHelper::get(optionsDictionary, "subtree", subtreeValue) && subtreeValue)
+    if (observerInit->subtree())
         options |= Subtree;
 
     if (!(options & Attributes)) {
         if (options & AttributeOldValue) {
             exceptionState.throwTypeError("The options object may only set 'attributeOldValue' to true when 'attributes' is true or not present.");
             return;
         }
         if (options & AttributeFilter) {
             exceptionState.throwTypeError("The options object may only set 'attributeFilter' when 'attributes' is true or not present.");
             return;
@@ skipping 147 matching lines @@
 
 void MutationObserver::trace(Visitor* visitor)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_records);
     visitor->trace(m_registrations);
 #endif
 }
 
 } // namespace blink