Changeset 121132 in webkit

Timestamp:

Jun 24, 2012, 8:16:07 PM (14 years ago)

Author:

mikelawther@chromium.org

Message:

CSS3 calc: transitions starting and ending with a calc expression move to end state
​https://bugs.webkit.org/show_bug.cgi?id=89738

Reviewed by Tony Chang.

Source/WebCore:

The equality operator for CalculationValue was not working as expected. The
equality operator for OwnPtr is private, as OwnPtrs should always be different.
The OwnPtrs ended up getting cast to bool before being compared, and the
comparison was always returning true.

The comparison between OwnPtrs has been removed. It doesn't add value to compare
the raw pointers either, since OwnPtrs should always be unique. We cannot
ASSERT the uniqueness though, as it is legitimate to compare a CalculationValue
to itself.

Test: css3/calc/transition-start-end-with-calc.html

• platform/CalculationValue.h:

(WebCore::CalculationValue::operator==):

LayoutTests:

• css3/calc/transition-start-end-with-calc-expected.txt: Added.
• css3/calc/transition-start-end-with-calc.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/calc/transition-start-end-with-calc-expected.txt (added)
• LayoutTests/css3/calc/transition-start-end-with-calc.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/CalculationValue.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-24  Mike Lawther  <mikelawther@chromium.org>
+
+        CSS3 calc: transitions starting and ending with a calc expression move to end state
+        https://bugs.webkit.org/show_bug.cgi?id=89738
+
+        Reviewed by Tony Chang.
+
+        * css3/calc/transition-start-end-with-calc-expected.txt: Added.
+        * css3/calc/transition-start-end-with-calc.html: Added.
+
 2012-06-21  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-24  Mike Lawther  <mikelawther@chromium.org>
+
+        CSS3 calc: transitions starting and ending with a calc expression move to end state
+        https://bugs.webkit.org/show_bug.cgi?id=89738
+
+        Reviewed by Tony Chang.
+
+        The equality operator for CalculationValue was not working as expected. The 
+        equality operator for OwnPtr is private, as OwnPtrs should always be different.
+        The OwnPtrs ended up getting cast to bool before being compared, and the 
+        comparison was always returning true.
+
+        The comparison between OwnPtrs has been removed. It doesn't add value to compare
+        the raw pointers either, since OwnPtrs should always be unique. We cannot
+        ASSERT the uniqueness though, as it is legitimate to compare a CalculationValue
+        to itself.
+
+        Test: css3/calc/transition-start-end-with-calc.html
+
+        * platform/CalculationValue.h:
+        (WebCore::CalculationValue::operator==):
+
 2012-06-24  MORITA Hajime  <morrita@google.com>
 

trunk/Source/WebCore/platform/CalculationValue.h

@@ -87 +87 @@
     bool operator==(const CalculationValue& o) const 
     { 
-        return m_value == o.m_value || *(m_value.get()) == *(o.m_value.get());
+        return *(m_value.get()) == *(o.m_value.get());
     }