Changeset 230737 in webkit

Timestamp:

Apr 17, 2018 4:33:02 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

References from CSSStyleDeclaration to CSSValues should be weak
​https://bugs.webkit.org/show_bug.cgi?id=180280
<rdar://problem/35804869>

Patch by Tadeu Zagallo <Tadeu Zagallo> on 2018-04-17
Reviewed by Geoffrey Garen.

No new tests - used the existing test to verify the leak

• css/DeprecatedCSSOMValue.h:

(WebCore::DeprecatedCSSOMValue::weakPtrFactory):

• css/PropertySetCSSStyleDeclaration.cpp:

(WebCore::PropertySetCSSStyleDeclaration::wrapForDeprecatedCSSOM):

• css/PropertySetCSSStyleDeclaration.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/DeprecatedCSSOMValue.h (modified) (3 diffs)
• css/PropertySetCSSStyleDeclaration.cpp (modified) (2 diffs)
• css/PropertySetCSSStyleDeclaration.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-04-17  Tadeu Zagallo  <tzagallo@apple.com>
+
+        References from CSSStyleDeclaration to CSSValues should be weak
+        https://bugs.webkit.org/show_bug.cgi?id=180280
+        <rdar://problem/35804869>
+
+        Reviewed by Geoffrey Garen.
+
+        No new tests - used the existing test to verify the leak
+
+        * css/DeprecatedCSSOMValue.h:
+        (WebCore::DeprecatedCSSOMValue::weakPtrFactory):
+        * css/PropertySetCSSStyleDeclaration.cpp:
+        (WebCore::PropertySetCSSStyleDeclaration::wrapForDeprecatedCSSOM):
+        * css/PropertySetCSSStyleDeclaration.h:
+
 2018-04-17  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Source/WebCore/css/DeprecatedCSSOMValue.h

@@ -32 +32 @@
 #include <wtf/RefCounted.h>
 #include <wtf/TypeCasts.h>
+#include <wtf/WeakPtr.h>
 #include <wtf/text/WTFString.h>
 
@@ -65 +66 @@
     CSSStyleDeclaration& owner() const { return m_owner; }
 
+    WeakPtrFactory<DeprecatedCSSOMValue>& weakPtrFactory() { return m_weakPtrFactory; }
+
 protected:
     static const size_t ClassTypeBits = 2;
@@ -93 +96 @@
     
     Ref<CSSStyleDeclaration> m_owner;
+    WeakPtrFactory<DeprecatedCSSOMValue> m_weakPtrFactory;
 };
 

trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp

@@ -309 +309 @@
 }
 
-DeprecatedCSSOMValue* PropertySetCSSStyleDeclaration::wrapForDeprecatedCSSOM(CSSValue* internalValue)
+RefPtr<DeprecatedCSSOMValue> PropertySetCSSStyleDeclaration::wrapForDeprecatedCSSOM(CSSValue* internalValue)
 {
     if (!internalValue)
@@ -317 +317 @@
     // FIXME: It is likely that the identity is not important for web compatibility and this code should be removed.
     if (!m_cssomValueWrappers)
-        m_cssomValueWrappers = std::make_unique<HashMap<CSSValue*, RefPtr<DeprecatedCSSOMValue>>>();
+        m_cssomValueWrappers = std::make_unique<HashMap<CSSValue*, WeakPtr<DeprecatedCSSOMValue>>>();
     
-    RefPtr<DeprecatedCSSOMValue>& clonedValue = m_cssomValueWrappers->add(internalValue, RefPtr<DeprecatedCSSOMValue>()).iterator->value;
-    if (!clonedValue)
-        clonedValue = internalValue->createDeprecatedCSSOMWrapper(*this);
-    return clonedValue.get();
+    auto& clonedValue = m_cssomValueWrappers->add(internalValue, WeakPtr<DeprecatedCSSOMValue>()).iterator->value;
+    if (clonedValue)
+        return clonedValue.get();
+
+    RefPtr<DeprecatedCSSOMValue> wrapper = internalValue->createDeprecatedCSSOMWrapper(*this);
+    clonedValue = makeWeakPtr(wrapper.get());
+    return wrapper;
 }
 

trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.h

@@ -32 +32 @@
 #include <wtf/HashMap.h>
 #include <wtf/RefPtr.h>
+#include <wtf/WeakPtr.h>
 
 namespace WebCore {
@@ -58 +59 @@
 
     MutableStyleProperties* m_propertySet;
-    std::unique_ptr<HashMap<CSSValue*, RefPtr<DeprecatedCSSOMValue>>> m_cssomValueWrappers;
+    std::unique_ptr<HashMap<CSSValue*, WeakPtr<DeprecatedCSSOMValue>>> m_cssomValueWrappers;
 
 private:
@@ -82 +83 @@
     Ref<MutableStyleProperties> copyProperties() const final;
 
-    DeprecatedCSSOMValue* wrapForDeprecatedCSSOM(CSSValue*);
+    RefPtr<DeprecatedCSSOMValue> wrapForDeprecatedCSSOM(CSSValue*);
     
     virtual bool willMutate() WARN_UNUSED_RETURN { return true; }