Changeset 114690 in webkit

Timestamp:

Apr 19, 2012 4:30:28 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Default to null value for HistoryItem::m_pageScaleFactor
​https://bugs.webkit.org/show_bug.cgi?id=84385

Patch by Alexandre Elias <​aelias@google.com> on 2012-04-19
Reviewed by Nate Chapin.

Previously, HistoryItem::m_pageScaleFactor defaulted to a value
of 1, making it impossible to determine whether this value was never
set, or intentionally set to 1. This patch introduces a default value
of 0 and makes restoreScrollPositionAndViewState not touch the page
scale factor if this value is still present at time of reload.

This is a no-op change for common navigation scenarios. The
motivation for this change is the corner case of syncing history items
from a desktop browser to a mobile device. In that case, we need a
way to specify that the history item does not contain a
pageScaleFactor so that the mobile device does not display the page
overly zoomed in.

No new tests.

• history/HistoryItem.cpp:

(WebCore::HistoryItem::HistoryItem):

• loader/HistoryController.cpp:

(WebCore::HistoryController::restoreScrollPositionAndViewState):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• history/HistoryItem.cpp (modified) (4 diffs)
• loader/HistoryController.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-19  Alexandre Elias  <aelias@google.com>
+
+        Default to null value for HistoryItem::m_pageScaleFactor
+        https://bugs.webkit.org/show_bug.cgi?id=84385
+
+        Reviewed by Nate Chapin.
+
+        Previously, HistoryItem::m_pageScaleFactor defaulted to a value
+        of 1, making it impossible to determine whether this value was never
+        set, or intentionally set to 1.  This patch introduces a default value
+        of 0 and makes restoreScrollPositionAndViewState not touch the page
+        scale factor if this value is still present at time of reload.
+
+        This is a no-op change for common navigation scenarios.  The
+        motivation for this change is the corner case of syncing history items
+        from a desktop browser to a mobile device.  In that case, we need a
+        way to specify that the history item does not contain a
+        pageScaleFactor so that the mobile device does not display the page
+        overly zoomed in.
+
+        No new tests.
+
+        * history/HistoryItem.cpp:
+        (WebCore::HistoryItem::HistoryItem):
+        * loader/HistoryController.cpp:
+        (WebCore::HistoryController::restoreScrollPositionAndViewState):
+
 2012-04-19  Alexis Menard  <alexis.menard@openbossa.org>
 

trunk/Source/WebCore/history/HistoryItem.cpp

@@ -62 +62 @@
     : m_lastVisitedTime(0)
     , m_lastVisitWasHTTPNonGet(false)
-    , m_pageScaleFactor(1)
+    , m_pageScaleFactor(0)
     , m_lastVisitWasFailure(false)
     , m_isTargetItem(false)
@@ -79 +79 @@
     , m_lastVisitedTime(time)
     , m_lastVisitWasHTTPNonGet(false)
-    , m_pageScaleFactor(1)
+    , m_pageScaleFactor(0)
     , m_lastVisitWasFailure(false)
     , m_isTargetItem(false)
@@ -98 +98 @@
     , m_lastVisitedTime(time)
     , m_lastVisitWasHTTPNonGet(false)
-    , m_pageScaleFactor(1)
+    , m_pageScaleFactor(0)
     , m_lastVisitWasFailure(false)
     , m_isTargetItem(false)
@@ -118 +118 @@
     , m_lastVisitedTime(0)
     , m_lastVisitWasHTTPNonGet(false)
-    , m_pageScaleFactor(1)
+    , m_pageScaleFactor(0)
     , m_lastVisitWasFailure(false)
     , m_isTargetItem(false)

trunk/Source/WebCore/loader/HistoryController.cpp

@@ -127 +127 @@
             view->setScrollPosition(m_currentItem->scrollPoint());
             Page* page = m_frame->page();
-            if (page && page->mainFrame() == m_frame)
+            if (page && page->mainFrame() == m_frame && m_currentItem->pageScaleFactor())
                 page->setPageScaleFactor(m_currentItem->pageScaleFactor(), m_currentItem->scrollPoint());
         }