Attachment #179395 for bug #104842

View Details Raw Unified Return to Bug 104842

| Differences between



2012-12-13  No'am Rosenthal  <noam.rosenthal@nokia.com>

        Disambiguate "background color" and "contents as solid color" on GraphicsLayer
        https://bugs.webkit.org/show_bug.cgi?id=104842

        Reviewed by Simon Fraser.

        Rename overloads in GraphicsLayerTextureMapper and GraphicsLayerChromium to account for the rename in GraphicsLayer.

        Covered by existing tests.

        * platform/graphics/chromium/GraphicsLayerChromium.cpp:
        * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
        (WebCore::GraphicsLayerTextureMapper::setContentsToSolidColor):
        * platform/graphics/texmap/GraphicsLayerTextureMapper.h:
        (GraphicsLayerTextureMapper):
        (WebCore::GraphicsLayerTextureMapper::solidColor):
        * platform/graphics/texmap/TextureMapperLayer.cpp:
        (WebCore::TextureMapperLayer::paintSelf):
        (WebCore::TextureMapperLayer::flushCompositingStateSelf):
        * platform/graphics/texmap/TextureMapperLayer.h:
        (State):

2012-12-13  Simon Fraser  <simon.fraser@apple.com>

        Disambiguate "background color" and "contents as solid color" on GraphicsLayer
        https://bugs.webkit.org/show_bug.cgi?id=104842

        Reviewed by NOBODY (OOPS!).

        GraphicsLayer failed to be clear about the distinction between
        the layer background color, and setting the layer contents
        to a color. This caused some recently added tests to fail,
        and required some special-casing for the TileCache in
        GraphicsLayerCA.
        
        Separate these two concepts on GraphicsLayer. setBackgroundColor()
        now sets the background color on the entire layer, which will only
        be used in special cases like the TileCache.
        
        The existing setContentsToBackgroundColor() is renamed to
        setContentsToSolidColor(), and is an explicit request to create
        a contents layer for the purpose of displaying a simple color.
        
        In both cases, 'clear' methods are not necessary; calling
        the setter with an invalid color clears the color.

        Covered by existing tests.

        * WebCore.exp.in: Remove GraphicsLayer::clearBackgroundColor().
        * platform/graphics/GraphicsLayer.cpp:
        (WebCore::GraphicsLayer::GraphicsLayer):
        (WebCore::GraphicsLayer::setBackgroundColor):
        (WebCore::GraphicsLayer::dumpProperties):
        * platform/graphics/GraphicsLayer.h:
        (GraphicsLayer): Remove m_backgroundColorSet; we just check whether
        the color is a valid color now.
        (WebCore::GraphicsLayer::setContentsToSolidColor):
        * platform/graphics/ca/GraphicsLayerCA.cpp:
        (WebCore::GraphicsLayerCA::GraphicsLayerCA):
        (WebCore::GraphicsLayerCA::setBackgroundColor):
        (WebCore::GraphicsLayerCA::setContentsToSolidColor):
        (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
        (WebCore::GraphicsLayerCA::updateBackgroundColor):
        (WebCore::GraphicsLayerCA::updateContentsColorLayer):
        (WebCore):
        * platform/graphics/ca/GraphicsLayerCA.h:
        (GraphicsLayerCA):
        * rendering/RenderLayerBacking.cpp:
        (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry): We have
        to call updateBackgroundColor(), because the 'is simple compositing layer'
        state may change in this code path.
        (WebCore::RenderLayerBacking::updateBackgroundColor): Don't initialize
        the Color to transparent (it will be invalid initially), and always
        call setContentsToSolidColor() which will either set or remove the color.

2012-12-12  Andy Estes  <aestes@apple.com>

        Don't dispatch fake mousemove events when we don't know where the cursor is



2012-12-13  No'am Rosenthal  <noam.rosenthal@nokia.com>

        Disambiguate "background color" and "contents as solid color" on GraphicsLayer
        https://bugs.webkit.org/show_bug.cgi?id=104842

        Reviewed by Simon Fraser.

        Rename overloads in coordinated graphics to account for the rename in GraphicsLayer.

        * Shared/CoordinatedGraphics/CoordinatedLayerInfo.h:
        (CoordinatedLayerInfo):
        * UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp:
        (WebKit::LayerTreeRenderer::setLayerState):
        * WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp:
        (WebCore::CoordinatedGraphicsLayer::setContentsToSolidColor):
        * WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.h:
        (CoordinatedGraphicsLayer):

2012-12-12  Seokju Kwon  <seokju.kwon@gmail.com>

        [EFL] Refactor duplicate code into EflInspectorUtilities

Lines 2165-2171 __ZN7WebCore13GraphicsLayer17distributeOpacityEf a/Source/WebCore/WebCore.exp.in_sec1
- a/Source/WebCore/WebCore.exp.in -1 lines
2165	__ZN7WebCore13GraphicsLayer17removeAllChildrenEv	2165	__ZN7WebCore13GraphicsLayer17removeAllChildrenEv
2166	__ZN7WebCore13GraphicsLayer17suspendAnimationsEd	2166	__ZN7WebCore13GraphicsLayer17suspendAnimationsEd
2167	__ZN7WebCore13GraphicsLayer18setBackgroundColorERKNS_5ColorE	2167	__ZN7WebCore13GraphicsLayer18setBackgroundColorERKNS_5ColorE
2168	__ZN7WebCore13GraphicsLayer20clearBackgroundColorEv
2169	__ZN7WebCore13GraphicsLayer20setReplicatedByLayerEPS0_	2168	__ZN7WebCore13GraphicsLayer20setReplicatedByLayerEPS0_
2170	__ZN7WebCore13GraphicsLayer6createEPNS_19GraphicsLayerClientE	2169	__ZN7WebCore13GraphicsLayer6createEPNS_19GraphicsLayerClientE
2171	__ZN7WebCore13GraphicsLayer6createEPNS_20GraphicsLayerFactoryEPNS_19GraphicsLayerClientE	2170	__ZN7WebCore13GraphicsLayer6createEPNS_20GraphicsLayerFactoryEPNS_19GraphicsLayerClientE



    , m_anchorPoint(0.5f, 0.5f, 0)
    , m_opacity(1)
    , m_zPosition(0)
    , m_backgroundColorSet(false)
    , m_contentsOpaque(false)
    , m_preserves3D(false)
    , m_backfaceVisibility(true)

void GraphicsLayer::setBackgroundColor(const Color& color)
{
    m_backgroundColor = color;
    m_backgroundColorSet = true;
}

void GraphicsLayer::clearBackgroundColor()
{
    m_backgroundColor = Color();
    m_backgroundColorSet = false;
}

void GraphicsLayer::paintGraphicsLayerContents(GraphicsContext& context, const IntRect& clip)

        ts << ")\n";
    }

    if (m_backgroundColor.isValid()) {
        writeIndent(ts, indent + 1);
        ts << "(backgroundColor " << m_backgroundColor.nameForRenderTreeAsText() << ")\n";
    }

Lines 292-302 public: a/Source/WebCore/platform/graphics/GraphicsLayer.h_sec1
- a/Source/WebCore/platform/graphics/GraphicsLayer.h -5 / +5 lines
292	bool acceleratesDrawing() const { return m_acceleratesDrawing; }	292	bool acceleratesDrawing() const { return m_acceleratesDrawing; }
293	virtual void setAcceleratesDrawing(bool b) { m_acceleratesDrawing = b; }	293	virtual void setAcceleratesDrawing(bool b) { m_acceleratesDrawing = b; }
294		294
295	// The color used to paint the layer backgrounds	295	// The color used to paint the layer background. Pass an invalid color to remove it.
		296	// Note that this covers the entire layer. Use setContentsToSolidColor() if the color should
		297	// only cover the contentsRect.
296	const Color& backgroundColor() const { return m_backgroundColor; }	298	const Color& backgroundColor() const { return m_backgroundColor; }
297	virtual void setBackgroundColor(const Color&);	299	virtual void setBackgroundColor(const Color&);
298	virtual void clearBackgroundColor();
299	bool backgroundColorSet() const { return m_backgroundColorSet; }
300		300
301	// opaque means that we know the layer contents have no alpha	301	// opaque means that we know the layer contents have no alpha
302	bool contentsOpaque() const { return m_contentsOpaque; }	302	bool contentsOpaque() const { return m_contentsOpaque; }
Lines 346-352 public: a/Source/WebCore/platform/graphics/GraphicsLayer.h_sec2
346	virtual void setContentsToImage(Image*) { }	346	virtual void setContentsToImage(Image*) { }
347	virtual bool shouldDirectlyCompositeImage(Image*) const { return true; }	347	virtual bool shouldDirectlyCompositeImage(Image*) const { return true; }
348	virtual void setContentsToMedia(PlatformLayer*) { } // video or plug-in	348	virtual void setContentsToMedia(PlatformLayer*) { } // video or plug-in
349	virtual void setContentsToBackgroundColor(const Color&) { }	349	// Pass an invalid color to remove the contents layer.
		350	virtual void setContentsToSolidColor(const Color&) { }
350	virtual void setContentsToCanvas(PlatformLayer*) { }	351	virtual void setContentsToCanvas(PlatformLayer*) { }
351	virtual bool hasContentsLayer() const { return false; }	352	virtual bool hasContentsLayer() const { return false; }
352		353
Lines 497-503 protected: a/Source/WebCore/platform/graphics/GraphicsLayer.h_sec3
497	FilterOperations m_filters;	498	FilterOperations m_filters;
498	#endif	499	#endif
499		500
500	bool m_backgroundColorSet : 1;
501	bool m_contentsOpaque : 1;	501	bool m_contentsOpaque : 1;
502	bool m_preserves3D: 1;	502	bool m_preserves3D: 1;
503	bool m_backfaceVisibility : 1;	503	bool m_backfaceVisibility : 1;



    : GraphicsLayer(client)
    , m_suspendTime(0)
    , m_contentsLayerPurpose(NoContentsLayer)
    , m_contentsLayerHasBackgroundColor(false)
{
    m_layer = LayerWebKitThread::create(LayerData::Layer, this);



void GraphicsLayerBlackBerry::setBackgroundColor(const Color& color)
{
    if (color == m_backgroundColor)
        return;

    GraphicsLayer::setBackgroundColor(color.rgb());

    m_contentsLayerHasBackgroundColor = true;
    updateLayerBackgroundColor();
}

void GraphicsLayerBlackBerry::clearBackgroundColor()
{
    if (!m_backgroundColorSet)
        return;

    GraphicsLayer::clearBackgroundColor();
    clearLayerBackgroundColor(*m_contentsLayer);
}

void GraphicsLayerBlackBerry::setContentsOpaque(bool opaque)
{
    if (m_contentsOpaque == opaque)


void GraphicsLayerBlackBerry::updateLayerBackgroundColor()
{
    if (m_backgroundColor.isValid())
        setLayerBackgroundColor(*m_layer, m_backgroundColor);

    // We never create the contents layer just for background color yet.
    if (m_backgroundColorSet)
        setLayerBackgroundColor(*m_contentsLayer, m_backgroundColor);
    else
        clearLayerBackgroundColor(*m_layer);
}

#if ENABLE(CSS_FILTERS)



#endif

    virtual void setBackgroundColor(const Color&);
    virtual void clearBackgroundColor();

    virtual void setContentsOpaque(bool);
    virtual void setBackfaceVisibility(bool);

    };

    ContentsLayerPurpose m_contentsLayerPurpose;
    bool m_contentsLayerHasBackgroundColor : 1;
};

} // namespace WebCore



GraphicsLayerCA::GraphicsLayerCA(GraphicsLayerClient* client)
    : GraphicsLayer(client)
    , m_contentsLayerPurpose(NoContentsLayer)
    , m_contentsLayerHasBackgroundColor(false)
    , m_allowTiledLayer(true)
    , m_isPageTileCacheLayer(false)
    , m_uncommittedChanges(0)


void GraphicsLayerCA::setBackgroundColor(const Color& color)
{
    if (m_backgroundColor == color)
        return;

    GraphicsLayer::setBackgroundColor(color);

    m_contentsLayerHasBackgroundColor = true;
    noteLayerPropertyChanged(BackgroundColorChanged);
}

void GraphicsLayerCA::clearBackgroundColor()
{
    if (!m_backgroundColorSet)
        return;

    GraphicsLayer::clearBackgroundColor();
    m_contentsLayerHasBackgroundColor = false;
    noteLayerPropertyChanged(BackgroundColorChanged);
}


        m_client->notifyAnimationStarted(this, startTime);
}

void GraphicsLayerCA::setContentsToSolidColor(const Color& color)
{
    if (color == m_contentsSolidColor)
        return;

    m_contentsSolidColor = color;

    if (m_contentsSolidColor.isValid()) {
        m_contentsLayerPurpose = ContentsLayerForBackgroundColor;
        m_contentsLayer = PlatformCALayer::create(PlatformCALayer::LayerTypeLayer, this);
#ifndef NDEBUG

    }

    noteSublayersChanged();
    noteLayerPropertyChanged(ContentsColorLayerChanged);
}

void GraphicsLayerCA::setContentsToImage(Image* image)

    
    if (m_uncommittedChanges & ContentsCanvasLayerChanged) // Needs to happen before ChildrenChanged
        updateContentsCanvasLayer();

    if (m_uncommittedChanges & ContentsColorLayerChanged) // Needs to happen before ChildrenChanged
        updateContentsColorLayer();
    
    if (m_uncommittedChanges & BackgroundColorChanged)
        updateBackgroundColor();

    if (m_uncommittedChanges & TransformChanged)
        updateTransform();

    m_sizeAtLastVisibleRectUpdate = m_size;
}

void GraphicsLayerCA::updateBackgroundColor()
{
    m_layer->setBackgroundColor(m_backgroundColor);
        m_layer->setBackgroundColor(m_backgroundColor);
        return;
    }

    if (!m_contentsLayer)
        return;

    setupContentsLayer(m_contentsLayer.get());
    updateContentsRect();

    if (m_backgroundColorSet)
        m_contentsLayer->setBackgroundColor(m_backgroundColor);
    else
        m_contentsLayer->setBackgroundColor(Color::transparent);
}

void GraphicsLayerCA::updateContentsImage()

    }
}

void GraphicsLayerCA::updateContentsColorLayer()
{
    // Color layer was set as m_contentsLayer, and will get parented in updateSublayerList().
    if (m_contentsLayer) {
        setupContentsLayer(m_contentsLayer.get());
        updateContentsRect();
        ASSERT(m_contentsSolidColor.isValid()); // An invalid color should have removed the contents layer.
        m_contentsLayer->setBackgroundColor(m_contentsSolidColor);
    }
}

