<!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>[207352] 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/207352">207352</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-10-14 11:45:52 -0700 (Fri, 14 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up BackForwardClient
https://bugs.webkit.org/show_bug.cgi?id=163454
Reviewed by Sam Weinig.
Source/WebCore:
Remove iOS specific member functions that are only used from WebKit.
* history/BackForwardClient.h:
* loader/EmptyClients.cpp:
Source/WebKit/mac:
* History/BackForwardList.h:
Remove override keywords.
* History/BackForwardList.mm:
(BackForwardList::clearAllPageCaches): Deleted.
Remove this, it's no longer used.
* WebView/WebView.mm:
(-[WebView _clearBackForwardCache]): Deleted.
* WebView/WebViewPrivate.h:
Remove SPI that's no longer used by anyone.
Source/WebKit2:
Remove empty iOS only stubs.
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebPage/WebBackForwardListProxy.h:
* WebProcess/WebPage/ios/WebBackForwardListProxyIOS.mm: Removed.</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="#trunkSourceWebCoreloaderEmptyClientscpp">trunk/Source/WebCore/loader/EmptyClients.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacHistoryBackForwardListh">trunk/Source/WebKit/mac/History/BackForwardList.h</a></li>
<li><a href="#trunkSourceWebKitmacHistoryBackForwardListmm">trunk/Source/WebKit/mac/History/BackForwardList.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewPrivateh">trunk/Source/WebKit/mac/WebView/WebViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebBackForwardListProxyh">trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebBackForwardListProxyIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebBackForwardListProxyIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207351 => 207352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-14 18:29:16 UTC (rev 207351)
+++ trunk/Source/WebCore/ChangeLog 2016-10-14 18:45:52 UTC (rev 207352)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-10-14 Anders Carlsson <andersca@apple.com>
+
+ Clean up BackForwardClient
+ https://bugs.webkit.org/show_bug.cgi?id=163454
+
+ Reviewed by Sam Weinig.
+
+ Remove iOS specific member functions that are only used from WebKit.
+
+ * history/BackForwardClient.h:
+ * loader/EmptyClients.cpp:
+
</ins><span class="cx"> 2016-10-13 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Move BackForwardList from WebCore to WebKitLegacy
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryBackForwardClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/BackForwardClient.h (207351 => 207352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/BackForwardClient.h 2016-10-14 18:29:16 UTC (rev 207351)
+++ trunk/Source/WebCore/history/BackForwardClient.h 2016-10-14 18:45:52 UTC (rev 207352)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2010, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
</span><span class="cx"> * Copyright (C) 2009 Google, Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="lines">@@ -25,8 +25,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef BackForwardClient_h
-#define BackForwardClient_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -50,17 +49,6 @@
</span><span class="cx"> virtual int forwardListCount() = 0;
</span><span class="cx">
</span><span class="cx"> virtual void close() = 0;
</span><del>-
-#if PLATFORM(IOS)
- // FIXME: These methods seem to violate the encapsulation of this class.
- virtual unsigned current() = 0;
- virtual void setCurrent(unsigned newCurrent) = 0;
-
- // FIXME: Consider renaming this method once we upstream the iOS changes to WebView.mm.
- virtual bool clearAllPageCaches() = 0;
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // BackForwardClient_h
</del></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (207351 => 207352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.cpp 2016-10-14 18:29:16 UTC (rev 207351)
+++ trunk/Source/WebCore/loader/EmptyClients.cpp 2016-10-14 18:45:52 UTC (rev 207352)
</span><span class="lines">@@ -148,12 +148,6 @@
</span><span class="cx"> int backListCount() override { return 0; }
</span><span class="cx"> int forwardListCount() override { return 0; }
</span><span class="cx"> void close() override { }
</span><del>-
-#if PLATFORM(IOS)
- unsigned current() override { return 0; }
- void setCurrent(unsigned) override { }
- bool clearAllPageCaches() override { return false; }
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> void fillWithEmptyClients(PageConfiguration& pageConfiguration)
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (207351 => 207352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-10-14 18:29:16 UTC (rev 207351)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-10-14 18:45:52 UTC (rev 207352)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-10-14 Anders Carlsson <andersca@apple.com>
+
+ Clean up BackForwardClient
+ https://bugs.webkit.org/show_bug.cgi?id=163454
+
+ Reviewed by Sam Weinig.
+
+ * History/BackForwardList.h:
+ Remove override keywords.
+
+ * History/BackForwardList.mm:
+ (BackForwardList::clearAllPageCaches): Deleted.
+ Remove this, it's no longer used.
+
+ * WebView/WebView.mm:
+ (-[WebView _clearBackForwardCache]): Deleted.
+ * WebView/WebViewPrivate.h:
+ Remove SPI that's no longer used by anyone.
+
</ins><span class="cx"> 2016-10-13 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Move BackForwardList from WebCore to WebKitLegacy
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryBackForwardListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/BackForwardList.h (207351 => 207352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/BackForwardList.h 2016-10-14 18:29:16 UTC (rev 207351)
+++ trunk/Source/WebKit/mac/History/BackForwardList.h 2016-10-14 18:45:52 UTC (rev 207352)
</span><span class="lines">@@ -70,10 +70,8 @@
</span><span class="cx"> WEBCORE_EXPORT Vector<Ref<WebCore::HistoryItem>>& entries();
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- unsigned current() override;
- void setCurrent(unsigned newCurrent) override;
-
- bool clearAllPageCaches() override;
</del><ins>+ unsigned current();
+ void setCurrent(unsigned newCurrent);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryBackForwardListmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/BackForwardList.mm (207351 => 207352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/BackForwardList.mm 2016-10-14 18:29:16 UTC (rev 207351)
+++ trunk/Source/WebKit/mac/History/BackForwardList.mm 2016-10-14 18:45:52 UTC (rev 207352)
</span><span class="lines">@@ -226,18 +226,6 @@
</span><span class="cx"> {
</span><span class="cx"> m_current = newCurrent;
</span><span class="cx"> }
</span><del>-
-bool BackForwardList::clearAllPageCaches()
-{
- bool didRemoveAtLeastOneItem = false;
- for (auto& item : m_entries) {
- if (item->isInPageCache()) {
- didRemoveAtLeastOneItem = true;
- PageCache::singleton().remove(item);
- }
- }
- return didRemoveAtLeastOneItem;
-}
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void BackForwardList::close()
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (207351 => 207352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-10-14 18:29:16 UTC (rev 207351)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-10-14 18:45:52 UTC (rev 207352)
</span><span class="lines">@@ -3554,20 +3554,6 @@
</span><span class="cx"> [self _locked_recursivelyPerformPlugInSelector:@selector(destroyAllPlugins) inFrame:[self mainFrame]];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_clearBackForwardCache
-{
- WebThreadRun(^{
- WebKit::MemoryMeasure measurer("[WebView _clearBackForwardCache]");
- BackForwardList* bfList = core([self backForwardList]);
- if (!bfList)
- return;
-
- BOOL didClearBFCache = bfList->clearAllPageCaches();
- if (WebKit::MemoryMeasure::isLoggingEnabled())
- NSLog(@"[WebView _clearBackForwardCache] %@ empty cache\n", (didClearBFCache ? @"DID" : @"did NOT"));
- });
-}
-
</del><span class="cx"> - (void)_startAllPlugIns
</span><span class="cx"> {
</span><span class="cx"> WebThreadLock();
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewPrivate.h (207351 => 207352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2016-10-14 18:29:16 UTC (rev 207351)
+++ trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2016-10-14 18:45:52 UTC (rev 207352)
</span><span class="lines">@@ -656,12 +656,6 @@
</span><span class="cx"> - (BOOL)_setMediaLayer:(CALayer*)layer forPluginView:(NSView*)pluginView;
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method _clearBackForwardCache
- @abstract Clear's this WebView's back/forward cache on the WebThread.
- */
-- (void)_clearBackForwardCache;
-
-/*!
</del><span class="cx"> @method _wantsTelephoneNumberParsing
</span><span class="cx"> @abstract Does this WebView want phone number parsing? (This could ultimately be disallowed by the document itself).
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (207351 => 207352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-10-14 18:29:16 UTC (rev 207351)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-14 18:45:52 UTC (rev 207352)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-10-14 Anders Carlsson <andersca@apple.com>
+
+ Clean up BackForwardClient
+ https://bugs.webkit.org/show_bug.cgi?id=163454
+
+ Reviewed by Sam Weinig.
+
+ Remove empty iOS only stubs.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/WebPage/WebBackForwardListProxy.h:
+ * WebProcess/WebPage/ios/WebBackForwardListProxyIOS.mm: Removed.
+
</ins><span class="cx"> 2016-10-14 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Enable Gamepads by default in WK2.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (207351 => 207352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-10-14 18:29:16 UTC (rev 207351)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-10-14 18:45:52 UTC (rev 207352)
</span><span class="lines">@@ -678,7 +678,6 @@
</span><span class="cx"> 2DA944AD1884E9BA00ED86DB /* TextCheckerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944A91884E9BA00ED86DB /* TextCheckerIOS.mm */; };
</span><span class="cx"> 2DA944AF1884E9BA00ED86DB /* WebPageProxyIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944AB1884E9BA00ED86DB /* WebPageProxyIOS.mm */; };
</span><span class="cx"> 2DA944B01884E9BA00ED86DB /* WebProcessProxyIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944AC1884E9BA00ED86DB /* WebProcessProxyIOS.mm */; };
</span><del>- 2DA944B91884EA3900ED86DB /* WebBackForwardListProxyIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944B51884EA3500ED86DB /* WebBackForwardListProxyIOS.mm */; };
</del><span class="cx"> 2DA944BA1884EA3C00ED86DB /* WebPageIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944B61884EA3500ED86DB /* WebPageIOS.mm */; };
</span><span class="cx"> 2DA944BD188511E700ED86DB /* NetworkProcessIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944BC188511E700ED86DB /* NetworkProcessIOS.mm */; };
</span><span class="cx"> 2DABA7721A817B1700EF0F1A /* WKPageRenderingProgressEventsInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DABA7711A817B1700EF0F1A /* WKPageRenderingProgressEventsInternal.h */; };
</span><span class="lines">@@ -2725,7 +2724,6 @@
</span><span class="cx"> 2DA944A91884E9BA00ED86DB /* TextCheckerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TextCheckerIOS.mm; path = ios/TextCheckerIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2DA944AB1884E9BA00ED86DB /* WebPageProxyIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebPageProxyIOS.mm; path = ios/WebPageProxyIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2DA944AC1884E9BA00ED86DB /* WebProcessProxyIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebProcessProxyIOS.mm; path = ios/WebProcessProxyIOS.mm; sourceTree = "<group>"; };
</span><del>- 2DA944B51884EA3500ED86DB /* WebBackForwardListProxyIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebBackForwardListProxyIOS.mm; path = ios/WebBackForwardListProxyIOS.mm; sourceTree = "<group>"; };
</del><span class="cx"> 2DA944B61884EA3500ED86DB /* WebPageIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebPageIOS.mm; path = ios/WebPageIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2DA944BC188511E700ED86DB /* NetworkProcessIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkProcessIOS.mm; path = NetworkProcess/ios/NetworkProcessIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2DABA7711A817B1700EF0F1A /* WKPageRenderingProgressEventsInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageRenderingProgressEventsInternal.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -5045,7 +5043,6 @@
</span><span class="cx"> children = (
</span><span class="cx"> 2DD13BD318F7DADD00E130A1 /* FindControllerIOS.mm */,
</span><span class="cx"> 2DA7FDCB18F88625008DDED0 /* FindIndicatorOverlayClientIOS.h */,
</span><del>- 2DA944B51884EA3500ED86DB /* WebBackForwardListProxyIOS.mm */,
</del><span class="cx"> 2DA944B61884EA3500ED86DB /* WebPageIOS.mm */,
</span><span class="cx"> 29232DF518B29DCE00D0596F /* WKAccessibilityWebPageObjectIOS.h */,
</span><span class="cx"> 29232DF618B29DCE00D0596F /* WKAccessibilityWebPageObjectIOS.mm */,
</span><span class="lines">@@ -9370,7 +9367,6 @@
</span><span class="cx"> BC72BA1D11E64907001EB4EA /* WebBackForwardList.cpp in Sources */,
</span><span class="cx"> 518D2CAD12D5153B003BB93B /* WebBackForwardListItem.cpp in Sources */,
</span><span class="cx"> BC72B9FA11E6476B001EB4EA /* WebBackForwardListProxy.cpp in Sources */,
</span><del>- 2DA944B91884EA3900ED86DB /* WebBackForwardListProxyIOS.mm in Sources */,
</del><span class="cx"> BC111A5A112F4FBB00337BAB /* WebChromeClient.cpp in Sources */,
</span><span class="cx"> 2D28F3E41885CCC1004B9EAE /* WebChromeClientIOS.mm in Sources */,
</span><span class="cx"> 3F87B9BD158940120090FF62 /* WebColorChooser.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebBackForwardListProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.h (207351 => 207352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.h 2016-10-14 18:29:16 UTC (rev 207351)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.h 2016-10-14 18:45:52 UTC (rev 207352)
</span><span class="lines">@@ -59,12 +59,6 @@
</span><span class="cx">
</span><span class="cx"> void close() override;
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- unsigned current() override;
- void setCurrent(unsigned newCurrent) override;
- bool clearAllPageCaches() override;
-#endif
-
</del><span class="cx"> WebPage* m_page;
</span><span class="cx"> HashSet<uint64_t> m_associatedItemIDs;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebBackForwardListProxyIOSmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebBackForwardListProxyIOS.mm (207351 => 207352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebBackForwardListProxyIOS.mm 2016-10-14 18:29:16 UTC (rev 207351)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebBackForwardListProxyIOS.mm 2016-10-14 18:45:52 UTC (rev 207352)
</span><span class="lines">@@ -1,54 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-#import "WebBackForwardListProxy.h"
-
-#if PLATFORM(IOS)
-
-#import <WebCore/NotImplemented.h>
-
-namespace WebKit {
-
-unsigned WebBackForwardListProxy::current()
-{
- notImplemented();
- return 0;
-}
-
-void WebBackForwardListProxy::setCurrent(unsigned)
-{
- notImplemented();
-}
-
-bool WebBackForwardListProxy::clearAllPageCaches()
-{
- notImplemented();
- return false;
-}
-
-} // namespace WebKit
-
-#endif // PLATFORM(IOS)
</del></span></pre>
</div>
</div>
</body>
</html>