<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[194492] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/194492">194492</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-01-01 21:56:29 -0800 (Fri, 01 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix naming in HistoryItem to refer to scrollPositions
https://bugs.webkit.org/show_bug.cgi?id=152646
Reviewed by Zalan Bujtas.
Source/WebCore:
HistoryItem stores a scrollPosition, so call it that.
No behavior change.
* history/HistoryItem.cpp:
(WebCore::HistoryItem::HistoryItem):
(WebCore::HistoryItem::scrollPosition):
(WebCore::HistoryItem::setScrollPosition):
(WebCore::HistoryItem::clearScrollPosition):
(WebCore::HistoryItem::scrollPoint): Deleted.
(WebCore::HistoryItem::setScrollPoint): Deleted.
(WebCore::HistoryItem::clearScrollPoint): Deleted.
* history/HistoryItem.h:
* loader/HistoryController.cpp:
(WebCore::HistoryController::saveScrollPositionAndViewStateToItem):
(WebCore::HistoryController::clearScrollPositionAndViewState):
(WebCore::HistoryController::restoreScrollPositionAndViewState):
(WebCore::HistoryController::updateForClientRedirect):
Source/WebKit/mac:
HistoryItem stores a scrollPosition, so call it that.
* History/WebHistoryItem.mm:
(-[WebHistoryItem scrollPoint]):
Source/WebKit2:
HistoryItem stores a scrollPosition, so call it that.
No behavior change.
* Shared/SessionState.cpp:
(WebKit::FrameState::encode):
(WebKit::FrameState::decode):
* Shared/SessionState.h:
* UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::encodeFrameStateNode):
(WebKit::decodeBackForwardTreeNode):
* WebProcess/WebCoreSupport/SessionStateConversion.cpp:
(WebKit::toFrameState):
(WebKit::applyFrameState):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehistoryHistoryItemcpp">trunk/Source/WebCore/history/HistoryItem.cpp</a></li>
<li><a href="#trunkSourceWebCorehistoryHistoryItemh">trunk/Source/WebCore/history/HistoryItem.h</a></li>
<li><a href="#trunkSourceWebCoreloaderHistoryControllercpp">trunk/Source/WebCore/loader/HistoryController.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebHistoryItemmm">trunk/Source/WebKit/mac/History/WebHistoryItem.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedSessionStatecpp">trunk/Source/WebKit2/Shared/SessionState.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedSessionStateh">trunk/Source/WebKit2/Shared/SessionState.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacLegacySessionStateCodingcpp">trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportSessionStateConversioncpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194491 => 194492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-02 05:53:01 UTC (rev 194491)
+++ trunk/Source/WebCore/ChangeLog 2016-01-02 05:56:29 UTC (rev 194492)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-01-01 Simon Fraser <simon.fraser@apple.com>
+
+ Fix naming in HistoryItem to refer to scrollPositions
+ https://bugs.webkit.org/show_bug.cgi?id=152646
+
+ Reviewed by Zalan Bujtas.
+
+ HistoryItem stores a scrollPosition, so call it that.
+
+ No behavior change.
+
+ * history/HistoryItem.cpp:
+ (WebCore::HistoryItem::HistoryItem):
+ (WebCore::HistoryItem::scrollPosition):
+ (WebCore::HistoryItem::setScrollPosition):
+ (WebCore::HistoryItem::clearScrollPosition):
+ (WebCore::HistoryItem::scrollPoint): Deleted.
+ (WebCore::HistoryItem::setScrollPoint): Deleted.
+ (WebCore::HistoryItem::clearScrollPoint): Deleted.
+ * history/HistoryItem.h:
+ * loader/HistoryController.cpp:
+ (WebCore::HistoryController::saveScrollPositionAndViewStateToItem):
+ (WebCore::HistoryController::clearScrollPositionAndViewState):
+ (WebCore::HistoryController::restoreScrollPositionAndViewState):
+ (WebCore::HistoryController::updateForClientRedirect):
+
</ins><span class="cx"> 2016-01-01 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Simple line layout: Add support for toggling simple line layout from command line.
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryHistoryItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/HistoryItem.cpp (194491 => 194492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/HistoryItem.cpp 2016-01-02 05:53:01 UTC (rev 194491)
+++ trunk/Source/WebCore/history/HistoryItem.cpp 2016-01-02 05:56:29 UTC (rev 194492)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> , m_target(item.m_target)
</span><span class="cx"> , m_title(item.m_title)
</span><span class="cx"> , m_displayTitle(item.m_displayTitle)
</span><del>- , m_scrollPoint(item.m_scrollPoint)
</del><ins>+ , m_scrollPosition(item.m_scrollPosition)
</ins><span class="cx"> , m_pageScaleFactor(item.m_pageScaleFactor)
</span><span class="cx"> , m_lastVisitWasFailure(item.m_lastVisitWasFailure)
</span><span class="cx"> , m_isTargetItem(item.m_isTargetItem)
</span><span class="lines">@@ -277,20 +277,19 @@
</span><span class="cx"> notifyHistoryItemChanged(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const IntPoint& HistoryItem::scrollPoint() const
</del><ins>+const IntPoint& HistoryItem::scrollPosition() const
</ins><span class="cx"> {
</span><del>- return m_scrollPoint;
</del><ins>+ return m_scrollPosition;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void HistoryItem::setScrollPoint(const IntPoint& point)
</del><ins>+void HistoryItem::setScrollPosition(const IntPoint& position)
</ins><span class="cx"> {
</span><del>- m_scrollPoint = point;
</del><ins>+ m_scrollPosition = position;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void HistoryItem::clearScrollPoint()
</del><ins>+void HistoryItem::clearScrollPosition()
</ins><span class="cx"> {
</span><del>- m_scrollPoint.setX(0);
- m_scrollPoint.setY(0);
</del><ins>+ m_scrollPosition = IntPoint();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float HistoryItem::pageScaleFactor() const
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryHistoryItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/HistoryItem.h (194491 => 194492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/HistoryItem.h 2016-01-02 05:53:01 UTC (rev 194491)
+++ trunk/Source/WebCore/history/HistoryItem.h 2016-01-02 05:56:29 UTC (rev 194492)
</span><span class="lines">@@ -102,9 +102,9 @@
</span><span class="cx">
</span><span class="cx"> bool lastVisitWasFailure() const { return m_lastVisitWasFailure; }
</span><span class="cx">
</span><del>- WEBCORE_EXPORT const IntPoint& scrollPoint() const;
- WEBCORE_EXPORT void setScrollPoint(const IntPoint&);
- void clearScrollPoint();
</del><ins>+ WEBCORE_EXPORT const IntPoint& scrollPosition() const;
+ WEBCORE_EXPORT void setScrollPosition(const IntPoint&);
+ void clearScrollPosition();
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT float pageScaleFactor() const;
</span><span class="cx"> WEBCORE_EXPORT void setPageScaleFactor(float);
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> String m_title;
</span><span class="cx"> String m_displayTitle;
</span><span class="cx">
</span><del>- IntPoint m_scrollPoint;
</del><ins>+ IntPoint m_scrollPosition;
</ins><span class="cx"> float m_pageScaleFactor;
</span><span class="cx"> Vector<String> m_documentState;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderHistoryControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/HistoryController.cpp (194491 => 194492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/HistoryController.cpp 2016-01-02 05:53:01 UTC (rev 194491)
+++ trunk/Source/WebCore/loader/HistoryController.cpp 2016-01-02 05:56:29 UTC (rev 194492)
</span><span class="lines">@@ -76,9 +76,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_frame.document()->inPageCache())
</span><del>- item->setScrollPoint(frameView->cachedScrollPosition());
</del><ins>+ item->setScrollPosition(frameView->cachedScrollPosition());
</ins><span class="cx"> else
</span><del>- item->setScrollPoint(frameView->scrollPosition());
</del><ins>+ item->setScrollPosition(frameView->scrollPosition());
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> item->setExposedContentRect(frameView->exposedContentRect());
</span><span class="cx"> item->setUnobscuredContentRect(frameView->unobscuredContentRect());
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> if (!m_currentItem)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_currentItem->clearScrollPoint();
</del><ins>+ m_currentItem->clearScrollPosition();
</ins><span class="cx"> m_currentItem->setPageScaleFactor(0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> // Don't restore scroll point on iOS as FrameLoaderClient::restoreViewState() does that.
</span><span class="cx"> if (view && !view->wasScrolledByUser()) {
</span><span class="cx"> Page* page = m_frame.page();
</span><del>- auto desiredScrollPosition = m_currentItem->scrollPoint();
</del><ins>+ auto desiredScrollPosition = m_currentItem->scrollPosition();
</ins><span class="cx">
</span><span class="cx"> if (page && m_frame.isMainFrame() && m_currentItem->pageScaleFactor())
</span><span class="cx"> page->setPageScaleFactor(m_currentItem->pageScaleFactor() * page->viewScaleFactor(), desiredScrollPosition);
</span><span class="lines">@@ -449,7 +449,7 @@
</span><span class="cx"> // webcore has closed the URL and saved away the form state.
</span><span class="cx"> if (m_currentItem) {
</span><span class="cx"> m_currentItem->clearDocumentState();
</span><del>- m_currentItem->clearScrollPoint();
</del><ins>+ m_currentItem->clearScrollPosition();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool needPrivacy = m_frame.page()->usesEphemeralSession();
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (194491 => 194492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-01-02 05:53:01 UTC (rev 194491)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-01-02 05:56:29 UTC (rev 194492)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-01-01 Simon Fraser <simon.fraser@apple.com>
+
+ Fix naming in HistoryItem to refer to scrollPositions
+ https://bugs.webkit.org/show_bug.cgi?id=152646
+
+ Reviewed by Zalan Bujtas.
+
+ HistoryItem stores a scrollPosition, so call it that.
+
+ * History/WebHistoryItem.mm:
+ (-[WebHistoryItem scrollPoint]):
+
</ins><span class="cx"> 2016-01-01 Jeff Miller <jeffm@apple.com>
</span><span class="cx">
</span><span class="cx"> Update user-visible copyright strings to include 2016
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistoryItemmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistoryItem.mm (194491 => 194492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2016-01-02 05:53:01 UTC (rev 194491)
+++ trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2016-01-02 05:56:29 UTC (rev 194492)
</span><span class="lines">@@ -393,7 +393,7 @@
</span><span class="cx">
</span><span class="cx"> - (NSPoint)scrollPoint
</span><span class="cx"> {
</span><del>- return core(_private)->scrollPoint();
</del><ins>+ return core(_private)->scrollPosition();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_visitedWithTitle:(NSString *)title
</span><span class="lines">@@ -610,12 +610,12 @@
</span><span class="cx">
</span><span class="cx"> - (CGPoint)_scrollPoint
</span><span class="cx"> {
</span><del>- return core(_private)->scrollPoint();
</del><ins>+ return core(_private)->scrollPosition();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_setScrollPoint:(CGPoint)scrollPoint
</span><span class="cx"> {
</span><del>- core(_private)->setScrollPoint(IntPoint(scrollPoint));
</del><ins>+ core(_private)->setScrollPosition(IntPoint(scrollPoint));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (uint32_t)_bookmarkID
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (194491 => 194492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-01-02 05:53:01 UTC (rev 194491)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-02 05:56:29 UTC (rev 194492)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2016-01-01 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Fix naming in HistoryItem to refer to scrollPositions
+ https://bugs.webkit.org/show_bug.cgi?id=152646
+
+ Reviewed by Zalan Bujtas.
+
+ HistoryItem stores a scrollPosition, so call it that.
+
+ No behavior change.
+
+ * Shared/SessionState.cpp:
+ (WebKit::FrameState::encode):
+ (WebKit::FrameState::decode):
+ * Shared/SessionState.h:
+ * UIProcess/mac/LegacySessionStateCoding.cpp:
+ (WebKit::encodeFrameStateNode):
+ (WebKit::decodeBackForwardTreeNode):
+ * WebProcess/WebCoreSupport/SessionStateConversion.cpp:
+ (WebKit::toFrameState):
+ (WebKit::applyFrameState):
+
+2016-01-01 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Fix reload and programmatic scrolling in RTL documents
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=152639
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedSessionStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/SessionState.cpp (194491 => 194492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/SessionState.cpp 2016-01-02 05:53:01 UTC (rev 194491)
+++ trunk/Source/WebKit2/Shared/SessionState.cpp 2016-01-02 05:56:29 UTC (rev 194492)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> encoder << documentSequenceNumber;
</span><span class="cx"> encoder << itemSequenceNumber;
</span><span class="cx">
</span><del>- encoder << scrollPoint;
</del><ins>+ encoder << scrollPosition;
</ins><span class="cx"> encoder << pageScaleFactor;
</span><span class="cx">
</span><span class="cx"> encoder << httpBody;
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> if (!decoder.decode(result.itemSequenceNumber))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!decoder.decode(result.scrollPoint))
</del><ins>+ if (!decoder.decode(result.scrollPosition))
</ins><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.pageScaleFactor))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedSessionStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/SessionState.h (194491 => 194492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/SessionState.h 2016-01-02 05:53:01 UTC (rev 194491)
+++ trunk/Source/WebKit2/Shared/SessionState.h 2016-01-02 05:56:29 UTC (rev 194492)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> int64_t documentSequenceNumber;
</span><span class="cx"> int64_t itemSequenceNumber;
</span><span class="cx">
</span><del>- WebCore::IntPoint scrollPoint;
</del><ins>+ WebCore::IntPoint scrollPosition;
</ins><span class="cx"> float pageScaleFactor;
</span><span class="cx">
</span><span class="cx"> Optional<HTTPBody> httpBody;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacLegacySessionStateCodingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp (194491 => 194492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2016-01-02 05:53:01 UTC (rev 194491)
+++ trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2016-01-02 05:56:29 UTC (rev 194492)
</span><span class="lines">@@ -336,8 +336,8 @@
</span><span class="cx">
</span><span class="cx"> encoder << frameState.referrer;
</span><span class="cx">
</span><del>- encoder << frameState.scrollPoint.x();
- encoder << frameState.scrollPoint.y();
</del><ins>+ encoder << frameState.scrollPosition.x();
+ encoder << frameState.scrollPosition.y();
</ins><span class="cx">
</span><span class="cx"> encoder << frameState.pageScaleFactor;
</span><span class="cx">
</span><span class="lines">@@ -899,13 +899,13 @@
</span><span class="cx">
</span><span class="cx"> decoder >> frameState.referrer;
</span><span class="cx">
</span><del>- int32_t scrollPointX;
- decoder >> scrollPointX;
</del><ins>+ int32_t scrollPositionX;
+ decoder >> scrollPositionX;
</ins><span class="cx">
</span><del>- int32_t scrollPointY;
- decoder >> scrollPointY;
</del><ins>+ int32_t scrollPositionY;
+ decoder >> scrollPositionY;
</ins><span class="cx">
</span><del>- frameState.scrollPoint = WebCore::IntPoint(scrollPointX, scrollPointY);
</del><ins>+ frameState.scrollPosition = WebCore::IntPoint(scrollPositionX, scrollPositionY);
</ins><span class="cx">
</span><span class="cx"> decoder >> frameState.pageScaleFactor;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportSessionStateConversioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.cpp (194491 => 194492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.cpp 2016-01-02 05:53:01 UTC (rev 194491)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.cpp 2016-01-02 05:56:29 UTC (rev 194492)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> frameState.documentSequenceNumber = historyItem.documentSequenceNumber();
</span><span class="cx"> frameState.itemSequenceNumber = historyItem.itemSequenceNumber();
</span><span class="cx">
</span><del>- frameState.scrollPoint = historyItem.scrollPoint();
</del><ins>+ frameState.scrollPosition = historyItem.scrollPosition();
</ins><span class="cx"> frameState.pageScaleFactor = historyItem.pageScaleFactor();
</span><span class="cx">
</span><span class="cx"> if (FormData* formData = const_cast<HistoryItem&>(historyItem).formData()) {
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> historyItem.setDocumentSequenceNumber(frameState.documentSequenceNumber);
</span><span class="cx"> historyItem.setItemSequenceNumber(frameState.itemSequenceNumber);
</span><span class="cx">
</span><del>- historyItem.setScrollPoint(frameState.scrollPoint);
</del><ins>+ historyItem.setScrollPosition(frameState.scrollPosition);
</ins><span class="cx"> historyItem.setPageScaleFactor(frameState.pageScaleFactor);
</span><span class="cx">
</span><span class="cx"> if (frameState.httpBody) {
</span></span></pre>
</div>
</div>
</body>
</html>