Changeset 112175 in webkit
- Timestamp:
- Mar 26, 2012 4:42:17 PM (12 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r112132 r112175 1 2012-03-26 Anders Carlsson <andersca@apple.com> 2 3 Never remove root compositing layers in the web process 4 https://bugs.webkit.org/show_bug.cgi?id=82255 5 <rdar://problem/11058521> 6 7 Reviewed by Sam Weinig. 8 9 Since we never leave accelerated compositing mode when using tiled drawing, we should 10 never remove root compositing layers in the web process. 11 12 * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm: 13 (WebKit::TiledCoreAnimationDrawingArea::setRootCompositingLayer): 14 1 15 2012-03-26 Rafael Brandao <rafael.lobo@openbossa.org> 2 16 -
trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm
r111226 r112175 111 111 CALayer *rootCompositingLayer = graphicsLayer ? graphicsLayer->platformLayer() : nil; 112 112 113 // Since we'll always be in accelerated compositing mode, the only time that layer will be nil 114 // is when the WKView is removed from its containing window. In that case, the layer will already be 115 // removed from the layer tree hierarchy over in the UI process, so there's no reason to remove it locally. 116 // In addition, removing the layer here will cause flashes when switching between tabs. 117 if (!rootCompositingLayer) 118 return; 119 113 120 if (m_layerTreeStateIsFrozen) { 114 121 m_pendingRootCompositingLayer = rootCompositingLayer; … … 326 333 void TiledCoreAnimationDrawingArea::setRootCompositingLayer(CALayer *layer) 327 334 { 335 ASSERT(layer); 328 336 ASSERT(!m_layerTreeStateIsFrozen); 329 337 … … 331 339 [CATransaction setDisableActions:YES]; 332 340 333 if (!layer) 334 m_rootLayer.get().sublayers = nil; 335 else { 336 m_rootLayer.get().sublayers = [NSArray arrayWithObject:layer]; 337 338 if (m_pageOverlayLayer) 339 [m_rootLayer.get() addSublayer:m_pageOverlayLayer->platformLayer()]; 340 } 341 m_rootLayer.get().sublayers = [NSArray arrayWithObject:layer]; 342 343 if (m_pageOverlayLayer) 344 [m_rootLayer.get() addSublayer:m_pageOverlayLayer->platformLayer()]; 341 345 342 346 [CATransaction commit];
Note: See TracChangeset
for help on using the changeset viewer.