Changeset 75758 in webkit

Timestamp:

Jan 13, 2011, 5:16:42 PM (15 years ago)

Author:

mthole@apple.com

Message:

The pageScaleFactor() should be saved/restored along with the scroll position
​https://bugs.webkit.org/show_bug.cgi?id=52406
<rdar://problem/8714412>

Reviewed by Darin Adler and Brady Eidson.

• history/HistoryItem.cpp:

(WebCore::HistoryItem::HistoryItem): Initialize m_pageScaleFactor.
(WebCore::HistoryItem::pageScaleFactor): Added getter.
(WebCore::HistoryItem::setPageScaleFactor): Added setter.
(WebCore::HistoryItem::encodeBackForwardTreeNode): Encode m_pageScaleFactor.
(WebCore::HistoryItem::decodeBackForwardTree): Decode m_pageScaleFactor.

• history/HistoryItem.h:
• loader/HistoryController.cpp:

(WebCore::HistoryController::saveScrollPositionAndViewStateToItem): Save the page scale factor...
(WebCore::HistoryController::restoreScrollPositionAndViewState): ...and restore it here.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• history/HistoryItem.cpp (modified) (9 diffs)
• history/HistoryItem.h (modified) (2 diffs)
• loader/HistoryController.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-13  Mike Thole  <mthole@apple.com>
+
+        Reviewed by Darin Adler and Brady Eidson.
+
+        The pageScaleFactor() should be saved/restored along with the scroll position
+        https://bugs.webkit.org/show_bug.cgi?id=52406
+        <rdar://problem/8714412>
+
+        * history/HistoryItem.cpp:
+        (WebCore::HistoryItem::HistoryItem): Initialize m_pageScaleFactor.
+        (WebCore::HistoryItem::pageScaleFactor): Added getter.
+        (WebCore::HistoryItem::setPageScaleFactor): Added setter.
+        (WebCore::HistoryItem::encodeBackForwardTreeNode): Encode m_pageScaleFactor.
+        (WebCore::HistoryItem::decodeBackForwardTree): Decode m_pageScaleFactor.
+        * history/HistoryItem.h:
+        * loader/HistoryController.cpp:
+        (WebCore::HistoryController::saveScrollPositionAndViewStateToItem): Save the page scale factor...
+        (WebCore::HistoryController::restoreScrollPositionAndViewState): ...and restore it here.
+
 2011-01-13  Evan Martin  <evan@chromium.org>
 

trunk/Source/WebCore/history/HistoryItem.cpp

@@ -41 +41 @@
 namespace WebCore {
 
-const uint32_t backForwardTreeEncodingVersion = 0;
+const uint32_t backForwardTreeEncodingVersion = 1;
 
 static long long generateSequenceNumber()
@@ -60 +60 @@
     : m_lastVisitedTime(0)
     , m_lastVisitWasHTTPNonGet(false)
+    , m_pageScaleFactor(1)
     , m_lastVisitWasFailure(false)
     , m_isTargetItem(false)
@@ -74 +75 @@
     , m_lastVisitedTime(time)
     , m_lastVisitWasHTTPNonGet(false)
+    , m_pageScaleFactor(1)
     , m_lastVisitWasFailure(false)
     , m_isTargetItem(false)
@@ -90 +92 @@
     , m_lastVisitedTime(time)
     , m_lastVisitWasHTTPNonGet(false)
+    , m_pageScaleFactor(1)
     , m_lastVisitWasFailure(false)
     , m_isTargetItem(false)
@@ -107 +110 @@
     , m_lastVisitedTime(0)
     , m_lastVisitWasHTTPNonGet(false)
+    , m_pageScaleFactor(1)
     , m_lastVisitWasFailure(false)
     , m_isTargetItem(false)
@@ -138 +142 @@
     , m_lastVisitWasHTTPNonGet(item.m_lastVisitWasHTTPNonGet)
     , m_scrollPoint(item.m_scrollPoint)
+    , m_pageScaleFactor(item.m_pageScaleFactor)
     , m_lastVisitWasFailure(item.m_lastVisitWasFailure)
     , m_isTargetItem(item.m_isTargetItem)
@@ -378 +383 @@
     m_scrollPoint.setX(0);
     m_scrollPoint.setY(0);
+}
+
+float HistoryItem::pageScaleFactor() const
+{
+    return m_pageScaleFactor;
+}
+
+void HistoryItem::setPageScaleFactor(float scaleFactor)
+{
+    m_pageScaleFactor = scaleFactor;
 }
 
@@ -668 +683 @@
     encoder.encodeInt32(m_scrollPoint.x());
     encoder.encodeInt32(m_scrollPoint.y());
+    
+    encoder.encodeFloat(m_pageScaleFactor);
 
     encoder.encodeBool(m_stateObject);
@@ -777 +794 @@
         return 0;
     node->m_scrollPoint = IntPoint(x, y);
+    
+    if (!decoder.decodeFloat(node->m_pageScaleFactor))
+        return 0;
 
     bool hasStateObject;

trunk/Source/WebCore/history/HistoryItem.h

@@ -124 +124 @@
     void setScrollPoint(const IntPoint&);
     void clearScrollPoint();
+    
+    float pageScaleFactor() const;
+    void setPageScaleFactor(float);
+    
     const Vector<String>& documentState() const;
     void setDocumentState(const Vector<String>&);
@@ -246 +250 @@
 
     IntPoint m_scrollPoint;
+    float m_pageScaleFactor;
     Vector<String> m_documentState;
     

trunk/Source/WebCore/loader/HistoryController.cpp

@@ -81 +81 @@
         
     item->setScrollPoint(m_frame->view()->scrollPosition());
+    item->setPageScaleFactor(m_frame->pageScaleFactor());
+    
     // FIXME: It would be great to work out a way to put this code in WebCore instead of calling through to the client.
     m_frame->loader()->client()->saveViewStateToItem(item);
@@ -115 +117 @@
     m_frame->loader()->client()->restoreViewState();
     
-    if (FrameView* view = m_frame->view())
-        if (!view->wasScrolledByUser())
+    if (FrameView* view = m_frame->view()) {
+        if (!view->wasScrolledByUser()) {
             view->setScrollPosition(m_currentItem->scrollPoint());
+            m_frame->scalePage(m_currentItem->pageScaleFactor(), m_currentItem->scrollPoint());
+        }
+    }
 }