void GraphicsLayerCA::updateContentsRect()
{
    if (!m_contentsLayer)



    virtual void setAcceleratesDrawing(bool);

    virtual void setBackgroundColor(const Color&);
    virtual void clearBackgroundColor();

    virtual void setContentsOpaque(bool);
    virtual void setBackfaceVisibility(bool);

    virtual void setContentsToImage(Image*);
    virtual void setContentsToMedia(PlatformLayer*);
    virtual void setContentsToCanvas(PlatformLayer*);
    virtual void setContentsToSolidColor(const Color&);

    virtual bool hasContentsLayer() const { return m_contentsLayer; }
    

    void updateBackfaceVisibility();
    void updateStructuralLayer(float pixelAlignmentScale, const FloatPoint& positionRelativeToBase);
    void updateLayerDrawsContent(float pixelAlignmentScale, const FloatPoint& positionRelativeToBase);
    void updateBackgroundColor();

    void updateContentsImage();
    void updateContentsMediaLayer();
    void updateContentsCanvasLayer();
    void updateContentsColorLayer();
    void updateContentsRect();
    void updateMaskLayer();
    void updateReplicatedLayers();

        ContentsImageChanged = 1 << 15,
        ContentsMediaLayerChanged = 1 << 16,
        ContentsCanvasLayerChanged = 1 << 17,
        ContentsColorLayerChanged = 1 << 18,
        ContentsRectChanged = 1 << 19,
        MaskLayerChanged = 1 << 20,
        ReplicatedLayerChanged = 1 << 21,
        ContentsNeedsDisplay = 1 << 22,
        AcceleratesDrawingChanged = 1 << 23,
        ContentsScaleChanged = 1 << 24,
        ContentsVisibilityChanged = 1 << 25,
        VisibleRectChanged = 1 << 26,
        FiltersChanged = 1 << 27,
        DebugIndicatorsChanged = 1 << 28
    };
    typedef unsigned LayerChangeFlags;
    void noteLayerPropertyChanged(LayerChangeFlags flags);

    bool m_contentsLayerHasBackgroundColor : 1;
    bool m_allowTiledLayer : 1;
    bool m_isPageTileCacheLayer : 1;
    
    Color m_contentsSolidColor;

    RetainPtr<CGImageRef> m_uncorrectedContentsImage;
    RetainPtr<CGImageRef> m_pendingContentsImage;



    , m_contentsLayerId(0)
    , m_linkHighlight(0)
    , m_contentsLayerPurpose(NoContentsLayer)
    , m_contentsLayerHasBackgroundColor(false)
    , m_inSetChildren(false)
    , m_scrollableArea(0)
{


void GraphicsLayerChromium::setBackgroundColor(const Color& color)
{
    if (color == m_backgroundColor)
        return;

    GraphicsLayer::setBackgroundColor(color.rgb());
    updateLayerBackgroundColor();
}

void GraphicsLayerChromium::clearBackgroundColor()
{
    GraphicsLayer::clearBackgroundColor();

    if (WebLayer* contentsLayer = contentsLayerIfRegistered())
        contentsLayer->setBackgroundColor(static_cast<RGBA32>(0));
}

void GraphicsLayerChromium::setContentsOpaque(bool opaque)
{
    GraphicsLayer::setContentsOpaque(opaque);


void GraphicsLayerChromium::updateLayerBackgroundColor()
{
    m_layer->setBackgroundColor(m_backgroundColor.rgb());
    if (!contentsLayer)
        return;

    // We never create the contents layer just for background color yet.
    if (m_backgroundColorSet)
        contentsLayer->setBackgroundColor(m_backgroundColor.rgb());
    else
        contentsLayer->setBackgroundColor(static_cast<RGBA32>(0));
}

void GraphicsLayerChromium::updateContentsVideo()



    virtual void setMaskLayer(GraphicsLayer*);

    virtual void setBackgroundColor(const Color&);
    virtual void clearBackgroundColor();

    virtual void setContentsOpaque(bool);
    virtual void setBackfaceVisibility(bool);

    OwnPtr<OpaqueRectTrackingContentLayerDelegate> m_opaqueRectTrackingContentLayerDelegate;

    ContentsLayerPurpose m_contentsLayerPurpose;
    bool m_contentsLayerHasBackgroundColor : 1;
    bool m_inSetChildren;

    typedef HashMap<String, int> AnimationIdMap;



    notifyChange(TextureMapperLayer::ContentsRectChange);
}

void GraphicsLayerTextureMapper::setContentsToSolidColor(const Color& color)
{
    if (color == m_solidColor)
        return;

    m_solidColor = color;
    setBackgroundColor(color);
    notifyChange(TextureMapperLayer::ContentChange);
}




    virtual void setContentsRect(const IntRect& r);
    virtual void setReplicatedByLayer(GraphicsLayer*);
    virtual void setContentsToImage(Image*);
    virtual void setContentsToSolidColor(const Color&);
    Color solidColor() const { return m_solidColor; }
    virtual void setContentsToMedia(PlatformLayer*);
    virtual void setContentsToCanvas(PlatformLayer* canvas) { setContentsToMedia(canvas); }
    virtual void flushCompositingState(const FloatRect&);

    bool m_needsDisplay;
    bool m_hasOwnBackingStore;
    bool m_fixedToViewport;
    Color m_solidColor;

    Color m_debugBorderColor;
    float m_debugBorderWidth;



    float opacity = options.opacity;
    RefPtr<BitmapTexture> mask = options.mask;

    if (m_state.solidColor.isValid() && !m_state.contentsRect.isEmpty()) {
        if (!m_state.solidColor.alpha())
            return;

        Color color = m_state.solidColor;
        float r, g, b, a;
        color.getRGBA(r, g, b, a);
        color = Color(r * opacity, g * opacity, b * opacity, a * opacity);
        options.textureMapper->drawSolidColor(m_state.contentsRect, transform, color);
        return;
    }

    if (m_backingStore) {

    m_state.backfaceVisibility = graphicsLayer->backfaceVisibility();
    m_state.childrenTransform = graphicsLayer->childrenTransform();
    m_state.opacity = graphicsLayer->opacity();
    m_state.solidColor = graphicsLayer->solidColor();
#if ENABLE(CSS_FILTERS)
    if (changeMask & FilterChange)
        m_state.filters = graphicsLayer->filters();

Lines 199-205 private: a/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h_sec1
- a/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h -1 / +1 lines
199	int descendantsWithContent;	199	int descendantsWithContent;
200	TextureMapperLayer* maskLayer;	200	TextureMapperLayer* maskLayer;
201	TextureMapperLayer* replicaLayer;	201	TextureMapperLayer* replicaLayer;
202	Color backgroundColor;	202	Color solidColor;
203	#if ENABLE(CSS_FILTERS)	203	#if ENABLE(CSS_FILTERS)
204	FilterOperations filters;	204	FilterOperations filters;
205	#endif	205	#endif



    setRequiresOwnBackingStore(compositor()->requiresOwnBackingStore(m_owningLayer, compAncestor));

    updateContentsRect(isSimpleContainer);
    updateBackgroundColor(isSimpleContainer);
    updateDrawsContent(isSimpleContainer);
    updateAfterWidgetResize();
}


void RenderLayerBacking::updateBackgroundColor(bool isSimpleContainer)
{
    Color backgroundColor;
    if (isSimpleContainer)
        backgroundColor = rendererBackgroundColor();

    // An unset (invalid) color will remove the solid color.
    m_graphicsLayer->setContentsToSolidColor(backgroundColor);
}

static bool supportsDirectBoxDecorationsComposition(const RenderObject* renderer)

Lines 56-62 struct CoordinatedLayerInfo { a/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedLayerInfo.h_sec1
- a/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedLayerInfo.h -1 / +1 lines
56	WebCore::TransformationMatrix childrenTransform;	56	WebCore::TransformationMatrix childrenTransform;
57	WebCore::IntRect contentsRect;	57	WebCore::IntRect contentsRect;
58	float opacity;	58	float opacity;
59	WebCore::Color backgroundColor;	59	WebCore::Color solidColor;
60		60
61	union {	61	union {
62	struct {	62	struct {

Lines 343-349 void LayerTreeRenderer::setLayerState(CoordinatedLayerID id, const CoordinatedLa a/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp_sec1
- a/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp -1 / +1 lines
343	layer->setBackfaceVisibility(layerInfo.backfaceVisible);	343	layer->setBackfaceVisibility(layerInfo.backfaceVisible);
344	layer->setContentsOpaque(layerInfo.contentsOpaque);	344	layer->setContentsOpaque(layerInfo.contentsOpaque);
345	layer->setContentsRect(layerInfo.contentsRect);	345	layer->setContentsRect(layerInfo.contentsRect);
346	layer->setContentsToBackgroundColor(layerInfo.backgroundColor);	346	layer->setContentsToSolidColor(layerInfo.solidColor);
347	layer->setDrawsContent(layerInfo.drawsContent);	347	layer->setDrawsContent(layerInfo.drawsContent);
348	layer->setContentsVisible(layerInfo.contentsVisible);	348	layer->setContentsVisible(layerInfo.contentsVisible);
349	toGraphicsLayerTextureMapper(layer)->setFixedToViewport(layerInfo.fixedToViewport);	349	toGraphicsLayerTextureMapper(layer)->setFixedToViewport(layerInfo.fixedToViewport);



}
#endif

void CoordinatedGraphicsLayer::setContentsToSolidColor(const Color& color)
{
    if (m_layerInfo.solidColor == color)
        return;
    m_layerInfo.solidColor = color;

    // This is in line with what CA does.
    setBackgroundColor(color);
    didChangeLayerState();
}


Lines 110-116 public: a/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.h_sec1
- a/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.h -1 / +1 lines
110	virtual void setOpacity(float) OVERRIDE;	110	virtual void setOpacity(float) OVERRIDE;
111	virtual void setContentsRect(const IntRect&) OVERRIDE;	111	virtual void setContentsRect(const IntRect&) OVERRIDE;
112	virtual void setContentsToImage(Image*) OVERRIDE;	112	virtual void setContentsToImage(Image*) OVERRIDE;
113	virtual void setContentsToBackgroundColor(const Color&) OVERRIDE;	113	virtual void setContentsToSolidColor(const Color&) OVERRIDE;
114	virtual bool shouldDirectlyCompositeImage(Image*) const OVERRIDE;	114	virtual bool shouldDirectlyCompositeImage(Image*) const OVERRIDE;
115	virtual void setContentsToCanvas(PlatformLayer*) OVERRIDE;	115	virtual void setContentsToCanvas(PlatformLayer*) OVERRIDE;
116	virtual void setMaskLayer(GraphicsLayer*) OVERRIDE;	116	virtual void setMaskLayer(GraphicsLayer*) OVERRIDE;



2012-12-13  No'am Rosenthal  <noam@webkit.org>

        Disambiguate "background color" and "contents as solid color" on GraphicsLayer
        https://bugs.webkit.org/show_bug.cgi?id=104842

        Reviewed by Simon Fraser.

        Since we don't set the background color for a layer with a solid color, the test results have to be rebaselined.

        * compositing/backing/no-backing-for-clip-expected.txt:
        * compositing/backing/no-backing-for-clip-overlap-expected.txt:
        * compositing/backing/no-backing-for-perspective-expected.txt:
        * compositing/columns/composited-in-paginated-expected.txt:
        * compositing/geometry/ancestor-overflow-change-expected.txt:
        * compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt:
        * compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt:
        * compositing/geometry/clip-expected.txt:
        * compositing/geometry/clip-inside-expected.txt:
        * compositing/geometry/composited-in-columns-expected.txt:
        * compositing/geometry/flipped-writing-mode-expected.txt:
        * compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt:
        * compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt:
        * compositing/geometry/limit-layer-bounds-overflow-root-expected.txt:
        * compositing/geometry/limit-layer-bounds-positioned-expected.txt:
        * compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt:
        * compositing/geometry/limit-layer-bounds-transformed-expected.txt:
        * compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt:
        * compositing/geometry/preserve-3d-switching-expected.txt:
        * compositing/iframes/become-composited-nested-iframes-expected.txt:
        * compositing/iframes/become-overlapped-iframe-expected.txt:
        * compositing/iframes/composited-parent-iframe-expected.txt:
        * compositing/iframes/connect-compositing-iframe-delayed-expected.txt:
        * compositing/iframes/connect-compositing-iframe-expected.txt:
        * compositing/iframes/connect-compositing-iframe2-expected.txt:
        * compositing/iframes/connect-compositing-iframe3-expected.txt:
        * compositing/iframes/enter-compositing-iframe-expected.txt:
        * compositing/iframes/iframe-resize-expected.txt:
        * compositing/iframes/invisible-nested-iframe-hide-expected.txt:
        * compositing/iframes/invisible-nested-iframe-show-expected.txt:
        * compositing/iframes/overlapped-iframe-expected.txt:
        * compositing/iframes/overlapped-iframe-iframe-expected.txt:
        * compositing/iframes/page-cache-layer-tree-expected.txt:
        * compositing/iframes/scrolling-iframe-expected.txt:
        * compositing/layer-creation/animation-overlap-with-children-expected.txt:
        * compositing/layer-creation/fixed-position-and-transform-expected.txt:
        * compositing/layer-creation/fixed-position-under-transform-expected.txt:
        * compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt:
        * compositing/layer-creation/overflow-scroll-overlap-expected.txt:
        * compositing/layer-creation/overlap-animation-expected.txt:
        * compositing/layer-creation/overlap-child-layer-expected.txt:
        * compositing/layer-creation/overlap-clipping-expected.txt:
        * compositing/layer-creation/overlap-transformed-and-clipped-expected.txt:
        * compositing/layer-creation/overlap-transformed-layer-expected.txt:
        * compositing/layer-creation/overlap-transforms-expected.txt:
        * compositing/layer-creation/scroll-partial-update-expected.txt:
        * compositing/layer-creation/spanOverlapsCanvas-expected.txt:
        * compositing/layer-creation/stacking-context-overlap-expected.txt:
        * compositing/layer-creation/stacking-context-overlap-nested-expected.txt:
        * compositing/layer-creation/translatez-overlap-expected.txt:
        * compositing/overflow-trumps-transform-style-expected.txt:
        * compositing/overflow/clip-descendents-expected.txt:
        * compositing/plugins/no-backing-store-expected.txt:
        * compositing/rtl/rtl-absolute-expected.txt:
        * compositing/rtl/rtl-absolute-overflow-expected.txt:
        * compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt:
        * compositing/rtl/rtl-fixed-expected.txt:
        * compositing/rtl/rtl-fixed-overflow-expected.txt:
        * compositing/rtl/rtl-relative-expected.txt:
        * compositing/tiled-layers-hidpi-expected.txt:
        * compositing/visible-rect/2d-transformed-expected.txt:
        * compositing/visible-rect/3d-transform-style-expected.txt:
        * compositing/visible-rect/3d-transformed-expected.txt:
        * compositing/visible-rect/animated-expected.txt:
        * compositing/visible-rect/animated-from-none-expected.txt:
        * compositing/visible-rect/clipped-by-viewport-expected.txt:
        * compositing/visible-rect/clipped-visible-rect-expected.txt:
        * compositing/visible-rect/iframe-and-layers-expected.txt:
        * compositing/visible-rect/nested-transform-expected.txt:
        * compositing/visible-rect/scrolled-expected.txt:
        * css3/filters/filtered-compositing-descendant-expected.txt:
        * platform/mac/compositing/geometry/fixed-position-composited-switch-expected.txt:
        * platform/mac/compositing/iframes/resizer-expected.txt:
        * platform/mac/compositing/repaint/invalidations-on-composited-layers-expected.txt:
        * platform/mac/compositing/tiling/crash-reparent-tiled-layer-expected.txt:
        * platform/mac/compositing/tiling/huge-layer-add-remove-child-expected.txt:
        * platform/mac/compositing/tiling/huge-layer-with-layer-children-expected.txt:
        * platform/mac/compositing/tiling/huge-layer-with-layer-children-resize-expected.txt:

2012-12-12  Simon Fraser  <simon.fraser@apple.com>

        Rebaseline some tiled scrolling results that were affected by r137387.

Lines 25-31 This layer should not have backing store. a/LayoutTests/compositing/backing/no-backing-for-clip-expected.txt_sec1
- a/LayoutTests/compositing/backing/no-backing-for-clip-expected.txt -1 lines
25	(GraphicsLayer	25	(GraphicsLayer
26	(position 30.00 48.00)	26	(position 30.00 48.00)
27	(bounds 100.00 100.00)	27	(bounds 100.00 100.00)
28	(backgroundColor #C0C0C0)
29	)	28	)
30	)	29	)
31	)	30	)



                (GraphicsLayer
                  (position 30.00 48.00)
                  (bounds 100.00 100.00)
                  (backgroundColor #C0C0C0)
                )
              )
            )

                (GraphicsLayer
                  (position 30.00 48.00)
                  (bounds 100.00 100.00)
                  (backgroundColor #C0C0C0)
                )
              )
            )

Lines 19-25 This layer should not have backing store. a/LayoutTests/compositing/backing/no-backing-for-perspective-expected.txt_sec1
- a/LayoutTests/compositing/backing/no-backing-for-perspective-expected.txt -1 lines
19	(GraphicsLayer	19	(GraphicsLayer
20	(position 31.00 49.00)	20	(position 31.00 49.00)
21	(bounds 100.00 100.00)	21	(bounds 100.00 100.00)
22	(backgroundColor #C0C0C0)
23	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])	22	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
24	)	23	)
25	)	24	)

Lines 7-13 a/LayoutTests/compositing/columns/composited-in-paginated-expected.txt_sec1
- a/LayoutTests/compositing/columns/composited-in-paginated-expected.txt -1 lines
7	(GraphicsLayer	7	(GraphicsLayer
8	(position 818.00 145.00)	8	(position 818.00 145.00)
9	(bounds 100.00 100.00)	9	(bounds 100.00 100.00)
10	(backgroundColor #0000FF)
11	)	10	)
12	)	11	)
13	)	12	)

Lines 7-13 a/LayoutTests/compositing/geometry/ancestor-overflow-change-expected.txt_sec1
- a/LayoutTests/compositing/geometry/ancestor-overflow-change-expected.txt -1 lines
7	(GraphicsLayer	7	(GraphicsLayer
8	(position 6.00 6.00)	8	(position 6.00 6.00)
9	(bounds 104.00 104.00)	9	(bounds 104.00 104.00)
10	(backgroundColor #008000)
11	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])	10	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
12	)	11	)
13	(GraphicsLayer	12	(GraphicsLayer

Lines 21-27 a/LayoutTests/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt_sec1
- a/LayoutTests/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt -1 lines
21	(GraphicsLayer	21	(GraphicsLayer
22	(position 490.00 108.00)	22	(position 490.00 108.00)
23	(bounds 100.00 100.00)	23	(bounds 100.00 100.00)
24	(backgroundColor #0000FF)
25	)	24	)
26	)	25	)
27	)	26	)



        )
        (GraphicsLayer
          (bounds 100.00 100.00)
          (backgroundColor #008000)
        )
        (GraphicsLayer
          (position 0.00 250.00)
          (bounds 100.00 100.00)
          (backgroundColor #008000)
        )
      )
    )

Lines 24-30 Test CSS clip with composited layers. Left and right sides should look the same. a/LayoutTests/compositing/geometry/clip-expected.txt_sec1
- a/LayoutTests/compositing/geometry/clip-expected.txt -1 lines
24	(GraphicsLayer	24	(GraphicsLayer
25	(position -5.00 -5.00)	25	(position -5.00 -5.00)
26	(bounds 120.00 120.00)	26	(bounds 120.00 120.00)
27	(backgroundColor #00000033)
28	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])	27	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
29	)	28	)
30	)	29	)

Lines 25-31 Test CSS clip with composited layers. Left and right sides should look the same. a/LayoutTests/compositing/geometry/clip-inside-expected.txt_sec1
- a/LayoutTests/compositing/geometry/clip-inside-expected.txt -1 lines
25	(GraphicsLayer	25	(GraphicsLayer
26	(position -15.00 -25.00)	26	(position -15.00 -25.00)
27	(bounds 120.00 120.00)	27	(bounds 120.00 120.00)
28	(backgroundColor #00000033)
29	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])	28	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
30	)	29	)
31	)	30	)



          (children 1
            (GraphicsLayer
              (bounds 60.00 60.00)
              (backgroundColor #008000)
            )
          )
        )

          (children 1
            (GraphicsLayer
              (bounds 60.00 60.00)
              (backgroundColor #008000)
            )
          )
        )

Lines 7-13 a/LayoutTests/compositing/geometry/flipped-writing-mode-expected.txt_sec1
- a/LayoutTests/compositing/geometry/flipped-writing-mode-expected.txt -1 lines
7	(GraphicsLayer	7	(GraphicsLayer
8	(position 18.00 10.00)	8	(position 18.00 10.00)
9	(bounds 250.00 200.00)	9	(bounds 250.00 200.00)
10	(backgroundColor #C0C0C0)
11	(children 1	10	(children 1
12	(GraphicsLayer	11	(GraphicsLayer
13	(position 35.00 10.00)	12	(position 35.00 10.00)

Lines 18-29 Second dump layer tree: a/LayoutTests/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt_sec1
- a/LayoutTests/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt -2 lines
18	(GraphicsLayer	18	(GraphicsLayer
19	(position 31.00 39.00)	19	(position 31.00 39.00)
20	(bounds 250.00 220.00)	20	(bounds 250.00 220.00)
21	(backgroundColor #0000FF)
22	(children 1	21	(children 1
23	(GraphicsLayer	22	(GraphicsLayer
24	(position 10.00 10.00)	23	(position 10.00 10.00)
25	(bounds 200.00 200.00)	24	(bounds 200.00 200.00)
26	(backgroundColor #FFFF00)
27	(transform [0.87 0.50 0.00 0.00] [-0.50 0.87 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 0.00 1.00])	25	(transform [0.87 0.50 0.00 0.00] [-0.50 0.87 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 0.00 1.00])
28	(children 1	26	(children 1
29	(GraphicsLayer	27	(GraphicsLayer

Lines 12-18 Text here a/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt_sec1
- a/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt -1 lines
12	(GraphicsLayer	12	(GraphicsLayer
13	(position 29.00 134.00)	13	(position 29.00 134.00)
14	(bounds 100.00 100.00)	14	(bounds 100.00 100.00)
15	(backgroundColor #FF0000)
16	)	15	)
17	(GraphicsLayer	16	(GraphicsLayer
18	(position 0.00 113.00)	17	(position 0.00 113.00)

Lines 11-17 a/LayoutTests/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt_sec1
- a/LayoutTests/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt -1 lines
11	(GraphicsLayer	11	(GraphicsLayer
12	(position 21.00 21.00)	12	(position 21.00 21.00)
13	(bounds 100.00 100.00)	13	(bounds 100.00 100.00)
14	(backgroundColor #FF0000)
15	)	14	)
16	(GraphicsLayer	15	(GraphicsLayer
17	(bounds 142.00 142.00)	16	(bounds 142.00 142.00)

Lines 12-18 Text here a/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-expected.txt_sec1
- a/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-expected.txt -1 lines
12	(GraphicsLayer	12	(GraphicsLayer
13	(position 29.00 29.00)	13	(position 29.00 29.00)
14	(bounds 100.00 100.00)	14	(bounds 100.00 100.00)
15	(backgroundColor #FF0000)
16	)	15	)
17	(GraphicsLayer	16	(GraphicsLayer
18	(position 0.00 8.00)	17	(position 0.00 8.00)

Lines 12-18 Text here a/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt_sec1
- a/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt -1 lines
12	(GraphicsLayer	12	(GraphicsLayer
13	(position 29.00 29.00)	13	(position 29.00 29.00)
14	(bounds 100.00 100.00)	14	(bounds 100.00 100.00)
15	(backgroundColor #FF0000)
16	)	15	)
17	(GraphicsLayer	16	(GraphicsLayer
18	(position 0.00 8.00)	17	(position 0.00 8.00)

Lines 12-18 Text here a/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt_sec1
- a/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt -1 lines
12	(GraphicsLayer	12	(GraphicsLayer
13	(position 129.00 29.00)	13	(position 129.00 29.00)
14	(bounds 200.00 100.00)	14	(bounds 200.00 100.00)
15	(backgroundColor #FF0000)
16	)	15	)
17	(GraphicsLayer	16	(GraphicsLayer
18	(position -971.00 8.00)	17	(position -971.00 8.00)

Lines 12-18 middle a/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt_sec1
- a/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt -1 lines
12	(GraphicsLayer	12	(GraphicsLayer
13	(position 129.00 29.00)	13	(position 129.00 29.00)
14	(bounds 200.00 100.00)	14	(bounds 200.00 100.00)
15	(backgroundColor #FF0000)
16	)	15	)
17	(GraphicsLayer	16	(GraphicsLayer
18	(position 8.00 8.00)	17	(position 8.00 8.00)

Lines 17-23 The green box appear angled out from the yellow box and embedded in it. a/LayoutTests/compositing/geometry/preserve-3d-switching-expected.txt_sec1
- a/LayoutTests/compositing/geometry/preserve-3d-switching-expected.txt -1 lines
17	(bounds 280.00 280.00)	17	(bounds 280.00 280.00)
18	(opacity 0.80)	18	(opacity 0.80)
19	(preserves3D 1)	19	(preserves3D 1)
20	(backgroundColor #FFFF00)
21	(transform [0.77 -0.56 -0.32 0.00] [0.00 0.50 -0.87 0.00] [0.64 0.66 0.38 0.00] [0.00 0.00 0.00 1.00])	20	(transform [0.77 -0.56 -0.32 0.00] [0.00 0.50 -0.87 0.00] [0.64 0.66 0.38 0.00] [0.00 0.00 0.00 1.00])
22	(children 1	21	(children 1
23	(GraphicsLayer	22	(GraphicsLayer



                                                        (GraphicsLayer
                                                          (position 18.00 10.00)
                                                          (bounds 210.00 210.00)
                                                          (backgroundColor #0000FF)
                                                        )
                                                      )
                                                    )

                                                        (GraphicsLayer
                                                          (position 18.00 10.00)
                                                          (bounds 210.00 210.00)
                                                          (backgroundColor #0000FF)
                                                        )
                                                      )
                                                    )

        )
        (GraphicsLayer
          (bounds 100.00 100.00)
          (backgroundColor #0000FF)
        )
      )
    )



                                (GraphicsLayer
                                  (position 18.00 10.00)
                                  (bounds 210.00 210.00)
                                  (backgroundColor #0000FF)
                                )
                              )
                            )

        (GraphicsLayer
          (position 5.00 5.00)
          (bounds 150.00 150.00)
          (backgroundColor #00000099)
        )
      )
    )

Lines 28-34 a/LayoutTests/compositing/iframes/composited-parent-iframe-expected.txt_sec1
- a/LayoutTests/compositing/iframes/composited-parent-iframe-expected.txt -1 lines
28	(GraphicsLayer	28	(GraphicsLayer
29	(position 18.00 10.00)	29	(position 18.00 10.00)
30	(bounds 210.00 210.00)	30	(bounds 210.00 210.00)
31	(backgroundColor #0000FF)
32	)	31	)
33	)	32	)
34	)	33	)



                                (GraphicsLayer
                                  (position 18.00 10.00)
                                  (bounds 210.00 210.00)
                                  (backgroundColor #0000FF)
                                )
                              )
                            )

        (GraphicsLayer
          (position 8.00 8.00)
          (bounds 100.00 100.00)
          (backgroundColor #0000FF)
        )
      )
    )



                                (GraphicsLayer
                                  (position 18.00 10.00)
                                  (bounds 210.00 210.00)
                                  (backgroundColor #0000FF)
                                )
                              )
                            )

        (GraphicsLayer
          (position 5.00 5.00)
          (bounds 50.00 50.00)
          (backgroundColor #00000033)
        )
      )
    )



                                (GraphicsLayer
                                  (position 18.00 10.00)
                                  (bounds 210.00 210.00)
                                  (backgroundColor #0000FF)
                                )
                              )
                            )

        (GraphicsLayer
          (position 5.00 5.00)
          (bounds 50.00 50.00)
          (backgroundColor #00000033)
        )
      )
    )

Lines 28-34 a/LayoutTests/compositing/iframes/connect-compositing-iframe3-expected.txt_sec1
- a/LayoutTests/compositing/iframes/connect-compositing-iframe3-expected.txt -1 lines
28	(GraphicsLayer	28	(GraphicsLayer
29	(position 18.00 10.00)	29	(position 18.00 10.00)
30	(bounds 210.00 210.00)	30	(bounds 210.00 210.00)
31	(backgroundColor #0000FF)
32	)	31	)
33	)	32	)
34	)	33	)



                                (GraphicsLayer
                                  (position 18.00 10.00)
                                  (bounds 210.00 210.00)
                                  (backgroundColor #0000FF)
                                )
                              )
                            )

        (GraphicsLayer
          (position 5.00 5.00)
          (bounds 50.00 50.00)
          (backgroundColor #00000033)
        )
      )
    )



                                (GraphicsLayer
                                  (position 18.00 10.00)
                                  (bounds 210.00 210.00)
                                  (backgroundColor #0000FF)
                                )
                              )
                            )

        (GraphicsLayer
          (position 5.00 5.00)
          (bounds 50.00 50.00)
          (backgroundColor #00000033)
        )
      )
    )

Lines 7-13 a/LayoutTests/compositing/iframes/invisible-nested-iframe-hide-expected.txt_sec1
- a/LayoutTests/compositing/iframes/invisible-nested-iframe-hide-expected.txt -1 lines
7	(GraphicsLayer	7	(GraphicsLayer
8	(position 18.00 10.00)	8	(position 18.00 10.00)
9	(bounds 210.00 210.00)	9	(bounds 210.00 210.00)
10	(backgroundColor #0000FF)
11	)	10	)
12	)	11	)
13	)	12	)

Lines 47-53 a/LayoutTests/compositing/iframes/invisible-nested-iframe-show-expected.txt_sec1
- a/LayoutTests/compositing/iframes/invisible-nested-iframe-show-expected.txt -2 lines
47	(GraphicsLayer	47	(GraphicsLayer
48	(position 18.00 10.00)	48	(position 18.00 10.00)
49	(bounds 210.00 210.00)	49	(bounds 210.00 210.00)
50	(backgroundColor #0000FF)
51	)	50	)
52	)	51	)
53	)	52	)
Lines 76-82 a/LayoutTests/compositing/iframes/invisible-nested-iframe-show-expected.txt_sec2
76	(GraphicsLayer	75	(GraphicsLayer
77	(position 18.00 202.00)	76	(position 18.00 202.00)
78	(bounds 210.00 210.00)	77	(bounds 210.00 210.00)
79	(backgroundColor #0000FF)
80	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])	78	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
81	)	79	)
82	)	80	)



                                (GraphicsLayer
                                  (position 18.00 10.00)
                                  (bounds 210.00 210.00)
                                  (backgroundColor #0000FF)
                                )
                              )
                            )

        (GraphicsLayer
          (position 5.00 5.00)
          (bounds 50.00 50.00)
          (backgroundColor #00000033)
        )
      )
    )

Lines 26-32 a/LayoutTests/compositing/iframes/overlapped-iframe-iframe-expected.txt_sec1
- a/LayoutTests/compositing/iframes/overlapped-iframe-iframe-expected.txt -1 lines
26	(GraphicsLayer	26	(GraphicsLayer
27	(position 18.00 10.00)	27	(position 18.00 10.00)
28	(bounds 210.00 210.00)	28	(bounds 210.00 210.00)
29	(backgroundColor #0000FF)
30	)	29	)
31	)	30	)
32	)	31	)



        (GraphicsLayer
          (position 13.00 55.00)
          (bounds 50.00 50.00)
          (backgroundColor #00000033)
        )
        (GraphicsLayer
          (position 8.00 274.00)

                                (GraphicsLayer
                                  (position 108.00 100.00)
                                  (bounds 200.00 200.00)
                                  (backgroundColor #0000FF)
                                )
                              )
                            )

        (GraphicsLayer
          (position 13.00 279.00)
          (bounds 50.00 50.00)
          (backgroundColor #00000033)
        )
      )
    )



                                (GraphicsLayer
                                  (position 108.00 100.00)
                                  (bounds 200.00 200.00)
                                  (backgroundColor #0000FF)
                                )
                              )
                            )

        (GraphicsLayer
          (position 5.00 5.00)
          (bounds 50.00 50.00)
          (backgroundColor #00000033)
        )
      )
    )

Lines 14-20 Should be composited a/LayoutTests/compositing/layer-creation/animation-overlap-with-children-expected.txt_sec1
- a/LayoutTests/compositing/layer-creation/animation-overlap-with-children-expected.txt -1 lines
14	(GraphicsLayer	14	(GraphicsLayer
15	(position 6.00 6.00)	15	(position 6.00 6.00)
16	(bounds 250.00 50.00)	16	(bounds 250.00 50.00)
17	(backgroundColor #C0C0C0)
18	)	17	)
19	(GraphicsLayer	18	(GraphicsLayer
20	(position 11.00 21.00)	19	(position 11.00 21.00)



        (GraphicsLayer
          (position 100.00 1100.00)
          (bounds 256.00 256.00)
          (backgroundColor #FF0000)
        )
        (GraphicsLayer
          (position 0.00 1000.00)
          (bounds 500.00 500.00)
          (backgroundColor #008000)
        )
      )
    )

Lines 14-20 a/LayoutTests/compositing/layer-creation/fixed-position-under-transform-expected.txt_sec1
- a/LayoutTests/compositing/layer-creation/fixed-position-under-transform-expected.txt -1 lines
14	(GraphicsLayer	14	(GraphicsLayer
15	(position 0.00 1000.00)	15	(position 0.00 1000.00)
16	(bounds 500.00 500.00)	16	(bounds 500.00 500.00)
17	(backgroundColor #008000)
18	)	17	)
19	)	18	)
20	)	19	)

Lines 16-22 This layer should be composited. a/LayoutTests/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt_sec1
- a/LayoutTests/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt -1 lines
16	(GraphicsLayer	16	(GraphicsLayer
17	(position 31.00 49.00)	17	(position 31.00 49.00)
18	(bounds 100.00 100.00)	18	(bounds 100.00 100.00)
19	(backgroundColor #C0C0C0)
20	(transform [0.98 0.00 -0.17 0.00] [0.00 1.00 0.00 0.00] [0.17 0.00 0.98 0.00] [0.00 0.00 0.00 1.00])	19	(transform [0.98 0.00 -0.17 0.00] [0.00 1.00 0.00 0.00] [0.17 0.00 0.98 0.00] [0.00 0.00 0.00 1.00])
21	)	20	)
22	)	21	)

Lines 20-26 a/LayoutTests/compositing/layer-creation/overflow-scroll-overlap-expected.txt_sec1
- a/LayoutTests/compositing/layer-creation/overflow-scroll-overlap-expected.txt -1 lines
20	(GraphicsLayer	20	(GraphicsLayer
21	(position 20.00 45.00)	21	(position 20.00 45.00)
22	(bounds 210.00 100.00)	22	(bounds 210.00 100.00)
23	(backgroundColor #0000FF)
24	)	23	)
25	)	24	)
26	)	25	)



                (GraphicsLayer
                  (position 10.00 10.00)
                  (bounds 100.00 100.00)
                  (backgroundColor #0000FF)
                )
                (GraphicsLayer
                  (position 10.00 120.00)
                  (bounds 100.00 100.00)
                  (backgroundColor #0000FF)
                )
              )
            )

Lines 11-17 a/LayoutTests/compositing/layer-creation/overlap-child-layer-expected.txt_sec1
- a/LayoutTests/compositing/layer-creation/overlap-child-layer-expected.txt -1 lines
11	)	11	)
12	(GraphicsLayer	12	(GraphicsLayer
13	(bounds 300.00 300.00)	13	(bounds 300.00 300.00)
14	(backgroundColor #008000)
15	)	14	)
16	)	15	)
17	)	16	)



          (children 1
            (GraphicsLayer
              (bounds 500.00 100.00)
              (backgroundColor #008000)
            )
          )
        )
        (GraphicsLayer
          (position 50.00 200.00)
          (bounds 500.00 100.00)
          (backgroundColor #008000)
        )
        (GraphicsLayer
          (position 450.00 200.00)
          (bounds 100.00 100.00)
          (backgroundColor #0000FF)
        )
      )
    )



              (children 2
                (GraphicsLayer
                  (bounds 100.00 100.00)
                  (backgroundColor #FF0000)
                )
                (GraphicsLayer
                  (bounds 100.00 100.00)
                  (backgroundColor #008000)
                )
              )
            )

Lines 18-24 a/LayoutTests/compositing/layer-creation/overlap-transformed-layer-expected.txt_sec1
- a/LayoutTests/compositing/layer-creation/overlap-transformed-layer-expected.txt -1 lines
18	)	18	)
19	(GraphicsLayer	19	(GraphicsLayer
20	(bounds 300.00 300.00)	20	(bounds 300.00 300.00)
21	(backgroundColor #008000)
22	)	21	)
23	)	22	)
24	)	23	)

Lines 15-27 a/LayoutTests/compositing/layer-creation/overlap-transforms-expected.txt_sec1
- a/LayoutTests/compositing/layer-creation/overlap-transforms-expected.txt -2 lines
15	(GraphicsLayer	15	(GraphicsLayer
16	(position 10.00 10.00)	16	(position 10.00 10.00)
17	(bounds 100.00 100.00)	17	(bounds 100.00 100.00)
18	(backgroundColor #0000FF)
19	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])	18	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
20	)	19	)
21	(GraphicsLayer	20	(GraphicsLayer
22	(position 10.00 120.00)	21	(position 10.00 120.00)
23	(bounds 100.00 100.00)	22	(bounds 100.00 100.00)
24	(backgroundColor #0000FF)
25	)	23	)
26	)	24	)
27	)	25	)

Lines 12-18 scroll me a/LayoutTests/compositing/layer-creation/scroll-partial-update-expected.txt_sec1
- a/LayoutTests/compositing/layer-creation/scroll-partial-update-expected.txt -1 lines
12	(GraphicsLayer	12	(GraphicsLayer
13	(position 10.00 10.00)	13	(position 10.00 10.00)
14	(bounds 400.00 100.00)	14	(bounds 400.00 100.00)
15	(backgroundColor #0000007F)
16	)	15	)
17	(GraphicsLayer	16	(GraphicsLayer
18	(position 200.00 8.00)	17	(position 200.00 8.00)

Lines 12-18 a/LayoutTests/compositing/layer-creation/spanOverlapsCanvas-expected.txt_sec1
- a/LayoutTests/compositing/layer-creation/spanOverlapsCanvas-expected.txt -1 lines
12	(GraphicsLayer	12	(GraphicsLayer
13	(position 8.00 8.00)	13	(position 8.00 8.00)
14	(bounds 100.00 50.00)	14	(bounds 100.00 50.00)
15	(backgroundColor #008000)
16	)	15	)
17	)	16	)
18	)	17	)

Lines 7-13 a/LayoutTests/compositing/layer-creation/stacking-context-overlap-expected.txt_sec1
- a/LayoutTests/compositing/layer-creation/stacking-context-overlap-expected.txt -1 lines
7	(GraphicsLayer	7	(GraphicsLayer
8	(position 8.00 8.00)	8	(position 8.00 8.00)
9	(bounds 20.00 20.00)	9	(bounds 20.00 20.00)
10	(backgroundColor #0000FF)
11	)	10	)
12	(GraphicsLayer	11	(GraphicsLayer
13	(position 8.00 18.00)	12	(position 8.00 18.00)

Lines 19-25 a/LayoutTests/compositing/layer-creation/stacking-context-overlap-nested-expected.txt_sec1
- a/LayoutTests/compositing/layer-creation/stacking-context-overlap-nested-expected.txt -1 lines
19	(GraphicsLayer	19	(GraphicsLayer
20	(position 65.00 65.00)	20	(position 65.00 65.00)
21	(bounds 76.00 76.00)	21	(bounds 76.00 76.00)
22	(backgroundColor #0000FF)
23	)	22	)
24	)	23	)
25	)	24	)

Lines 7-13 a/LayoutTests/compositing/layer-creation/translatez-overlap-expected.txt_sec1
- a/LayoutTests/compositing/layer-creation/translatez-overlap-expected.txt -1 lines
7	(GraphicsLayer	7	(GraphicsLayer
8	(position 18.00 10.00)	8	(position 18.00 10.00)
9	(bounds 100.00 100.00)	9	(bounds 100.00 100.00)
10	(backgroundColor #0000FF)
11	)	10	)
12	)	11	)
13	)	12	)

Lines 10-22 flat a/LayoutTests/compositing/overflow-trumps-transform-style-expected.txt_sec1
- a/LayoutTests/compositing/overflow-trumps-transform-style-expected.txt -2 lines
10	(position 18.00 10.00)	10	(position 18.00 10.00)
11	(bounds 100.00 100.00)	11	(bounds 100.00 100.00)
12	(preserves3D 1)	12	(preserves3D 1)
13	(backgroundColor #0000FF)
14	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])	13	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
15	)	14	)
16	(GraphicsLayer	15	(GraphicsLayer
17	(position 18.00 120.00)	16	(position 18.00 120.00)
18	(bounds 100.00 100.00)	17	(bounds 100.00 100.00)
19	(backgroundColor #0000FF)
20	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])	18	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
21	)	19	)
22	)	20	)

Lines 13-19 Test overflow clipping of composited elements in various configurations. a/LayoutTests/compositing/overflow/clip-descendents-expected.txt_sec1
- a/LayoutTests/compositing/overflow/clip-descendents-expected.txt -4 lines
13	(GraphicsLayer	13	(GraphicsLayer
14	(position 2.00 12.00)	14	(position 2.00 12.00)
15	(bounds 100.00 150.00)	15	(bounds 100.00 150.00)
16	(backgroundColor #808080)
17	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])	16	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
18	)	17	)
19	)	18	)
Lines 41-47 Test overflow clipping of composited elements in various configurations. a/LayoutTests/compositing/overflow/clip-descendents-expected.txt_sec2
41	(GraphicsLayer	40	(GraphicsLayer
42	(position 2.00 12.00)	41	(position 2.00 12.00)
43	(bounds 100.00 150.00)	42	(bounds 100.00 150.00)
44	(backgroundColor #808080)
45	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])	43	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
46	)	44	)
47	)	45	)
Lines 57-63 Test overflow clipping of composited elements in various configurations. a/LayoutTests/compositing/overflow/clip-descendents-expected.txt_sec3
57	(GraphicsLayer	55	(GraphicsLayer
58	(position 2.00 12.00)	56	(position 2.00 12.00)
59	(bounds 100.00 150.00)	57	(bounds 100.00 150.00)
60	(backgroundColor #808080)
61	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])	58	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
62	)	59	)
63	)	60	)
Lines 74-80 Test overflow clipping of composited elements in various configurations. a/LayoutTests/compositing/overflow/clip-descendents-expected.txt_sec4
74	(GraphicsLayer	71	(GraphicsLayer
75	(position 2.00 12.00)	72	(position 2.00 12.00)
76	(bounds 100.00 150.00)	73	(bounds 100.00 150.00)
77	(backgroundColor #808080)
78	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])	74	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
79	)	75	)
80	)	76	)

Lines 12-18 a/LayoutTests/compositing/plugins/no-backing-store-expected.txt_sec1
- a/LayoutTests/compositing/plugins/no-backing-store-expected.txt -1 lines
12	(GraphicsLayer	12	(GraphicsLayer
13	(position 266.00 20.00)	13	(position 266.00 20.00)
14	(bounds 100.00 100.00)	14	(bounds 100.00 100.00)
15	(backgroundColor #0000FF)
16	)	15	)
17	(GraphicsLayer	16	(GraphicsLayer
18	(position 390.00 18.00)	17	(position 390.00 18.00)

Lines 7-13 a/LayoutTests/compositing/rtl/rtl-absolute-expected.txt_sec1
- a/LayoutTests/compositing/rtl/rtl-absolute-expected.txt -1 lines
7	(GraphicsLayer	7	(GraphicsLayer
8	(position 50.00 50.00)	8	(position 50.00 50.00)
9	(bounds 100.00 100.00)	9	(bounds 100.00 100.00)
10	(backgroundColor #008000)
11	)	10	)
12	)	11	)
13	)	12	)

Lines 8-14 a/LayoutTests/compositing/rtl/rtl-absolute-overflow-expected.txt_sec1
- a/LayoutTests/compositing/rtl/rtl-absolute-overflow-expected.txt -1 lines
8	(GraphicsLayer	8	(GraphicsLayer
9	(position 265.00 50.00)	9	(position 265.00 50.00)
10	(bounds 100.00 100.00)	10	(bounds 100.00 100.00)
11	(backgroundColor #008000)
12	)	11	)
13	)	12	)
14	)	13	)

Lines 8-14 a/LayoutTests/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt_sec1
- a/LayoutTests/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt -1 lines
8	(GraphicsLayer	8	(GraphicsLayer
9	(position 51.00 50.00)	9	(position 51.00 50.00)
10	(bounds 100.00 100.00)	10	(bounds 100.00 100.00)
11	(backgroundColor #008000)
12	)	11	)
13	)	12	)
14	)	13	)

Lines 7-13 a/LayoutTests/compositing/rtl/rtl-fixed-expected.txt_sec1
- a/LayoutTests/compositing/rtl/rtl-fixed-expected.txt -1 lines
7	(GraphicsLayer	7	(GraphicsLayer
8	(position 50.00 50.00)	8	(position 50.00 50.00)
9	(bounds 100.00 100.00)	9	(bounds 100.00 100.00)
10	(backgroundColor #008000)
11	)	10	)
12	)	11	)
13	)	12	)

Lines 8-14 a/LayoutTests/compositing/rtl/rtl-fixed-overflow-expected.txt_sec1
- a/LayoutTests/compositing/rtl/rtl-fixed-overflow-expected.txt -1 lines
8	(GraphicsLayer	8	(GraphicsLayer
9	(position 265.00 50.00)	9	(position 265.00 50.00)
10	(bounds 100.00 100.00)	10	(bounds 100.00 100.00)
11	(backgroundColor #008000)
12	)	11	)
13	)	12	)
14	)	13	)

Lines 7-13 a/LayoutTests/compositing/rtl/rtl-relative-expected.txt_sec1
- a/LayoutTests/compositing/rtl/rtl-relative-expected.txt -1 lines
7	(GraphicsLayer	7	(GraphicsLayer
8	(position 642.00 58.00)	8	(position 642.00 58.00)
9	(bounds 100.00 100.00)	9	(bounds 100.00 100.00)
10	(backgroundColor #008000)
11	)	10	)
12	)	11	)
13	)	12	)

