Title: [102373] trunk/Source/WebCore
- Revision
- 102373
- Author
- e...@google.com
- Date
- 2011-12-08 13:07:57 -0800 (Thu, 08 Dec 2011)
Log Message
[chromium] Remove dead code in compositor
https://bugs.webkit.org/show_bug.cgi?id=74103
Reviewed by James Robinson.
Tested via the compiler.
* platform/graphics/chromium/LayerChromium.h:
* platform/graphics/chromium/LayerRendererChromium.cpp:
* platform/graphics/chromium/LayerRendererChromium.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (102372 => 102373)
--- trunk/Source/WebCore/ChangeLog 2011-12-08 21:06:08 UTC (rev 102372)
+++ trunk/Source/WebCore/ChangeLog 2011-12-08 21:07:57 UTC (rev 102373)
@@ -1,3 +1,16 @@
+2011-12-08 Adrienne Walker <e...@google.com>
+
+ [chromium] Remove dead code in compositor
+ https://bugs.webkit.org/show_bug.cgi?id=74103
+
+ Reviewed by James Robinson.
+
+ Tested via the compiler.
+
+ * platform/graphics/chromium/LayerChromium.h:
+ * platform/graphics/chromium/LayerRendererChromium.cpp:
+ * platform/graphics/chromium/LayerRendererChromium.h:
+
2011-12-08 Eric Penner <epen...@google.com>
[chromium] Need to adjust memory limit and viewport multipliers.
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h (102372 => 102373)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h 2011-12-08 21:06:08 UTC (rev 102372)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h 2011-12-08 21:07:57 UTC (rev 102373)
@@ -169,10 +169,8 @@
virtual void protectVisibleTileTextures() { }
virtual bool needsContentsScale() const { return false; }
- // These exist just for debugging (via drawDebugBorder()).
void setDebugBorderColor(const Color&);
void setDebugBorderWidth(float);
- void drawDebugBorder();
virtual void pushPropertiesTo(CCLayerImpl*);
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (102372 => 102373)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2011-12-08 21:06:08 UTC (rev 102372)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2011-12-08 21:07:57 UTC (rev 102373)
@@ -596,23 +596,6 @@
GraphicsContext3D::RGBA, GraphicsContext3D::UNSIGNED_BYTE, pixels));
}
-// Returns true if any part of the layer falls within the visibleRect
-bool LayerRendererChromium::isLayerVisible(LayerChromium* layer, const TransformationMatrix& matrix, const IntRect& visibleRect)
-{
- // Form the matrix used by the shader to map the corners of the layer's
- // bounds into clip space.
- TransformationMatrix renderMatrix = matrix;
- renderMatrix.scale3d(layer->bounds().width(), layer->bounds().height(), 1);
- renderMatrix = m_projectionMatrix * renderMatrix;
-
- FloatRect layerRect(-0.5, -0.5, 1, 1);
- FloatRect mappedRect = renderMatrix.mapRect(layerRect);
-
- // The layer is visible if it intersects any part of a rectangle whose origin
- // is at (-1, -1) and size is 2x2.
- return mappedRect.intersects(FloatRect(-1, -1, 2, 2));
-}
-
ManagedTexture* LayerRendererChromium::getOffscreenLayerTexture()
{
return settings().compositeOffscreen && rootLayer() ? rootLayer()->renderSurface()->contentsTexture() : 0;
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h (102372 => 102373)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h 2011-12-08 21:06:08 UTC (rev 102372)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h 2011-12-08 21:07:57 UTC (rev 102373)
@@ -172,8 +172,6 @@
ManagedTexture* getOffscreenLayerTexture();
void copyOffscreenTextureToDisplay();
- bool isLayerVisible(LayerChromium*, const TransformationMatrix&, const IntRect& visibleRect);
-
void setDrawViewportRect(const IntRect&, bool flipY);
void releaseRenderSurfaceTextures();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes