Revert a WAR.

Revert a WAR for issue 3215000.
https://android-git.corp.google.com/g/#change,81012

With the current fix, this WAR is not necessary.
b:3215000

Change-Id: I47261f19fbd87864d6b41edfbdb50be1fbbfccc7

3 files changed, 0 insertions, 14 deletions

diff --git a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
index f71ee88..b84831d 100644
--- a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
@@ -240,12 +240,6 @@ bool BaseLayerAndroid::drawGL(IntRect& viewRect, SkRect& visibleRect,
     glEnable(GL_SCISSOR_TEST);
 
     glScissor(left, top, width, height);
-    if (!m_glWebViewState || !m_glWebViewState->hasContent()) {
-        glClearColor(1, 1, 1, 1);
-        glClear(GL_COLOR_BUFFER_BIT);
-        glBindBuffer(GL_ARRAY_BUFFER, 0);
-        return true;
-    }
     glClearColor((float)m_color.red() / 255.0,
                  (float)m_color.green() / 255.0,
                  (float)m_color.blue() / 255.0, 1);
diff --git a/WebCore/platform/graphics/android/GLWebViewState.cpp b/WebCore/platform/graphics/android/GLWebViewState.cpp
index 7c2f851..1c32848 100644
--- a/WebCore/platform/graphics/android/GLWebViewState.cpp
+++ b/WebCore/platform/graphics/android/GLWebViewState.cpp
@@ -237,12 +237,6 @@ void GLWebViewState::setViewport(SkRect& viewport, float scale)
             static_cast<int>(ceilf(viewport.fBottom * invTileContentHeight)));
 }
 
-bool GLWebViewState::hasContent()
-{
-    android::Mutex::Autolock lock(m_baseLayerLock);
-    return m_baseLayer;
-}
-
 } // namespace WebCore
 
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/WebCore/platform/graphics/android/GLWebViewState.h b/WebCore/platform/graphics/android/GLWebViewState.h
index 3b6f1d1..c627a6e 100644
--- a/WebCore/platform/graphics/android/GLWebViewState.h
+++ b/WebCore/platform/graphics/android/GLWebViewState.h
@@ -191,8 +191,6 @@ public:
 
     unsigned int currentPictureCounter() const { return m_currentPictureCounter; }
 
-    bool hasContent();
-
 private:
     void inval(const IntRect& rect); // caller must hold m_baseLayerLock