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

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

Issue 246893017: Disable layer squashing (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/platform/RuntimeEnabledFeatures.in » ('j') | 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 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 // No tests fail if it's deleted. 199 // No tests fail if it's deleted.
200 if (hasAcceleratedCompositing != m_hasAcceleratedCompositing) 200 if (hasAcceleratedCompositing != m_hasAcceleratedCompositing)
201 setCompositingLayersNeedRebuild(); 201 setCompositingLayersNeedRebuild();
202 202
203 m_hasAcceleratedCompositing = hasAcceleratedCompositing; 203 m_hasAcceleratedCompositing = hasAcceleratedCompositing;
204 m_rootShouldAlwaysCompositeDirty = true; 204 m_rootShouldAlwaysCompositeDirty = true;
205 } 205 }
206 206
207 bool RenderLayerCompositor::layerSquashingEnabled() const 207 bool RenderLayerCompositor::layerSquashingEnabled() const
208 { 208 {
209 if (!RuntimeEnabledFeatures::layerSquashingEnabled())
210 return false;
209 if (Settings* settings = m_renderView.document().settings()) 211 if (Settings* settings = m_renderView.document().settings())
210 return settings->layerSquashingEnabled(); 212 return settings->layerSquashingEnabled();
211 return true; 213 return true;
212 } 214 }
213 215
214 bool RenderLayerCompositor::legacyOrCurrentAcceleratedCompositingForOverflowScro llEnabled() const 216 bool RenderLayerCompositor::legacyOrCurrentAcceleratedCompositingForOverflowScro llEnabled() const
215 { 217 {
216 return legacyAcceleratedCompositingForOverflowScrollEnabled() || accelerated CompositingForOverflowScrollEnabled(); 218 return legacyAcceleratedCompositingForOverflowScrollEnabled() || accelerated CompositingForOverflowScrollEnabled();
217 } 219 }
218 220
(...skipping 1496 matching lines...) Expand 10 before | Expand all | Expand 10 after
1715 } else if (graphicsLayer == m_scrollLayer.get()) { 1717 } else if (graphicsLayer == m_scrollLayer.get()) {
1716 name = "LocalFrame Scrolling Layer"; 1718 name = "LocalFrame Scrolling Layer";
1717 } else { 1719 } else {
1718 ASSERT_NOT_REACHED(); 1720 ASSERT_NOT_REACHED();
1719 } 1721 }
1720 1722
1721 return name; 1723 return name;
1722 } 1724 }
1723 1725
1724 } // namespace WebCore 1726 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/platform/RuntimeEnabledFeatures.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698