Fix issues with setting viewstate before initializing

 Allow drawing without a CachedRoot (just skip drawing extras in that case)
 Initialize PictureSet correctly when using the SkPicture ctor
 If delay-setting a layer on glWebViewState, set isAfterFirstLayout to
 true to force the baseLayer update.

Change-Id: I9b24fd2e8450acf0138433edce8700c9ec227e52

1 files changed, 8 insertions, 2 deletions

diff --git a/Source/WebKit/android/jni/PictureSet.cpp b/Source/WebKit/android/jni/PictureSet.cpp
index 181256c..98d7438 100644
--- a/Source/WebKit/android/jni/PictureSet.cpp
+++ b/Source/WebKit/android/jni/PictureSet.cpp
@@ -83,13 +83,19 @@ PictureSet::PictureSet()
 
 PictureSet::PictureSet(SkPicture* picture)
 {
-    if (!picture)
+    mBaseArea = mAdditionalArea = 0;
+    if (!picture) {
+        mWidth = mHeight = 0;
         return;
+    }
+    mWidth = picture->width();
+    mHeight = picture->height();
+    mBaseArea = mWidth * mHeight;
     Pictures pictureAndBounds;
     pictureAndBounds.mPicture = picture;
     SkSafeRef(pictureAndBounds.mPicture);
     pictureAndBounds.mEmpty = false;
-    pictureAndBounds.mArea.setRect(0, 0, picture->width(), picture->height());
+    pictureAndBounds.mArea.setRect(0, 0, mWidth, mHeight);
     pictureAndBounds.mSplit = false;
     pictureAndBounds.mBase = true;
     pictureAndBounds.mElapsed = 0;