<!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>[184056] 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/184056">184056</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-10 14:45:25 -0700 (Sun, 10 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of the public item accessors in BackForwardClient
https://bugs.webkit.org/show_bug.cgi?id=144827
Patch by Sungmann Cho <sungmann.cho@navercorp.com> on 2015-05-10
Reviewed by Darin Adler.
Remove backItem(), currentItem(), and forwardItem() from BackForwardClient.
We can still use these functionalities through BackForwardController.
No new tests, no behavior change.
Source/WebCore:
* history/BackForwardClient.h:
(WebCore::BackForwardClient::backItem): Deleted.
(WebCore::BackForwardClient::currentItem): Deleted.
(WebCore::BackForwardClient::forwardItem): Deleted.
Source/WebKit/mac:
* WebView/WebView.mm:
(-[WebView _loadBackForwardListFromOtherView:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehistoryBackForwardClienth">trunk/Source/WebCore/history/BackForwardClient.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184055 => 184056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-10 21:43:26 UTC (rev 184055)
+++ trunk/Source/WebCore/ChangeLog 2015-05-10 21:45:25 UTC (rev 184056)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2015-05-10 Sungmann Cho <sungmann.cho@navercorp.com>
</span><span class="cx">
</span><ins>+ Get rid of the public item accessors in BackForwardClient
+ https://bugs.webkit.org/show_bug.cgi?id=144827
+
+ Reviewed by Darin Adler.
+
+ Remove backItem(), currentItem(), and forwardItem() from BackForwardClient.
+ We can still use these functionalities through BackForwardController.
+
+ No new tests, no behavior change.
+
+ * history/BackForwardClient.h:
+ (WebCore::BackForwardClient::backItem): Deleted.
+ (WebCore::BackForwardClient::currentItem): Deleted.
+ (WebCore::BackForwardClient::forwardItem): Deleted.
+
+2015-05-10 Sungmann Cho <sungmann.cho@navercorp.com>
+
</ins><span class="cx"> Rename Length::isPercent() and Length::isPercentNotCalculated().
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=144791
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryBackForwardClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/BackForwardClient.h (184055 => 184056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/BackForwardClient.h 2015-05-10 21:43:26 UTC (rev 184055)
+++ trunk/Source/WebCore/history/BackForwardClient.h 2015-05-10 21:45:25 UTC (rev 184056)
</span><span class="lines">@@ -59,12 +59,6 @@
</span><span class="cx"> // FIXME: Consider renaming this method once we upstream the iOS changes to WebView.mm.
</span><span class="cx"> virtual bool clearAllPageCaches() = 0;
</span><span class="cx"> #endif
</span><del>-
- // FIXME: Delete these once all callers are using BackForwardController
- // instead of calling this directly.
- HistoryItem* backItem() { return itemAtIndex(-1); }
- HistoryItem* currentItem() { return itemAtIndex(0); }
- HistoryItem* forwardItem() { return itemAtIndex(1); }
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (184055 => 184056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-05-10 21:43:26 UTC (rev 184055)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-05-10 21:45:25 UTC (rev 184056)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-05-10 Sungmann Cho <sungmann.cho@navercorp.com>
+
+ Get rid of the public item accessors in BackForwardClient
+ https://bugs.webkit.org/show_bug.cgi?id=144827
+
+ Reviewed by Darin Adler.
+
+ Remove backItem(), currentItem(), and forwardItem() from BackForwardClient.
+ We can still use these functionalities through BackForwardController.
+
+ No new tests, no behavior change.
+
+ * WebView/WebView.mm:
+ (-[WebView _loadBackForwardListFromOtherView:]):
+
</ins><span class="cx"> 2015-05-09 Yoav Weiss <yoav@yoav.ws>
</span><span class="cx">
</span><span class="cx"> Remove the PICTURE_SIZES build flag
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (184055 => 184056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-05-10 21:43:26 UTC (rev 184055)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-05-10 21:45:25 UTC (rev 184056)
</span><span class="lines">@@ -2008,29 +2008,29 @@
</span><span class="cx"> // type. (See behavior matrix at the top of WebFramePrivate.) So we copy all the items
</span><span class="cx"> // in the back forward list, and go to the current one.
</span><span class="cx">
</span><del>- BackForwardClient* backForwardClient = _private->page->backForward().client();
- ASSERT(!backForwardClient->currentItem()); // destination list should be empty
</del><ins>+ BackForwardController& backForward = _private->page->backForward();
+ ASSERT(!backForward.currentItem()); // destination list should be empty
</ins><span class="cx">
</span><del>- BackForwardClient* otherBackForwardClient = otherView->_private->page->backForward().client();
- if (!otherBackForwardClient->currentItem())
</del><ins>+ BackForwardController& otherBackForward = otherView->_private->page->backForward();
+ if (!otherBackForward.currentItem())
</ins><span class="cx"> return; // empty back forward list, bail
</span><span class="cx">
</span><span class="cx"> HistoryItem* newItemToGoTo = nullptr;
</span><span class="cx">
</span><del>- int lastItemIndex = otherBackForwardClient->forwardListCount();
- for (int i = -otherBackForwardClient->backListCount(); i <= lastItemIndex; ++i) {
</del><ins>+ int lastItemIndex = otherBackForward.forwardCount();
+ for (int i = -otherBackForward.backCount(); i <= lastItemIndex; ++i) {
</ins><span class="cx"> if (i == 0) {
</span><span class="cx"> // If this item is showing , save away its current scroll and form state,
</span><span class="cx"> // since that might have changed since loading and it is normally not saved
</span><span class="cx"> // until we leave that page.
</span><span class="cx"> otherView->_private->page->mainFrame().loader().history().saveDocumentAndScrollState();
</span><span class="cx"> }
</span><del>- Ref<HistoryItem> newItem = otherBackForwardClient->itemAtIndex(i)->copy();
</del><ins>+ Ref<HistoryItem> newItem = otherBackForward.itemAtIndex(i)->copy();
</ins><span class="cx"> if (i == 0)
</span><span class="cx"> newItemToGoTo = newItem.ptr();
</span><del>- backForwardClient->addItem(WTF::move(newItem));
</del><ins>+ backForward.client()->addItem(WTF::move(newItem));
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> ASSERT(newItemToGoTo);
</span><span class="cx"> _private->page->goToItem(*newItemToGoTo, FrameLoadType::IndexedBackForward);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (184055 => 184056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2015-05-10 21:43:26 UTC (rev 184055)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-05-10 21:45:25 UTC (rev 184056)
</span><span class="lines">@@ -3965,7 +3965,7 @@
</span><span class="cx"> /* [in] */ IUnknown* /*sender*/,
</span><span class="cx"> /* [retval][out] */ BOOL* result)
</span><span class="cx"> {
</span><del>- *result = !!(m_page->backForward().client()->backItem() && !m_page->defersLoading());
</del><ins>+ *result = !!(m_page->backForward().backItem() && !m_page->defersLoading());
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3980,7 +3980,7 @@
</span><span class="cx"> /* [in] */ IUnknown* /*sender*/,
</span><span class="cx"> /* [retval][out] */ BOOL* result)
</span><span class="cx"> {
</span><del>- *result = !!(m_page->backForward().client()->forwardItem() && !m_page->defersLoading());
</del><ins>+ *result = !!(m_page->backForward().forwardItem() && !m_page->defersLoading());
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5491,30 +5491,30 @@
</span><span class="cx"> // It turns out the right combination of behavior is done with the back/forward load
</span><span class="cx"> // type. (See behavior matrix at the top of WebFramePrivate.) So we copy all the items
</span><span class="cx"> // in the back forward list, and go to the current one.
</span><del>- BackForwardClient* backForwardClient = m_page->backForward().client();
- ASSERT(!backForwardClient->currentItem()); // destination list should be empty
</del><ins>+ BackForwardController& backForward = m_page->backForward();
+ ASSERT(!backForward.currentItem()); // destination list should be empty
</ins><span class="cx">
</span><span class="cx"> COMPtr<WebView> otherWebView;
</span><span class="cx"> if (FAILED(otherView->QueryInterface(&otherWebView)))
</span><span class="cx"> return E_FAIL;
</span><del>- BackForwardClient* otherBackForwardClient = otherWebView->m_page->backForward().client();
- if (!otherBackForwardClient->currentItem())
</del><ins>+ BackForwardController& otherBackForward = otherWebView->m_page->backForward();
+ if (!otherBackForward.currentItem())
</ins><span class="cx"> return S_OK; // empty back forward list, bail
</span><span class="cx">
</span><span class="cx"> HistoryItem* newItemToGoTo = 0;
</span><span class="cx">
</span><del>- int lastItemIndex = otherBackForwardClient->forwardListCount();
- for (int i = -otherBackForwardClient->backListCount(); i <= lastItemIndex; ++i) {
</del><ins>+ int lastItemIndex = otherBackForward.forwardCount();
+ for (int i = -otherBackForward.backCount(); i <= lastItemIndex; ++i) {
</ins><span class="cx"> if (!i) {
</span><span class="cx"> // If this item is showing , save away its current scroll and form state,
</span><span class="cx"> // since that might have changed since loading and it is normally not saved
</span><span class="cx"> // until we leave that page.
</span><span class="cx"> otherWebView->m_page->mainFrame().loader().history().saveDocumentAndScrollState();
</span><span class="cx"> }
</span><del>- Ref<HistoryItem> newItem = otherBackForwardClient->itemAtIndex(i)->copy();
</del><ins>+ Ref<HistoryItem> newItem = otherBackForward.itemAtIndex(i)->copy();
</ins><span class="cx"> if (!i)
</span><span class="cx"> newItemToGoTo = newItem.ptr();
</span><del>- backForwardClient->addItem(WTF::move(newItem));
</del><ins>+ backForward.client()->addItem(WTF::move(newItem));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT(newItemToGoTo);
</span></span></pre>
</div>
</div>
</body>
</html>