Changeset 205383 in webkit

Timestamp:

Sep 2, 2016 4:25:00 PM (8 years ago)

Author:

rniwa@webkit.org

Message:

Temporarily break customElements.whenDefined to remove flaky crashes
​https://bugs.webkit.org/show_bug.cgi?id=161555

Reviewed by Chris Dumez.

Source/WebCore:

Remove HashMap of DeferredWrapper which causes a crash during destruction.
This breaks the semantics of "whenDefined" for now.

• bindings/js/JSCustomElementRegistryCustom.cpp:

(WebCore::whenDefinedPromise):

• dom/CustomElementRegistry.cpp:

(WebCore::CustomElementRegistry::addElementDefinition):

• dom/CustomElementRegistry.h:

(WebCore::CustomElementRegistry::promiseMap): Deleted.

LayoutTests:

Rebaseline the test now that some test cases are failing due to the partial rollout.

• fast/custom-elements/CustomElementRegistry-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/custom-elements/CustomElementRegistry-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/JSCustomElementRegistryCustom.cpp (modified) (1 diff)
• Source/WebCore/dom/CustomElementRegistry.cpp (modified) (1 diff)
• Source/WebCore/dom/CustomElementRegistry.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-09-02  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Temporarily break customElements.whenDefined to remove flaky crashes
+        https://bugs.webkit.org/show_bug.cgi?id=161555
+
+        Reviewed by Chris Dumez.
+
+        Rebaseline the test now that some test cases are failing due to the partial rollout.
+
+        * fast/custom-elements/CustomElementRegistry-expected.txt:
+
 2016-09-02  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/LayoutTests/fast/custom-elements/CustomElementRegistry-expected.txt

@@ -30 +30 @@
 PASS customElements.get must return undefined when the registry does not contain an entry with the given name even if the name was not a valid custom element name 
 PASS customElements.get return the constructor of the entry with the given name when there is a matching entry. 
-PASS customElements.whenDefined must return a promise for a valid custom element name 
+FAIL customElements.whenDefined must return a promise for a valid custom element name assert_true: expected true got false
 PASS customElements.whenDefined must return the same promise each time invoked for a valid custom element name which has not been defined 
-PASS customElements.whenDefined must return an unresolved promise when the registry does not contain the entry with the given name 
+FAIL customElements.whenDefined must return an unresolved promise when the registry does not contain the entry with the given name undefined is not an object (evaluating 'customElements.whenDefined('a-b').then')
 PASS customElements.whenDefined must return a rejected promise when the given name is not a valid custom element name 
 PASS customElements.whenDefined must return a resolved promise when the registry contains the entry with the given name 
 PASS customElements.whenDefined must return a new resolved promise each time invoked when the registry contains the entry with the given name 
-PASS A promise returned by customElements.whenDefined must be resolved by "define" 
+FAIL A promise returned by customElements.whenDefined must be resolved by "define" undefined is not an object (evaluating 'promise.then')
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-02  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Temporarily break customElements.whenDefined to remove flaky crashes
+        https://bugs.webkit.org/show_bug.cgi?id=161555
+
+        Reviewed by Chris Dumez.
+
+        Remove HashMap of DeferredWrapper which causes a crash during destruction.
+        This breaks the semantics of "whenDefined" for now.
+
+        * bindings/js/JSCustomElementRegistryCustom.cpp:
+        (WebCore::whenDefinedPromise):
+        * dom/CustomElementRegistry.cpp:
+        (WebCore::CustomElementRegistry::addElementDefinition):
+        * dom/CustomElementRegistry.h:
+        (WebCore::CustomElementRegistry::promiseMap): Deleted.
+
 2016-09-02  Ryan Haddad  <ryanhaddad@apple.com>
         Unreviewed, rolling out r205373.

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

@@ -183 +183 @@
     }
 
-    auto result = registry.promiseMap().ensure(localName, [&] {
-        return DeferredWrapper::create(&state, &globalObject, JSPromiseDeferred::create(&state, &globalObject));
-    });
-
-    return result.iterator->value->promise();
+    return jsUndefined();
 }
 

trunk/Source/WebCore/dom/CustomElementRegistry.cpp

@@ -79 +79 @@
     if (auto* document = m_window.document())
         enqueueUpgradeInShadowIncludingTreeOrder(*document, elementInterface.get());
-
-    if (auto promise = m_promiseMap.take(localName))
-        promise.value()->resolve(nullptr);
 }
 

trunk/Source/WebCore/dom/CustomElementRegistry.h

@@ -67 +67 @@
     JSC::JSValue get(const AtomicString&);
 
-    HashMap<AtomicString, Ref<DeferredWrapper>>& promiseMap() { return m_promiseMap; }
-
 private:
     CustomElementRegistry(DOMWindow&);
@@ -75 +73 @@
     HashMap<AtomicString, Ref<JSCustomElementInterface>> m_nameMap;
     HashMap<const JSC::JSObject*, JSCustomElementInterface*> m_constructorMap;
-    HashMap<AtomicString, Ref<DeferredWrapper>> m_promiseMap;
 
     bool m_elementDefinitionIsRunning { false };