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

Side by Side Diff: Source/core/paint/DeprecatedPaintLayer.cpp

Issue 1158603003: CSS Independent Transform Properties (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase master and explicit applyTransform parameters 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Robert O'Callahan <roc+@cs.cmu.edu> 7 * Robert O'Callahan <roc+@cs.cmu.edu>
8 * David Baron <dbaron@fas.harvard.edu> 8 * David Baron <dbaron@fas.harvard.edu>
9 * Christian Biesinger <cbiesinger@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 paintInvalidationContainerWasScrolled && !child->isPaintInvalidation Container()); 334 paintInvalidationContainerWasScrolled && !child->isPaintInvalidation Container());
335 } 335 }
336 } 336 }
337 337
338 void DeprecatedPaintLayer::updateTransformationMatrix() 338 void DeprecatedPaintLayer::updateTransformationMatrix()
339 { 339 {
340 if (m_transform) { 340 if (m_transform) {
341 LayoutBox* box = layoutBox(); 341 LayoutBox* box = layoutBox();
342 ASSERT(box); 342 ASSERT(box);
343 m_transform->makeIdentity(); 343 m_transform->makeIdentity();
344 box->style()->applyTransform(*m_transform, LayoutSize(box->pixelSnappedS ize()), ComputedStyle::IncludeTransformOrigin); 344 box->style()->applyTransform(*m_transform, LayoutSize(box->pixelSnappedS ize()), ComputedStyle::IncludeTransformOrigin, ComputedStyle::IncludeMotionPath, ComputedStyle::IncludeIndependentTransformProperties);
345 makeMatrixRenderable(*m_transform, compositor()->hasAcceleratedCompositi ng()); 345 makeMatrixRenderable(*m_transform, compositor()->hasAcceleratedCompositi ng());
346 } 346 }
347 } 347 }
348 348
349 void DeprecatedPaintLayer::updateTransform(const ComputedStyle* oldStyle, const ComputedStyle& newStyle) 349 void DeprecatedPaintLayer::updateTransform(const ComputedStyle* oldStyle, const ComputedStyle& newStyle)
350 { 350 {
351 if (oldStyle && newStyle.transformDataEquivalent(*oldStyle)) 351 if (oldStyle && newStyle.transformDataEquivalent(*oldStyle))
352 return; 352 return;
353 353
354 // hasTransform() on the layoutObject is also true when there is transform-s tyle: preserve-3d or perspective set, 354 // hasTransform() on the layoutObject is also true when there is transform-s tyle: preserve-3d or perspective set,
(...skipping 2400 matching lines...) Expand 10 before | Expand all | Expand 10 after
2755 2755
2756 void showLayerTree(const blink::LayoutObject* layoutObject) 2756 void showLayerTree(const blink::LayoutObject* layoutObject)
2757 { 2757 {
2758 if (!layoutObject) { 2758 if (!layoutObject) {
2759 fprintf(stderr, "Cannot showLayerTree. Root is (nil)\n"); 2759 fprintf(stderr, "Cannot showLayerTree. Root is (nil)\n");
2760 return; 2760 return;
2761 } 2761 }
2762 showLayerTree(layoutObject->enclosingLayer()); 2762 showLayerTree(layoutObject->enclosingLayer());
2763 } 2763 }
2764 #endif 2764 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698