Merge "Expand base layer bounds to fill viewport"

3 files changed, 17 insertions, 1 deletions

diff --git a/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp
index 1de5ae7..ce520b4 100644
--- a/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp
@@ -53,4 +53,17 @@ void BaseLayerAndroid::getLocalTransform(SkMatrix* matrix) const
     matrix->preConcat(getMatrix());
 }
 
+IFrameLayerAndroid* BaseLayerAndroid::updatePosition(SkRect viewport,
+                                                     IFrameLayerAndroid* parentIframeLayer)
+{
+    if (viewport.fRight > getWidth() || viewport.fBottom > getHeight()) {
+        // To handle the viewport expanding past the layer's size with HW accel,
+        // expand the size of the layer, so that tiles will cover the viewport.
+        setSize(std::max(viewport.fRight, getWidth()),
+                std::max(viewport.fBottom, getHeight()));
+    }
+
+    return LayerAndroid::updatePosition(viewport, parentIframeLayer);
+}
+
 } // namespace WebCore
diff --git a/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.h b/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.h
index 0ef39c8..f4cf9f3 100644
--- a/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.h
+++ b/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.h
@@ -49,6 +49,8 @@ public:
     virtual void getLocalTransform(SkMatrix* matrix) const;
     virtual const TransformationMatrix* drawTransform() const { return 0; }
 
+    virtual IFrameLayerAndroid* updatePosition(SkRect viewport,
+                                               IFrameLayerAndroid* parentIframeLayer);
 private:
     // TODO: move to SurfaceCollection.
     Color m_color;
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index a4381e6..05666bb 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -306,7 +306,8 @@ PictureSet* draw(SkCanvas* canvas, SkColor bgColor, DrawExtras extras, bool spli
     int sc = canvas->save(SkCanvas::kClip_SaveFlag);
     canvas->clipRect(SkRect::MakeLTRB(0, 0, content->width(),
                 content->height()), SkRegion::kDifference_Op);
-    canvas->drawColor(bgColor);
+    Color c = m_baseLayer->getBackgroundColor();
+    canvas->drawColor(SkColorSetARGBInline(c.alpha(), c.red(), c.green(), c.blue()));
     canvas->restoreToCount(sc);
 
     // call this to be sure we've adjusted for any scrolling or animations