| OLD | NEW |
| 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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 | 176 |
| 177 bool RenderLayerCompositor::compositingLayersNeedRebuild() | 177 bool RenderLayerCompositor::compositingLayersNeedRebuild() |
| 178 { | 178 { |
| 179 // enableCompositingModeIfNeeded can set the m_compositingLayersNeedRebuild
bit. | 179 // enableCompositingModeIfNeeded can set the m_compositingLayersNeedRebuild
bit. |
| 180 ASSERT(!m_rootShouldAlwaysCompositeDirty); | 180 ASSERT(!m_rootShouldAlwaysCompositeDirty); |
| 181 return m_compositingLayersNeedRebuild; | 181 return m_compositingLayersNeedRebuild; |
| 182 } | 182 } |
| 183 | 183 |
| 184 bool RenderLayerCompositor::rootShouldAlwaysComposite() const | 184 bool RenderLayerCompositor::rootShouldAlwaysComposite() const |
| 185 { | 185 { |
| 186 Settings* settings = m_renderView.document().settings(); | 186 if (m_hasAcceleratedCompositing && !m_renderView.frame()->isMainFrame()) |
| 187 bool shouldComposite = settings->forceCompositingMode() && m_hasAcceleratedC
ompositing; | |
| 188 if (shouldComposite && !m_renderView.frame()->isMainFrame()) | |
| 189 return m_compositingReasonFinder.requiresCompositingForScrollableFrame()
; | 187 return m_compositingReasonFinder.requiresCompositingForScrollableFrame()
; |
| 190 return shouldComposite; | 188 return m_hasAcceleratedCompositing; |
| 191 } | 189 } |
| 192 | 190 |
| 193 void RenderLayerCompositor::updateAcceleratedCompositingSettings() | 191 void RenderLayerCompositor::updateAcceleratedCompositingSettings() |
| 194 { | 192 { |
| 195 m_compositingReasonFinder.updateTriggers(); | 193 m_compositingReasonFinder.updateTriggers(); |
| 196 | 194 |
| 197 bool hasAcceleratedCompositing = m_renderView.document().settings()->acceler
atedCompositingEnabled(); | 195 bool hasAcceleratedCompositing = m_renderView.document().settings()->acceler
atedCompositingEnabled(); |
| 198 | 196 |
| 199 // FIXME: Is this needed? It was added in https://bugs.webkit.org/show_bug.c
gi?id=26651. | 197 // FIXME: Is this needed? It was added in https://bugs.webkit.org/show_bug.c
gi?id=26651. |
| 200 // No tests fail if it's deleted. | 198 // No tests fail if it's deleted. |
| (...skipping 1219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1420 } else if (graphicsLayer == m_scrollLayer.get()) { | 1418 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 1421 name = "LocalFrame Scrolling Layer"; | 1419 name = "LocalFrame Scrolling Layer"; |
| 1422 } else { | 1420 } else { |
| 1423 ASSERT_NOT_REACHED(); | 1421 ASSERT_NOT_REACHED(); |
| 1424 } | 1422 } |
| 1425 | 1423 |
| 1426 return name; | 1424 return name; |
| 1427 } | 1425 } |
| 1428 | 1426 |
| 1429 } // namespace WebCore | 1427 } // namespace WebCore |
| OLD | NEW |