Title: [103015] trunk/Source/WebCore
- Revision
- 103015
- Author
- [email protected]
- Date
- 2011-12-15 19:43:40 -0800 (Thu, 15 Dec 2011)
Log Message
[chromium] Clean up unnecessary leaf functions in GraphicsLayerChromium
https://bugs.webkit.org/show_bug.cgi?id=74140
Reviewed by James Robinson.
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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (103014 => 103015)
--- trunk/Source/WebCore/ChangeLog 2011-12-16 03:41:12 UTC (rev 103014)
+++ trunk/Source/WebCore/ChangeLog 2011-12-16 03:43:40 UTC (rev 103015)
@@ -1,3 +1,21 @@
+2011-12-15 Adrienne Walker <[email protected]>
+
+ [chromium] Clean up unnecessary leaf functions in GraphicsLayerChromium
+ https://bugs.webkit.org/show_bug.cgi?id=74140
+
+ Reviewed by James Robinson.
+
+ 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-15 Kenneth Russell <[email protected]>
Unreviewed, rolling out r103000.
Modified: trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp (103014 => 103015)
--- trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp 2011-12-16 03:41:12 UTC (rev 103014)
+++ trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp 2011-12-16 03:43:40 UTC (rev 103015)
@@ -242,7 +242,7 @@
void GraphicsLayerChromium::setContentsOpaque(bool opaque)
{
GraphicsLayer::setContentsOpaque(opaque);
- updateContentsOpaque();
+ m_layer->setOpaque(m_contentsOpaque);
}
void GraphicsLayerChromium::setMaskLayer(GraphicsLayer* maskLayer)
@@ -261,7 +261,7 @@
void GraphicsLayerChromium::setBackfaceVisibility(bool visible)
{
GraphicsLayer::setBackfaceVisibility(visible);
- updateBackfaceVisibility();
+ m_layer->setDoubleSided(m_backfaceVisibility);
}
void GraphicsLayerChromium::setOpacity(float opacity)
@@ -514,16 +514,6 @@
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) {
@@ -574,7 +564,7 @@
}
m_layer->setPreserves3D(m_preserves3D);
- updateOpacityOnLayer();
+ primaryLayer()->setOpacity(m_opacity);
updateNames();
}
@@ -658,12 +648,6 @@
return 1;
}
-// This function simply mimics the operation of GraphicsLayerCA
-void GraphicsLayerChromium::updateOpacityOnLayer()
-{
- primaryLayer()->setOpacity(m_opacity);
-}
-
void GraphicsLayerChromium::deviceOrPageScaleFactorChanged()
{
updateContentsScale();
Modified: trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.h (103014 => 103015)
--- trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.h 2011-12-16 03:41:12 UTC (rev 103014)
+++ trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.h 2011-12-16 03:43:40 UTC (rev 103015)
@@ -105,8 +105,6 @@
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;
@@ -119,8 +117,6 @@
void updateTransform();
void updateChildrenTransform();
void updateMasksToBounds();
- void updateContentsOpaque();
- void updateBackfaceVisibility();
void updateLayerPreserves3D();
void updateLayerDrawsContent();
void updateLayerBackgroundColor();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
