From 175c4bf762acbd0cfa02e74905fc4041e26ace63 Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Mon, 16 Apr 2012 18:41:37 +0000 Subject: [PATCH] [chromium] Delete uncalled unreserveContentsTextures function https://bugs.webkit.org/show_bug.cgi?id=84005 Patch by James Robinson on 2012-04-16 Reviewed by Adrienne Walker. This is vestigal dead code. * platform/graphics/chromium/Canvas2DLayerChromium.cpp: * platform/graphics/chromium/Canvas2DLayerChromium.h: (Canvas2DLayerChromium): * platform/graphics/chromium/LayerChromium.h: * platform/graphics/chromium/cc/CCLayerImpl.h: (CCLayerImpl): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114284 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 16 ++++++++++++++++ .../platform/graphics/chromium/Canvas2DLayerChromium.cpp | 6 ------ .../platform/graphics/chromium/Canvas2DLayerChromium.h | 1 - .../WebCore/platform/graphics/chromium/LayerChromium.h | 1 - .../WebCore/platform/graphics/chromium/cc/CCLayerImpl.h | 1 - 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index ae49c53..158a14e 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,19 @@ +2012-04-16 James Robinson + + [chromium] Delete uncalled unreserveContentsTextures function + https://bugs.webkit.org/show_bug.cgi?id=84005 + + Reviewed by Adrienne Walker. + + This is vestigal dead code. + + * platform/graphics/chromium/Canvas2DLayerChromium.cpp: + * platform/graphics/chromium/Canvas2DLayerChromium.h: + (Canvas2DLayerChromium): + * platform/graphics/chromium/LayerChromium.h: + * platform/graphics/chromium/cc/CCLayerImpl.h: + (CCLayerImpl): + 2012-04-13 Simon Fraser Avoid using backing store for compositing layers that just need to clip diff --git a/Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.cpp b/Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.cpp index 106090d..124468b 100644 --- a/Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.cpp +++ b/Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.cpp @@ -144,12 +144,6 @@ void Canvas2DLayerChromium::pushPropertiesTo(CCLayerImpl* layer) textureLayer->setTextureId(m_backTextureId); } -void Canvas2DLayerChromium::unreserveContentsTexture() -{ - if (m_useDoubleBuffering) - m_frontTexture->unreserve(); -} - } #endif // USE(ACCELERATED_COMPOSITING) diff --git a/Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.h b/Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.h index 753222e..761b141 100644 --- a/Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.h +++ b/Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.h @@ -57,7 +57,6 @@ public: virtual bool drawsContent() const OVERRIDE; virtual void update(CCTextureUpdater&, const CCOcclusionTracker*) OVERRIDE; virtual void pushPropertiesTo(CCLayerImpl*) OVERRIDE; - virtual void unreserveContentsTexture() OVERRIDE; void setCanvas(SkCanvas*); diff --git a/Source/WebCore/platform/graphics/chromium/LayerChromium.h b/Source/WebCore/platform/graphics/chromium/LayerChromium.h index 58a8d07..6e62261 100644 --- a/Source/WebCore/platform/graphics/chromium/LayerChromium.h +++ b/Source/WebCore/platform/graphics/chromium/LayerChromium.h @@ -179,7 +179,6 @@ public: virtual void update(CCTextureUpdater&, const CCOcclusionTracker*) { } virtual void idleUpdate(CCTextureUpdater&, const CCOcclusionTracker*) { } virtual void setIsMask(bool) { } - virtual void unreserveContentsTexture() { } virtual void bindContentsTexture() { } virtual void protectVisibleTileTextures() { } virtual bool needsContentsScale() const { return false; } diff --git a/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h b/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h index 3f08d68..e929393 100644 --- a/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h +++ b/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h @@ -88,7 +88,6 @@ public: virtual void didDraw() { } void appendDebugBorderQuad(CCQuadCuller&, const CCSharedQuadState*) const; - void unreserveContentsTexture(); virtual void bindContentsTexture(LayerRendererChromium*); // Returns true if this layer has content to draw. -- 2.7.4