am 6ed525ec: When a WebView starts, we may get first layout before viewSizeChanged() ever get called. Call WebView\'s getViewWidth() to get the current UI width. If it is still 0, log a warning.

Merge commit '6ed525ecee76541aa60ca95598330e990fa16ffa' into eclair-plus-aosp

* commit '6ed525ecee76541aa60ca95598330e990fa16ffa':
  When a WebView starts, we may get first layout before viewSizeChanged()

core/java/android/webkit/WebView.java

@@ -905,8 +905,9 @@ public class WebView extends AbsoluteLayout
     /*
      * Return the width of the view where the content of WebView should render
      * to.
+     * Note: this can be called from WebCoreThread.
      */
-    private int getViewWidth() {
+    /* package */ int getViewWidth() {
         if (!isVerticalScrollBarEnabled() || mOverlayVerticalScrollbar) {
             return getWidth();
         } else {
@@ -932,8 +933,9 @@ public class WebView extends AbsoluteLayout
     /*
      * Return the height of the view where the content of WebView should render
      * to.  Note that this excludes mTitleBar, if there is one.
+     * Note: this can be called from WebCoreThread.
      */
-    private int getViewHeight() {
+    /* package */ int getViewHeight() {
         int height = getHeight();
         if (isHorizontalScrollBarEnabled() && !mOverlayHorizontalScrollbar) {
             height -= getHorizontalScrollbarHeight();

core/java/android/webkit/WebViewCore.java

@@ -1890,7 +1890,22 @@ final class WebViewCore {
         if (mViewportWidth != 0 && !updateRestoreState) return;
 
         // now notify webview
-        int webViewWidth = Math.round(mCurrentViewWidth * mCurrentViewScale);
+        // webViewWidth refers to the width in the view system
+        int webViewWidth;
+        // viewportWidth refers to the width in the document system
+        int viewportWidth = mCurrentViewWidth;
+        if (viewportWidth == 0) {
+            // this may happen when WebView just starts. This is not perfect as
+            // we call WebView method from WebCore thread. But not perfect
+            // reference is better than no reference.
+            webViewWidth = mWebView.getViewWidth();
+            viewportWidth = webViewWidth * 100 / WebView.DEFAULT_SCALE_PERCENT;
+            if (viewportWidth == 0) {
+                Log.w(LOGTAG, "Can't get the viewWidth after the first layout");
+            }
+        } else {
+            webViewWidth = Math.round(viewportWidth * mCurrentViewScale);
+        }
         mRestoreState = new RestoreState();
         mRestoreState.mMinScale = mViewportMinimumScale / 100.0f;
         mRestoreState.mMaxScale = mViewportMaximumScale / 100.0f;
@@ -1942,7 +1957,7 @@ final class WebViewCore {
             mEventHub.sendMessageAtFrontOfQueue(Message.obtain(null,
                     EventHub.VIEW_SIZE_CHANGED, data));
         } else if (mSettings.getUseWideViewPort()) {
-            if (mCurrentViewWidth == 0) {
+            if (viewportWidth == 0) {
                 // Trick to ensure VIEW_SIZE_CHANGED will be sent from WebView
                 // to WebViewCore
                 mWebView.mLastWidthSent = 0;
@@ -1956,8 +1971,7 @@ final class WebViewCore {
                                 : mRestoreState.mTextWrapScale)
                         : mRestoreState.mViewScale;
                 data.mWidth = Math.round(webViewWidth / data.mScale);
-                data.mHeight = mCurrentViewHeight * data.mWidth
+                data.mHeight = mCurrentViewHeight * data.mWidth / viewportWidth;
-                        / mCurrentViewWidth;
                 data.mTextWrapWidth = Math.round(webViewWidth
                         / mRestoreState.mTextWrapScale);
                 data.mIgnoreHeight = false;