Changeset 199551 in webkit

Timestamp:

Apr 14, 2016 1:49:12 PM (8 years ago)

Author:

Manuel Rego Casasnovas

Message:

[css-grid] Implement CSSGridTemplateAreasValue::equals
​https://bugs.webkit.org/show_bug.cgi?id=156578

Reviewed by Darin Adler.

Source/WebCore:

This was causing an infinite loop setting grid-template-areas
from JavaScript.

The reason was that CSSGridTemplateAreasValue needs
an specific implementation of equals() method.

Test: fast/css-grid-layout/grid-template-areas-infinite-loop.html

• css/CSSGridTemplateAreasValue.cpp:

(WebCore::CSSGridTemplateAreasValue::equals):

• css/CSSGridTemplateAreasValue.h:

LayoutTests:

• fast/css-grid-layout/grid-template-areas-infinite-loop-expected.txt: Added.
• fast/css-grid-layout/grid-template-areas-infinite-loop.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css-grid-layout/grid-template-areas-infinite-loop-expected.txt (added)
• LayoutTests/fast/css-grid-layout/grid-template-areas-infinite-loop.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSGridTemplateAreasValue.cpp (modified) (1 diff)
• Source/WebCore/css/CSSGridTemplateAreasValue.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-04-14  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [css-grid] Implement CSSGridTemplateAreasValue::equals
+        https://bugs.webkit.org/show_bug.cgi?id=156578
+
+        Reviewed by Darin Adler.
+
+        * fast/css-grid-layout/grid-template-areas-infinite-loop-expected.txt: Added.
+        * fast/css-grid-layout/grid-template-areas-infinite-loop.html: Added.
+
 2016-04-14  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-04-14  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [css-grid] Implement CSSGridTemplateAreasValue::equals
+        https://bugs.webkit.org/show_bug.cgi?id=156578
+
+        Reviewed by Darin Adler.
+
+        This was causing an infinite loop setting grid-template-areas
+        from JavaScript.
+
+        The reason was that CSSGridTemplateAreasValue needs
+        an specific implementation of equals() method.
+
+        Test: fast/css-grid-layout/grid-template-areas-infinite-loop.html
+
+        * css/CSSGridTemplateAreasValue.cpp:
+        (WebCore::CSSGridTemplateAreasValue::equals):
+        * css/CSSGridTemplateAreasValue.h:
+
 2016-04-14  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/css/CSSGridTemplateAreasValue.cpp

@@ -86 +86 @@
 }
 
+bool CSSGridTemplateAreasValue::equals(const CSSGridTemplateAreasValue& other) const
+{
+    return m_gridAreaMap == other.m_gridAreaMap && m_rowCount == other.m_rowCount && m_columnCount == other.m_columnCount;
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/css/CSSGridTemplateAreasValue.h

@@ -55 +55 @@
     size_t columnCount() const { return m_columnCount; }
 
+    bool equals(const CSSGridTemplateAreasValue&) const;
+
 private:
     CSSGridTemplateAreasValue(const NamedGridAreaMap&, size_t rowCount, size_t columnCount);