Changeset 122589 in webkit

Timestamp:

Jul 13, 2012 9:11:13 AM (12 years ago)

Author:

zhajiang@rim.com

Message:

[BlackBerry] resetBitmapZoomScale called while zooming preventing pinch zoom
​https://bugs.webkit.org/show_bug.cgi?id=91247

Reviewed by Antonio Gomes.
Patch by Jacky Jiang <​zhajiang@rim.com>

PR: 175432
On yahoo.com, the web page stopped zooming while trying to pinch as
WebPageClient::resetBitmapZoomScale(double) was being called by
WebPagePrivate::zoomToInitialScaleOnLoad() after load finished.
And also yahoo.com was keeping updating layout, which made it really
bad that zoomToInitialScaleOnLoad() was called many times when load
finished and the load type was FrameLoadTypeStandard or FrameLoadTypeSame.
As we only care about the situation that dispatchDidFirstVisuallyNonEmptyLayout()
happens after load finished, we can move the code to that method and
set a flag for WebPage layoutFinished() and zoomToInitialScaleOnLoad()
instead. In this way, we can ensure that the flag is only enabled when
dispatchDidFirstVisuallyNonEmptyLayout() is called after load finished
and get rid of calling zoomToInitialScaleOnLoad() lots of times when
keeping updating layout in such kind of situation.

Internally reviewed by Arvid Nilsson

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::WebPagePrivate):
(BlackBerry::WebKit::WebPagePrivate::setLoadState):
(BlackBerry::WebKit::WebPagePrivate::layoutFinished):

• Api/WebPage_p.h:

(BlackBerry::WebKit::WebPagePrivate::shouldZoomToInitialScaleOnLoad):
(BlackBerry::WebKit::WebPagePrivate::setShouldZoomToInitialScaleAfterLoadFinished):
(WebPagePrivate):

• WebCoreSupport/FrameLoaderClientBlackBerry.cpp:

(WebCore::FrameLoaderClientBlackBerry::dispatchDidFirstVisuallyNonEmptyLayout):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPage.cpp (modified) (4 diffs)
• Api/WebPage_p.h (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• WebCoreSupport/FrameLoaderClientBlackBerry.cpp (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -338 +338 @@
     , m_activationState(ActivationActive)
     , m_shouldResetTilesWhenShown(false)
+    , m_shouldZoomToInitialScaleAfterLoadFinished(false)
     , m_userScalable(true)
     , m_userPerformedManualZoom(false)
@@ -1055 +1056 @@
             m_backingStore->d->resetTiles(true /* resetBackground */);
             m_backingStore->d->setScrollingOrZooming(false, false /* shouldBlit */);
+            m_shouldZoomToInitialScaleAfterLoadFinished = false;
             m_userPerformedManualZoom = false;
             m_userPerformedManualScroll = false;
@@ -1700 +1702 @@
     m_nestedLayoutFinishedCount++;
 
-    if (shouldZoomToInitialScaleOnLoad())
+    if (shouldZoomToInitialScaleOnLoad()) {
         zoomToInitialScaleOnLoad();
-    else if (loadState() != None)
+        m_shouldZoomToInitialScaleAfterLoadFinished = false;
+    } else if (loadState() != None)
         notifyTransformedContentsSizeChanged();
 
@@ -1735 +1738 @@
         }
     }
-}
-
-bool WebPagePrivate::shouldZoomToInitialScaleOnLoad() const
-{
-    // For FrameLoadTypeSame or FrameLoadTypeStandard load, the layout timer can be fired which can call dispatchDidFirstVisuallyNonEmptyLayout()
-    // after the load Finished state, in which case the web page will have no chance to zoom to initial scale. So we should give it a chance,
-    // otherwise the scale of the web page can be incorrect.
-    FrameLoadType frameLoadType = FrameLoadTypeStandard;
-    if (m_mainFrame && m_mainFrame->loader())
-        frameLoadType = m_mainFrame->loader()->loadType();
-    if (m_loadState == Committed || (m_loadState == Finished && (frameLoadType == FrameLoadTypeSame || frameLoadType == FrameLoadTypeStandard)))
-        return true;
-    return false;
 }
 

