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

Unified Diff: Source/core/rendering/RenderLayerCompositor.cpp

Issue 15181006: Plumb CompositingReason from Blink to compositor. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Addressed reviewer feedback, keeping the forwarding include Created 7 years, 7 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
« no previous file with comments | « Source/core/rendering/RenderLayerBacking.cpp ('k') | public/platform/WebCompositingReasons.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderLayerCompositor.cpp
diff --git a/Source/core/rendering/RenderLayerCompositor.cpp b/Source/core/rendering/RenderLayerCompositor.cpp
index a68cf2a4121ab0c9df7393b0658cac642846eafd..2421fe406af9e1d86279739831e01b81e549e73e 100644
--- a/Source/core/rendering/RenderLayerCompositor.cpp
+++ b/Source/core/rendering/RenderLayerCompositor.cpp
@@ -1571,7 +1571,7 @@ CompositingReasons RenderLayerCompositor::directReasonsForCompositing(const Rend
directReasons |= CompositingReasonAnimation;
if (requiresCompositingForTransition(renderer))
- directReasons |= CompositingReasonTransition;
+ directReasons |= CompositingReasonAnimation;
if (requiresCompositingForFilters(renderer))
directReasons |= CompositingReasonFilters;
@@ -1627,9 +1627,6 @@ const char* RenderLayerCompositor::logReasonsForCompositing(const RenderLayer* l
if (reasons & CompositingReasonAnimation)
return "animation";
- if (reasons & CompositingReasonTransition)
- return "transition";
-
if (reasons & CompositingReasonFilters)
return "filters";
« no previous file with comments | « Source/core/rendering/RenderLayerBacking.cpp ('k') | public/platform/WebCompositingReasons.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698