Changeset 116617 in webkit
- Timestamp:
- May 10, 2012 12:38:51 AM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r116616 r116617 1 2012-05-10 Alexandre Elias <aelias@google.com> 2 3 Default to null value for HistoryItem::m_pageScaleFactor 4 https://bugs.webkit.org/show_bug.cgi?id=84385 5 6 Reviewed by Adam Barth. 7 8 Previously, HistoryItem::m_pageScaleFactor defaulted to a value 9 of 1, making it impossible to determine whether this value was never 10 set, or intentionally set to 1. This patch introduces a default value 11 of 0 and makes restoreScrollPositionAndViewState not touch the page 12 scale factor if this value is still present at time of reload. 13 14 This is a no-op change for common navigation scenarios. The 15 motivation for this change is the corner case of syncing history items 16 from a desktop browser to a mobile device. In that case, we need a 17 way to specify that the history item does not contain a 18 pageScaleFactor so that the mobile device does not display the page 19 overly zoomed in. 20 21 No new tests. 22 23 * history/HistoryItem.cpp: 24 (WebCore::HistoryItem::HistoryItem): 25 * loader/HistoryController.cpp: 26 (WebCore::HistoryController::restoreScrollPositionAndViewState): 27 1 28 2012-05-10 Csaba Osztrogonác <ossy@webkit.org> 2 29 -
trunk/Source/WebCore/history/HistoryItem.cpp
r116167 r116617 62 62 : m_lastVisitedTime(0) 63 63 , m_lastVisitWasHTTPNonGet(false) 64 , m_pageScaleFactor( 1)64 , m_pageScaleFactor(0) 65 65 , m_lastVisitWasFailure(false) 66 66 , m_isTargetItem(false) … … 79 79 , m_lastVisitedTime(time) 80 80 , m_lastVisitWasHTTPNonGet(false) 81 , m_pageScaleFactor( 1)81 , m_pageScaleFactor(0) 82 82 , m_lastVisitWasFailure(false) 83 83 , m_isTargetItem(false) … … 98 98 , m_lastVisitedTime(time) 99 99 , m_lastVisitWasHTTPNonGet(false) 100 , m_pageScaleFactor( 1)100 , m_pageScaleFactor(0) 101 101 , m_lastVisitWasFailure(false) 102 102 , m_isTargetItem(false) … … 118 118 , m_lastVisitedTime(0) 119 119 , m_lastVisitWasHTTPNonGet(false) 120 , m_pageScaleFactor( 1)120 , m_pageScaleFactor(0) 121 121 , m_lastVisitWasFailure(false) 122 122 , m_isTargetItem(false) -
trunk/Source/WebCore/loader/HistoryController.cpp
r114703 r116617 127 127 view->setScrollPosition(m_currentItem->scrollPoint()); 128 128 Page* page = m_frame->page(); 129 if (page && page->mainFrame() == m_frame )129 if (page && page->mainFrame() == m_frame && m_currentItem->pageScaleFactor()) 130 130 page->setPageScaleFactor(m_currentItem->pageScaleFactor(), m_currentItem->scrollPoint()); 131 131 }
Note: See TracChangeset
for help on using the changeset viewer.