Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(279)

Unified Diff: Source/core/css/ComputedStyleCSSValueMapping.cpp

Issue 1158603003: CSS Independent Transform Properties (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Correct equality operators and remove dependencies on size() in parser Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/css/ComputedStyleCSSValueMapping.cpp
diff --git a/Source/core/css/ComputedStyleCSSValueMapping.cpp b/Source/core/css/ComputedStyleCSSValueMapping.cpp
index 6e7bf2485fdd8e6e13ef455c9247cfe963628249..4ee174f8f170b2b890561d47266e417ec2c29c59 100644
--- a/Source/core/css/ComputedStyleCSSValueMapping.cpp
+++ b/Source/core/css/ComputedStyleCSSValueMapping.cpp
@@ -955,7 +955,7 @@ static PassRefPtrWillBeRawPtr<CSSValue> computedTransform(const LayoutObject* la
box = pixelSnappedIntRect(toLayoutBox(layoutObject)->borderBoxRect());
TransformationMatrix transform;
- style.applyTransform(transform, LayoutSize(box.size()), ComputedStyle::ExcludeTransformOrigin, ComputedStyle::ExcludeMotionPath);
+ style.applyTransform(transform, LayoutSize(box.size()), ComputedStyle::ExcludeTransformOrigin, ComputedStyle::ExcludeMotionPath, ComputedStyle::ExcludeTransformProperty);
// FIXME: Need to print out individual functions (https://bugs.webkit.org/show_bug.cgi?id=23924)
RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
@@ -2638,7 +2638,59 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
return valueForScrollSnapCoordinate(style.scrollSnapCoordinate(), style);
case CSSPropertyScrollSnapDestination:
return valueForScrollSnapDestination(style.scrollSnapDestination(), style);
+ case CSSPropertyTranslate: {
+ if (!style.hasTranslateProperty())
+ return cssValuePool().createValue(0, CSSPrimitiveValue::CSS_PX);
+ RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
+ if (layoutObject && layoutObject->isBox()) {
+ LayoutRect box = toLayoutBox(layoutObject)->borderBoxRect();
+ list->append(zoomAdjustedPixelValue(floatValueForLength(style.translate()->x(), box.width().toFloat()), style));
+
+ if (style.translate()->type() != TransformOperation::TranslateX) {
+ list->append(zoomAdjustedPixelValue(floatValueForLength(style.translate()->y(), box.height().toFloat()), style));
+ }
+
+ } else {
+ // No box to resolve the percentage values
+ list->append(zoomAdjustedPixelValueForLength(style.translate()->x(), style));
+
+ if (style.translate()->type() != TransformOperation::TranslateX) {
+ list->append(zoomAdjustedPixelValueForLength(style.translate()->y(), style));
+ }
+ }
+
+ if (style.translate()->type() == TransformOperation::Translate3D) {
+ list->append(zoomAdjustedPixelValue(style.translate()->z(), style));
+ }
+
+ return list.release();
+ }
+ case CSSPropertyRotate: {
+ if (!style.hasRotateProperty())
+ return cssValuePool().createValue(0, CSSPrimitiveValue::CSS_DEG);
+
+ RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
+ list->append(cssValuePool().createValue(style.rotate()->angle(), CSSPrimitiveValue::CSS_DEG));
+ if (style.rotate()->is3DOperation()) {
+ list->append(cssValuePool().createValue(style.rotate()->x(), CSSPrimitiveValue::CSS_NUMBER));
+ list->append(cssValuePool().createValue(style.rotate()->y(), CSSPrimitiveValue::CSS_NUMBER));
+ list->append(cssValuePool().createValue(style.rotate()->z(), CSSPrimitiveValue::CSS_NUMBER));
+ }
+ return list.release();
+ }
+ case CSSPropertyScale: {
+ if (!style.hasScaleProperty())
+ return cssValuePool().createValue(0, CSSPrimitiveValue::CSS_NUMBER);
+ RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
+ list->append(cssValuePool().createValue(style.scale()->x(), CSSPrimitiveValue::CSS_NUMBER));
+ if (style.scale()->type() == TransformOperation::ScaleX)
+ return list.release();
+ list->append(cssValuePool().createValue(style.scale()->y(), CSSPrimitiveValue::CSS_NUMBER));
+ if (style.scale()->type() == TransformOperation::Scale3D)
+ list->append(cssValuePool().createValue(style.scale()->z(), CSSPrimitiveValue::CSS_NUMBER));
+ return list.release();
+ }
case CSSPropertyAll:
return nullptr;
default:

Powered by Google App Engine
This is Rietveld 408576698