<!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>[194495] 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/194495">194495</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-01-01 22:55:12 -0800 (Fri, 01 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the iOS and EFL builds, after an over-eager commit-queue commit.
Source/WebKit/mac:
* History/WebHistoryItem.mm:
(-[WebHistoryItem initFromDictionaryRepresentation:]):
Source/WebKit2:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::restoreViewState):
* WebProcess/WebPage/efl/WebPageEfl.cpp:
(WebKit::WebPage::restorePageState):</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageeflWebPageEflcpp">trunk/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (194494 => 194495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-01-02 06:06:35 UTC (rev 194494)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-01-02 06:55:12 UTC (rev 194495)
</span><span class="lines">@@ -1,5 +1,12 @@
</span><span class="cx"> 2016-01-01 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Fix the iOS and EFL builds, after an over-eager commit-queue commit.
+
+ * History/WebHistoryItem.mm:
+ (-[WebHistoryItem initFromDictionaryRepresentation:]):
+
+2016-01-01 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Fix naming in HistoryItem to refer to scrollPositions
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=152646
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistoryItemmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistoryItem.mm (194494 => 194495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2016-01-02 06:06:35 UTC (rev 194494)
+++ trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2016-01-02 06:55:12 UTC (rev 194495)
</span><span class="lines">@@ -377,7 +377,7 @@
</span><span class="cx"> NSNumber *scrollPointXValue = [dict objectForKey:scrollPointXKey];
</span><span class="cx"> NSNumber *scrollPointYValue = [dict objectForKey:scrollPointYKey];
</span><span class="cx"> if (scrollPointXValue && scrollPointYValue)
</span><del>- core(_private)->setScrollPoint(IntPoint([scrollPointXValue intValue], [scrollPointYValue intValue]));
</del><ins>+ core(_private)->setScrollPosition(IntPoint([scrollPointXValue intValue], [scrollPointYValue intValue]));
</ins><span class="cx">
</span><span class="cx"> uint32_t bookmarkIDValue = [[dict objectForKey:bookmarkIDKey] unsignedIntValue];
</span><span class="cx"> if (bookmarkIDValue)
</span><span class="lines">@@ -471,9 +471,9 @@
</span><span class="cx"> if (viewportArguments)
</span><span class="cx"> [dict setObject:viewportArguments forKey:@"WebViewportArguments"];
</span><span class="cx">
</span><del>- IntPoint scrollPoint = core(_private)->scrollPoint();
- [dict setObject:[NSNumber numberWithInt:scrollPoint.x()] forKey:scrollPointXKey];
- [dict setObject:[NSNumber numberWithInt:scrollPoint.y()] forKey:scrollPointYKey];
</del><ins>+ IntPoint scrollPosition = core(_private)->scrollPosition();
+ [dict setObject:[NSNumber numberWithInt:scrollPosition.x()] forKey:scrollPointXKey];
+ [dict setObject:[NSNumber numberWithInt:scrollPosition.y()] forKey:scrollPointYKey];
</ins><span class="cx">
</span><span class="cx"> uint32_t bookmarkID = core(_private)->bookmarkID();
</span><span class="cx"> if (bookmarkID)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (194494 => 194495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-01-02 06:06:35 UTC (rev 194494)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-02 06:55:12 UTC (rev 194495)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2016-01-01 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Fix the iOS and EFL builds, after an over-eager commit-queue commit.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::restoreViewState):
+ * WebProcess/WebPage/efl/WebPageEfl.cpp:
+ (WebKit::WebPage::restorePageState):
+
+2016-01-01 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Fix naming in HistoryItem to refer to scrollPositions
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=152646
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (194494 => 194495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2016-01-02 06:06:35 UTC (rev 194494)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2016-01-02 06:55:12 UTC (rev 194495)
</span><span class="lines">@@ -1206,7 +1206,7 @@
</span><span class="cx"> if (m_frame->isMainFrame())
</span><span class="cx"> m_frame->page()->restorePageState(*currentItem);
</span><span class="cx"> else if (!view->wasScrolledByUser())
</span><del>- view->setScrollPosition(currentItem->scrollPoint());
</del><ins>+ view->setScrollPosition(currentItem->scrollPosition());
</ins><span class="cx"> }
</span><span class="cx"> #else
</span><span class="cx"> // Inform the UI process of the scale factor.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageeflWebPageEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp (194494 => 194495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp 2016-01-02 06:06:35 UTC (rev 194494)
+++ trunk/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp 2016-01-02 06:55:12 UTC (rev 194495)
</span><span class="lines">@@ -232,12 +232,12 @@
</span><span class="cx"> void WebPage::restorePageState(const HistoryItem& historyItem)
</span><span class="cx"> {
</span><span class="cx"> float restorePageScaleFactor = historyItem.pageScaleFactor();
</span><del>- IntPoint restoreScrollPoint = historyItem.scrollPoint();
</del><ins>+ IntPoint restoreScrollPosition = historyItem.scrollPosition();
</ins><span class="cx">
</span><span class="cx"> // A scale factor or scroll point of zero means that the history item has the default scale factor or scroll position,
</span><span class="cx"> // thus we don't need to update it.
</span><del>- if (restorePageScaleFactor || restoreScrollPoint != IntPoint(0, 0))
- scalePage(restorePageScaleFactor, restoreScrollPoint);
</del><ins>+ if (restorePageScaleFactor || restoreScrollPosition != IntPoint())
+ scalePage(restorePageScaleFactor, restoreScrollPosition);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::savePageState(HistoryItem&)
</span></span></pre>
</div>
</div>
</body>
</html>