trunk/Source/WebKit/blackberry/Api/WebPage_p.h

@@ -208 +208 @@
     void notifyDismissAutofillDialog();
 
-    bool shouldZoomToInitialScaleOnLoad() const;
+    bool shouldZoomToInitialScaleOnLoad() const { return loadState() == Committed || m_shouldZoomToInitialScaleAfterLoadFinished; }
+    void setShouldZoomToInitialScaleAfterLoadFinished(bool shouldZoomToInitialScaleAfterLoadFinished)
+    {
+        m_shouldZoomToInitialScaleAfterLoadFinished = shouldZoomToInitialScaleAfterLoadFinished;
+    }
+
     // Called according to our heuristic or from setLoadState depending on whether we have a virtual viewport.
     void zoomToInitialScaleOnLoad();
@@ -461 +466 @@
     ActivationStateType m_activationState;
     bool m_shouldResetTilesWhenShown;
+    bool m_shouldZoomToInitialScaleAfterLoadFinished;
     bool m_userScalable;
     bool m_userPerformedManualZoom;

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-07-13  Jacky Jiang  <zhajiang@rim.com>
+
+        [BlackBerry] resetBitmapZoomScale called while zooming preventing pinch zoom
+        https://bugs.webkit.org/show_bug.cgi?id=91247
+
+        Reviewed by Antonio Gomes.
+
+        PR: 175432
+        On yahoo.com, the web page stopped zooming while trying to pinch as
+        WebPageClient::resetBitmapZoomScale(double) was being called by
+        WebPagePrivate::zoomToInitialScaleOnLoad() after load finished.
+        And also yahoo.com was keeping updating layout, which made it really
+        bad that zoomToInitialScaleOnLoad() was called many times when load
+        finished and the load type was FrameLoadTypeStandard or FrameLoadTypeSame.
+        As we only care about the situation that dispatchDidFirstVisuallyNonEmptyLayout()
+        happens after load finished, we can move the code to that method and
+        set a flag for WebPage layoutFinished() and zoomToInitialScaleOnLoad()
+        instead. In this way, we can ensure that the flag is only enabled when
+        dispatchDidFirstVisuallyNonEmptyLayout() is called after load finished
+        and get rid of calling zoomToInitialScaleOnLoad() lots of times when
+        keeping updating layout in such kind of situation.
+
+        Internally reviewed by Arvid Nilsson
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::WebPagePrivate):
+        (BlackBerry::WebKit::WebPagePrivate::setLoadState):
+        (BlackBerry::WebKit::WebPagePrivate::layoutFinished):
+        * Api/WebPage_p.h:
+        (BlackBerry::WebKit::WebPagePrivate::shouldZoomToInitialScaleOnLoad):
+        (BlackBerry::WebKit::WebPagePrivate::setShouldZoomToInitialScaleAfterLoadFinished):
+        (WebPagePrivate):
+        * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
+        (WebCore::FrameLoaderClientBlackBerry::dispatchDidFirstVisuallyNonEmptyLayout):
+
 2012-07-13  Jakob Petsovits  <jpetsovits@rim.com>
 

trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp

@@ -826 +826 @@
     readyToRender(true);
 
+    // For FrameLoadTypeSame or FrameLoadTypeStandard load, the layout timer can be fired which can call
+    // dispatchDidFirstVisuallyNonEmptyLayout() after the load Finished state, in which case the web page
+    // will have no chance to zoom to initial scale. So we should give it a chance, otherwise the scale of
+    // the web page can be incorrect.
+    FrameLoadType frameLoadType = m_frame->loader()->loadType();
+    if (m_webPagePrivate->loadState() == WebPagePrivate::Finished && (frameLoadType == FrameLoadTypeSame || frameLoadType == FrameLoadTypeStandard))
+        m_webPagePrivate->setShouldZoomToInitialScaleAfterLoadFinished(true);
+
     if (m_webPagePrivate->shouldZoomToInitialScaleOnLoad()) {
         m_webPagePrivate->zoomToInitialScaleOnLoad(); // Set the proper zoom level first.