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

Side by Side Diff: Source/core/rendering/RenderLayer.cpp

Issue 85463002: Web Animations: Remove WebAnimations runtime feature in favor of WebAnimationsCSS (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years 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 | Annotate | Revision Log
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 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 if (had3DTransform != has3DTransform()) 569 if (had3DTransform != has3DTransform())
570 dirty3DTransformedDescendantStatus(); 570 dirty3DTransformedDescendantStatus();
571 } 571 }
572 572
573 TransformationMatrix RenderLayer::currentTransform(RenderStyle::ApplyTransformOr igin applyOrigin) const 573 TransformationMatrix RenderLayer::currentTransform(RenderStyle::ApplyTransformOr igin applyOrigin) const
574 { 574 {
575 if (!m_transform) 575 if (!m_transform)
576 return TransformationMatrix(); 576 return TransformationMatrix();
577 577
578 // FIXME: handle this under web-animations 578 // FIXME: handle this under web-animations
579 if (!RuntimeEnabledFeatures::webAnimationsEnabled() && renderer()->style()-> isRunningAcceleratedAnimation()) { 579 if (!RuntimeEnabledFeatures::webAnimationsCSSEnabled() && renderer()->style( )->isRunningAcceleratedAnimation()) {
580 TransformationMatrix currTransform; 580 TransformationMatrix currTransform;
581 RefPtr<RenderStyle> style = renderer()->animation().getAnimatedStyleForR enderer(renderer()); 581 RefPtr<RenderStyle> style = renderer()->animation().getAnimatedStyleForR enderer(renderer());
582 style->applyTransform(currTransform, renderBox()->pixelSnappedBorderBoxR ect().size(), applyOrigin); 582 style->applyTransform(currTransform, renderBox()->pixelSnappedBorderBoxR ect().size(), applyOrigin);
583 makeMatrixRenderable(currTransform, canRender3DTransforms()); 583 makeMatrixRenderable(currTransform, canRender3DTransforms());
584 return currTransform; 584 return currTransform;
585 } 585 }
586 586
587 // m_transform includes transform-origin, so we need to recompute the transf orm here. 587 // m_transform includes transform-origin, so we need to recompute the transf orm here.
588 if (applyOrigin == RenderStyle::ExcludeTransformOrigin) { 588 if (applyOrigin == RenderStyle::ExcludeTransformOrigin) {
589 RenderBox* box = renderBox(); 589 RenderBox* box = renderBox();
(...skipping 3530 matching lines...) Expand 10 before | Expand all | Expand 10 after
4120 } 4120 }
4121 } 4121 }
4122 4122
4123 void showLayerTree(const WebCore::RenderObject* renderer) 4123 void showLayerTree(const WebCore::RenderObject* renderer)
4124 { 4124 {
4125 if (!renderer) 4125 if (!renderer)
4126 return; 4126 return;
4127 showLayerTree(renderer->enclosingLayer()); 4127 showLayerTree(renderer->enclosingLayer());
4128 } 4128 }
4129 #endif 4129 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698