Changeset 35117 in webkit

Timestamp:

Jul 10, 2008 9:54:03 PM (16 years ago)

Author:

dino@apple.com

Message:

Reviewed by hyatt.

Calculate computed style for -webkit-transform property
​https://bugs.webkit.org/show_bug.cgi?id=19864

Test: css3/transform-computed-style-001.html

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::computedTransform):
(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

handles -webkit-transform property now

• manual-tests/computed-transform-value.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/transform-computed-style-001-expected.txt (added)
• LayoutTests/css3/transform-computed-style-001.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (5 diffs)
• WebCore/manual-tests/computed-transform-value.html (added)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-07-10  Dean Jackson  <dino@apple.com>
+
+        Reviewed by hyatt.
+        
+        Testing the computed style of -webkit-transform
+        https://bugs.webkit.org/show_bug.cgi?id=19864
+
+        * css3/transform-computed-style-001-expected.txt: Added.
+        * css3/transform-computed-style-001.html: Added.
+
 2008-07-10  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-07-10  Dean Jackson  <dino@apple.com>
+
+        Reviewed by hyatt.
+
+        Calculate computed style for -webkit-transform property
+        https://bugs.webkit.org/show_bug.cgi?id=19864
+
+        Test: css3/transform-computed-style-001.html
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::computedTransform):
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+            handles -webkit-transform property now
+        * manual-tests/computed-transform-value.html: Added.
+
 2008-07-10  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -38 +38 @@
 #include "RenderObject.h"
 #include "ShadowValue.h"
+#include "WebKitCSSTransformValue.h"
 
 #if ENABLE(DASHBOARD_SUPPORT)
@@ -184 +185 @@
     CSSPropertyWebkitTextStrokeColor,
     CSSPropertyWebkitTextStrokeWidth,
+    CSSPropertyWebkitTransform,
+    CSSPropertyWebkitTransformOriginX,
+    CSSPropertyWebkitTransformOriginY,
     CSSPropertyWebkitUserDrag,
     CSSPropertyWebkitUserModify,
@@ -382 +386 @@
 {
     return renderer->style()->boxSizing() == CONTENT_BOX ? renderer->contentBox() : renderer->borderBox();
+}
+
+static PassRefPtr<CSSValueList> computedTransform(RenderObject* renderer)
+{
+    if (!renderer)
+        return 0;
+
+    IntRect box = sizingBox(renderer);
+
+    AffineTransform transform;
+    renderer->style()->applyTransform(transform, box.size());
+
+    RefPtr<WebKitCSSTransformValue> transformVal = WebKitCSSTransformValue::create(WebKitCSSTransformValue::MatrixTransformOperation);
+
+    transformVal->append(CSSPrimitiveValue::create(transform.a(), CSSPrimitiveValue::CSS_NUMBER));
+    transformVal->append(CSSPrimitiveValue::create(transform.b(), CSSPrimitiveValue::CSS_NUMBER));
+    transformVal->append(CSSPrimitiveValue::create(transform.c(), CSSPrimitiveValue::CSS_NUMBER));
+    transformVal->append(CSSPrimitiveValue::create(transform.d(), CSSPrimitiveValue::CSS_NUMBER));
+    transformVal->append(CSSPrimitiveValue::create(transform.e(), CSSPrimitiveValue::CSS_NUMBER));
+    transformVal->append(CSSPrimitiveValue::create(transform.f(), CSSPrimitiveValue::CSS_NUMBER));
+
+    RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
+    list->append(transformVal);
+
+    return list.release();
 }
 
@@ -1011 +1040 @@
             return 0;
         }
+        case CSSPropertyWebkitTransform:
+            return computedTransform(renderer);
+        case CSSPropertyWebkitTransformOriginX:
+            if (renderer) {
+                IntRect box = sizingBox(renderer);
+                return CSSPrimitiveValue::create(style->transformOriginX().calcMinValue(box.width()), CSSPrimitiveValue::CSS_PX);
+            }
+            else
+                return CSSPrimitiveValue::create(style->transformOriginX());
+        case CSSPropertyWebkitTransformOriginY:
+            if (renderer) {
+                IntRect box = sizingBox(renderer);
+                return CSSPrimitiveValue::create(style->transformOriginY().calcMinValue(box.height()), CSSPrimitiveValue::CSS_PX);
+            }
+            else
+                return CSSPrimitiveValue::create(style->transformOriginY());
         case CSSPropertyBackground:
         case CSSPropertyBorder:
@@ -1068 +1113 @@
         case CSSPropertyWebkitPaddingStart:
         case CSSPropertyWebkitTextStroke:
-        case CSSPropertyWebkitTransform:
-        case CSSPropertyWebkitTransformOrigin:
-        case CSSPropertyWebkitTransformOriginX:
-        case CSSPropertyWebkitTransformOriginY:
         case CSSPropertyWebkitTransition:
         case CSSPropertyWebkitTransitionDuration: