Attachment #118496 for bug #74140

View Details Raw Unified Return to Bug 74140



2011-12-08  Adrienne Walker  <enne@google.com>

        [chromium] Clean up unnecessary leaf functions in GraphicsLayerChromium
        https://bugs.webkit.org/show_bug.cgi?id=74140

        Reviewed by NOBODY (OOPS!).

        Tested by existing compositor layout tests.

        This is a follow-on cleanup to r102196, which made some of these
        functions less useful than they had been in the past.

        * platform/graphics/chromium/GraphicsLayerChromium.cpp:
        (WebCore::GraphicsLayerChromium::setContentsOpaque):
        (WebCore::GraphicsLayerChromium::setBackfaceVisibility):
        (WebCore::GraphicsLayerChromium::updateLayerPreserves3D):
        * platform/graphics/chromium/GraphicsLayerChromium.h:

2011-12-08  Stephen White  <senorblanco@chromium.org>

        Use Skia's implementation of Gaussian blur when accelerated filters



void GraphicsLayerChromium::setContentsOpaque(bool opaque)
{
    GraphicsLayer::setContentsOpaque(opaque);
    m_layer->setOpaque(m_contentsOpaque);
}

void GraphicsLayerChromium::setMaskLayer(GraphicsLayer* maskLayer)

void GraphicsLayerChromium::setBackfaceVisibility(bool visible)
{
    GraphicsLayer::setBackfaceVisibility(visible);
    m_layer->setDoubleSided(m_backfaceVisibility);
}

void GraphicsLayerChromium::setOpacity(float opacity)

    updateDebugIndicators();
}

void GraphicsLayerChromium::updateContentsOpaque()
{
    m_layer->setOpaque(m_contentsOpaque);
}

void GraphicsLayerChromium::updateBackfaceVisibility()
{
    m_layer->setDoubleSided(m_backfaceVisibility);
}

void GraphicsLayerChromium::updateLayerPreserves3D()
{
    if (m_preserves3D && !m_transformLayer) {

    }

    m_layer->setPreserves3D(m_preserves3D);
    primaryLayer()->setOpacity(m_opacity);
    updateNames();
}


    return 1;
}

// This function simply mimics the operation of GraphicsLayerCA
void GraphicsLayerChromium::updateOpacityOnLayer()
{
    primaryLayer()->setOpacity(m_opacity);
}

void GraphicsLayerChromium::deviceOrPageScaleFactorChanged()
{
    updateContentsScale();



    LayerChromium* contentsLayer() const { return m_contentsLayer.get(); }

private:
    void updateOpacityOnLayer();

    LayerChromium* primaryLayer() const  { return m_transformLayer.get() ? m_transformLayer.get() : m_layer.get(); }
    LayerChromium* hostLayerForChildren() const;
    LayerChromium* layerForParent() const;

    void updateTransform();
    void updateChildrenTransform();
    void updateMasksToBounds();
    void updateContentsOpaque();
    void updateBackfaceVisibility();
    void updateLayerPreserves3D();
    void updateLayerDrawsContent();
    void updateLayerBackgroundColor();

Return to Bug 74140

Lines 242-248 void GraphicsLayerChromium::clearBackgroundColor() a/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp_sec1
- a/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp -19 / +3 lines
242	void GraphicsLayerChromium::setContentsOpaque(bool opaque)	242	void GraphicsLayerChromium::setContentsOpaque(bool opaque)
243	{	243	{
244	GraphicsLayer::setContentsOpaque(opaque);	244	GraphicsLayer::setContentsOpaque(opaque);
245	updateContentsOpaque();	245	m_layer->setOpaque(m_contentsOpaque);
246	}	246	}
247		247
248	void GraphicsLayerChromium::setMaskLayer(GraphicsLayer* maskLayer)	248	void GraphicsLayerChromium::setMaskLayer(GraphicsLayer* maskLayer)
Lines 261-267 void GraphicsLayerChromium::setMaskLayer(GraphicsLayer* maskLayer) a/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp_sec2
261	void GraphicsLayerChromium::setBackfaceVisibility(bool visible)	261	void GraphicsLayerChromium::setBackfaceVisibility(bool visible)
262	{	262	{
263	GraphicsLayer::setBackfaceVisibility(visible);	263	GraphicsLayer::setBackfaceVisibility(visible);
264	updateBackfaceVisibility();	264	m_layer->setDoubleSided(m_backfaceVisibility);
265	}	265	}
266		266
267	void GraphicsLayerChromium::setOpacity(float opacity)	267	void GraphicsLayerChromium::setOpacity(float opacity)
Lines 514-529 void GraphicsLayerChromium::updateMasksToBounds() a/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp_sec3
514	updateDebugIndicators();	514	updateDebugIndicators();
515	}	515	}
516		516
517	void GraphicsLayerChromium::updateContentsOpaque()
518	{
519	m_layer->setOpaque(m_contentsOpaque);
520	}
521
522	void GraphicsLayerChromium::updateBackfaceVisibility()
523	{
524	m_layer->setDoubleSided(m_backfaceVisibility);
525	}
526
527	void GraphicsLayerChromium::updateLayerPreserves3D()	517	void GraphicsLayerChromium::updateLayerPreserves3D()
528	{	518	{
529	if (m_preserves3D && !m_transformLayer) {	519	if (m_preserves3D && !m_transformLayer) {
Lines 574-580 void GraphicsLayerChromium::updateLayerPreserves3D() a/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp_sec4
574	}	564	}
575		565
576	m_layer->setPreserves3D(m_preserves3D);	566	m_layer->setPreserves3D(m_preserves3D);
577	updateOpacityOnLayer();	567	primaryLayer()->setOpacity(m_opacity);
578	updateNames();	568	updateNames();
579	}	569	}
580		570
Lines 658-669 float GraphicsLayerChromium::contentsScale() const a/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp_sec5
658	return 1;	648	return 1;
659	}	649	}
660		650
661	// This function simply mimics the operation of GraphicsLayerCA
662	void GraphicsLayerChromium::updateOpacityOnLayer()
663	{
664	primaryLayer()->setOpacity(m_opacity);
665	}
666
667	void GraphicsLayerChromium::deviceOrPageScaleFactorChanged()	651	void GraphicsLayerChromium::deviceOrPageScaleFactorChanged()
668	{	652	{
669	updateContentsScale();	653	updateContentsScale();

Lines 105-112 public: a/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.h_sec1
- a/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.h -4 lines
105	LayerChromium* contentsLayer() const { return m_contentsLayer.get(); }	105	LayerChromium* contentsLayer() const { return m_contentsLayer.get(); }
106		106
107	private:	107	private:
108	void updateOpacityOnLayer();
109
110	LayerChromium* primaryLayer() const { return m_transformLayer.get() ? m_transformLayer.get() : m_layer.get(); }	108	LayerChromium* primaryLayer() const { return m_transformLayer.get() ? m_transformLayer.get() : m_layer.get(); }
111	LayerChromium* hostLayerForChildren() const;	109	LayerChromium* hostLayerForChildren() const;
112	LayerChromium* layerForParent() const;	110	LayerChromium* layerForParent() const;
Lines 119-126 private: a/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.h_sec2
119	void updateTransform();	117	void updateTransform();
120	void updateChildrenTransform();	118	void updateChildrenTransform();
121	void updateMasksToBounds();	119	void updateMasksToBounds();
122	void updateContentsOpaque();
123	void updateBackfaceVisibility();
124	void updateLayerPreserves3D();	120	void updateLayerPreserves3D();
125	void updateLayerDrawsContent();	121	void updateLayerDrawsContent();
126	void updateLayerBackgroundColor();	122	void updateLayerBackgroundColor();

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +18 lines
		1	2011-12-08 Adrienne Walker <enne@google.com>
		2
		3	[chromium] Clean up unnecessary leaf functions in GraphicsLayerChromium
		4	https://bugs.webkit.org/show_bug.cgi?id=74140
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Tested by existing compositor layout tests.
		9
		10	This is a follow-on cleanup to r102196, which made some of these
		11	functions less useful than they had been in the past.
		12
		13	* platform/graphics/chromium/GraphicsLayerChromium.cpp:
		14	(WebCore::GraphicsLayerChromium::setContentsOpaque):
		15	(WebCore::GraphicsLayerChromium::setBackfaceVisibility):
		16	(WebCore::GraphicsLayerChromium::updateLayerPreserves3D):
		17	* platform/graphics/chromium/GraphicsLayerChromium.h:
		18
1	2011-12-08 Stephen White <senorblanco@chromium.org>	19	2011-12-08 Stephen White <senorblanco@chromium.org>
2		20
3	Use Skia's implementation of Gaussian blur when accelerated filters	21	Use Skia's implementation of Gaussian blur when accelerated filters