Lines 7-13 a/LayoutTests/compositing/tiled-layers-hidpi-expected.txt_sec1
- a/LayoutTests/compositing/tiled-layers-hidpi-expected.txt -1 lines
7	(GraphicsLayer	7	(GraphicsLayer
8	(position 8.00 8.00)	8	(position 8.00 8.00)
9	(bounds 1800.00 10.00)	9	(bounds 1800.00 10.00)
10	(backgroundColor #0000FF)
11	)	10	)
12	)	11	)
13	)	12	)

Lines 18-36 a/LayoutTests/compositing/visible-rect/2d-transformed-expected.txt_sec1
- a/LayoutTests/compositing/visible-rect/2d-transformed-expected.txt -3 lines
18	(children 3	18	(children 3
19	(GraphicsLayer	19	(GraphicsLayer
20	(bounds 200.00 200.00)	20	(bounds 200.00 200.00)
21	(backgroundColor #0000FF)
22	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [-100.00 0.00 0.00 1.00])	21	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [-100.00 0.00 0.00 1.00])
23	(visible rect 100.00, 0.00 100.00 x 200.00)	22	(visible rect 100.00, 0.00 100.00 x 200.00)
24	)	23	)
25	(GraphicsLayer	24	(GraphicsLayer
26	(bounds 200.00 200.00)	25	(bounds 200.00 200.00)
27	(backgroundColor #0000FF)
28	(transform [0.71 0.71 0.00 0.00] [-0.71 0.71 0.00 0.00] [0.00 0.00 1.00 0.00] [150.00 0.00 0.00 1.00])	26	(transform [0.71 0.71 0.00 0.00] [-0.71 0.71 0.00 0.00] [0.00 0.00 1.00 0.00] [150.00 0.00 0.00 1.00])
29	(visible rect 0.00, 0.00 200.00 x 200.00)	27	(visible rect 0.00, 0.00 200.00 x 200.00)
30	)	28	)
31	(GraphicsLayer	29	(GraphicsLayer
32	(bounds 200.00 200.00)	30	(bounds 200.00 200.00)
33	(backgroundColor #0000FF)
34	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [400.00 0.00 0.00 1.00])	31	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [400.00 0.00 0.00 1.00])
35	(visible rect 0.00, 0.00 100.00 x 200.00)	32	(visible rect 0.00, 0.00 100.00 x 200.00)
36	)	33	)

Lines 24-30 a/LayoutTests/compositing/visible-rect/3d-transform-style-expected.txt_sec1
- a/LayoutTests/compositing/visible-rect/3d-transform-style-expected.txt -2 lines
24	(children 1	24	(children 1
25	(GraphicsLayer	25	(GraphicsLayer
26	(bounds 300.00 300.00)	26	(bounds 300.00 300.00)
27	(backgroundColor #0000FF)
28	(transform [1.00 0.00 0.00 0.00] [0.00 0.91 0.42 0.00] [0.00 -0.42 0.91 0.00] [0.00 0.00 0.00 1.00])	27	(transform [1.00 0.00 0.00 0.00] [0.00 0.91 0.42 0.00] [0.00 -0.42 0.91 0.00] [0.00 0.00 0.00 1.00])
29	(visible rect 0.00, 0.00 213.67 x 200.68)	28	(visible rect 0.00, 0.00 213.67 x 200.68)
30	)	29	)
Lines 52-58 a/LayoutTests/compositing/visible-rect/3d-transform-style-expected.txt_sec2
52	(children 1	51	(children 1
53	(GraphicsLayer	52	(GraphicsLayer
54	(bounds 300.00 300.00)	53	(bounds 300.00 300.00)
55	(backgroundColor #0000FF)
56	(transform [0.91 0.00 0.42 0.00] [0.00 1.00 0.00 0.00] [-0.42 0.00 0.91 0.00] [0.00 0.00 0.00 1.00])	54	(transform [0.91 0.00 0.42 0.00] [0.00 1.00 0.00 0.00] [-0.42 0.00 0.91 0.00] [0.00 0.00 0.00 1.00])
57	(visible rect 0.00, 0.00 200.68 x 213.67)	55	(visible rect 0.00, 0.00 200.68 x 213.67)
58	)	56	)

Lines 20-26 a/LayoutTests/compositing/visible-rect/3d-transformed-expected.txt_sec1
- a/LayoutTests/compositing/visible-rect/3d-transformed-expected.txt -2 lines
20	(GraphicsLayer	20	(GraphicsLayer
21	(anchor 0.20 0.20)	21	(anchor 0.20 0.20)
22	(bounds 500.00 500.00)	22	(bounds 500.00 500.00)
23	(backgroundColor #0000FF)
24	(transform [1.00 0.00 0.00 0.00] [0.00 0.71 0.71 0.00] [0.00 -0.71 0.71 0.00] [0.00 0.00 0.00 1.00])	23	(transform [1.00 0.00 0.00 0.00] [0.00 0.71 0.71 0.00] [0.00 -0.71 0.71 0.00] [0.00 0.00 0.00 1.00])
25	(visible rect 0.00, 0.00 220.62 x 218.46)	24	(visible rect 0.00, 0.00 220.62 x 218.46)
26	)	25	)
Lines 42-48 a/LayoutTests/compositing/visible-rect/3d-transformed-expected.txt_sec2
42	(GraphicsLayer	41	(GraphicsLayer
43	(anchor 0.20 0.20)	42	(anchor 0.20 0.20)
44	(bounds 500.00 500.00)	43	(bounds 500.00 500.00)
45	(backgroundColor #0000FF)
46	(transform [0.71 0.00 0.71 0.00] [0.00 1.00 0.00 0.00] [-0.71 0.00 0.71 0.00] [0.00 0.00 0.00 1.00])	44	(transform [0.71 0.00 0.71 0.00] [0.00 1.00 0.00 0.00] [-0.71 0.00 0.71 0.00] [0.00 0.00 0.00 1.00])
47	(visible rect 0.00, 0.00 218.46 x 220.62)	45	(visible rect 0.00, 0.00 218.46 x 220.62)
48	)	46	)

Lines 18-24 a/LayoutTests/compositing/visible-rect/animated-expected.txt_sec1
- a/LayoutTests/compositing/visible-rect/animated-expected.txt -1 lines
18	(children 1	18	(children 1
19	(GraphicsLayer	19	(GraphicsLayer
20	(bounds 200.00 200.00)	20	(bounds 200.00 200.00)
21	(backgroundColor #0000FF)
22	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [-100.00 0.00 0.00 1.00])	21	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [-100.00 0.00 0.00 1.00])
23	(visible rect 100.00, 0.00 100.00 x 200.00)	22	(visible rect 100.00, 0.00 100.00 x 200.00)
24	)	23	)

Lines 19-25 a/LayoutTests/compositing/visible-rect/animated-from-none-expected.txt_sec1
- a/LayoutTests/compositing/visible-rect/animated-from-none-expected.txt -1 lines
19	(GraphicsLayer	19	(GraphicsLayer
20	(position -100.00 0.00)	20	(position -100.00 0.00)
21	(bounds 200.00 200.00)	21	(bounds 200.00 200.00)
22	(backgroundColor #0000FF)
23	(visible rect 100.00, 0.00 100.00 x 200.00)	22	(visible rect 100.00, 0.00 100.00 x 200.00)
24	)	23	)
25	)	24	)

Lines 9-22 a/LayoutTests/compositing/visible-rect/clipped-by-viewport-expected.txt_sec1
- a/LayoutTests/compositing/visible-rect/clipped-by-viewport-expected.txt -2 lines
9	(GraphicsLayer	9	(GraphicsLayer
10	(position -100.00 -120.00)	10	(position -100.00 -120.00)
11	(bounds 200.00 200.00)	11	(bounds 200.00 200.00)
12	(backgroundColor #0000FF)
13	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])	12	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
14	(visible rect 100.00, 120.00 100.00 x 80.00)	13	(visible rect 100.00, 120.00 100.00 x 80.00)
15	)	14	)
16	(GraphicsLayer	15	(GraphicsLayer
17	(position -100.00 200.00)	16	(position -100.00 200.00)
18	(bounds 200.00 200.00)	17	(bounds 200.00 200.00)
19	(backgroundColor #0000FF)
20	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])	18	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
21	(visible rect 100.00, 0.00 100.00 x 200.00)	19	(visible rect 100.00, 0.00 100.00 x 200.00)
22	)	20	)

Lines 19-39 a/LayoutTests/compositing/visible-rect/clipped-visible-rect-expected.txt_sec1
- a/LayoutTests/compositing/visible-rect/clipped-visible-rect-expected.txt -3 lines
19	(GraphicsLayer	19	(GraphicsLayer
20	(position -100.00 0.00)	20	(position -100.00 0.00)
21	(bounds 200.00 200.00)	21	(bounds 200.00 200.00)
22	(backgroundColor #0000FF)
23	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])	22	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
24	(visible rect 100.00, 0.00 100.00 x 200.00)	23	(visible rect 100.00, 0.00 100.00 x 200.00)
25	)	24	)
26	(GraphicsLayer	25	(GraphicsLayer
27	(position 150.00 0.00)	26	(position 150.00 0.00)
28	(bounds 200.00 200.00)	27	(bounds 200.00 200.00)
29	(backgroundColor #0000FF)
30	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])	28	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
31	(visible rect 0.00, 0.00 200.00 x 200.00)	29	(visible rect 0.00, 0.00 200.00 x 200.00)
32	)	30	)
33	(GraphicsLayer	31	(GraphicsLayer
34	(position 400.00 0.00)	32	(position 400.00 0.00)
35	(bounds 200.00 200.00)	33	(bounds 200.00 200.00)
36	(backgroundColor #0000FF)
37	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])	34	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
38	(visible rect 0.00, 0.00 100.00 x 200.00)	35	(visible rect 0.00, 0.00 100.00 x 200.00)
39	)	36	)

Lines 55-61 a/LayoutTests/compositing/visible-rect/iframe-and-layers-expected.txt_sec1
- a/LayoutTests/compositing/visible-rect/iframe-and-layers-expected.txt -1 lines
55	(GraphicsLayer	55	(GraphicsLayer
56	(position 8.00 226.00)	56	(position 8.00 226.00)
57	(bounds 200.00 200.00)	57	(bounds 200.00 200.00)
58	(backgroundColor #0000FF)
59	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])	58	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
60	(visible rect 0.00, 0.00 200.00 x 200.00)	59	(visible rect 0.00, 0.00 200.00 x 200.00)
61	)	60	)

Lines 31-37 a/LayoutTests/compositing/visible-rect/nested-transform-expected.txt_sec1
- a/LayoutTests/compositing/visible-rect/nested-transform-expected.txt -2 lines
31	(children 1	31	(children 1
32	(GraphicsLayer	32	(GraphicsLayer
33	(bounds 500.00 500.00)	33	(bounds 500.00 500.00)
34	(backgroundColor #0000FF)
35	(transform [1.00 0.00 0.00 0.00] [0.00 0.82 0.57 0.00] [0.00 -0.57 0.82 0.00] [0.00 0.00 0.00 1.00])	34	(transform [1.00 0.00 0.00 0.00] [0.00 0.82 0.57 0.00] [0.00 -0.57 0.82 0.00] [0.00 0.00 0.00 1.00])
36	(visible rect 0.00, 0.00 500.00 x 369.91)	35	(visible rect 0.00, 0.00 500.00 x 369.91)
37	)	36	)
Lines 67-73 a/LayoutTests/compositing/visible-rect/nested-transform-expected.txt_sec2
67	(children 1	66	(children 1
68	(GraphicsLayer	67	(GraphicsLayer
69	(bounds 500.00 500.00)	68	(bounds 500.00 500.00)
70	(backgroundColor #0000FF)
71	(transform [1.00 0.00 0.00 0.00] [0.00 0.82 0.57 0.00] [0.00 -0.57 0.82 0.00] [0.00 0.00 0.00 1.00])	69	(transform [1.00 0.00 0.00 0.00] [0.00 0.82 0.57 0.00] [0.00 -0.57 0.82 0.00] [0.00 0.00 0.00 1.00])
72	(visible rect 0.00, 0.00 500.00 x 351.87)	70	(visible rect 0.00, 0.00 500.00 x 351.87)
73	)	71	)

Lines 9-15 a/LayoutTests/compositing/visible-rect/scrolled-expected.txt_sec1
- a/LayoutTests/compositing/visible-rect/scrolled-expected.txt -1 lines
9	(GraphicsLayer	9	(GraphicsLayer
10	(position 8.00 0.00)	10	(position 8.00 0.00)
11	(bounds 200.00 500.00)	11	(bounds 200.00 500.00)
12	(backgroundColor #0000FF)
13	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])	12	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
14	(visible rect 17.00, 200.00 183.00 x 300.00)	13	(visible rect 17.00, 200.00 183.00 x 300.00)
15	)	14	)

Lines 12-18 a/LayoutTests/css3/filters/filtered-compositing-descendant-expected.txt_sec1
- a/LayoutTests/css3/filters/filtered-compositing-descendant-expected.txt -1 lines
12	(GraphicsLayer	12	(GraphicsLayer
13	(position 22.00 22.00)	13	(position 22.00 22.00)
14	(bounds 100.00 100.00)	14	(bounds 100.00 100.00)
15	(backgroundColor #FF0000)
16	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])	15	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
17	)	16	)
18	)	17	)



        (GraphicsLayer
          (position 495.00 30.00)
          (bounds 300.00 100.00)
          (backgroundColor #008000)
        )
      )
    )

        (GraphicsLayer
          (position 495.00 30.00)
          (bounds 300.00 100.00)
          (backgroundColor #008000)
        )
      )
    )

Lines 28-34 a/LayoutTests/platform/mac/compositing/iframes/resizer-expected.txt_sec1
- a/LayoutTests/platform/mac/compositing/iframes/resizer-expected.txt -1 lines
28	(GraphicsLayer	28	(GraphicsLayer
29	(position 18.00 10.00)	29	(position 18.00 10.00)
30	(bounds 210.00 210.00)	30	(bounds 210.00 210.00)
31	(backgroundColor #0000FF)
32	)	31	)
33	)	32	)
34	)	33	)



        (GraphicsLayer
          (position 8.00 41.00)
          (bounds 400.00 400.00)
          (backgroundColor #008000)
          (children 1
            (GraphicsLayer
              (position 50.00 50.00)
              (bounds 75.00 75.00)
              (backgroundColor #0000FF)
            )
          )
        )

Lines 15-21 From https://bugs.webkit.org/show_bug.cgi?id=44629. The parent is a tiled layer. a/LayoutTests/platform/mac/compositing/tiling/crash-reparent-tiled-layer-expected.txt_sec1
- a/LayoutTests/platform/mac/compositing/tiling/crash-reparent-tiled-layer-expected.txt -1 lines
15	(GraphicsLayer	15	(GraphicsLayer
16	(position 51.00 101.00)	16	(position 51.00 101.00)
17	(bounds 200.00 4800.00)	17	(bounds 200.00 4800.00)
18	(backgroundColor #FF0000)
19	)	18	)
20	)	19	)
21	)	20	)

Lines 35-41 Second (child added): a/LayoutTests/platform/mac/compositing/tiling/huge-layer-add-remove-child-expected.txt_sec1
- a/LayoutTests/platform/mac/compositing/tiling/huge-layer-add-remove-child-expected.txt -1 lines
35	(GraphicsLayer	35	(GraphicsLayer
36	(position 51.00 401.00)	36	(position 51.00 401.00)
37	(bounds 200.00 200.00)	37	(bounds 200.00 200.00)
38	(backgroundColor #FF0000)
39	)	38	)
40	)	39	)
41	)	40	)



            (GraphicsLayer
              (position 51.00 101.00)
              (bounds 200.00 200.00)
              (backgroundColor #FF0000)
            )
            (GraphicsLayer
              (position 51.00 4701.00)
              (bounds 200.00 200.00)
              (backgroundColor #0000FF)
            )
          )
        )



            (GraphicsLayer
              (position 51.00 101.00)
              (bounds 200.00 200.00)
              (backgroundColor #FF0000)
            )
            (GraphicsLayer
              (position 276.00 201.00)
              (bounds 200.00 200.00)
              (backgroundColor #0000FF)
            )
          )
        )

            (GraphicsLayer
              (position 51.00 101.00)
              (bounds 200.00 200.00)
              (backgroundColor #FF0000)
            )
            (GraphicsLayer
              (position 276.00 4701.00)
              (bounds 200.00 200.00)
              (backgroundColor #0000FF)
            )
          )
        )

            (GraphicsLayer
              (position 51.00 101.00)
              (bounds 200.00 200.00)
              (backgroundColor #FF0000)
            )
            (GraphicsLayer
              (position 276.00 201.00)
              (bounds 200.00 200.00)
              (backgroundColor #0000FF)
            )
          )
        )

Lines 11-17 a/LayoutTests/platform/mac/compositing/tiling/tile-cache-zoomed-expected.txt_sec1
- a/LayoutTests/platform/mac/compositing/tiling/tile-cache-zoomed-expected.txt -1 lines
11	(GraphicsLayer	11	(GraphicsLayer
12	(position 8.00 8.00)	12	(position 8.00 8.00)
13	(bounds 700.00 2500.00)	13	(bounds 700.00 2500.00)
14	(backgroundColor #C0C0C0)
15	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])	14	(transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
16	(visible rect 0.00, 0.00 482.63 x 357.63)	15	(visible rect 0.00, 0.00 482.63 x 357.63)
17	)	16	)

Return to Bug 104842

Lines 80-86 GraphicsLayer::GraphicsLayer(GraphicsLayerClient* client) a/Source/WebCore/platform/graphics/GraphicsLayer.cpp_sec1
- a/Source/WebCore/platform/graphics/GraphicsLayer.cpp -9 / +1 lines
80	, m_anchorPoint(0.5f, 0.5f, 0)	80	, m_anchorPoint(0.5f, 0.5f, 0)
81	, m_opacity(1)	81	, m_opacity(1)
82	, m_zPosition(0)	82	, m_zPosition(0)
83	, m_backgroundColorSet(false)
84	, m_contentsOpaque(false)	83	, m_contentsOpaque(false)
85	, m_preserves3D(false)	84	, m_preserves3D(false)
86	, m_backfaceVisibility(true)	85	, m_backfaceVisibility(true)
Lines 313-325 void GraphicsLayer::setOffsetFromRenderer(const IntSize& offset, ShouldSetNeedsD a/Source/WebCore/platform/graphics/GraphicsLayer.cpp_sec2
313	void GraphicsLayer::setBackgroundColor(const Color& color)	312	void GraphicsLayer::setBackgroundColor(const Color& color)
314	{	313	{
315	m_backgroundColor = color;	314	m_backgroundColor = color;
316	m_backgroundColorSet = true;
317	}
318
319	void GraphicsLayer::clearBackgroundColor()
320	{
321	m_backgroundColor = Color();
322	m_backgroundColorSet = false;
323	}	315	}
324		316
325	void GraphicsLayer::paintGraphicsLayerContents(GraphicsContext& context, const IntRect& clip)	317	void GraphicsLayer::paintGraphicsLayerContents(GraphicsContext& context, const IntRect& clip)
Lines 657-663 void GraphicsLayer::dumpProperties(TextStream& ts, int indent, LayerTreeAsTextBe a/Source/WebCore/platform/graphics/GraphicsLayer.cpp_sec3
657	ts << ")\n";	649	ts << ")\n";
658	}	650	}
659		651
660	if (m_backgroundColorSet) {	652	if (m_backgroundColor.isValid()) {
661	writeIndent(ts, indent + 1);	653	writeIndent(ts, indent + 1);
662	ts << "(backgroundColor " << m_backgroundColor.nameForRenderTreeAsText() << ")\n";	654	ts << "(backgroundColor " << m_backgroundColor.nameForRenderTreeAsText() << ")\n";
663	}	655	}

Lines 274-280 PassOwnPtr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerClient* client) a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp_sec1
- a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp -36 / +27 lines
274	GraphicsLayerCA::GraphicsLayerCA(GraphicsLayerClient* client)	274	GraphicsLayerCA::GraphicsLayerCA(GraphicsLayerClient* client)
275	: GraphicsLayer(client)	275	: GraphicsLayer(client)
276	, m_contentsLayerPurpose(NoContentsLayer)	276	, m_contentsLayerPurpose(NoContentsLayer)
277	, m_contentsLayerHasBackgroundColor(false)
278	, m_allowTiledLayer(true)	277	, m_allowTiledLayer(true)
279	, m_isPageTileCacheLayer(false)	278	, m_isPageTileCacheLayer(false)
280	, m_uncommittedChanges(0)	279	, m_uncommittedChanges(0)
Lines 564-585 void GraphicsLayerCA::setAllowTiledLayer(bool allowTiledLayer) a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp_sec2
564		563
565	void GraphicsLayerCA::setBackgroundColor(const Color& color)	564	void GraphicsLayerCA::setBackgroundColor(const Color& color)
566	{	565	{
567	if (m_backgroundColorSet && m_backgroundColor == color)	566	if (m_backgroundColor == color)
568	return;	567	return;
569		568
570	GraphicsLayer::setBackgroundColor(color);	569	GraphicsLayer::setBackgroundColor(color);
571
572	m_contentsLayerHasBackgroundColor = true;
573	noteLayerPropertyChanged(BackgroundColorChanged);
574	}
575
576	void GraphicsLayerCA::clearBackgroundColor()
577	{
578	if (!m_backgroundColorSet)
579	return;
580
581	GraphicsLayer::clearBackgroundColor();
582	m_contentsLayerHasBackgroundColor = false;
583	noteLayerPropertyChanged(BackgroundColorChanged);	570	noteLayerPropertyChanged(BackgroundColorChanged);
584	}	571	}
585		572
Lines 756-765 void GraphicsLayerCA::platformCALayerAnimationStarted(CFTimeInterval startTime) a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp_sec3
756	m_client->notifyAnimationStarted(this, startTime);	743	m_client->notifyAnimationStarted(this, startTime);
757	}	744	}
758		745
759	void GraphicsLayerCA::setContentsToBackgroundColor(const Color& color)	746	void GraphicsLayerCA::setContentsToSolidColor(const Color& color)
760	{	747	{
761	setBackgroundColor(color);	748	if (color == m_contentsSolidColor)
762	if (color != Color::transparent) {	749	return;
		750
		751	m_contentsSolidColor = color;
		752
		753	if (m_contentsSolidColor.isValid()) {
763	m_contentsLayerPurpose = ContentsLayerForBackgroundColor;	754	m_contentsLayerPurpose = ContentsLayerForBackgroundColor;
764	m_contentsLayer = PlatformCALayer::create(PlatformCALayer::LayerTypeLayer, this);	755	m_contentsLayer = PlatformCALayer::create(PlatformCALayer::LayerTypeLayer, this);
765	#ifndef NDEBUG	756	#ifndef NDEBUG
Lines 771-777 void GraphicsLayerCA::setContentsToBackgroundColor(const Color& color) a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp_sec4
771	}	762	}
772		763
773	noteSublayersChanged();	764	noteSublayersChanged();
774	noteLayerPropertyChanged(BackgroundColorChanged);	765	noteLayerPropertyChanged(ContentsColorLayerChanged);
775	}	766	}
776		767
777	void GraphicsLayerCA::setContentsToImage(Image* image)	768	void GraphicsLayerCA::setContentsToImage(Image* image)
Lines 1093-1101 void GraphicsLayerCA::commitLayerChangesBeforeSublayers(float pageScaleFactor, c a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp_sec5
1093		1084
1094	if (m_uncommittedChanges & ContentsCanvasLayerChanged) // Needs to happen before ChildrenChanged	1085	if (m_uncommittedChanges & ContentsCanvasLayerChanged) // Needs to happen before ChildrenChanged
1095	updateContentsCanvasLayer();	1086	updateContentsCanvasLayer();
		1087
		1088	if (m_uncommittedChanges & ContentsColorLayerChanged) // Needs to happen before ChildrenChanged
		1089	updateContentsColorLayer();
1096		1090
1097	if (m_uncommittedChanges & BackgroundColorChanged) // Needs to happen before ChildrenChanged, and after updating image or video	1091	if (m_uncommittedChanges & BackgroundColorChanged)
1098	updateLayerBackgroundColor();	1092	updateBackgroundColor();
1099		1093
1100	if (m_uncommittedChanges & TransformChanged)	1094	if (m_uncommittedChanges & TransformChanged)
1101	updateTransform();	1095	updateTransform();
Lines 1616-1638 void GraphicsLayerCA::updateVisibleRect(const FloatRect& oldVisibleRect) a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp_sec6
1616	m_sizeAtLastVisibleRectUpdate = m_size;	1610	m_sizeAtLastVisibleRectUpdate = m_size;
1617	}	1611	}
1618		1612
1619	void GraphicsLayerCA::updateLayerBackgroundColor()	1613	void GraphicsLayerCA::updateBackgroundColor()
1620	{	1614	{
1621	if (m_isPageTileCacheLayer) {	1615	m_layer->setBackgroundColor(m_backgroundColor);
1622	m_layer->setBackgroundColor(m_backgroundColor);
1623	return;
1624	}
1625
1626	if (!m_contentsLayer)
1627	return;
1628
1629	setupContentsLayer(m_contentsLayer.get());
1630	updateContentsRect();
1631
1632	if (m_backgroundColorSet)
1633	m_contentsLayer->setBackgroundColor(m_backgroundColor);
1634	else
1635	m_contentsLayer->setBackgroundColor(Color::transparent);
1636	}	1616	}
1637		1617
1638	void GraphicsLayerCA::updateContentsImage()	1618	void GraphicsLayerCA::updateContentsImage()
Lines 1686-1691 void GraphicsLayerCA::updateContentsCanvasLayer() a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp_sec7
1686	}	1666	}
1687	}	1667	}
1688		1668
		1669	void GraphicsLayerCA::updateContentsColorLayer()
		1670	{
		1671	// Color layer was set as m_contentsLayer, and will get parented in updateSublayerList().
		1672	if (m_contentsLayer) {
		1673	setupContentsLayer(m_contentsLayer.get());
		1674	updateContentsRect();
		1675	ASSERT(m_contentsSolidColor.isValid()); // An invalid color should have removed the contents layer.
		1676	m_contentsLayer->setBackgroundColor(m_contentsSolidColor);
		1677	}
		1678	}
		1679
1689	void GraphicsLayerCA::updateContentsRect()	1680	void GraphicsLayerCA::updateContentsRect()
1690	{	1681	{
1691	if (!m_contentsLayer)	1682	if (!m_contentsLayer)

Lines 89-95 public: a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h_sec1
- a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h -13 / +16 lines
89	virtual void setAcceleratesDrawing(bool);	89	virtual void setAcceleratesDrawing(bool);
90		90
91	virtual void setBackgroundColor(const Color&);	91	virtual void setBackgroundColor(const Color&);
92	virtual void clearBackgroundColor();
93		92
94	virtual void setContentsOpaque(bool);	93	virtual void setContentsOpaque(bool);
95	virtual void setBackfaceVisibility(bool);	94	virtual void setBackfaceVisibility(bool);
Lines 117-123 public: a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h_sec2
117	virtual void setContentsToImage(Image*);	116	virtual void setContentsToImage(Image*);
118	virtual void setContentsToMedia(PlatformLayer*);	117	virtual void setContentsToMedia(PlatformLayer*);
119	virtual void setContentsToCanvas(PlatformLayer*);	118	virtual void setContentsToCanvas(PlatformLayer*);
120	virtual void setContentsToBackgroundColor(const Color&);	119	virtual void setContentsToSolidColor(const Color&);
121		120
122	virtual bool hasContentsLayer() const { return m_contentsLayer; }	121	virtual bool hasContentsLayer() const { return m_contentsLayer; }
123		122
Lines 317-327 private: a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h_sec3
317	void updateBackfaceVisibility();	316	void updateBackfaceVisibility();
318	void updateStructuralLayer(float pixelAlignmentScale, const FloatPoint& positionRelativeToBase);	317	void updateStructuralLayer(float pixelAlignmentScale, const FloatPoint& positionRelativeToBase);
319	void updateLayerDrawsContent(float pixelAlignmentScale, const FloatPoint& positionRelativeToBase);	318	void updateLayerDrawsContent(float pixelAlignmentScale, const FloatPoint& positionRelativeToBase);
320	void updateLayerBackgroundColor();	319	void updateBackgroundColor();
321		320
322	void updateContentsImage();	321	void updateContentsImage();
323	void updateContentsMediaLayer();	322	void updateContentsMediaLayer();
324	void updateContentsCanvasLayer();	323	void updateContentsCanvasLayer();
		324	void updateContentsColorLayer();
325	void updateContentsRect();	325	void updateContentsRect();
326	void updateMaskLayer();	326	void updateMaskLayer();
327	void updateReplicatedLayers();	327	void updateReplicatedLayers();
Lines 373-388 private: a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h_sec4
373	ContentsImageChanged = 1 << 15,	373	ContentsImageChanged = 1 << 15,
374	ContentsMediaLayerChanged = 1 << 16,	374	ContentsMediaLayerChanged = 1 << 16,
375	ContentsCanvasLayerChanged = 1 << 17,	375	ContentsCanvasLayerChanged = 1 << 17,
376	ContentsRectChanged = 1 << 18,	376	ContentsColorLayerChanged = 1 << 18,
377	MaskLayerChanged = 1 << 19,	377	ContentsRectChanged = 1 << 19,
378	ReplicatedLayerChanged = 1 << 20,	378	MaskLayerChanged = 1 << 20,
379	ContentsNeedsDisplay = 1 << 21,	379	ReplicatedLayerChanged = 1 << 21,
380	AcceleratesDrawingChanged = 1 << 22,	380	ContentsNeedsDisplay = 1 << 22,
381	ContentsScaleChanged = 1 << 23,	381	AcceleratesDrawingChanged = 1 << 23,
382	ContentsVisibilityChanged = 1 << 24,	382	ContentsScaleChanged = 1 << 24,
383	VisibleRectChanged = 1 << 25,	383	ContentsVisibilityChanged = 1 << 25,
384	FiltersChanged = 1 << 26,	384	VisibleRectChanged = 1 << 26,
385	DebugIndicatorsChanged = 1 << 27	385	FiltersChanged = 1 << 27,
		386	DebugIndicatorsChanged = 1 << 28
386	};	387	};
387	typedef unsigned LayerChangeFlags;	388	typedef unsigned LayerChangeFlags;
388	void noteLayerPropertyChanged(LayerChangeFlags flags);	389	void noteLayerPropertyChanged(LayerChangeFlags flags);
Lines 418-423 private: a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h_sec5
418	bool m_contentsLayerHasBackgroundColor : 1;	419	bool m_contentsLayerHasBackgroundColor : 1;
419	bool m_allowTiledLayer : 1;	420	bool m_allowTiledLayer : 1;
420	bool m_isPageTileCacheLayer : 1;	421	bool m_isPageTileCacheLayer : 1;
		422
		423	Color m_contentsSolidColor;
421		424
422	RetainPtr<CGImageRef> m_uncorrectedContentsImage;	425	RetainPtr<CGImageRef> m_uncorrectedContentsImage;
423	RetainPtr<CGImageRef> m_pendingContentsImage;	426	RetainPtr<CGImageRef> m_pendingContentsImage;

Lines 758-763 void RenderLayerBacking::updateGraphicsLayerGeometry() a/Source/WebCore/rendering/RenderLayerBacking.cpp_sec1
- a/Source/WebCore/rendering/RenderLayerBacking.cpp -4 / +5 lines
758	setRequiresOwnBackingStore(compositor()->requiresOwnBackingStore(m_owningLayer, compAncestor));	758	setRequiresOwnBackingStore(compositor()->requiresOwnBackingStore(m_owningLayer, compAncestor));
759		759
760	updateContentsRect(isSimpleContainer);	760	updateContentsRect(isSimpleContainer);
		761	updateBackgroundColor(isSimpleContainer);
761	updateDrawsContent(isSimpleContainer);	762	updateDrawsContent(isSimpleContainer);
762	updateAfterWidgetResize();	763	updateAfterWidgetResize();
763	}	764	}
Lines 1150-1161 Color RenderLayerBacking::rendererBackgroundColor() const a/Source/WebCore/rendering/RenderLayerBacking.cpp_sec2
1150		1151
1151	void RenderLayerBacking::updateBackgroundColor(bool isSimpleContainer)	1152	void RenderLayerBacking::updateBackgroundColor(bool isSimpleContainer)
1152	{	1153	{
1153	Color backgroundColor = Color::transparent;	1154	Color backgroundColor;
1154	if (isSimpleContainer)	1155	if (isSimpleContainer)
1155	backgroundColor = rendererBackgroundColor();	1156	backgroundColor = rendererBackgroundColor();
1156	m_graphicsLayer->setContentsToBackgroundColor(backgroundColor);	1157
1157	if (backgroundColor == Color::transparent)	1158	// An unset (invalid) color will remove the solid color.
1158	m_graphicsLayer->clearBackgroundColor();	1159	m_graphicsLayer->setContentsToSolidColor(backgroundColor);
1159	}	1160	}
1160		1161
1161	static bool supportsDirectBoxDecorationsComposition(const RenderObject* renderer)	1162	static bool supportsDirectBoxDecorationsComposition(const RenderObject* renderer)

Lines 362-375 bool CoordinatedGraphicsLayer::setFilters(const FilterOperations& newFilters) a/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp_sec1
- a/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp -6 / +3 lines
362	}	362	}
363	#endif	363	#endif
364		364
365	void CoordinatedGraphicsLayer::setContentsToBackgroundColor(const Color& color)	365	void CoordinatedGraphicsLayer::setContentsToSolidColor(const Color& color)
366	{	366	{
367	if (m_layerInfo.backgroundColor == color)	367	if (m_layerInfo.solidColor == color)
368	return;	368	return;
369	m_layerInfo.backgroundColor = color;	369	m_layerInfo.solidColor = color;
370
371	// This is in line with what CA does.
372	setBackgroundColor(color);
373	didChangeLayerState();	370	didChangeLayerState();
374	}	371	}
375		372

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +76 lines
		1	2012-12-13 No'am Rosenthal <noam.rosenthal@nokia.com>
		2
		3	Disambiguate "background color" and "contents as solid color" on GraphicsLayer
		4	https://bugs.webkit.org/show_bug.cgi?id=104842
		5
		6	Reviewed by Simon Fraser.
		7
		8	Rename overloads in GraphicsLayerTextureMapper and GraphicsLayerChromium to account for the rename in GraphicsLayer.
		9
		10	Covered by existing tests.
		11
		12	* platform/graphics/chromium/GraphicsLayerChromium.cpp:
		13	* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
		14	(WebCore::GraphicsLayerTextureMapper::setContentsToSolidColor):
		15	* platform/graphics/texmap/GraphicsLayerTextureMapper.h:
		16	(GraphicsLayerTextureMapper):
		17	(WebCore::GraphicsLayerTextureMapper::solidColor):
		18	* platform/graphics/texmap/TextureMapperLayer.cpp:
		19	(WebCore::TextureMapperLayer::paintSelf):
		20	(WebCore::TextureMapperLayer::flushCompositingStateSelf):
		21	* platform/graphics/texmap/TextureMapperLayer.h:
		22	(State):
		23
		24	2012-12-13 Simon Fraser <simon.fraser@apple.com>
		25
		26	Disambiguate "background color" and "contents as solid color" on GraphicsLayer
		27	https://bugs.webkit.org/show_bug.cgi?id=104842
		28
		29	Reviewed by NOBODY (OOPS!).
		30
		31	GraphicsLayer failed to be clear about the distinction between
		32	the layer background color, and setting the layer contents
		33	to a color. This caused some recently added tests to fail,
		34	and required some special-casing for the TileCache in
		35	GraphicsLayerCA.
		36
		37	Separate these two concepts on GraphicsLayer. setBackgroundColor()
		38	now sets the background color on the entire layer, which will only
		39	be used in special cases like the TileCache.
		40
		41	The existing setContentsToBackgroundColor() is renamed to
		42	setContentsToSolidColor(), and is an explicit request to create
		43	a contents layer for the purpose of displaying a simple color.
		44
		45	In both cases, 'clear' methods are not necessary; calling
		46	the setter with an invalid color clears the color.
		47
		48	Covered by existing tests.
		49
		50	* WebCore.exp.in: Remove GraphicsLayer::clearBackgroundColor().
		51	* platform/graphics/GraphicsLayer.cpp:
		52	(WebCore::GraphicsLayer::GraphicsLayer):
		53	(WebCore::GraphicsLayer::setBackgroundColor):
		54	(WebCore::GraphicsLayer::dumpProperties):
		55	* platform/graphics/GraphicsLayer.h:
		56	(GraphicsLayer): Remove m_backgroundColorSet; we just check whether
		57	the color is a valid color now.
		58	(WebCore::GraphicsLayer::setContentsToSolidColor):
		59	* platform/graphics/ca/GraphicsLayerCA.cpp:
		60	(WebCore::GraphicsLayerCA::GraphicsLayerCA):
		61	(WebCore::GraphicsLayerCA::setBackgroundColor):
		62	(WebCore::GraphicsLayerCA::setContentsToSolidColor):
		63	(WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
		64	(WebCore::GraphicsLayerCA::updateBackgroundColor):
65	(WebCore::GraphicsLayerCA::updateContentsColorLayer):
66	(WebCore):
67	* platform/graphics/ca/GraphicsLayerCA.h:
68	(GraphicsLayerCA):
69	* rendering/RenderLayerBacking.cpp:
70	(WebCore::RenderLayerBacking::updateGraphicsLayerGeometry): We have
71	to call updateBackgroundColor(), because the 'is simple compositing layer'
72	state may change in this code path.
73	(WebCore::RenderLayerBacking::updateBackgroundColor): Don't initialize
74	the Color to transparent (it will be invalid initially), and always
75	call setContentsToSolidColor() which will either set or remove the color.
76
1	2012-12-12 Andy Estes <aestes@apple.com>	77	2012-12-12 Andy Estes <aestes@apple.com>
2		78
3	Don't dispatch fake mousemove events when we don't know where the cursor is	79	Don't dispatch fake mousemove events when we don't know where the cursor is

Lines 1-3 a/Source/WebKit2/ChangeLog_sec1
- a/Source/WebKit2/ChangeLog +18 lines
		1	2012-12-13 No'am Rosenthal <noam.rosenthal@nokia.com>
		2
		3	Disambiguate "background color" and "contents as solid color" on GraphicsLayer
		4	https://bugs.webkit.org/show_bug.cgi?id=104842
		5
		6	Reviewed by Simon Fraser.
		7
		8	Rename overloads in coordinated graphics to account for the rename in GraphicsLayer.
		9
		10	* Shared/CoordinatedGraphics/CoordinatedLayerInfo.h:
		11	(CoordinatedLayerInfo):
		12	* UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp:
		13	(WebKit::LayerTreeRenderer::setLayerState):
		14	* WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp:
		15	(WebCore::CoordinatedGraphicsLayer::setContentsToSolidColor):
		16	* WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.h:
		17	(CoordinatedGraphicsLayer):
		18
1	2012-12-12 Seokju Kwon <seokju.kwon@gmail.com>	19	2012-12-12 Seokju Kwon <seokju.kwon@gmail.com>
2		20
3	[EFL] Refactor duplicate code into EflInspectorUtilities	21	[EFL] Refactor duplicate code into EflInspectorUtilities

Lines 97-103 GraphicsLayerBlackBerry::GraphicsLayerBlackBerry(GraphicsLayerClient* client) a/Source/WebCore/platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp_sec1
- a/Source/WebCore/platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp -21 / +5 lines
97	: GraphicsLayer(client)	97	: GraphicsLayer(client)
98	, m_suspendTime(0)	98	, m_suspendTime(0)
99	, m_contentsLayerPurpose(NoContentsLayer)	99	, m_contentsLayerPurpose(NoContentsLayer)
100	, m_contentsLayerHasBackgroundColor(false)
101	{	100	{
102	m_layer = LayerWebKitThread::create(LayerData::Layer, this);	101	m_layer = LayerWebKitThread::create(LayerData::Layer, this);
103		102
Lines 330-353 bool GraphicsLayerBlackBerry::setFilters(const FilterOperations& filters) a/Source/WebCore/platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp_sec2
330		329
331	void GraphicsLayerBlackBerry::setBackgroundColor(const Color& color)	330	void GraphicsLayerBlackBerry::setBackgroundColor(const Color& color)
332	{	331	{
333	if (m_backgroundColorSet && m_backgroundColor == color)	332	if (color == m_backgroundColor)
334	return;	333	return;
335		334
336	GraphicsLayer::setBackgroundColor(color);	335	GraphicsLayer::setBackgroundColor(color.rgb());
337
338	m_contentsLayerHasBackgroundColor = true;
339	updateLayerBackgroundColor();	336	updateLayerBackgroundColor();
340	}	337	}
341		338
342	void GraphicsLayerBlackBerry::clearBackgroundColor()
343	{
344	if (!m_backgroundColorSet)
345	return;
346
347	GraphicsLayer::clearBackgroundColor();
348	clearLayerBackgroundColor(*m_contentsLayer);
349	}
350
351	void GraphicsLayerBlackBerry::setContentsOpaque(bool opaque)	339	void GraphicsLayerBlackBerry::setContentsOpaque(bool opaque)
352	{	340	{
353	if (m_contentsOpaque == opaque)	341	if (m_contentsOpaque == opaque)
Lines 835-848 void GraphicsLayerBlackBerry::updateHasFixedAncestorInDOMTree() a/Source/WebCore/platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp_sec3
835		823
836	void GraphicsLayerBlackBerry::updateLayerBackgroundColor()	824	void GraphicsLayerBlackBerry::updateLayerBackgroundColor()
837	{	825	{
838	if (!m_contentsLayer)	826	if (m_backgroundColor.isValid())
839	return;	827	setLayerBackgroundColor(*m_layer, m_backgroundColor);
840
841	// We never create the contents layer just for background color yet.
842	if (m_backgroundColorSet)
843	setLayerBackgroundColor(*m_contentsLayer, m_backgroundColor);
844	else	828	else
845	clearLayerBackgroundColor(*m_contentsLayer);	829	clearLayerBackgroundColor(*m_layer);
846	}	830	}
847		831
848	#if ENABLE(CSS_FILTERS)	832	#if ENABLE(CSS_FILTERS)

Lines 101-107 GraphicsLayerChromium::GraphicsLayerChromium(GraphicsLayerClient* client) a/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp_sec1
- a/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp -20 / +4 lines
101	, m_contentsLayerId(0)	101	, m_contentsLayerId(0)
102	, m_linkHighlight(0)	102	, m_linkHighlight(0)
103	, m_contentsLayerPurpose(NoContentsLayer)	103	, m_contentsLayerPurpose(NoContentsLayer)
104	, m_contentsLayerHasBackgroundColor(false)
105	, m_inSetChildren(false)	104	, m_inSetChildren(false)
106	, m_scrollableArea(0)	105	, m_scrollableArea(0)
107	{	106	{
Lines 285-304 void GraphicsLayerChromium::setContentsVisible(bool contentsVisible) a/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp_sec2
285		284
286	void GraphicsLayerChromium::setBackgroundColor(const Color& color)	285	void GraphicsLayerChromium::setBackgroundColor(const Color& color)
287	{	286	{
288	GraphicsLayer::setBackgroundColor(color.rgb());	287	if (color == m_backgroundColor)
		288	return;
289		289
290	m_contentsLayerHasBackgroundColor = true;	290	GraphicsLayer::setBackgroundColor(color.rgb());
291	updateLayerBackgroundColor();	291	updateLayerBackgroundColor();
292	}	292	}
293		293
294	void GraphicsLayerChromium::clearBackgroundColor()
295	{
296	GraphicsLayer::clearBackgroundColor();
297
298	if (WebLayer* contentsLayer = contentsLayerIfRegistered())
299	contentsLayer->setBackgroundColor(static_cast<RGBA32>(0));
300	}
301
302	void GraphicsLayerChromium::setContentsOpaque(bool opaque)	294	void GraphicsLayerChromium::setContentsOpaque(bool opaque)
303	{	295	{
304	GraphicsLayer::setContentsOpaque(opaque);	296	GraphicsLayer::setContentsOpaque(opaque);
Lines 803-817 void GraphicsLayerChromium::updateLayerIsDrawable() a/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp_sec3
803		795
804	void GraphicsLayerChromium::updateLayerBackgroundColor()	796	void GraphicsLayerChromium::updateLayerBackgroundColor()
805	{	797	{
806	WebLayer* contentsLayer = contentsLayerIfRegistered();	798	m_layer->setBackgroundColor(m_backgroundColor.rgb());
807	if (!contentsLayer)
808	return;
809
810	// We never create the contents layer just for background color yet.
811	if (m_backgroundColorSet)
812	contentsLayer->setBackgroundColor(m_backgroundColor.rgb());
813	else
814	contentsLayer->setBackgroundColor(static_cast<RGBA32>(0));
815	}	799	}
816		800
817	void GraphicsLayerChromium::updateContentsVideo()	801	void GraphicsLayerChromium::updateContentsVideo()

Lines 351-363 void GraphicsLayerTextureMapper::setContentsRect(const IntRect& value) a/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp_sec1
- a/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp -4 / +3 lines
351	notifyChange(TextureMapperLayer::ContentsRectChange);	351	notifyChange(TextureMapperLayer::ContentsRectChange);
352	}	352	}
353		353
354	void GraphicsLayerTextureMapper::setContentsToBackgroundColor(const Color& color)	354	void GraphicsLayerTextureMapper::setContentsToSolidColor(const Color& color)
355	{	355	{
356	if (color == m_backgroundColor)	356	if (color == m_solidColor)
357	return;	357	return;
358		358
359	m_backgroundColor = color;	359	m_solidColor = color;
360	setBackgroundColor(color);
361	notifyChange(TextureMapperLayer::ContentChange);	360	notifyChange(TextureMapperLayer::ContentChange);
362	}	361	}
363		362

Lines 109-120 void TextureMapperLayer::paintSelf(const TextureMapperPaintOptions& options) a/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp_sec1
- a/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp -3 / +7 lines
109	float opacity = options.opacity;	109	float opacity = options.opacity;
110	RefPtr<BitmapTexture> mask = options.mask;	110	RefPtr<BitmapTexture> mask = options.mask;
111		111
112	if (m_state.backgroundColor.alpha() && !m_state.contentsRect.isEmpty()) {	112	if (m_state.solidColor.isValid() && !m_state.contentsRect.isEmpty()) {
113	Color color = m_state.backgroundColor;	113	if (!m_state.solidColor.alpha())
		114	return;
		115
		116	Color color = m_state.solidColor;
114	float r, g, b, a;	117	float r, g, b, a;
115	color.getRGBA(r, g, b, a);	118	color.getRGBA(r, g, b, a);
116	color = Color(r * opacity, g * opacity, b * opacity, a * opacity);	119	color = Color(r * opacity, g * opacity, b * opacity, a * opacity);
117	options.textureMapper->drawSolidColor(m_state.contentsRect, transform, color);	120	options.textureMapper->drawSolidColor(m_state.contentsRect, transform, color);
		121	return;
118	}	122	}
119		123
120	if (m_backingStore) {	124	if (m_backingStore) {
Lines 436-442 void TextureMapperLayer::flushCompositingStateSelf(GraphicsLayerTextureMapper* g a/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp_sec2
436	m_state.backfaceVisibility = graphicsLayer->backfaceVisibility();	440	m_state.backfaceVisibility = graphicsLayer->backfaceVisibility();
437	m_state.childrenTransform = graphicsLayer->childrenTransform();	441	m_state.childrenTransform = graphicsLayer->childrenTransform();
438	m_state.opacity = graphicsLayer->opacity();	442	m_state.opacity = graphicsLayer->opacity();
439	m_state.backgroundColor = graphicsLayer->backgroundColor();	443	m_state.solidColor = graphicsLayer->solidColor();
440	#if ENABLE(CSS_FILTERS)	444	#if ENABLE(CSS_FILTERS)
441	if (changeMask & FilterChange)	445	if (changeMask & FilterChange)
442	m_state.filters = graphicsLayer->filters();	446	m_state.filters = graphicsLayer->filters();

Lines 1-3 a/LayoutTests/ChangeLog_sec1
- a/LayoutTests/ChangeLog +88 lines
		1	2012-12-13 No'am Rosenthal <noam@webkit.org>
		2
		3	Disambiguate "background color" and "contents as solid color" on GraphicsLayer
		4	https://bugs.webkit.org/show_bug.cgi?id=104842
		5
		6	Reviewed by Simon Fraser.
		7
		8	Since we don't set the background color for a layer with a solid color, the test results have to be rebaselined.
		9
		10	* compositing/backing/no-backing-for-clip-expected.txt:
		11	* compositing/backing/no-backing-for-clip-overlap-expected.txt:
		12	* compositing/backing/no-backing-for-perspective-expected.txt:
		13	* compositing/columns/composited-in-paginated-expected.txt:
		14	* compositing/geometry/ancestor-overflow-change-expected.txt:
		15	* compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt:
		16	* compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt:
		17	* compositing/geometry/clip-expected.txt:
		18	* compositing/geometry/clip-inside-expected.txt:
		19	* compositing/geometry/composited-in-columns-expected.txt:
		20	* compositing/geometry/flipped-writing-mode-expected.txt:
		21	* compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt:
		22	* compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt:
		23	* compositing/geometry/limit-layer-bounds-overflow-root-expected.txt:
		24	* compositing/geometry/limit-layer-bounds-positioned-expected.txt:
		25	* compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt:
		26	* compositing/geometry/limit-layer-bounds-transformed-expected.txt:
		27	* compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt:
		28	* compositing/geometry/preserve-3d-switching-expected.txt:
		29	* compositing/iframes/become-composited-nested-iframes-expected.txt:
		30	* compositing/iframes/become-overlapped-iframe-expected.txt:
		31	* compositing/iframes/composited-parent-iframe-expected.txt:
		32	* compositing/iframes/connect-compositing-iframe-delayed-expected.txt:
		33	* compositing/iframes/connect-compositing-iframe-expected.txt:
		34	* compositing/iframes/connect-compositing-iframe2-expected.txt:
		35	* compositing/iframes/connect-compositing-iframe3-expected.txt:
		36	* compositing/iframes/enter-compositing-iframe-expected.txt:
		37	* compositing/iframes/iframe-resize-expected.txt:
		38	* compositing/iframes/invisible-nested-iframe-hide-expected.txt:
		39	* compositing/iframes/invisible-nested-iframe-show-expected.txt:
		40	* compositing/iframes/overlapped-iframe-expected.txt:
		41	* compositing/iframes/overlapped-iframe-iframe-expected.txt:
		42	* compositing/iframes/page-cache-layer-tree-expected.txt:
		43	* compositing/iframes/scrolling-iframe-expected.txt:
		44	* compositing/layer-creation/animation-overlap-with-children-expected.txt:
		45	* compositing/layer-creation/fixed-position-and-transform-expected.txt:
		46	* compositing/layer-creation/fixed-position-under-transform-expected.txt:
		47	* compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt:
		48	* compositing/layer-creation/overflow-scroll-overlap-expected.txt:
		49	* compositing/layer-creation/overlap-animation-expected.txt:
		50	* compositing/layer-creation/overlap-child-layer-expected.txt:
		51	* compositing/layer-creation/overlap-clipping-expected.txt:
		52	* compositing/layer-creation/overlap-transformed-and-clipped-expected.txt:
		53	* compositing/layer-creation/overlap-transformed-layer-expected.txt:
		54	* compositing/layer-creation/overlap-transforms-expected.txt:
		55	* compositing/layer-creation/scroll-partial-update-expected.txt:
		56	* compositing/layer-creation/spanOverlapsCanvas-expected.txt:
		57	* compositing/layer-creation/stacking-context-overlap-expected.txt:
		58	* compositing/layer-creation/stacking-context-overlap-nested-expected.txt:
		59	* compositing/layer-creation/translatez-overlap-expected.txt:
		60	* compositing/overflow-trumps-transform-style-expected.txt:
		61	* compositing/overflow/clip-descendents-expected.txt:
		62	* compositing/plugins/no-backing-store-expected.txt:
		63	* compositing/rtl/rtl-absolute-expected.txt:
		64	* compositing/rtl/rtl-absolute-overflow-expected.txt:
65	* compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt:
66	* compositing/rtl/rtl-fixed-expected.txt:
67	* compositing/rtl/rtl-fixed-overflow-expected.txt:
68	* compositing/rtl/rtl-relative-expected.txt:
69	* compositing/tiled-layers-hidpi-expected.txt:
70	* compositing/visible-rect/2d-transformed-expected.txt:
71	* compositing/visible-rect/3d-transform-style-expected.txt:
72	* compositing/visible-rect/3d-transformed-expected.txt:
73	* compositing/visible-rect/animated-expected.txt:
74	* compositing/visible-rect/animated-from-none-expected.txt:
75	* compositing/visible-rect/clipped-by-viewport-expected.txt:
76	* compositing/visible-rect/clipped-visible-rect-expected.txt:
77	* compositing/visible-rect/iframe-and-layers-expected.txt:
78	* compositing/visible-rect/nested-transform-expected.txt:
79	* compositing/visible-rect/scrolled-expected.txt:
80	* css3/filters/filtered-compositing-descendant-expected.txt:
81	* platform/mac/compositing/geometry/fixed-position-composited-switch-expected.txt:
82	* platform/mac/compositing/iframes/resizer-expected.txt:
83	* platform/mac/compositing/repaint/invalidations-on-composited-layers-expected.txt:
84	* platform/mac/compositing/tiling/crash-reparent-tiled-layer-expected.txt:
85	* platform/mac/compositing/tiling/huge-layer-add-remove-child-expected.txt:
86	* platform/mac/compositing/tiling/huge-layer-with-layer-children-expected.txt:
87	* platform/mac/compositing/tiling/huge-layer-with-layer-children-resize-expected.txt:
88
1	2012-12-12 Simon Fraser <simon.fraser@apple.com>	89	2012-12-12 Simon Fraser <simon.fraser@apple.com>
2		90
3	Rebaseline some tiled scrolling results that were affected by r137387.	91	Rebaseline some tiled scrolling results that were affected by r137387.

Lines 11-17 a/LayoutTests/compositing/geometry/composited-in-columns-expected.txt_sec1
- a/LayoutTests/compositing/geometry/composited-in-columns-expected.txt -2 lines
11	(children 1	11	(children 1
12	(GraphicsLayer	12	(GraphicsLayer
13	(bounds 60.00 60.00)	13	(bounds 60.00 60.00)
14	(backgroundColor #008000)
15	)	14	)
16	)	15	)
17	)	16	)
Lines 22-28 a/LayoutTests/compositing/geometry/composited-in-columns-expected.txt_sec2
22	(children 1	21	(children 1
23	(GraphicsLayer	22	(GraphicsLayer
24	(bounds 60.00 60.00)	23	(bounds 60.00 60.00)
25	(backgroundColor #008000)
26	)	24	)
27	)	25	)
28	)	26	)

Lines 48-54 a/LayoutTests/compositing/iframes/become-composited-nested-iframes-expected.txt_sec1
- a/LayoutTests/compositing/iframes/become-composited-nested-iframes-expected.txt -3 lines
48	(GraphicsLayer	48	(GraphicsLayer
49	(position 18.00 10.00)	49	(position 18.00 10.00)
50	(bounds 210.00 210.00)	50	(bounds 210.00 210.00)
51	(backgroundColor #0000FF)
52	)	51	)
53	)	52	)
54	)	53	)
Lines 117-123 a/LayoutTests/compositing/iframes/become-composited-nested-iframes-expected.txt_sec2
117	(GraphicsLayer	116	(GraphicsLayer
118	(position 18.00 10.00)	117	(position 18.00 10.00)
119	(bounds 210.00 210.00)	118	(bounds 210.00 210.00)
120	(backgroundColor #0000FF)
121	)	119	)
122	)	120	)
123	)	121	)
Lines 145-151 a/LayoutTests/compositing/iframes/become-composited-nested-iframes-expected.txt_sec3
145	)	143	)
146	(GraphicsLayer	144	(GraphicsLayer
147	(bounds 100.00 100.00)	145	(bounds 100.00 100.00)
148	(backgroundColor #0000FF)
149	)	146	)
150	)	147	)
151	)	148	)

