Changeset 264068 in webkit

Timestamp:

Jul 8, 2020, 2:01:47 AM (5 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r258459 - SVGMatrix should have the access right of its owner SVGTransform always
​https://bugs.webkit.org/show_bug.cgi?id=207462

Reviewed by Simon Fraser.

Source/WebCore:

The SVGMatrix needs to be reattached to its owner SVGTransform when the
access right of this owner changes. The access right of the owner changes
when it gets attached to or detached from a higher level owner.

Test: svg/dom/SVGTransformList-anim-read-only.html

• svg/SVGTransform.h:
• svg/properties/SVGProperty.h:

(WebCore::SVGProperty::attach):
(WebCore::SVGProperty::detach):
(WebCore::SVGProperty::reattach):

LayoutTests:

• svg/dom/SVGTransformList-anim-read-only-expected.txt: Added.
• svg/dom/SVGTransformList-anim-read-only.html: Added.

Location:

releases/WebKitGTK/webkit-2.28

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/dom/SVGTransformList-anim-read-only-expected.txt (added)
• LayoutTests/svg/dom/SVGTransformList-anim-read-only.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/svg/SVGTransform.h (modified) (1 diff)
• Source/WebCore/svg/properties/SVGProperty.h (modified) (2 diffs)

releases/WebKitGTK/webkit-2.28/LayoutTests/ChangeLog

@@ +1 @@
+2020-03-13  Said Abou-Hallawa  <said@apple.com>
+
+        SVGMatrix should have the access right of its owner SVGTransform always
+        https://bugs.webkit.org/show_bug.cgi?id=207462
+
+        Reviewed by Simon Fraser.
+
+        * svg/dom/SVGTransformList-anim-read-only-expected.txt: Added.
+        * svg/dom/SVGTransformList-anim-read-only.html: Added.
+
 2020-04-22  Enrique Ocaña González  <eocanha@igalia.com>
 

releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog

@@ +1 @@
+2020-03-13  Said Abou-Hallawa  <said@apple.com>
+
+        SVGMatrix should have the access right of its owner SVGTransform always
+        https://bugs.webkit.org/show_bug.cgi?id=207462
+
+        Reviewed by Simon Fraser.
+
+        The SVGMatrix needs to be reattached to its owner SVGTransform when the
+        access right of this owner changes. The access right of the owner changes
+        when it gets attached to or detached from a higher level owner.
+
+        Test: svg/dom/SVGTransformList-anim-read-only.html
+
+        * svg/SVGTransform.h:
+        * svg/properties/SVGProperty.h:
+        (WebCore::SVGProperty::attach):
+        (WebCore::SVGProperty::detach):
+        (WebCore::SVGProperty::reattach):
+
 2020-03-02  Mark Lam  <mark.lam@apple.com>
 

releases/WebKitGTK/webkit-2.28/Source/WebCore/svg/SVGTransform.h

@@ -145 +145 @@
     }
 
+    void attach(SVGPropertyOwner* owner, SVGPropertyAccess access) override
+    {
+        Base::attach(owner, access);
+        // Reattach the SVGMatrix to the SVGTransformValue with the new SVGPropertyAccess.
+        m_value.matrix()->reattach(this, access);
+    }
+
+    void detach() override
+    {
+        Base::detach();
+        // Reattach the SVGMatrix to the SVGTransformValue with the SVGPropertyAccess::ReadWrite.
+        m_value.matrix()->reattach(this, access());
+    }
+
 private:
     using Base = SVGValueProperty<SVGTransformValue>;

releases/WebKitGTK/webkit-2.28/Source/WebCore/svg/properties/SVGProperty.h

@@ -37 +37 @@
     // Managing the relationship with the owner.
     bool isAttached() const { return m_owner; }
-    void attach(SVGPropertyOwner* owner, SVGPropertyAccess access)
+    virtual void attach(SVGPropertyOwner* owner, SVGPropertyAccess access)
     {
         ASSERT(!m_owner);
@@ -45 +45 @@
     }
 
-    void detach()
+    virtual void detach()
     {
         m_owner = nullptr;
         m_access = SVGPropertyAccess::ReadWrite;
+        m_state = SVGPropertyState::Clean;
+    }
+
+    void reattach(SVGPropertyOwner* owner, SVGPropertyAccess access)
+    {
+        ASSERT_UNUSED(owner, owner == m_owner);
+        m_access = access;
         m_state = SVGPropertyState::Clean;
     }