2 files changed, 11 insertions, 9 deletions

diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index 134408a..f35f768 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -945,20 +945,22 @@ bool WebViewCore::updateLayers(LayerAndroid* layers)
     return true;
 }
 
-BaseLayerAndroid* WebViewCore::createBaseLayer()
+BaseLayerAndroid* WebViewCore::createBaseLayer(SkRegion* region)
 {
     BaseLayerAndroid* base = new BaseLayerAndroid();
     base->setContent(m_content);
 
-    m_skipContentDraw = true;
-    bool layoutSucceeded = layoutIfNeededRecursive(m_mainFrame);
-    m_skipContentDraw = false;
-    // Layout only fails if called during a layout.
-    LOG_ASSERT(layoutSucceeded, "Can never be called recursively");
+    if (!region->isEmpty()) {
+        m_skipContentDraw = true;
+        bool layoutSucceeded = layoutIfNeededRecursive(m_mainFrame);
+        m_skipContentDraw = false;
+        // Layout only fails if called during a layout.
+        LOG_ASSERT(layoutSucceeded, "Can never be called recursively");
+    }
 
 #if USE(ACCELERATED_COMPOSITING)
     // We set the background color
-    if (m_mainFrame && m_mainFrame->document()
+    if (!region->isEmpty() && m_mainFrame && m_mainFrame->document()
         && m_mainFrame->document()->body()) {
         Document* document = m_mainFrame->document();
         RefPtr<RenderStyle> style = document->styleForElementIgnoringPendingStylesheets(document->body());
@@ -1013,7 +1015,7 @@ BaseLayerAndroid* WebViewCore::recordContent(SkRegion* region, SkIPoint* point)
         region->getBounds().fBottom);
     DBG_SET_LOG("end");
 
-    return createBaseLayer();
+    return createBaseLayer(region);
 }
 
 void WebViewCore::splitContent(PictureSet* content)
diff --git a/Source/WebKit/android/jni/WebViewCore.h b/Source/WebKit/android/jni/WebViewCore.h
index 491a0ad..ea57c11 100644
--- a/Source/WebKit/android/jni/WebViewCore.h
+++ b/Source/WebKit/android/jni/WebViewCore.h
@@ -527,7 +527,7 @@ namespace android {
         // This creates a new BaseLayerAndroid by copying the current m_content
         // and doing a copy of the layers. The layers' content may be updated
         // as we are calling layersSync().
-        BaseLayerAndroid* createBaseLayer();
+        BaseLayerAndroid* createBaseLayer(SkRegion*);
         bool updateLayers(LayerAndroid*);
 
         int textWrapWidth() const { return m_textWrapWidth; }