<!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>[162745] 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/162745">162745</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-24 18:08:56 -0800 (Fri, 24 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove back/forward list related functions from Page
https://bugs.webkit.org/show_bug.cgi?id=127596
Reviewed by Andreas Kling.
Source/WebCore:
* WebCore.exp.in:
* history/BackForwardController.cpp:
(WebCore::BackForwardController::canGoBackOrForward):
(WebCore::BackForwardController::goBackOrForward):
(WebCore::BackForwardController::goBack):
(WebCore::BackForwardController::goForward):
(WebCore::BackForwardController::count):
* page/EventHandler.cpp:
(WebCore::EventHandler::defaultBackspaceEventHandler):
* page/Page.cpp:
* page/Page.h:
Source/WebKit/efl:
* ewk/ewk_frame.cpp:
(ewk_frame_navigate):
(ewk_frame_navigate_possible):
Source/WebKit/gtk:
* webkit/webkitwebview.cpp:
(webkit_web_view_set_maintains_back_forward_list):
(webkit_web_view_get_back_forward_list):
(webkit_web_view_go_back):
(webkit_web_view_go_back_or_forward):
(webkit_web_view_go_forward):
(webkit_web_view_can_go_back_or_forward):
(webkit_web_view_can_go_forward):
Source/WebKit/mac:
* WebView/WebFrameView.mm:
(-[WebFrameView keyDown:keyDown:]):
* WebView/WebView.mm:
(-[WebView _loadBackForwardListFromOtherView:]):
(-[WebView initWithCoder:]):
(-[WebView encodeWithCoder:]):
(-[WebView backForwardList]):
(-[WebView setMaintainsBackForwardList:]):
(-[WebView goBack]):
(-[WebView goForward]):
(-[WebView canGoBack]):
(-[WebView canGoForward]):
Source/WebKit/win:
* WebView.cpp:
(WebView::keyDown):
(WebView::goBack):
(WebView::goForward):
Source/WebKit2:
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::performNonEditingBehaviorForSelector):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorehistoryBackForwardControllercpp">trunk/Source/WebCore/history/BackForwardController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebKiteflChangeLog">trunk/Source/WebKit/efl/ChangeLog</a></li>
<li><a href="#trunkSourceWebKiteflewkewk_framecpp">trunk/Source/WebKit/efl/ewk/ewk_frame.cpp</a></li>
<li><a href="#trunkSourceWebKiteflewkewk_viewcpp">trunk/Source/WebKit/efl/ewk/ewk_view.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkChangeLog">trunk/Source/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitwebbackforwardlistcpp">trunk/Source/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitwebviewcpp">trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFrameViewmm">trunk/Source/WebKit/mac/WebView/WebFrameView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162744 => 162745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-25 02:04:38 UTC (rev 162744)
+++ trunk/Source/WebCore/ChangeLog 2014-01-25 02:08:56 UTC (rev 162745)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-01-24 Anders Carlsson <andersca@apple.com>
+
+ Remove back/forward list related functions from Page
+ https://bugs.webkit.org/show_bug.cgi?id=127596
+
+ Reviewed by Andreas Kling.
+
+ * WebCore.exp.in:
+ * history/BackForwardController.cpp:
+ (WebCore::BackForwardController::canGoBackOrForward):
+ (WebCore::BackForwardController::goBackOrForward):
+ (WebCore::BackForwardController::goBack):
+ (WebCore::BackForwardController::goForward):
+ (WebCore::BackForwardController::count):
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::defaultBackspaceEventHandler):
+ * page/Page.cpp:
+ * page/Page.h:
+
</ins><span class="cx"> 2014-01-24 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Update style asynchronously after style sheet load
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (162744 => 162745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-01-25 02:04:38 UTC (rev 162744)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-01-25 02:08:56 UTC (rev 162745)
</span><span class="lines">@@ -816,6 +816,8 @@
</span><span class="cx"> __ZN7WebCore20protocolIsJavaScriptERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore20toUInt32EnforceRangeEPN3JSC9ExecStateENS0_7JSValueE
</span><span class="cx"> __ZN7WebCore21BackForwardController11itemAtIndexEi
</span><ins>+__ZN7WebCore21BackForwardController6goBackEv
+__ZN7WebCore21BackForwardController9goForwardEv
</ins><span class="cx"> __ZN7WebCore21CrossThreadCopierBaseILb0ELb0EN3WTF6StringEE4copyERKS2_
</span><span class="cx"> __ZN7WebCore21CrossThreadCopierBaseILb0ELb0ENS_19IDBDatabaseMetadataEE4copyERKS1_
</span><span class="cx"> __ZN7WebCore21MemoryPressureHandler7installEv
</span><span class="lines">@@ -1014,9 +1016,7 @@
</span><span class="cx"> __ZN7WebCore4Page36setShouldSuppressScrollbarAnimationsEb
</span><span class="cx"> __ZN7WebCore4Page36suspendActiveDOMObjectsAndAnimationsEv
</span><span class="cx"> __ZN7WebCore4Page37setInLowQualityImageInterpolationModeEb
</span><del>-__ZN7WebCore4Page6goBackEv
</del><span class="cx"> __ZN7WebCore4Page8goToItemEPNS_11HistoryItemENS_13FrameLoadTypeE
</span><del>-__ZN7WebCore4Page9goForwardEv
</del><span class="cx"> __ZN7WebCore4Page9initGroupEv
</span><span class="cx"> __ZN7WebCore4PageC1ERNS0_11PageClientsE
</span><span class="cx"> __ZN7WebCore4PageD1Ev
</span><span class="lines">@@ -1651,6 +1651,7 @@
</span><span class="cx"> __ZNK7WebCore20ResourceResponseBase8mimeTypeEv
</span><span class="cx"> __ZNK7WebCore20TransformationMatrixcv13CATransform3DEv
</span><span class="cx"> __ZNK7WebCore21BackForwardController12forwardCountEv
</span><ins>+__ZNK7WebCore21BackForwardController18canGoBackOrForwardEi
</ins><span class="cx"> __ZNK7WebCore21BackForwardController9backCountEv
</span><span class="cx"> __ZNK7WebCore21NetworkStorageSession13cookieStorageEv
</span><span class="cx"> __ZNK7WebCore21RenderLayerCompositor11scrollLayerEv
</span><span class="lines">@@ -1698,7 +1699,6 @@
</span><span class="cx"> __ZNK7WebCore4Page14renderTreeSizeEv
</span><span class="cx"> __ZNK7WebCore4Page15visibilityStateEv
</span><span class="cx"> __ZNK7WebCore4Page16hasSeenAnyPluginEv
</span><del>-__ZNK7WebCore4Page17backForwardClientEv
</del><span class="cx"> __ZNK7WebCore4Page17viewportArgumentsEv
</span><span class="cx"> __ZNK7WebCore4Page34inLowQualityImageInterpolationModeEv
</span><span class="cx"> __ZNK7WebCore4Page9groupNameEv
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryBackForwardControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/BackForwardController.cpp (162744 => 162745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/BackForwardController.cpp 2014-01-25 02:04:38 UTC (rev 162744)
+++ trunk/Source/WebCore/history/BackForwardController.cpp 2014-01-25 02:08:56 UTC (rev 162745)
</span><span class="lines">@@ -46,22 +46,55 @@
</span><span class="cx">
</span><span class="cx"> bool BackForwardController::canGoBackOrForward(int distance) const
</span><span class="cx"> {
</span><del>- return m_page.canGoBackOrForward(distance);
</del><ins>+ if (!distance)
+ return true;
+ if (distance > 0 && distance <= forwardCount())
+ return true;
+ if (distance < 0 && -distance <= backCount())
+ return true;
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BackForwardController::goBackOrForward(int distance)
</span><span class="cx"> {
</span><del>- m_page.goBackOrForward(distance);
</del><ins>+ if (!distance)
+ return;
+
+ HistoryItem* item = itemAtIndex(distance);
+ if (!item) {
+ if (distance > 0) {
+ if (int forwardCount = this->forwardCount())
+ item = itemAtIndex(forwardCount);
+ } else {
+ if (int backCount = this->backCount())
+ item = itemAtIndex(-backCount);
+ }
+ }
+
+ if (!item)
+ return;
+
+ m_page.goToItem(item, FrameLoadTypeIndexedBackForward);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool BackForwardController::goBack()
</span><span class="cx"> {
</span><del>- return m_page.goBack();
</del><ins>+ HistoryItem* item = backItem();
+ if (!item)
+ return false;
+
+ m_page.goToItem(item, FrameLoadTypeBack);
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool BackForwardController::goForward()
</span><span class="cx"> {
</span><del>- return m_page.goForward();
</del><ins>+ HistoryItem* item = forwardItem();
+ if (!item)
+ return false;
+
+ m_page.goToItem(item, FrameLoadTypeForward);
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BackForwardController::addItem(PassRefPtr<HistoryItem> item)
</span><span class="lines">@@ -76,7 +109,7 @@
</span><span class="cx">
</span><span class="cx"> int BackForwardController::count() const
</span><span class="cx"> {
</span><del>- return m_page.getHistoryLength();
</del><ins>+ return m_client->backListCount() + 1 + m_client->forwardListCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int BackForwardController::backCount() const
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (162744 => 162745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2014-01-25 02:04:38 UTC (rev 162744)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2014-01-25 02:08:56 UTC (rev 162745)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "AXObjectCache.h"
</span><span class="cx"> #include "AutoscrollController.h"
</span><ins>+#include "BackForwardController.h"
</ins><span class="cx"> #include "CachedImage.h"
</span><span class="cx"> #include "Chrome.h"
</span><span class="cx"> #include "ChromeClient.h"
</span><span class="lines">@@ -3422,9 +3423,9 @@
</span><span class="cx"> bool handledEvent = false;
</span><span class="cx">
</span><span class="cx"> if (event->shiftKey())
</span><del>- handledEvent = page->goForward();
</del><ins>+ handledEvent = page->backForward().goForward();
</ins><span class="cx"> else
</span><del>- handledEvent = page->goBack();
</del><ins>+ handledEvent = page->backForward().goBack();
</ins><span class="cx">
</span><span class="cx"> if (handledEvent)
</span><span class="cx"> event->setDefaultHandled();
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (162744 => 162745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2014-01-25 02:04:38 UTC (rev 162744)
+++ trunk/Source/WebCore/page/Page.cpp 2014-01-25 02:08:56 UTC (rev 162745)
</span><span class="lines">@@ -361,66 +361,6 @@
</span><span class="cx"> m_openedByDOM = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-BackForwardClient* Page::backForwardClient() const
-{
- return backForward().client();
-}
-
-bool Page::goBack()
-{
- HistoryItem* item = backForward().backItem();
-
- if (item) {
- goToItem(item, FrameLoadTypeBack);
- return true;
- }
- return false;
-}
-
-bool Page::goForward()
-{
- HistoryItem* item = backForward().forwardItem();
-
- if (item) {
- goToItem(item, FrameLoadTypeForward);
- return true;
- }
- return false;
-}
-
-bool Page::canGoBackOrForward(int distance) const
-{
- if (distance == 0)
- return true;
- if (distance > 0 && distance <= backForward().forwardCount())
- return true;
- if (distance < 0 && -distance <= backForward().backCount())
- return true;
- return false;
-}
-
-void Page::goBackOrForward(int distance)
-{
- if (distance == 0)
- return;
-
- HistoryItem* item = backForward().itemAtIndex(distance);
- if (!item) {
- if (distance > 0) {
- if (int forwardCount = backForward().forwardCount())
- item = backForward().itemAtIndex(forwardCount);
- } else {
- if (int backCount = backForward().backCount())
- item = backForward().itemAtIndex(-backCount);
- }
- }
-
- if (!item)
- return;
-
- goToItem(item, FrameLoadTypeIndexedBackForward);
-}
-
</del><span class="cx"> void Page::goToItem(HistoryItem* item, FrameLoadType type)
</span><span class="cx"> {
</span><span class="cx"> // stopAllLoaders may end up running onload handlers, which could cause further history traversals that may lead to the passed in HistoryItem
</span><span class="lines">@@ -433,11 +373,6 @@
</span><span class="cx"> m_mainFrame->loader().history().goToItem(item, type);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int Page::getHistoryLength()
-{
- return backForward().backCount() + 1 + backForward().forwardCount();
-}
-
</del><span class="cx"> void Page::setGroupName(const String& name)
</span><span class="cx"> {
</span><span class="cx"> if (m_group && !m_group->name().isEmpty()) {
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (162744 => 162745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2014-01-25 02:04:38 UTC (rev 162744)
+++ trunk/Source/WebCore/page/Page.h 2014-01-25 02:08:56 UTC (rev 162745)
</span><span class="lines">@@ -167,14 +167,6 @@
</span><span class="cx"> bool openedByDOM() const;
</span><span class="cx"> void setOpenedByDOM();
</span><span class="cx">
</span><del>- // DEPRECATED. Use backForward() instead of the following 6 functions.
- BackForwardClient* backForwardClient() const;
- bool goBack();
- bool goForward();
- bool canGoBackOrForward(int distance) const;
- void goBackOrForward(int distance);
- int getHistoryLength();
-
</del><span class="cx"> void goToItem(HistoryItem*, FrameLoadType);
</span><span class="cx">
</span><span class="cx"> void setGroupName(const String&);
</span></span></pre></div>
<a id="trunkSourceWebKiteflChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/ChangeLog (162744 => 162745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/ChangeLog 2014-01-25 02:04:38 UTC (rev 162744)
+++ trunk/Source/WebKit/efl/ChangeLog 2014-01-25 02:08:56 UTC (rev 162745)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-01-24 Anders Carlsson <andersca@apple.com>
+
+ Remove back/forward list related functions from Page
+ https://bugs.webkit.org/show_bug.cgi?id=127596
+
+ Reviewed by Andreas Kling.
+
+ * ewk/ewk_frame.cpp:
+ (ewk_frame_navigate):
+ (ewk_frame_navigate_possible):
+
</ins><span class="cx"> 2014-01-23 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove recompileAllJSFunctions timer in ScriptDebugServer
</span></span></pre></div>
<a id="trunkSourceWebKiteflewkewk_framecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/ewk/ewk_frame.cpp (162744 => 162745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/ewk/ewk_frame.cpp 2014-01-25 02:04:38 UTC (rev 162744)
+++ trunk/Source/WebKit/efl/ewk/ewk_frame.cpp 2014-01-25 02:08:56 UTC (rev 162745)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ewk_frame.h"
</span><span class="cx">
</span><ins>+#include "BackForwardController.h"
</ins><span class="cx"> #include "DocumentLoader.h"
</span><span class="cx"> #include "DocumentMarkerController.h"
</span><span class="cx"> #include "Editor.h"
</span><span class="lines">@@ -613,9 +614,9 @@
</span><span class="cx"> EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, smartData, false);
</span><span class="cx"> EINA_SAFETY_ON_NULL_RETURN_VAL(smartData->frame, false);
</span><span class="cx"> WebCore::Page* page = smartData->frame->page();
</span><del>- if (!page->canGoBackOrForward(steps))
</del><ins>+ if (!page->backForward().canGoBackOrForward(steps))
</ins><span class="cx"> return false;
</span><del>- page->goBackOrForward(steps);
</del><ins>+ page->backForward().goBackOrForward(steps);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -634,7 +635,7 @@
</span><span class="cx"> EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, smartData, false);
</span><span class="cx"> EINA_SAFETY_ON_NULL_RETURN_VAL(smartData->frame, false);
</span><span class="cx"> WebCore::Page* page = smartData->frame->page();
</span><del>- return page->canGoBackOrForward(steps);
</del><ins>+ return page->backForward().canGoBackOrForward(steps);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float ewk_frame_page_zoom_get(const Evas_Object* ewkFrame)
</span></span></pre></div>
<a id="trunkSourceWebKiteflewkewk_viewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (162744 => 162745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2014-01-25 02:04:38 UTC (rev 162744)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2014-01-25 02:08:56 UTC (rev 162745)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ewk_view.h"
</span><span class="cx">
</span><ins>+#include "BackForwardController.h"
</ins><span class="cx"> #include "BackForwardList.h"
</span><span class="cx"> #include "Bridge.h"
</span><span class="cx"> #include "Chrome.h"
</span><span class="lines">@@ -836,7 +837,7 @@
</span><span class="cx"> priv->settings.allowUniversalAccessFromFileURLs = pageSettings.allowUniversalAccessFromFileURLs();
</span><span class="cx"> priv->settings.allowFileAccessFromFileURLs = pageSettings.allowFileAccessFromFileURLs();
</span><span class="cx">
</span><del>- priv->history = ewk_history_new(static_cast<WebCore::BackForwardList*>(priv->page->backForwardClient()));
</del><ins>+ priv->history = ewk_history_new(static_cast<WebCore::BackForwardList*>(priv->page->backForward().client()));
</ins><span class="cx">
</span><span class="cx"> priv->pageClient = adoptPtr(new PageClientEfl(smartData->self));
</span><span class="cx">
</span><span class="lines">@@ -1932,14 +1933,14 @@
</span><span class="cx"> {
</span><span class="cx"> EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
</span><span class="cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
</span><del>- return static_cast<WebCore::BackForwardList*>(priv->page->backForwardClient())->enabled();
</del><ins>+ return static_cast<WebCore::BackForwardList*>(priv->page->backForward().client())->enabled();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Eina_Bool ewk_view_history_enable_set(Evas_Object* ewkView, Eina_Bool enable)
</span><span class="cx"> {
</span><span class="cx"> EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
</span><span class="cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
</span><del>- static_cast<WebCore::BackForwardList*>(priv->page->backForwardClient())->setEnabled(enable);
</del><ins>+ static_cast<WebCore::BackForwardList*>(priv->page->backForward().client())->setEnabled(enable);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1947,7 +1948,7 @@
</span><span class="cx"> {
</span><span class="cx"> EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, 0);
</span><span class="cx"> EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, 0);
</span><del>- if (!static_cast<WebCore::BackForwardList*>(priv->page->backForwardClient())->enabled()) {
</del><ins>+ if (!static_cast<WebCore::BackForwardList*>(priv->page->backForward().client())->enabled()) {
</ins><span class="cx"> ERR("asked history, but it's disabled! Returning 0!");
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/ChangeLog (162744 => 162745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/ChangeLog 2014-01-25 02:04:38 UTC (rev 162744)
+++ trunk/Source/WebKit/gtk/ChangeLog 2014-01-25 02:08:56 UTC (rev 162745)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-01-24 Anders Carlsson <andersca@apple.com>
+
+ Remove back/forward list related functions from Page
+ https://bugs.webkit.org/show_bug.cgi?id=127596
+
+ Reviewed by Andreas Kling.
+
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_set_maintains_back_forward_list):
+ (webkit_web_view_get_back_forward_list):
+ (webkit_web_view_go_back):
+ (webkit_web_view_go_back_or_forward):
+ (webkit_web_view_go_forward):
+ (webkit_web_view_can_go_back_or_forward):
+ (webkit_web_view_can_go_forward):
+
</ins><span class="cx"> 2014-01-24 Enrique Ocaña González <eocanha@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Put cache files in XDG_CACHE_HOME
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitwebbackforwardlistcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp (162744 => 162745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp 2014-01-25 02:04:38 UTC (rev 162744)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp 2014-01-25 02:08:56 UTC (rev 162745)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "webkitwebbackforwardlist.h"
</span><span class="cx">
</span><ins>+#include "BackForwardController.h"
</ins><span class="cx"> #include "BackForwardList.h"
</span><span class="cx"> #include "HistoryItem.h"
</span><span class="cx"> #include "Page.h"
</span><span class="lines">@@ -116,7 +117,7 @@
</span><span class="cx"> webBackForwardList = WEBKIT_WEB_BACK_FORWARD_LIST(g_object_new(WEBKIT_TYPE_WEB_BACK_FORWARD_LIST, NULL));
</span><span class="cx"> WebKitWebBackForwardListPrivate* priv = webBackForwardList->priv;
</span><span class="cx">
</span><del>- priv->backForwardList = static_cast<WebCore::BackForwardList*>(core(webView)->backForwardClient());
</del><ins>+ priv->backForwardList = static_cast<WebCore::BackForwardList*>(core(webView)->backForward().client());
</ins><span class="cx"> priv->backForwardList->setEnabled(TRUE);
</span><span class="cx">
</span><span class="cx"> return webBackForwardList;
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitwebviewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (162744 => 162745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2014-01-25 02:04:38 UTC (rev 162744)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2014-01-25 02:08:56 UTC (rev 162745)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx">
</span><span class="cx"> #include "AXObjectCache.h"
</span><span class="cx"> #include "ArchiveResource.h"
</span><ins>+#include "BackForwardController.h"
</ins><span class="cx"> #include "BackForwardList.h"
</span><span class="cx"> #include "BatteryClientGtk.h"
</span><span class="cx"> #include "CairoUtilities.h"
</span><span class="lines">@@ -4100,7 +4101,7 @@
</span><span class="cx"> {
</span><span class="cx"> g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
</span><span class="cx">
</span><del>- static_cast<BackForwardList*>(core(webView)->backForwardClient())->setEnabled(flag);
</del><ins>+ static_cast<BackForwardList*>(core(webView)->backForward().client())->setEnabled(flag);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -4115,7 +4116,7 @@
</span><span class="cx"> WebKitWebBackForwardList* webkit_web_view_get_back_forward_list(WebKitWebView* webView)
</span><span class="cx"> {
</span><span class="cx"> g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), 0);
</span><del>- if (!core(webView) || !static_cast<BackForwardList*>(core(webView)->backForwardClient())->enabled())
</del><ins>+ if (!core(webView) || !static_cast<BackForwardList*>(core(webView)->backForward().client())->enabled())
</ins><span class="cx"> return 0;
</span><span class="cx"> return webView->priv->backForwardList.get();
</span><span class="cx"> }
</span><span class="lines">@@ -4152,7 +4153,7 @@
</span><span class="cx"> {
</span><span class="cx"> g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
</span><span class="cx">
</span><del>- core(webView)->goBack();
</del><ins>+ core(webView)->backForward().goBack();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -4168,7 +4169,7 @@
</span><span class="cx"> {
</span><span class="cx"> g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
</span><span class="cx">
</span><del>- core(webView)->goBackOrForward(steps);
</del><ins>+ core(webView)->backForward().goBackOrForward(steps);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -4181,7 +4182,7 @@
</span><span class="cx"> {
</span><span class="cx"> g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
</span><span class="cx">
</span><del>- core(webView)->goForward();
</del><ins>+ core(webView)->backForward().goForward();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -4196,7 +4197,7 @@
</span><span class="cx"> {
</span><span class="cx"> g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
</span><span class="cx">
</span><del>- if (!core(webView) || !core(webView)->backForwardClient()->backItem())
</del><ins>+ if (!core(webView) || !core(webView)->backForward().client()->canGoBackOrForward(-1))
</ins><span class="cx"> return FALSE;
</span><span class="cx">
</span><span class="cx"> return TRUE;
</span><span class="lines">@@ -4217,7 +4218,7 @@
</span><span class="cx"> {
</span><span class="cx"> g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
</span><span class="cx">
</span><del>- return core(webView)->canGoBackOrForward(steps);
</del><ins>+ return core(webView)->backForward().canGoBackOrForward(steps);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -4237,7 +4238,7 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return FALSE;
</span><span class="cx">
</span><del>- if (!page->backForwardClient()->forwardItem())
</del><ins>+ if (!page->backForward().forwardItem())
</ins><span class="cx"> return FALSE;
</span><span class="cx">
</span><span class="cx"> return TRUE;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (162744 => 162745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-01-25 02:04:38 UTC (rev 162744)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-25 02:08:56 UTC (rev 162745)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2014-01-24 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Remove back/forward list related functions from Page
+ https://bugs.webkit.org/show_bug.cgi?id=127596
+
+ Reviewed by Andreas Kling.
+
+ * WebView/WebFrameView.mm:
+ (-[WebFrameView keyDown:keyDown:]):
+ * WebView/WebView.mm:
+ (-[WebView _loadBackForwardListFromOtherView:]):
+ (-[WebView initWithCoder:]):
+ (-[WebView encodeWithCoder:]):
+ (-[WebView backForwardList]):
+ (-[WebView setMaintainsBackForwardList:]):
+ (-[WebView goBack]):
+ (-[WebView goForward]):
+ (-[WebView canGoBack]):
+ (-[WebView canGoForward]):
+
+2014-01-24 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Get rid of monotonicallyIncreasingTimeMS and start using std::chrono instead
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=127571
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFrameViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrameView.mm (162744 => 162745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2014-01-25 02:04:38 UTC (rev 162744)
+++ trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2014-01-25 02:08:56 UTC (rev 162745)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> #import "WebViewInternal.h"
</span><span class="cx"> #import "WebViewPrivate.h"
</span><span class="cx"> #import <Foundation/NSURLRequest.h>
</span><ins>+#import <WebCore/BackForwardController.h>
</ins><span class="cx"> #import <WebCore/BackForwardList.h>
</span><span class="cx"> #import <WebCore/DragController.h>
</span><span class="cx"> #import <WebCore/EventHandler.h>
</span><span class="lines">@@ -926,7 +927,7 @@
</span><span class="cx"> int index, count;
</span><span class="cx"> BOOL callSuper = YES;
</span><span class="cx"> Frame* coreFrame = [self _web_frame];
</span><del>- BOOL maintainsBackForwardList = coreFrame && static_cast<BackForwardList*>(coreFrame->page()->backForwardClient())->enabled() ? YES : NO;
</del><ins>+ BOOL maintainsBackForwardList = coreFrame && static_cast<BackForwardList*>(coreFrame->page()->backForward().client())->enabled() ? YES : NO;
</ins><span class="cx">
</span><span class="cx"> count = [characters length];
</span><span class="cx"> for (index = 0; index < count; ++index) {
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (162744 => 162745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-01-25 02:04:38 UTC (rev 162744)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-01-25 02:08:56 UTC (rev 162745)
</span><span class="lines">@@ -1993,10 +1993,10 @@
</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->backForwardClient();
</del><ins>+ BackForwardClient* backForwardClient = _private->page->backForward().client();
</ins><span class="cx"> ASSERT(!backForwardClient->currentItem()); // destination list should be empty
</span><span class="cx">
</span><del>- BackForwardClient* otherBackForwardClient = otherView->_private->page->backForwardClient();
</del><ins>+ BackForwardClient* otherBackForwardClient = otherView->_private->page->backForward().client();
</ins><span class="cx"> if (!otherBackForwardClient->currentItem())
</span><span class="cx"> return; // empty back forward list, bail
</span><span class="cx">
</span><span class="lines">@@ -5131,7 +5131,7 @@
</span><span class="cx">
</span><span class="cx"> LOG(Encoding, "FrameName = %@, GroupName = %@, useBackForwardList = %d\n", frameName, groupName, (int)useBackForwardList);
</span><span class="cx"> [result _commonInitializationWithFrameName:frameName groupName:groupName];
</span><del>- static_cast<BackForwardList*>([result page]->backForwardClient())->setEnabled(useBackForwardList);
</del><ins>+ static_cast<BackForwardList*>([result page]->backForward().client())->setEnabled(useBackForwardList);
</ins><span class="cx"> result->_private->allowsUndo = allowsUndo;
</span><span class="cx"> if (preferences)
</span><span class="cx"> [result setPreferences:preferences];
</span><span class="lines">@@ -5155,7 +5155,7 @@
</span><span class="cx"> // Restore the subviews we set aside.
</span><span class="cx"> _subviews = originalSubviews;
</span><span class="cx">
</span><del>- BOOL useBackForwardList = _private->page && static_cast<BackForwardList*>(_private->page->backForwardClient())->enabled();
</del><ins>+ BOOL useBackForwardList = _private->page && static_cast<BackForwardList*>(_private->page->backForward().client())->enabled();
</ins><span class="cx"> if ([encoder allowsKeyedCoding]) {
</span><span class="cx"> [encoder encodeObject:[[self mainFrame] name] forKey:@"FrameName"];
</span><span class="cx"> [encoder encodeObject:[self groupName] forKey:@"GroupName"];
</span><span class="lines">@@ -5617,7 +5617,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!_private->page)
</span><span class="cx"> return nil;
</span><del>- BackForwardList* list = static_cast<BackForwardList*>(_private->page->backForwardClient());
</del><ins>+ BackForwardList* list = static_cast<BackForwardList*>(_private->page->backForward().client());
</ins><span class="cx"> if (!list->enabled())
</span><span class="cx"> return nil;
</span><span class="cx"> return kit(list);
</span><span class="lines">@@ -5627,7 +5627,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!_private->page)
</span><span class="cx"> return;
</span><del>- static_cast<BackForwardList*>(_private->page->backForwardClient())->setEnabled(flag);
</del><ins>+ static_cast<BackForwardList*>(_private->page->backForward().client())->setEnabled(flag);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)goBack
</span><span class="lines">@@ -5638,10 +5638,10 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (WebThreadIsCurrent() || !WebThreadIsEnabled())
</span><span class="cx"> #endif
</span><del>- return _private->page->goBack();
</del><ins>+ return _private->page->backForward().goBack();
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> WebThreadRun(^{
</span><del>- _private->page->goBack();
</del><ins>+ _private->page->backForward().goBack();
</ins><span class="cx"> });
</span><span class="cx"> // FIXME: <rdar://problem/9157572> -[WebView goBack] and -goForward always return YES when called from the main thread
</span><span class="cx"> return YES;
</span><span class="lines">@@ -5656,10 +5656,10 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (WebThreadIsCurrent() || !WebThreadIsEnabled())
</span><span class="cx"> #endif
</span><del>- return _private->page->goForward();
</del><ins>+ return _private->page->backForward().goForward();
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> WebThreadRun(^{
</span><del>- _private->page->goForward();
</del><ins>+ _private->page->backForward().goForward();
</ins><span class="cx"> });
</span><span class="cx"> // FIXME: <rdar://problem/9157572> -[WebView goBack] and -goForward always return YES when called from the main thread
</span><span class="cx"> return YES;
</span><span class="lines">@@ -6381,7 +6381,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> return NO;
</span><span class="cx">
</span><del>- return !!_private->page->backForwardClient()->backItem();
</del><ins>+ return _private->page->backForward().canGoBackOrForward(-1);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)canGoForward
</span><span class="lines">@@ -6394,7 +6394,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> return NO;
</span><span class="cx">
</span><del>- return !!_private->page->backForwardClient()->forwardItem();
</del><ins>+ return !!_private->page->backForward().canGoBackOrForward(1);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (IBAction)goBack:(id)sender
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (162744 => 162745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-01-25 02:04:38 UTC (rev 162744)
+++ trunk/Source/WebKit/win/ChangeLog 2014-01-25 02:08:56 UTC (rev 162745)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-24 Anders Carlsson <andersca@apple.com>
+
+ Remove back/forward list related functions from Page
+ https://bugs.webkit.org/show_bug.cgi?id=127596
+
+ Reviewed by Andreas Kling.
+
+ * WebView.cpp:
+ (WebView::keyDown):
+ (WebView::goBack):
+ (WebView::goForward):
+
</ins><span class="cx"> 2014-01-24 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Move HistoryItem to std::unique_ptr
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (162744 => 162745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2014-01-25 02:04:38 UTC (rev 162744)
+++ trunk/Source/WebKit/win/WebView.cpp 2014-01-25 02:08:56 UTC (rev 162745)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebView.h"
</span><span class="cx">
</span><ins>+#include "BackForwardController.h"
</ins><span class="cx"> #include "COMVariantSetter.h"
</span><span class="cx"> #include "DOMCoreClasses.h"
</span><span class="cx"> #include "FullscreenVideoController.h"
</span><span class="lines">@@ -72,6 +73,7 @@
</span><span class="cx"> #include <WebCore/AXObjectCache.h>
</span><span class="cx"> #include <WebCore/ApplicationCacheStorage.h>
</span><span class="cx"> #include <WebCore/BString.h>
</span><ins>+#include <WebCore/BackForwardController.h>
</ins><span class="cx"> #include <WebCore/BackForwardList.h>
</span><span class="cx"> #include <WebCore/BitmapInfo.h>
</span><span class="cx"> #include <WebCore/Chrome.h>
</span><span class="lines">@@ -2067,9 +2069,9 @@
</span><span class="cx"> // FIXME: This logic should probably be in EventHandler::defaultArrowEventHandler().
</span><span class="cx"> // FIXME: Should check that other modifiers aren't pressed.
</span><span class="cx"> if (virtualKeyCode == VK_RIGHT && keyEvent.ctrlKey())
</span><del>- return m_page->goForward();
</del><ins>+ return m_page->backForward().goForward();
</ins><span class="cx"> if (virtualKeyCode == VK_LEFT && keyEvent.ctrlKey())
</span><del>- return m_page->goBack();
</del><ins>+ return m_page->backForward().goBack();
</ins><span class="cx">
</span><span class="cx"> // Need to scroll the page if the arrow keys, pgup/dn, or home/end are hit.
</span><span class="cx"> ScrollDirection direction;
</span><span class="lines">@@ -3084,7 +3086,7 @@
</span><span class="cx"> if (!m_useBackForwardList)
</span><span class="cx"> return E_FAIL;
</span><span class="cx">
</span><del>- *list = WebBackForwardList::createInstance(static_cast<WebCore::BackForwardList*>(m_page->backForwardClient()));
</del><ins>+ *list = WebBackForwardList::createInstance(static_cast<WebCore::BackForwardList*>(m_page->backForward().client()));
</ins><span class="cx">
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="lines">@@ -3099,14 +3101,14 @@
</span><span class="cx"> HRESULT STDMETHODCALLTYPE WebView::goBack(
</span><span class="cx"> /* [retval][out] */ BOOL* succeeded)
</span><span class="cx"> {
</span><del>- *succeeded = m_page->goBack();
</del><ins>+ *succeeded = m_page->backForward().goBack();
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT STDMETHODCALLTYPE WebView::goForward(
</span><span class="cx"> /* [retval][out] */ BOOL* succeeded)
</span><span class="cx"> {
</span><del>- *succeeded = m_page->goForward();
</del><ins>+ *succeeded = m_page->backForward().goForward();
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3917,7 +3919,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->backForwardClient()->backItem() && !m_page->defersLoading());
</del><ins>+ *result = !!(m_page->backForward().client()->backItem() && !m_page->defersLoading());
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3932,7 +3934,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->backForwardClient()->forwardItem() && !m_page->defersLoading());
</del><ins>+ *result = !!(m_page->backForward().client()->forwardItem() && !m_page->defersLoading());
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5411,13 +5413,13 @@
</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->backForwardClient();
</del><ins>+ BackForwardClient* backForwardClient = m_page->backForward().client();
</ins><span class="cx"> ASSERT(!backForwardClient->currentItem()); // destination list should be empty
</span><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->backForwardClient();
</del><ins>+ BackForwardClient* otherBackForwardClient = otherWebView->m_page->backForward().client();
</ins><span class="cx"> if (!otherBackForwardClient->currentItem())
</span><span class="cx"> return S_OK; // empty back forward list, bail
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (162744 => 162745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-25 02:04:38 UTC (rev 162744)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-25 02:08:56 UTC (rev 162745)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-01-24 Anders Carlsson <andersca@apple.com>
+
+ Remove back/forward list related functions from Page
+ https://bugs.webkit.org/show_bug.cgi?id=127596
+
+ Reviewed by Andreas Kling.
+
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::performNonEditingBehaviorForSelector):
+
</ins><span class="cx"> 2014-01-24 Jinwoo Song <jinwoo7.song@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix attemp on the EFL after r162728.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (162744 => 162745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-01-25 02:04:38 UTC (rev 162744)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-01-25 02:08:56 UTC (rev 162745)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> #import <PDFKit/PDFKit.h>
</span><span class="cx"> #import <QuartzCore/QuartzCore.h>
</span><span class="cx"> #import <WebCore/AXObjectCache.h>
</span><ins>+#import <WebCore/BackForwardController.h>
</ins><span class="cx"> #import <WebCore/EventHandler.h>
</span><span class="cx"> #import <WebCore/FocusController.h>
</span><span class="cx"> #import <WebCore/FrameLoader.h>
</span><span class="lines">@@ -637,13 +638,13 @@
</span><span class="cx"> else if (selector == "moveWordLeft:")
</span><span class="cx"> didPerformAction = scroll(m_page.get(), ScrollLeft, ScrollByPage);
</span><span class="cx"> else if (selector == "moveToLeftEndOfLine:")
</span><del>- didPerformAction = m_page->goBack();
</del><ins>+ didPerformAction = m_page->backForward().goBack();
</ins><span class="cx"> else if (selector == "moveRight:")
</span><span class="cx"> didPerformAction = scroll(m_page.get(), ScrollRight, ScrollByLine);
</span><span class="cx"> else if (selector == "moveWordRight:")
</span><span class="cx"> didPerformAction = scroll(m_page.get(), ScrollRight, ScrollByPage);
</span><span class="cx"> else if (selector == "moveToRightEndOfLine:")
</span><del>- didPerformAction = m_page->goForward();
</del><ins>+ didPerformAction = m_page->backForward().goForward();
</ins><span class="cx">
</span><span class="cx"> return didPerformAction;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>