Lines 28-34 a/LayoutTests/compositing/iframes/enter-compositing-iframe-expected.txt_sec1
- a/LayoutTests/compositing/iframes/enter-compositing-iframe-expected.txt -2 lines
28	(GraphicsLayer	28	(GraphicsLayer
29	(position 18.00 10.00)	29	(position 18.00 10.00)
30	(bounds 210.00 210.00)	30	(bounds 210.00 210.00)
31	(backgroundColor #0000FF)
32	)	31	)
33	)	32	)
34	)	33	)
Lines 45-51 a/LayoutTests/compositing/iframes/enter-compositing-iframe-expected.txt_sec2
45	(GraphicsLayer	44	(GraphicsLayer
46	(position 5.00 5.00)	45	(position 5.00 5.00)
47	(bounds 50.00 50.00)	46	(bounds 50.00 50.00)
48	(backgroundColor #00000033)
49	)	47	)
50	)	48	)
51	)	49	)

Lines 28-34 a/LayoutTests/compositing/iframes/iframe-resize-expected.txt_sec1
- a/LayoutTests/compositing/iframes/iframe-resize-expected.txt -2 lines
28	(GraphicsLayer	28	(GraphicsLayer
29	(position 18.00 10.00)	29	(position 18.00 10.00)
30	(bounds 210.00 210.00)	30	(bounds 210.00 210.00)
31	(backgroundColor #0000FF)
32	)	31	)
33	)	32	)
34	)	33	)
Lines 45-51 a/LayoutTests/compositing/iframes/iframe-resize-expected.txt_sec2
45	(GraphicsLayer	44	(GraphicsLayer
46	(position 5.00 5.00)	45	(position 5.00 5.00)
47	(bounds 50.00 50.00)	46	(bounds 50.00 50.00)
48	(backgroundColor #00000033)
49	)	47	)
50	)	48	)
51	)	49	)

Lines 52-58 This tests that layers are rebuilt properly after the page is restored from the a/LayoutTests/compositing/iframes/page-cache-layer-tree-expected.txt_sec1
- a/LayoutTests/compositing/iframes/page-cache-layer-tree-expected.txt -3 lines
52	(GraphicsLayer	52	(GraphicsLayer
53	(position 13.00 55.00)	53	(position 13.00 55.00)
54	(bounds 50.00 50.00)	54	(bounds 50.00 50.00)
55	(backgroundColor #00000033)
56	)	55	)
57	(GraphicsLayer	56	(GraphicsLayer
58	(position 8.00 274.00)	57	(position 8.00 274.00)
Lines 77-83 This tests that layers are rebuilt properly after the page is restored from the a/LayoutTests/compositing/iframes/page-cache-layer-tree-expected.txt_sec2
77	(GraphicsLayer	76	(GraphicsLayer
78	(position 108.00 100.00)	77	(position 108.00 100.00)
79	(bounds 200.00 200.00)	78	(bounds 200.00 200.00)
80	(backgroundColor #0000FF)
81	)	79	)
82	)	80	)
83	)	81	)
Lines 94-100 This tests that layers are rebuilt properly after the page is restored from the a/LayoutTests/compositing/iframes/page-cache-layer-tree-expected.txt_sec3
94	(GraphicsLayer	92	(GraphicsLayer
95	(position 13.00 279.00)	93	(position 13.00 279.00)
96	(bounds 50.00 50.00)	94	(bounds 50.00 50.00)
97	(backgroundColor #00000033)
98	)	95	)
99	)	96	)
100	)	97	)

Lines 29-35 a/LayoutTests/compositing/iframes/scrolling-iframe-expected.txt_sec1
- a/LayoutTests/compositing/iframes/scrolling-iframe-expected.txt -2 lines
29	(GraphicsLayer	29	(GraphicsLayer
30	(position 108.00 100.00)	30	(position 108.00 100.00)
31	(bounds 200.00 200.00)	31	(bounds 200.00 200.00)
32	(backgroundColor #0000FF)
33	)	32	)
34	)	33	)
35	)	34	)
Lines 46-52 a/LayoutTests/compositing/iframes/scrolling-iframe-expected.txt_sec2
46	(GraphicsLayer	45	(GraphicsLayer
47	(position 5.00 5.00)	46	(position 5.00 5.00)
48	(bounds 50.00 50.00)	47	(bounds 50.00 50.00)
49	(backgroundColor #00000033)
50	)	48	)
51	)	49	)
52	)	50	)

Lines 13-23 a/LayoutTests/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt_sec1
- a/LayoutTests/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt -2 lines
13	(children 2	13	(children 2
14	(GraphicsLayer	14	(GraphicsLayer
15	(bounds 100.00 100.00)	15	(bounds 100.00 100.00)
16	(backgroundColor #FF0000)
17	)	16	)
18	(GraphicsLayer	17	(GraphicsLayer
19	(bounds 100.00 100.00)	18	(bounds 100.00 100.00)
20	(backgroundColor #008000)
21	)	19	)
22	)	20	)
23	)	21	)