<!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>[166613] trunk/Source/WebKit2</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/166613">166613</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-04-01 14:35:54 -0700 (Tue, 01 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Demote WKBackForwardListDidChangeNotification to SPI
https://bugs.webkit.org/show_bug.cgi?id=131059
Reviewed by Dan Bernstein.
* UIProcess/API/Cocoa/WKBackForwardList.h:
* UIProcess/API/Cocoa/WKBackForwardList.mm:
* UIProcess/API/Cocoa/WKBackForwardListInternal.h:
* UIProcess/API/Cocoa/WKBackForwardListPrivate.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListInternal.h.
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::NavigationState::LoaderClient::didChangeBackForwardList):
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBackForwardListh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBackForwardListmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBackForwardListInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaNavigationStatemm">trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBackForwardListPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListPrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (166612 => 166613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-01 21:29:48 UTC (rev 166612)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-01 21:35:54 UTC (rev 166613)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-04-01 Anders Carlsson <andersca@apple.com>
+
+ Demote WKBackForwardListDidChangeNotification to SPI
+ https://bugs.webkit.org/show_bug.cgi?id=131059
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/Cocoa/WKBackForwardList.h:
+ * UIProcess/API/Cocoa/WKBackForwardList.mm:
+ * UIProcess/API/Cocoa/WKBackForwardListInternal.h:
+ * UIProcess/API/Cocoa/WKBackForwardListPrivate.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListInternal.h.
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::LoaderClient::didChangeBackForwardList):
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-04-01 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Add SPI to determine if a WKWebView is displaying a PDF
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBackForwardListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h (166612 => 166613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h 2014-04-01 21:29:48 UTC (rev 166612)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h 2014-04-01 21:35:54 UTC (rev 166613)
</span><span class="lines">@@ -29,26 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #import <WebKit2/WKBackForwardListItem.h>
</span><span class="cx">
</span><del>-/*! Posted when a back-forward list changes. The notification object is the WKBackForwardList
- that changed. The <code>userInfo</code> dictionary may contain the
- @link WKBackForwardListAddedItemKey @/link and @link WKBackForwardListRemovedItemsKey @/link
- keys.
-*/
-WK_EXTERN NSString * const WKBackForwardListDidChangeNotification;
</del><span class="cx">
</span><del>-/*! A key in the <code>userInfo</code> dictionary of a
- @link WKBackForwardListDidChangeNotification @/link, whose value is the
- @link WKBackForwardListItem @/link that was appended to the list.
-*/
-WK_EXTERN NSString * const WKBackForwardListAddedItemKey;
-
-
-/*! A key in the <code>userInfo</code> dictionary of a
- @link WKBackForwardListDidChangeNotification @/link, whose value is an NSArray of
- @link WKBackForwardListItem@/link instances that were removed from the list.
-*/
-WK_EXTERN NSString * const WKBackForwardListRemovedItemsKey;
-
</del><span class="cx"> WK_API_CLASS
</span><span class="cx"> @interface WKBackForwardList : NSObject
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBackForwardListmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm (166612 => 166613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm 2014-04-01 21:29:48 UTC (rev 166612)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm 2014-04-01 21:35:54 UTC (rev 166613)
</span><span class="lines">@@ -31,10 +31,12 @@
</span><span class="cx"> #import "WKBackForwardListItemInternal.h"
</span><span class="cx"> #import "WKNSArray.h"
</span><span class="cx">
</span><del>-NSString * const WKBackForwardListDidChangeNotification = @"WKBackForwardListDidChangeNotification";
-NSString * const WKBackForwardListAddedItemKey = @"WKBackForwardListAddedItemKey";
-NSString * const WKBackForwardListRemovedItemsKey = @"WKBackForwardListRemovedItemsKey";
</del><ins>+// FIXME: Remove this when nobody depends on it.
+WK_EXTERN NSString * const WKBackForwardListDidChangeNotification;
+NSString * const WKBackForwardListDidChangeNotification = @"_WKBackForwardListDidChangeNotification";
</ins><span class="cx">
</span><ins>+NSString * const _WKBackForwardListDidChangeNotification = @"_WKBackForwardListDidChangeNotification";
+
</ins><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="cx"> @implementation WKBackForwardList {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBackForwardListInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListInternal.h (166612 => 166613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListInternal.h 2014-04-01 21:29:48 UTC (rev 166612)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListInternal.h 2014-04-01 21:35:54 UTC (rev 166613)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import "WKBackForwardList.h"
</del><ins>+#import "WKBackForwardListPrivate.h"
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBackForwardListPrivatehfromrev166612trunkSourceWebKit2UIProcessAPICocoaWKBackForwardListInternalh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListPrivate.h (from rev 166612, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListInternal.h) (0 => 166613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListPrivate.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListPrivate.h 2014-04-01 21:35:54 UTC (rev 166613)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+/*
+ * Copyright (C) 2014 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 <WebKit2/WKBackForwardList.h>
+
+#if WK_API_ENABLED
+
+WK_EXTERN NSString * const _WKBackForwardListDidChangeNotification;
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (166612 => 166613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-04-01 21:29:48 UTC (rev 166612)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-04-01 21:35:54 UTC (rev 166613)
</span><span class="lines">@@ -517,22 +517,7 @@
</span><span class="cx">
</span><span class="cx"> void NavigationState::LoaderClient::didChangeBackForwardList(WebKit::WebPageProxy*, WebKit::WebBackForwardListItem* addedItem, Vector<RefPtr<WebKit::WebBackForwardListItem>> removedItems)
</span><span class="cx"> {
</span><del>- auto userInfo = adoptNS([[NSMutableDictionary alloc] init]);
-
- if (addedItem)
- [userInfo setObject:wrapper(*addedItem) forKey:WKBackForwardListAddedItemKey];
-
- if (!removedItems.isEmpty()) {
- Vector<id> removed;
- removed.reserveInitialCapacity(removedItems.size());
-
- for (const auto& removedItem : removedItems)
- removed.uncheckedAppend(wrapper(*removedItem));
-
- [userInfo setObject:adoptNS([[NSArray alloc] initWithObjects:removed.data() count:removed.size()]).get() forKey:WKBackForwardListRemovedItemsKey];
- }
-
- [[NSNotificationCenter defaultCenter] postNotificationName:WKBackForwardListDidChangeNotification object:wrapper(m_navigationState.m_webView->_page->backForwardList()) userInfo:userInfo.get()];
</del><ins>+ [[NSNotificationCenter defaultCenter] postNotificationName:_WKBackForwardListDidChangeNotification object:wrapper(m_navigationState.m_webView->_page->backForwardList())];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NavigationState::willChangeIsLoading()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (166612 => 166613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-04-01 21:29:48 UTC (rev 166612)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-04-01 21:35:54 UTC (rev 166613)
</span><span class="lines">@@ -251,6 +251,7 @@
</span><span class="cx"> 1A6FBD2911E69BC200DB1371 /* NetscapePlugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FBD2711E69BC200DB1371 /* NetscapePlugin.cpp */; };
</span><span class="cx"> 1A7865B916CAC71500ACE83A /* PluginProcessConnectionManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A7865B716CAC71500ACE83A /* PluginProcessConnectionManagerMessageReceiver.cpp */; };
</span><span class="cx"> 1A7865BA16CAC71500ACE83A /* PluginProcessConnectionManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7865B816CAC71500ACE83A /* PluginProcessConnectionManagerMessages.h */; };
</span><ins>+ 1A79D9F218EB5EF100914CC5 /* WKBackForwardListPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A79D9F118EB5EF100914CC5 /* WKBackForwardListPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 1A7C6CDA1378950800B9C04D /* EnvironmentVariables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A7C6CD81378950800B9C04D /* EnvironmentVariables.cpp */; };
</span><span class="cx"> 1A7C6CDB1378950800B9C04D /* EnvironmentVariables.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7C6CD91378950800B9C04D /* EnvironmentVariables.h */; };
</span><span class="cx"> 1A7E376D18E3CA57003D0FFF /* _WKScriptWorld.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A7E376B18E3CA57003D0FFF /* _WKScriptWorld.mm */; };
</span><span class="lines">@@ -2015,6 +2016,7 @@
</span><span class="cx"> 1A7865B616CAC6FD00ACE83A /* PluginProcessConnectionManager.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = PluginProcessConnectionManager.messages.in; sourceTree = "<group>"; };
</span><span class="cx"> 1A7865B716CAC71500ACE83A /* PluginProcessConnectionManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginProcessConnectionManagerMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A7865B816CAC71500ACE83A /* PluginProcessConnectionManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginProcessConnectionManagerMessages.h; sourceTree = "<group>"; };
</span><ins>+ 1A79D9F118EB5EF100914CC5 /* WKBackForwardListPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBackForwardListPrivate.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1A7C6CD81378950800B9C04D /* EnvironmentVariables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EnvironmentVariables.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A7C6CD91378950800B9C04D /* EnvironmentVariables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EnvironmentVariables.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A7E376B18E3CA57003D0FFF /* _WKScriptWorld.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKScriptWorld.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -3788,6 +3790,7 @@
</span><span class="cx"> 37C4C08B1814AC5C003688B9 /* WKBackForwardList.h */,
</span><span class="cx"> 37C4C08A1814AC5C003688B9 /* WKBackForwardList.mm */,
</span><span class="cx"> 37C4C08E1814AF3A003688B9 /* WKBackForwardListInternal.h */,
</span><ins>+ 1A79D9F118EB5EF100914CC5 /* WKBackForwardListPrivate.h */,
</ins><span class="cx"> 37C4C08518149C5B003688B9 /* WKBackForwardListItem.h */,
</span><span class="cx"> 37C4C08418149C5B003688B9 /* WKBackForwardListItem.mm */,
</span><span class="cx"> 37C4C08818149F23003688B9 /* WKBackForwardListItemInternal.h */,
</span><span class="lines">@@ -6702,6 +6705,7 @@
</span><span class="cx"> C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */,
</span><span class="cx"> 512C06891638F67E00ABB911 /* HostRecord.h in Headers */,
</span><span class="cx"> 37F90DE31376560E0051CF68 /* HTTPCookieAcceptPolicy.h in Headers */,
</span><ins>+ 1A79D9F218EB5EF100914CC5 /* WKBackForwardListPrivate.h in Headers */,
</ins><span class="cx"> BCCF6B2512C93E7A008F9C35 /* ImageOptions.h in Headers */,
</span><span class="cx"> 1A1E093418861D3800D2DC49 /* WebProgressTrackerClient.h in Headers */,
</span><span class="cx"> BC64697011DBE603006455B0 /* APIArray.h in Headers */,
</span></span></pre>
</div>
</div>
</body>
</html>