<!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>[170725] 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/170725">170725</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-07-02 14:49:33 -0700 (Wed, 02 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rip out more dead code
https://bugs.webkit.org/show_bug.cgi?id=134562
Reviewed by Andreas Kling.
* Shared/LegacySessionState.cpp: Removed.
* Shared/LegacySessionState.h: Removed.
* Shared/WebBackForwardListItem.cpp:
(WebKit::WebBackForwardListItem::WebBackForwardListItem): Deleted.
(WebKit::WebBackForwardListItem::backForwardData): Deleted.
(WebKit::WebBackForwardListItem::setBackForwardData): Deleted.
(WebKit::WebBackForwardListItem::encode): Deleted.
(WebKit::WebBackForwardListItem::decode): Deleted.
* Shared/WebBackForwardListItem.h:
(WebKit::WebBackForwardListItem::create): Deleted.
(WebKit::WebBackForwardListItem::setOriginalURL): Deleted.
(WebKit::WebBackForwardListItem::setURL): Deleted.
(WebKit::WebBackForwardListItem::setTitle): Deleted.
* UIProcess/WebPageProxy.cpp:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebPage/WebPage.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebBackForwardListItemcpp">trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebBackForwardListItemh">trunk/Source/WebKit2/Shared/WebBackForwardListItem.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedLegacySessionStatecpp">trunk/Source/WebKit2/Shared/LegacySessionState.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedLegacySessionStateh">trunk/Source/WebKit2/Shared/LegacySessionState.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170724 => 170725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-02 21:35:43 UTC (rev 170724)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-02 21:49:33 UTC (rev 170725)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2014-07-02 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Rip out more dead code
+ https://bugs.webkit.org/show_bug.cgi?id=134562
+
+ Reviewed by Andreas Kling.
+
+ * Shared/LegacySessionState.cpp: Removed.
+ * Shared/LegacySessionState.h: Removed.
+ * Shared/WebBackForwardListItem.cpp:
+ (WebKit::WebBackForwardListItem::WebBackForwardListItem): Deleted.
+ (WebKit::WebBackForwardListItem::backForwardData): Deleted.
+ (WebKit::WebBackForwardListItem::setBackForwardData): Deleted.
+ (WebKit::WebBackForwardListItem::encode): Deleted.
+ (WebKit::WebBackForwardListItem::decode): Deleted.
+ * Shared/WebBackForwardListItem.h:
+ (WebKit::WebBackForwardListItem::create): Deleted.
+ (WebKit::WebBackForwardListItem::setOriginalURL): Deleted.
+ (WebKit::WebBackForwardListItem::setURL): Deleted.
+ (WebKit::WebBackForwardListItem::setTitle): Deleted.
+ * UIProcess/WebPageProxy.cpp:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/WebPage/WebPage.cpp:
+
+2014-07-02 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> RestoreSession should take a vector of BackForwardListItemStates
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134558
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedLegacySessionStatecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/LegacySessionState.cpp (170724 => 170725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/LegacySessionState.cpp 2014-07-02 21:35:43 UTC (rev 170724)
+++ trunk/Source/WebKit2/Shared/LegacySessionState.cpp 2014-07-02 21:49:33 UTC (rev 170725)
</span><span class="lines">@@ -1,84 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 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.
- */
-
-#include "config.h"
-#include "LegacySessionState.h"
-
-#include "WebCoreArgumentCoders.h"
-
-namespace IPC {
-
-// This assumes that when we encode a RefPtr we want to encode the object it points to and it is never null.
-template<typename T> struct ArgumentCoder<RefPtr<T>> {
- static void encode(ArgumentEncoder& encoder, const RefPtr<T>& item)
- {
- item->encode(encoder);
- }
-
- static bool decode(ArgumentDecoder& decoder, RefPtr<T>& item)
- {
- item = T::decode(decoder);
- return item;
- }
-};
-
-} // namespace IPC
-
-namespace WebKit {
-
-LegacySessionState::LegacySessionState()
- : m_currentIndex(0)
-{
-}
-
-LegacySessionState::LegacySessionState(const BackForwardListItemVector& list, uint32_t currentIndex)
- : m_list(list)
- , m_currentIndex(currentIndex)
-{
-}
-
-bool LegacySessionState::isEmpty() const
-{
- // Because this might change later, callers should use this instead of
- // calling list().isEmpty() directly themselves.
- return m_list.isEmpty();
-}
-
-void LegacySessionState::encode(IPC::ArgumentEncoder& encoder) const
-{
- encoder << m_list;
- encoder << m_currentIndex;
-}
-
-bool LegacySessionState::decode(IPC::ArgumentDecoder& decoder, LegacySessionState& state)
-{
- if (!decoder.decode(state.m_list))
- return false;
- if (!decoder.decode(state.m_currentIndex))
- return false;
- return true;
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedLegacySessionStateh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/LegacySessionState.h (170724 => 170725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/LegacySessionState.h 2014-07-02 21:35:43 UTC (rev 170724)
+++ trunk/Source/WebKit2/Shared/LegacySessionState.h 2014-07-02 21:49:33 UTC (rev 170725)
</span><span class="lines">@@ -1,58 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 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.
- */
-
-#ifndef LegacySessionState_h
-#define LegacySessionState_h
-
-#include "WebBackForwardListItem.h"
-
-namespace IPC {
-class ArgumentDecoder;
-class ArgumentEncoder;
-}
-
-namespace WebKit {
-
-class LegacySessionState {
-public:
- LegacySessionState();
- LegacySessionState(const BackForwardListItemVector&, uint32_t currentIndex);
-
- const BackForwardListItemVector& list() const { return m_list; }
- uint32_t currentIndex() const { return m_currentIndex; }
-
- bool isEmpty() const;
-
- void encode(IPC::ArgumentEncoder&) const;
- static bool decode(IPC::ArgumentDecoder&, LegacySessionState&);
-
-private:
- BackForwardListItemVector m_list;
- uint32_t m_currentIndex;
-};
-
-} // namespace WebKit
-
-#endif // LegacySessionState_h
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedWebBackForwardListItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp (170724 => 170725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp 2014-07-02 21:35:43 UTC (rev 170724)
+++ trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp 2014-07-02 21:49:33 UTC (rev 170725)
</span><span class="lines">@@ -26,11 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebBackForwardListItem.h"
</span><span class="cx">
</span><del>-#include "APIData.h"
-#include "DataReference.h"
-#include "LegacySessionStateCoding.h"
-#include "WebCoreArgumentCoders.h"
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> static uint64_t highestUsedItemID = 0;
</span><span class="lines">@@ -47,19 +42,6 @@
</span><span class="cx"> highestUsedItemID = m_itemState.identifier;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebBackForwardListItem::WebBackForwardListItem(const String& originalURL, const String& url, const String& title, const uint8_t* backForwardData, size_t backForwardDataSize, uint64_t itemID)
-{
- m_itemState.pageState.mainFrameState.originalURLString = originalURL;
- m_itemState.pageState.mainFrameState.urlString = url;
- m_itemState.pageState.title = title;
- m_itemState.identifier = itemID;
-
- if (m_itemState.identifier > highestUsedItemID)
- highestUsedItemID = m_itemState.identifier;
-
- setBackForwardData(backForwardData, backForwardDataSize);
-}
-
</del><span class="cx"> WebBackForwardListItem::~WebBackForwardListItem()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -69,50 +51,4 @@
</span><span class="cx"> return highestUsedItemID;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<API::Data> WebBackForwardListItem::backForwardData() const
-{
- return encodeLegacySessionHistoryEntryData(m_itemState.pageState.mainFrameState);
-}
-
-void WebBackForwardListItem::setBackForwardData(const uint8_t* data, size_t size)
-{
- decodeLegacySessionHistoryEntryData(data, size, m_itemState.pageState.mainFrameState);
-}
-
-void WebBackForwardListItem::encode(IPC::ArgumentEncoder& encoder) const
-{
- encoder << m_itemState.pageState.mainFrameState.originalURLString;
- encoder << m_itemState.pageState.mainFrameState.urlString;
- encoder << m_itemState.pageState.title;
- encoder << m_itemState.identifier;
-
- RefPtr<API::Data> backForwardData = this->backForwardData();
- encoder << IPC::DataReference(backForwardData->bytes(), backForwardData->size());
-}
-
-PassRefPtr<WebBackForwardListItem> WebBackForwardListItem::decode(IPC::ArgumentDecoder& decoder)
-{
- String originalURL;
- if (!decoder.decode(originalURL))
- return 0;
-
- String url;
- if (!decoder.decode(url))
- return 0;
-
- String title;
- if (!decoder.decode(title))
- return 0;
-
- uint64_t itemID;
- if (!decoder.decode(itemID))
- return 0;
-
- IPC::DataReference data;
- if (!decoder.decode(data))
- return 0;
-
- return create(originalURL, url, title, data.data(), data.size(), itemID);
-}
-
</del><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebBackForwardListItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebBackForwardListItem.h (170724 => 170725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebBackForwardListItem.h 2014-07-02 21:35:43 UTC (rev 170724)
+++ trunk/Source/WebKit2/Shared/WebBackForwardListItem.h 2014-07-02 21:49:33 UTC (rev 170725)
</span><span class="lines">@@ -45,12 +45,6 @@
</span><span class="cx"> class WebBackForwardListItem : public API::ObjectImpl<API::Object::Type::BackForwardListItem> {
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<WebBackForwardListItem> create(BackForwardListItemState);
</span><del>-
- static PassRefPtr<WebBackForwardListItem> create(const String& originalURL, const String& url, const String& title, const uint8_t* backForwardData, size_t backForwardDataSize, uint64_t itemID)
- {
- return adoptRef(new WebBackForwardListItem(originalURL, url, title, backForwardData, backForwardDataSize, itemID));
- }
-
</del><span class="cx"> virtual ~WebBackForwardListItem();
</span><span class="cx">
</span><span class="cx"> uint64_t itemID() const { return m_itemState.identifier; }
</span><span class="lines">@@ -58,31 +52,18 @@
</span><span class="cx">
</span><span class="cx"> void setPageState(PageState pageState) { m_itemState.pageState = std::move(pageState); }
</span><span class="cx">
</span><del>- void setOriginalURL(const String& originalURL) { m_itemState.pageState.mainFrameState.originalURLString = originalURL; }
</del><span class="cx"> const String& originalURL() const { return m_itemState.pageState.mainFrameState.originalURLString; }
</span><del>-
- void setURL(const String& url) { m_itemState.pageState.mainFrameState.urlString = url; }
</del><span class="cx"> const String& url() const { return m_itemState.pageState.mainFrameState.urlString; }
</span><del>-
- void setTitle(const String& title) { m_itemState.pageState.title = title; }
</del><span class="cx"> const String& title() const { return m_itemState.pageState.title; }
</span><span class="cx">
</span><del>- void setBackForwardData(const uint8_t* buffer, size_t size);
- PassRefPtr<API::Data> backForwardData() const;
-
</del><span class="cx"> void setSnapshotUUID(const String& uuid) { m_itemState.snapshotUUID = uuid; }
</span><span class="cx"> const String& snapshotUUID() const { return m_itemState.snapshotUUID; }
</span><span class="cx">
</span><del>- void encode(IPC::ArgumentEncoder&) const;
- static PassRefPtr<WebBackForwardListItem> decode(IPC::ArgumentDecoder&);
-
</del><span class="cx"> static uint64_t highedUsedItemID();
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit WebBackForwardListItem(BackForwardListItemState);
</span><span class="cx">
</span><del>- WebBackForwardListItem(const String& originalURL, const String& url, const String& title, const uint8_t* backForwardData, size_t backForwardDataSize, uint64_t itemID);
-
</del><span class="cx"> BackForwardListItemState m_itemState;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (170724 => 170725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-02 21:35:43 UTC (rev 170724)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-02 21:49:33 UTC (rev 170725)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> #include "DrawingAreaProxyMessages.h"
</span><span class="cx"> #include "EventDispatcherMessages.h"
</span><span class="cx"> #include "FindIndicator.h"
</span><del>-#include "LegacySessionState.h"
</del><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "NativeWebKeyboardEvent.h"
</span><span class="cx"> #include "NativeWebMouseEvent.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (170724 => 170725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-07-02 21:35:43 UTC (rev 170724)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-07-02 21:49:33 UTC (rev 170725)
</span><span class="lines">@@ -903,8 +903,6 @@
</span><span class="cx"> 518ACF1112B015F800B04B83 /* WKCredentialTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 518ACF1012B015F800B04B83 /* WKCredentialTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 518D2CAD12D5153B003BB93B /* WebBackForwardListItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 518D2CAB12D5153B003BB93B /* WebBackForwardListItem.cpp */; };
</span><span class="cx"> 518D2CAE12D5153B003BB93B /* WebBackForwardListItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 518D2CAC12D5153B003BB93B /* WebBackForwardListItem.h */; };
</span><del>- 518D2CCA12D51DFB003BB93B /* LegacySessionState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 518D2CC812D51DFB003BB93B /* LegacySessionState.cpp */; };
- 518D2CCB12D51DFB003BB93B /* LegacySessionState.h in Headers */ = {isa = PBXBuildFile; fileRef = 518D2CC912D51DFB003BB93B /* LegacySessionState.h */; };
</del><span class="cx"> 518E8EF816B2091C00E91429 /* AuthenticationManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 518E8EF316B2091C00E91429 /* AuthenticationManager.cpp */; };
</span><span class="cx"> 518E8EF916B2091C00E91429 /* AuthenticationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 518E8EF416B2091C00E91429 /* AuthenticationManager.h */; };
</span><span class="cx"> 518E8EFB16B2091C00E91429 /* AuthenticationManager.mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 518E8EF716B2091C00E91429 /* AuthenticationManager.mac.mm */; };
</span><span class="lines">@@ -2909,8 +2907,6 @@
</span><span class="cx"> 518ACF1012B015F800B04B83 /* WKCredentialTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKCredentialTypes.h; sourceTree = "<group>"; };
</span><span class="cx"> 518D2CAB12D5153B003BB93B /* WebBackForwardListItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebBackForwardListItem.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 518D2CAC12D5153B003BB93B /* WebBackForwardListItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebBackForwardListItem.h; sourceTree = "<group>"; };
</span><del>- 518D2CC812D51DFB003BB93B /* LegacySessionState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LegacySessionState.cpp; sourceTree = "<group>"; };
- 518D2CC912D51DFB003BB93B /* LegacySessionState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LegacySessionState.h; sourceTree = "<group>"; };
</del><span class="cx"> 518E8EF316B2091C00E91429 /* AuthenticationManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AuthenticationManager.cpp; path = Authentication/AuthenticationManager.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 518E8EF416B2091C00E91429 /* AuthenticationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AuthenticationManager.h; path = Authentication/AuthenticationManager.h; sourceTree = "<group>"; };
</span><span class="cx"> 518E8EF516B2091C00E91429 /* AuthenticationManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AuthenticationManager.messages.in; path = Authentication/AuthenticationManager.messages.in; sourceTree = "<group>"; };
</span><span class="lines">@@ -4414,8 +4410,6 @@
</span><span class="cx"> E1E552C316AE065E004ED653 /* SandboxInitializationParameters.h */,
</span><span class="cx"> 33152973130D0CB200ED2483 /* SecurityOriginData.cpp */,
</span><span class="cx"> 33152974130D0CB200ED2483 /* SecurityOriginData.h */,
</span><del>- 518D2CC812D51DFB003BB93B /* LegacySessionState.cpp */,
- 518D2CC912D51DFB003BB93B /* LegacySessionState.h */,
</del><span class="cx"> 1AFDE6571954A42B00C48FFA /* SessionState.cpp */,
</span><span class="cx"> 1AFDE6581954A42B00C48FFA /* SessionState.h */,
</span><span class="cx"> 753E3E0B1887397300188496 /* SessionTracker.cpp */,
</span><span class="lines">@@ -7337,7 +7331,6 @@
</span><span class="cx"> E18E690C169B563F009B6670 /* SecItemShimProxy.h in Headers */,
</span><span class="cx"> E18E6918169B667B009B6670 /* SecItemShimProxyMessages.h in Headers */,
</span><span class="cx"> 33152976130D0CB200ED2483 /* SecurityOriginData.h in Headers */,
</span><del>- 518D2CCB12D51DFB003BB93B /* LegacySessionState.h in Headers */,
</del><span class="cx"> 1AA20D5118AD50E0005D1ED4 /* WKNavigationDelegatePrivate.h in Headers */,
</span><span class="cx"> 1ACB7987191ECADD006A6A61 /* XPCPtr.h in Headers */,
</span><span class="cx"> 1A6420E512DCE2FF00CAAE2C /* ShareableBitmap.h in Headers */,
</span><span class="lines">@@ -9017,7 +9010,6 @@
</span><span class="cx"> E18E690B169B563F009B6670 /* SecItemShimProxy.cpp in Sources */,
</span><span class="cx"> E18E6917169B667B009B6670 /* SecItemShimProxyMessageReceiver.cpp in Sources */,
</span><span class="cx"> 33152975130D0CB200ED2483 /* SecurityOriginData.cpp in Sources */,
</span><del>- 518D2CCA12D51DFB003BB93B /* LegacySessionState.cpp in Sources */,
</del><span class="cx"> 515E772B184008B90007203F /* DatabaseProcessCreationParameters.cpp in Sources */,
</span><span class="cx"> 1A6420E412DCE2FF00CAAE2C /* ShareableBitmap.cpp in Sources */,
</span><span class="cx"> C01A260112662F2100C9ED55 /* ShareableBitmapCG.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (170724 => 170725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-07-02 21:35:43 UTC (rev 170724)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-07-02 21:49:33 UTC (rev 170725)
</span><span class="lines">@@ -41,8 +41,6 @@
</span><span class="cx"> #include "InjectedBundleBackForwardList.h"
</span><span class="cx"> #include "InjectedBundleUserMessageCoders.h"
</span><span class="cx"> #include "LayerTreeHost.h"
</span><del>-#include "LegacySessionState.h"
-#include "LegacySessionStateCoding.h"
</del><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "NetscapePlugin.h"
</span><span class="cx"> #include "NotificationPermissionRequestManager.h"
</span></span></pre>
</div>
</div>
</body>
</html>