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

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: Rebased. 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 557 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 if (had3DTransform != has3DTransform()) 568 if (had3DTransform != has3DTransform())
569 dirty3DTransformedDescendantStatus(); 569 dirty3DTransformedDescendantStatus();
570 } 570 }
571 571
572 TransformationMatrix RenderLayer::currentTransform(RenderStyle::ApplyTransformOr igin applyOrigin) const 572 TransformationMatrix RenderLayer::currentTransform(RenderStyle::ApplyTransformOr igin applyOrigin) const
573 { 573 {
574 if (!m_transform) 574 if (!m_transform)
575 return TransformationMatrix(); 575 return TransformationMatrix();
576 576
577 // FIXME: handle this under web-animations 577 // FIXME: handle this under web-animations
578 if (!RuntimeEnabledFeatures::webAnimationsEnabled() && renderer()->style()-> isRunningAcceleratedAnimation()) { 578 if (!RuntimeEnabledFeatures::webAnimationsCSSEnabled() && renderer()->style( )->isRunningAcceleratedAnimation()) {
579 TransformationMatrix currTransform; 579 TransformationMatrix currTransform;
580 RefPtr<RenderStyle> style = renderer()->animation().getAnimatedStyleForR enderer(renderer()); 580 RefPtr<RenderStyle> style = renderer()->animation().getAnimatedStyleForR enderer(renderer());
581 style->applyTransform(currTransform, renderBox()->pixelSnappedBorderBoxR ect().size(), applyOrigin); 581 style->applyTransform(currTransform, renderBox()->pixelSnappedBorderBoxR ect().size(), applyOrigin);
582 makeMatrixRenderable(currTransform, canRender3DTransforms()); 582 makeMatrixRenderable(currTransform, canRender3DTransforms());
583 return currTransform; 583 return currTransform;
584 } 584 }
585 585
586 // m_transform includes transform-origin, so we need to recompute the transf orm here. 586 // m_transform includes transform-origin, so we need to recompute the transf orm here.
587 if (applyOrigin == RenderStyle::ExcludeTransformOrigin) { 587 if (applyOrigin == RenderStyle::ExcludeTransformOrigin) {
588 RenderBox* box = renderBox(); 588 RenderBox* box = renderBox();
(...skipping 3571 matching lines...) Expand 10 before | Expand all | Expand 10 after
4160 } 4160 }
4161 } 4161 }
4162 4162
4163 void showLayerTree(const WebCore::RenderObject* renderer) 4163 void showLayerTree(const WebCore::RenderObject* renderer)
4164 { 4164 {
4165 if (!renderer) 4165 if (!renderer)
4166 return; 4166 return;
4167 showLayerTree(renderer->enclosingLayer()); 4167 showLayerTree(renderer->enclosingLayer());
4168 } 4168 }
4169 #endif 4169 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/CompositedLayerMapping.cpp ('k') | Source/core/rendering/RenderLayerCompositor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698