[webkit-changes] [114703] trunk/Source/WebCore

[dimich]

Title: [114703] trunk/Source/WebCore

Revision

114703

Author

dim...@chromium.org

Date

2012-04-19 17:33:05 -0700 (Thu, 19 Apr 2012)

Log Message

Unreviewed, rolling out r114690.
http://trac.webkit.org/changeset/114690
https://bugs.webkit.org/show_bug.cgi?id=84408

Broke GlueSerializeTest.BackwardsCompatibleTest in Chromium
test_shell_tests (Requested by dimich on #webkit).

Patch by Sheriff Bot <webkit.review....@gmail.com> on 2012-04-19

* history/HistoryItem.cpp:
(WebCore::HistoryItem::HistoryItem):
* loader/HistoryController.cpp:
(WebCore::HistoryController::restoreScrollPositionAndViewState):

Modified Paths

• trunk/Source/WebCore/ChangeLog
• trunk/Source/WebCore/history/HistoryItem.cpp
• trunk/Source/WebCore/loader/HistoryController.cpp

Diff

Modified: trunk/Source/WebCore/ChangeLog (114702 => 114703)

--- trunk/Source/WebCore/ChangeLog	2012-04-20 00:17:41 UTC (rev 114702)
+++ trunk/Source/WebCore/ChangeLog	2012-04-20 00:33:05 UTC (rev 114703)
@@ -1,3 +1,17 @@
+2012-04-19  Sheriff Bot  <webkit.review....@gmail.com>
+
+        Unreviewed, rolling out r114690.
+        http://trac.webkit.org/changeset/114690
+        https://bugs.webkit.org/show_bug.cgi?id=84408
+
+        Broke GlueSerializeTest.BackwardsCompatibleTest in Chromium
+        test_shell_tests (Requested by dimich on #webkit).
+
+        * history/HistoryItem.cpp:
+        (WebCore::HistoryItem::HistoryItem):
+        * loader/HistoryController.cpp:
+        (WebCore::HistoryController::restoreScrollPositionAndViewState):
+
 2012-04-19  Andreas Kling  <kl...@webkit.org>
 
         ElementAttributeData should be fast-malloc'd.

Modified: trunk/Source/WebCore/history/HistoryItem.cpp (114702 => 114703)

--- trunk/Source/WebCore/history/HistoryItem.cpp	2012-04-20 00:17:41 UTC (rev 114702)
+++ trunk/Source/WebCore/history/HistoryItem.cpp	2012-04-20 00:33:05 UTC (rev 114703)
@@ -61,7 +61,7 @@
 HistoryItem::HistoryItem()
     : m_lastVisitedTime(0)
     , m_lastVisitWasHTTPNonGet(false)
-    , m_pageScaleFactor(0)
+    , m_pageScaleFactor(1)
     , m_lastVisitWasFailure(false)
     , m_isTargetItem(false)
     , m_visitCount(0)
@@ -78,7 +78,7 @@
     , m_title(title)
     , m_lastVisitedTime(time)
     , m_lastVisitWasHTTPNonGet(false)
-    , m_pageScaleFactor(0)
+    , m_pageScaleFactor(1)
     , m_lastVisitWasFailure(false)
     , m_isTargetItem(false)
     , m_visitCount(0)
@@ -97,7 +97,7 @@
     , m_displayTitle(alternateTitle)
     , m_lastVisitedTime(time)
     , m_lastVisitWasHTTPNonGet(false)
-    , m_pageScaleFactor(0)
+    , m_pageScaleFactor(1)
     , m_lastVisitWasFailure(false)
     , m_isTargetItem(false)
     , m_visitCount(0)
@@ -117,7 +117,7 @@
     , m_title(title)
     , m_lastVisitedTime(0)
     , m_lastVisitWasHTTPNonGet(false)
-    , m_pageScaleFactor(0)
+    , m_pageScaleFactor(1)
     , m_lastVisitWasFailure(false)
     , m_isTargetItem(false)
     , m_visitCount(0)

Modified: trunk/Source/WebCore/loader/HistoryController.cpp (114702 => 114703)

--- trunk/Source/WebCore/loader/HistoryController.cpp	2012-04-20 00:17:41 UTC (rev 114702)
+++ trunk/Source/WebCore/loader/HistoryController.cpp	2012-04-20 00:33:05 UTC (rev 114703)
@@ -126,7 +126,7 @@
         if (!view->wasScrolledByUser()) {
             view->setScrollPosition(m_currentItem->scrollPoint());
             Page* page = m_frame->page();
-            if (page && page->mainFrame() == m_frame && m_currentItem->pageScaleFactor())
+            if (page && page->mainFrame() == m_frame)
                 page->setPageScaleFactor(m_currentItem->pageScaleFactor(), m_currentItem->scrollPoint());
         }
     }

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes