Commit e2b1968c authored by simon.fraser@apple.com's avatar simon.fraser@apple.com
Browse files

2011-02-15 Simon Fraser <simon.fraser@apple.com>

        Reviewed by Anders Carlsson, Darin Adler.

        Layers stick around in DrawingAreaImpl until we switch out of compositing
        https://bugs.webkit.org/show_bug.cgi?id=54498

        When leaving compositing mode soon, remove all the child layers
        of the nonCompositedContent layer right away, so they don't stick
        around.

        * WebProcess/WebPage/DrawingAreaImpl.cpp:
        (WebKit::DrawingAreaImpl::setRootCompositingLayer):
        * WebProcess/WebPage/mac/LayerTreeHostMac.mm:
        (WebKit::LayerTreeHostMac::setRootCompositingLayer):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@78623 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 583e8b70
2011-02-15 Simon Fraser <simon.fraser@apple.com>
Reviewed by Anders Carlsson, Darin Adler.
Layers stick around in DrawingAreaImpl until we switch out of compositing
https://bugs.webkit.org/show_bug.cgi?id=54498
When leaving compositing mode soon, remove all the child layers
of the nonCompositedContent layer right away, so they don't stick
around.
* WebProcess/WebPage/DrawingAreaImpl.cpp:
(WebKit::DrawingAreaImpl::setRootCompositingLayer):
* WebProcess/WebPage/mac/LayerTreeHostMac.mm:
(WebKit::LayerTreeHostMac::setRootCompositingLayer):
2011-02-15 Kenneth Russell <kbr@google.com>
 
Reviewed by Darin Fisher.
......@@ -193,6 +193,7 @@ void DrawingAreaImpl::setRootCompositingLayer(GraphicsLayer* graphicsLayer)
if (m_layerTreeHost) {
// We'll exit accelerated compositing mode on a timer, to avoid re-entering
// compositing code via display() and layout.
m_layerTreeHost->setRootCompositingLayer(0);
exitAcceleratedCompositingModeSoon();
}
}
......
......@@ -118,12 +118,11 @@ void LayerTreeHostMac::scheduleLayerFlush()
void LayerTreeHostMac::setRootCompositingLayer(GraphicsLayer* graphicsLayer)
{
ASSERT(graphicsLayer);
m_nonCompositedContentLayer->removeAllChildren();
// Add the accelerated layer tree hierarchy.
m_nonCompositedContentLayer->addChild(graphicsLayer);
if (graphicsLayer)
m_nonCompositedContentLayer->addChild(graphicsLayer);
}
void LayerTreeHostMac::invalidate()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment