Merge "Fix 3366514, browser emulator no longer crashes" into honeycomb

[android-x86/external-webkit.git] / WebCore / platform / graphics / android / BaseLayerAndroid.cpp

diff --git a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
index c602d63..2446cb1 100644 (file)
--- a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
@@ -121,8 +121,6 @@ void BaseLayerAndroid::drawCanvas(SkCanvas* canvas)
 #if USE(ACCELERATED_COMPOSITING)
 bool BaseLayerAndroid::drawBasePictureInGL(SkRect& viewport, float scale)
 {
-    if (m_content.isEmpty())
-        return false;
     if (!m_glWebViewState)
         return false;
 
@@ -269,9 +267,6 @@ bool BaseLayerAndroid::drawGL(IntRect& viewRect, SkRect& visibleRect,
     XLOG("drawBasePicture drawGL() viewRect: %d, %d, %d, %d",
          left, top, width, height);
 
-    glEnable(GL_SCISSOR_TEST);
-
-    glScissor(left, top, width, height);
     glClearColor((float)m_color.red() / 255.0,
                  (float)m_color.green() / 255.0,
                  (float)m_color.blue() / 255.0, 1);
@@ -340,7 +335,6 @@ bool BaseLayerAndroid::drawGL(IntRect& viewRect, SkRect& visibleRect,
     } else {
         TilesManager::instance()->cleanupLayersTextures(0);
     }
-    glDisable(GL_SCISSOR_TEST);
 
     glBindBuffer(GL_ARRAY_BUFFER, 0);
     m_previousVisible = visibleRect;