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 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
237 m_updateCompositingLayersTimer.startOneShot(0); | 237 m_updateCompositingLayersTimer.startOneShot(0); |
238 } | 238 } |
239 | 239 |
240 void RenderLayerCompositor::updateCompositingLayersTimerFired(Timer<RenderLayerC
ompositor>*) | 240 void RenderLayerCompositor::updateCompositingLayersTimerFired(Timer<RenderLayerC
ompositor>*) |
241 { | 241 { |
242 updateCompositingLayers(); | 242 updateCompositingLayers(); |
243 } | 243 } |
244 | 244 |
245 bool RenderLayerCompositor::hasAnyAdditionalCompositedLayers(const RenderLayer*
rootLayer) const | 245 bool RenderLayerCompositor::hasAnyAdditionalCompositedLayers(const RenderLayer*
rootLayer) const |
246 { | 246 { |
247 return m_compositedLayerCount > rootLayer->isComposited(); | 247 return m_compositedLayerCount > (rootLayer->isComposited() ? 1 : 0); |
248 } | 248 } |
249 | 249 |
250 void RenderLayerCompositor::updateCompositingLayers(CompositingUpdateType update
Type, RenderLayer* updateRoot) | 250 void RenderLayerCompositor::updateCompositingLayers(CompositingUpdateType update
Type, RenderLayer* updateRoot) |
251 { | 251 { |
252 m_updateCompositingLayersTimer.stop(); | 252 m_updateCompositingLayersTimer.stop(); |
253 | 253 |
254 if (m_forceCompositingMode && !m_compositing) | 254 if (m_forceCompositingMode && !m_compositing) |
255 enableCompositingMode(true); | 255 enableCompositingMode(true); |
256 | 256 |
257 if (!m_compositingDependsOnGeometry && !m_compositing) | 257 if (!m_compositingDependsOnGeometry && !m_compositing) |
(...skipping 1653 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1911 if (!viewLayer->isComposited()) | 1911 if (!viewLayer->isComposited()) |
1912 return; | 1912 return; |
1913 | 1913 |
1914 if (GraphicsLayer* rootLayer = viewLayer->backing()->graphicsLayer()) | 1914 if (GraphicsLayer* rootLayer = viewLayer->backing()->graphicsLayer()) |
1915 rootLayer->noteDeviceOrPageScaleFactorChangedIncludingDescendants(); | 1915 rootLayer->noteDeviceOrPageScaleFactorChangedIncludingDescendants(); |
1916 } | 1916 } |
1917 | 1917 |
1918 } // namespace WebCore | 1918 } // namespace WebCore |
1919 | 1919 |
1920 #endif // USE(ACCELERATED_COMPOSITING) | 1920 #endif // USE(ACCELERATED_COMPOSITING) |
OLD | NEW |