Changeset 76568 in webkit

Timestamp:

Jan 24, 2011 9:15:56 PM (13 years ago)

Author:

Simon Fraser

Message:

2011-01-24 Simon Fraser <Simon Fraser>

Reviewed by Chris Marrin.

perspective() transform function should take lengths
​https://bugs.webkit.org/show_bug.cgi?id=52683

The argument to the perspective() transform function should
be a Length, rather than a bare number. Bare numbers are still
accepted (and treated as px), but this behavior is deprecated.

Test: animations/3d/transform-perspective.html

transforms/3d/general/3dtransform-values.html

• css/CSSParser.cpp: (WebCore::CSSParser::parseTransform): Check the units for the perspective() function. Allow bare numbers for backwards compatibility.
• css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::createTransformOperations): Convert value to Length.
• platform/graphics/transforms/PerspectiveTransformOperation.cpp: (WebCore::clampToPostiveInteger): Helper. (WebCore::PerspectiveTransformOperation::blend): Blend via Lengths.
• platform/graphics/transforms/PerspectiveTransformOperation.h: (WebCore::PerspectiveTransformOperation::create): double -> Length. (WebCore::PerspectiveTransformOperation::perspective): Ditto. (WebCore::PerspectiveTransformOperation::isIdentity): Ditto. (WebCore::PerspectiveTransformOperation::apply): Ditto. (WebCore::PerspectiveTransformOperation::PerspectiveTransformOperation): Assert that the Length is a fixed type.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/animations/3d/transform-perspective-expected.txt (added)
• LayoutTests/animations/3d/transform-perspective.html (added)
• LayoutTests/transforms/3d/general/3dtransform-values-expected.txt (modified) (1 diff)
• LayoutTests/transforms/3d/general/3dtransform-values.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSParser.cpp (modified) (1 diff)
• Source/WebCore/css/CSSStyleSelector.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.h (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-24  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Chris Marrin.
+
+        perspective() transform function should take lengths
+        https://bugs.webkit.org/show_bug.cgi?id=52683
+        
+        Add tests for perspective() handling, and interpolation for animation.
+
+        * animations/3d/transform-perspective-expected.txt: Added.
+        * animations/3d/transform-perspective.html: Added.
+        * transforms/3d/general/3dtransform-values-expected.txt:
+        * transforms/3d/general/3dtransform-values.html:
+
 2011-01-24  Kent Tamura  <tkent@chromium.org>
 

trunk/LayoutTests/transforms/3d/general/3dtransform-values-expected.txt

@@ -10 +10 @@
 transform "rotate3d(0, 1, 0, 180px)" expected "none" : PASS
 transform "rotate3d(0, 1, 0, 180px)" expected "none" : PASS
+transform "perspective(400)" expected "matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, -0.0025, 0, 0, 0, 1)" : PASS
+transform "perspective(400px)" expected "matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, -0.0025, 0, 0, 0, 1)" : PASS
+transform "perspective(400em)" expected "matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, -0.00015625, 0, 0, 0, 1)" : PASS
+transform "perspective(50%)" expected "none" : PASS
+transform "perspective(-400)" expected "none" : PASS
+transform "perspective(0)" expected "matrix(1, 0, 0, 1, 0, 0)" : PASS
+transform "perspective(400deg)" expected "none" : PASS
+transform "perspective(banana)" expected "none" : PASS
 

trunk/LayoutTests/transforms/3d/general/3dtransform-values.html

@@ -38 +38 @@
       { 'transform' : 'rotate3d(0, 1, 0, 180px)', 'result' : 'none' }, // last value must be an angle
       { 'transform' : 'rotate3d(0, 1, 0, 180px)', 'result' : 'none' }, // last value must be an angle
+      { 'transform' : 'perspective(400)', 'result' : 'matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, -0.0025, 0, 0, 0, 1)' }, // legacy
+      { 'transform' : 'perspective(400px)', 'result' : 'matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, -0.0025, 0, 0, 0, 1)' },
+      { 'transform' : 'perspective(400em)', 'result' : 'matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, -0.00015625, 0, 0, 0, 1)' },
+      { 'transform' : 'perspective(50%)', 'result' : 'none' },
+      { 'transform' : 'perspective(-400)', 'result' : 'none' },
+      { 'transform' : 'perspective(0)', 'result' : 'matrix(1, 0, 0, 1, 0, 0)' },
+      { 'transform' : 'perspective(400deg)', 'result' : 'none' }, // unit must be length
+      { 'transform' : 'perspective(banana)', 'result' : 'none' }, // unit must be length
     ];
     

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-24  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Chris Marrin.
+
+        perspective() transform function should take lengths
+        https://bugs.webkit.org/show_bug.cgi?id=52683
+        
+        The argument to the perspective() transform function should
+        be a Length, rather than a bare number. Bare numbers are still
+        accepted (and treated as px), but this behavior is deprecated.
+
+        Test: animations/3d/transform-perspective.html
+              transforms/3d/general/3dtransform-values.html
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseTransform): Check the units for the perspective()
+        function. Allow bare numbers for backwards compatibility.
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::createTransformOperations): Convert
+        value to Length.
+        * platform/graphics/transforms/PerspectiveTransformOperation.cpp:
+        (WebCore::clampToPostiveInteger): Helper.
+        (WebCore::PerspectiveTransformOperation::blend): Blend via Lengths.
+        * platform/graphics/transforms/PerspectiveTransformOperation.h:
+        (WebCore::PerspectiveTransformOperation::create): double -> Length.
+        (WebCore::PerspectiveTransformOperation::perspective): Ditto.
+        (WebCore::PerspectiveTransformOperation::isIdentity): Ditto.
+        (WebCore::PerspectiveTransformOperation::apply): Ditto.
+        (WebCore::PerspectiveTransformOperation::PerspectiveTransformOperation): Assert
+        that the Length is a fixed type.
+
 2011-01-24  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/css/CSSParser.cpp

@@ -5317 +5317 @@
                 if (!validUnit(a, FLength, true))
                     return 0;
+            } else if (info.type() == WebKitCSSTransformValue::PerspectiveTransformOperation && argNumber == 0) {
+                // 1st param of perspective() must be a non-negative number (deprecated) or length.
+                if (!validUnit(a, FNumber | FLength | FNonNeg, true))
+                    return 0;
             } else if (!validUnit(a, unit, true))
                 return 0;

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -7053 +7053 @@
             }   
             case WebKitCSSTransformValue::PerspectiveTransformOperation: {
-                double p = firstValue->getDoubleValue();
-                if (p < 0.0)
+                bool ok = true;
+                Length p = Length(0, Fixed);
+                if (CSSPrimitiveValue::isUnitTypeLength(firstValue->primitiveType()))
+                    p = convertToLength(firstValue, style, rootStyle, zoomFactor, &ok);
+                else {
+                    // This is a quirk that should go away when 3d transforms are finalized.
+                    double val = firstValue->getDoubleValue();
+                    ok = val >= 0;
+                    val = min<double>(val, numeric_limits<int>::max());
+                    p = Length(static_cast<int>(val), Fixed);
+                }
+                
+                if (!ok)
                     return false;
+
                 operations.operations().append(PerspectiveTransformOperation::create(p));
                 break;

trunk/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.cpp

@@ -28 +28 @@
 
 #include <algorithm>
+#include <limits>
 
 using namespace std;
 
 namespace WebCore {
+
+static int clampToPostiveInteger(double val)
+{
+    return static_cast<int>(max<double>(min<double>(val, numeric_limits<int>::max()), 0));
+}
 
 PassRefPtr<TransformOperation> PerspectiveTransformOperation::blend(const TransformOperation* from, double progress, bool blendToIdentity)
@@ -38 +44 @@
         return this;
     
-    if (blendToIdentity)
-        return PerspectiveTransformOperation::create(m_p + (1. - m_p) * progress);
+    if (blendToIdentity) {
+        double p = m_p.calcFloatValue(1);
+        p = p + (1. - p) * progress; // FIXME: this seems wrong. https://bugs.webkit.org/show_bug.cgi?id=52700
+        return PerspectiveTransformOperation::create(Length(clampToPostiveInteger(p), Fixed));
+    }
     
     const PerspectiveTransformOperation* fromOp = static_cast<const PerspectiveTransformOperation*>(from);
-    double fromP = fromOp ? fromOp->m_p : 0;
-    double toP = m_p;
+    Length fromP = fromOp ? fromOp->m_p : Length(m_p.type());
+    Length toP = m_p;
 
     TransformationMatrix fromT;
     TransformationMatrix toT;
-    fromT.applyPerspective(fromP);
-    toT.applyPerspective(toP);
+    fromT.applyPerspective(fromP.calcFloatValue(1));
+    toT.applyPerspective(toP.calcFloatValue(1));
     toT.blend(fromT, progress);
     TransformationMatrix::DecomposedType decomp;
     toT.decompose(decomp);
-    
-    return PerspectiveTransformOperation::create(decomp.perspectiveZ ? -1.0 / decomp.perspectiveZ : 0.0);
+
+    if (decomp.perspectiveZ) {
+        double val = -1.0 / decomp.perspectiveZ;
+        return PerspectiveTransformOperation::create(Length(clampToPostiveInteger(val), Fixed));
+    }
+    return PerspectiveTransformOperation::create(Length(0, Fixed));
 }
 

trunk/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.h

@@ -27 +27 @@
 #define PerspectiveTransformOperation_h
 
+#include "Length.h"
 #include "TransformOperation.h"
 
@@ -33 +34 @@
 class PerspectiveTransformOperation : public TransformOperation {
 public:
-    static PassRefPtr<PerspectiveTransformOperation> create(double p)
+    static PassRefPtr<PerspectiveTransformOperation> create(const Length& p)
     {
         return adoptRef(new PerspectiveTransformOperation(p));
     }
 
-    double perspective() const { return m_p; }
+    Length perspective() const { return m_p; }
     
 private:
-    virtual bool isIdentity() const { return m_p == 0; }
+    virtual bool isIdentity() const { return m_p.calcFloatValue(1) == 0; }
     virtual OperationType getOperationType() const { return PERSPECTIVE; }
     virtual bool isSameType(const TransformOperation& o) const { return o.getOperationType() == PERSPECTIVE; }
@@ -55 +56 @@
     virtual bool apply(TransformationMatrix& transform, const IntSize&) const
     {
-        transform.applyPerspective(m_p);
+        transform.applyPerspective(m_p.calcFloatValue(1));
         return false;
     }
@@ -61 +62 @@
     virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false);
 
-    PerspectiveTransformOperation(double p)
+    PerspectiveTransformOperation(const Length& p)
         : m_p(p)
     {
+        ASSERT(p.isFixed());
     }
 
-    double m_p;
+    Length m_p;
 };