From e4a9afa814f96ff1cfaab5a755d903ab16b84650 Mon Sep 17 00:00:00 2001
From: Matthew Hui <mhui@codeaurora.org>
Date: Thu, 20 Sep 2012 10:06:12 -0400
Subject: Revert "Workaround double blit failure"

This reverts commit 0c274b96c2dfb5a83b12a99f1ca9069378f73bdb.

Change-Id: Iaea6c25cf1aae59e7ce85cd43b028ba9c2e437f0
CRs-fixed: 396141
---
 Source/WebCore/platform/graphics/android/rendering/Surface.cpp | 8 --------
 Source/WebCore/platform/graphics/android/rendering/Tile.cpp    | 2 --
 Source/WebCore/platform/graphics/android/rendering/Tile.h      | 2 --
 3 files changed, 12 deletions(-)

(limited to 'Source/WebCore')

diff --git a/Source/WebCore/platform/graphics/android/rendering/Surface.cpp b/Source/WebCore/platform/graphics/android/rendering/Surface.cpp
index 6caf93b..24d8fc9 100644
--- a/Source/WebCore/platform/graphics/android/rendering/Surface.cpp
+++ b/Source/WebCore/platform/graphics/android/rendering/Surface.cpp
@@ -419,14 +419,6 @@ bool Surface::blitFromContents(Tile* tile)
     if (!singleLayer() || !tile || !getFirstLayer() || !getFirstLayer()->content())
         return false;
 
-    if (tile->frontTexture() != tile->lastDrawnTexture()) {
-        // the below works around an issue where glTexSubImage2d can't update a
-        // texture that hasn't drawn yet by drawing it off screen.
-        // glFlush() and glFinish() work also, but are likely more wasteful.
-        SkRect rect = SkRect::MakeXYWH(-100, -100, 0, 0);
-        FloatRect fillPortion(0, 0, 0, 0);
-        tile->frontTexture()->drawGL(false, rect, 1.0f, 0, false, true, fillPortion);
-    }
     LayerContent* content = getFirstLayer()->content();
     // Extract the dirty rect from the region. Note that this is *NOT* constrained
     // to this tile
diff --git a/Source/WebCore/platform/graphics/android/rendering/Tile.cpp b/Source/WebCore/platform/graphics/android/rendering/Tile.cpp
index 76be981..e2b9554 100644
--- a/Source/WebCore/platform/graphics/android/rendering/Tile.cpp
+++ b/Source/WebCore/platform/graphics/android/rendering/Tile.cpp
@@ -52,7 +52,6 @@ Tile::Tile(bool isLayerTile)
     , m_y(-1)
     , m_frontTexture(0)
     , m_backTexture(0)
-    , m_lastDrawnTexture(0)
     , m_scale(1)
     , m_dirty(true)
     , m_repaintsPending(0)
@@ -240,7 +239,6 @@ bool Tile::drawGL(float opacity, const SkRect& rect, float scale,
 
     m_frontTexture->drawGL(isLayerTile(), rect, opacity, transform,
                            forceBlending, usePointSampling, fillPortion);
-    m_lastDrawnTexture = m_frontTexture;
     return true;
 }
 
diff --git a/Source/WebCore/platform/graphics/android/rendering/Tile.h b/Source/WebCore/platform/graphics/android/rendering/Tile.h
index f467bb0..1a50587 100644
--- a/Source/WebCore/platform/graphics/android/rendering/Tile.h
+++ b/Source/WebCore/platform/graphics/android/rendering/Tile.h
@@ -127,7 +127,6 @@ public:
     int y() const { return m_y; }
     TileTexture* frontTexture() { return m_frontTexture; }
     TileTexture* backTexture() { return m_backTexture; }
-    TileTexture* lastDrawnTexture() { return m_lastDrawnTexture; }
 
     // only used for prioritization - the higher, the more relevant the tile is
     unsigned long long drawCount() { return m_drawCount; }
@@ -152,7 +151,6 @@ private:
 
     TileTexture* m_frontTexture;
     TileTexture* m_backTexture;
-    TileTexture* m_lastDrawnTexture;
     float m_scale;
 
     // used to signal that the that the tile is out-of-date and needs to be
-- 
cgit v1.1