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

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

Issue 101623002: Drop "only composite opacity animations when already in compositing mode". (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Seperate window.internals and window.testRunner 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
« no previous file with comments | « Source/core/frame/animation/AnimationControllerPrivate.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 1668 matching lines...) Expand 10 before | Expand all | Expand 10 after
1679 bool RenderLayerCompositor::requiresCompositingForBackfaceVisibilityHidden(Rende rObject* renderer) const 1679 bool RenderLayerCompositor::requiresCompositingForBackfaceVisibilityHidden(Rende rObject* renderer) const
1680 { 1680 {
1681 return canRender3DTransforms() && renderer->style()->backfaceVisibility() == BackfaceVisibilityHidden; 1681 return canRender3DTransforms() && renderer->style()->backfaceVisibility() == BackfaceVisibilityHidden;
1682 } 1682 }
1683 1683
1684 bool RenderLayerCompositor::requiresCompositingForAnimation(RenderObject* render er) const 1684 bool RenderLayerCompositor::requiresCompositingForAnimation(RenderObject* render er) const
1685 { 1685 {
1686 if (!(m_compositingTriggers & ChromeClient::AnimationTrigger)) 1686 if (!(m_compositingTriggers & ChromeClient::AnimationTrigger))
1687 return false; 1687 return false;
1688 1688
1689 if (!RuntimeEnabledFeatures::webAnimationsCSSEnabled()) { 1689 if (!RuntimeEnabledFeatures::webAnimationsCSSEnabled())
1690 // FIXME: Remove this condition once force-compositing-mode is enabled o n all platforms. 1690 return renderer->animation().isRunningAcceleratableAnimationOnRenderer(r enderer);
1691 bool shouldAccelerateOpacity = inCompositingMode();
1692 return renderer->animation().isRunningAcceleratableAnimationOnRenderer(r enderer, shouldAccelerateOpacity);
1693 }
1694 1691
1695 return shouldCompositeForActiveAnimations(*renderer, inCompositingMode()); 1692 return shouldCompositeForActiveAnimations(*renderer);
1696 } 1693 }
1697 1694
1698 bool RenderLayerCompositor::requiresCompositingForTransition(RenderObject* rende rer) const 1695 bool RenderLayerCompositor::requiresCompositingForTransition(RenderObject* rende rer) const
1699 { 1696 {
1700 if (!(m_compositingTriggers & ChromeClient::AnimationTrigger)) 1697 if (!(m_compositingTriggers & ChromeClient::AnimationTrigger))
1701 return false; 1698 return false;
1702 1699
1703 if (Settings* settings = m_renderView->document().settings()) { 1700 if (Settings* settings = m_renderView->document().settings()) {
1704 if (!settings->acceleratedCompositingForTransitionEnabled()) 1701 if (!settings->acceleratedCompositingForTransitionEnabled())
1705 return false; 1702 return false;
(...skipping 755 matching lines...) Expand 10 before | Expand all | Expand 10 after
2461 } else if (graphicsLayer == m_scrollLayer.get()) { 2458 } else if (graphicsLayer == m_scrollLayer.get()) {
2462 name = "Frame Scrolling Layer"; 2459 name = "Frame Scrolling Layer";
2463 } else { 2460 } else {
2464 ASSERT_NOT_REACHED(); 2461 ASSERT_NOT_REACHED();
2465 } 2462 }
2466 2463
2467 return name; 2464 return name;
2468 } 2465 }
2469 2466
2470 } // namespace WebCore 2467 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/animation/AnimationControllerPrivate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698