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

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: 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
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 1691 matching lines...) Expand 10 before | Expand all | Expand 10 after
1702 bool RenderLayerCompositor::requiresCompositingForBackfaceVisibilityHidden(Rende rObject* renderer) const 1702 bool RenderLayerCompositor::requiresCompositingForBackfaceVisibilityHidden(Rende rObject* renderer) const
1703 { 1703 {
1704 return canRender3DTransforms() && renderer->style()->backfaceVisibility() == BackfaceVisibilityHidden; 1704 return canRender3DTransforms() && renderer->style()->backfaceVisibility() == BackfaceVisibilityHidden;
1705 } 1705 }
1706 1706
1707 bool RenderLayerCompositor::requiresCompositingForAnimation(RenderObject* render er) const 1707 bool RenderLayerCompositor::requiresCompositingForAnimation(RenderObject* render er) const
1708 { 1708 {
1709 if (!(m_compositingTriggers & ChromeClient::AnimationTrigger)) 1709 if (!(m_compositingTriggers & ChromeClient::AnimationTrigger))
1710 return false; 1710 return false;
1711 1711
1712 if (!RuntimeEnabledFeatures::webAnimationsCSSEnabled()) { 1712 if (!RuntimeEnabledFeatures::webAnimationsCSSEnabled())
1713 // FIXME: Remove this condition once force-compositing-mode is enabled o n all platforms. 1713 return renderer->animation().isRunningAcceleratableAnimationOnRenderer(r enderer);
1714 bool shouldAccelerateOpacity = inCompositingMode();
1715 return renderer->animation().isRunningAcceleratableAnimationOnRenderer(r enderer, shouldAccelerateOpacity);
1716 }
1717 1714
1718 return shouldCompositeForActiveAnimations(*renderer, inCompositingMode()); 1715 return shouldCompositeForActiveAnimations(*renderer);
1719 } 1716 }
1720 1717
1721 bool RenderLayerCompositor::requiresCompositingForTransition(RenderObject* rende rer) const 1718 bool RenderLayerCompositor::requiresCompositingForTransition(RenderObject* rende rer) const
1722 { 1719 {
1723 if (!(m_compositingTriggers & ChromeClient::AnimationTrigger)) 1720 if (!(m_compositingTriggers & ChromeClient::AnimationTrigger))
1724 return false; 1721 return false;
1725 1722
1726 if (Settings* settings = m_renderView->document().settings()) { 1723 if (Settings* settings = m_renderView->document().settings()) {
1727 if (!settings->acceleratedCompositingForTransitionEnabled()) 1724 if (!settings->acceleratedCompositingForTransitionEnabled())
1728 return false; 1725 return false;
(...skipping 755 matching lines...) Expand 10 before | Expand all | Expand 10 after
2484 } else if (graphicsLayer == m_scrollLayer.get()) { 2481 } else if (graphicsLayer == m_scrollLayer.get()) {
2485 name = "Frame Scrolling Layer"; 2482 name = "Frame Scrolling Layer";
2486 } else { 2483 } else {
2487 ASSERT_NOT_REACHED(); 2484 ASSERT_NOT_REACHED();
2488 } 2485 }
2489 2486
2490 return name; 2487 return name;
2491 } 2488 }
2492 2489
2493 } // namespace WebCore 2490 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698