| Index: Source/WebCore/rendering/RenderLayerBacking.cpp
|
| ===================================================================
|
| --- Source/WebCore/rendering/RenderLayerBacking.cpp (revision 115913)
|
| +++ Source/WebCore/rendering/RenderLayerBacking.cpp (working copy)
|
| @@ -92,7 +92,6 @@
|
| , m_artificiallyInflatedBounds(false)
|
| , m_isMainFrameRenderViewLayer(false)
|
| , m_usingTiledCacheLayer(false)
|
| - , m_requiresOwnBackingStore(true)
|
| #if ENABLE(CSS_FILTERS)
|
| , m_canCompositeFilters(false)
|
| #endif
|
| @@ -566,10 +565,6 @@
|
| }
|
|
|
| m_graphicsLayer->setContentsRect(contentsBox());
|
| -
|
| - // If this layer was created just for clipping or to apply perspective, it doesn't need its own backing store.
|
| - setRequiresOwnBackingStore(compositor()->requiresOwnBackingStore(m_owningLayer, compAncestor));
|
| -
|
| updateDrawsContent();
|
| updateAfterWidgetResize();
|
| }
|
| @@ -949,7 +944,7 @@
|
|
|
| bool RenderLayerBacking::containsPaintedContent() const
|
| {
|
| - if (isSimpleContainerCompositingLayer() || paintsIntoWindow() || paintsIntoCompositedAncestor() || m_artificiallyInflatedBounds || m_owningLayer->isReflection())
|
| + if (isSimpleContainerCompositingLayer() || paintsIntoWindow() || m_artificiallyInflatedBounds || m_owningLayer->isReflection())
|
| return false;
|
|
|
| if (isDirectlyCompositedImage())
|
| @@ -1107,8 +1102,6 @@
|
|
|
| void RenderLayerBacking::setContentsNeedDisplay()
|
| {
|
| - ASSERT(!paintsIntoCompositedAncestor());
|
| -
|
| if (m_graphicsLayer && m_graphicsLayer->drawsContent())
|
| m_graphicsLayer->setNeedsDisplay();
|
|
|
| @@ -1122,8 +1115,6 @@
|
| // r is in the coordinate space of the layer's render object
|
| void RenderLayerBacking::setContentsNeedDisplayInRect(const IntRect& r)
|
| {
|
| - ASSERT(!paintsIntoCompositedAncestor());
|
| -
|
| if (m_graphicsLayer && m_graphicsLayer->drawsContent()) {
|
| IntRect layerDirtyRect = r;
|
| layerDirtyRect.move(-m_graphicsLayer->offsetFromRenderer());
|
| @@ -1148,7 +1139,7 @@
|
| PaintBehavior paintBehavior, GraphicsLayerPaintingPhase paintingPhase,
|
| RenderObject* paintingRoot)
|
| {
|
| - if (paintsIntoWindow() || paintsIntoCompositedAncestor()) {
|
| + if (paintsIntoWindow()) {
|
| ASSERT_NOT_REACHED();
|
| return;
|
| }
|
|
|