[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
beidson at apple.com
beidson at apple.com
Fri Jan 21 14:58:44 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 03ae156182d3a52585abd97d9136aad7bbf22372
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 5 21:45:04 2011 +0000
https://bugs.webkit.org/show_bug.cgi?id=51949
Make WebBackForwardListItem shared, and add encoders and decoders
Reviewed by Darin Adler.
* Shared/WebBackForwardListItem.cpp: Copied from UIProcess/WebBackForwardListItem.cpp.
(WebKit::WebBackForwardListItem::encode):
(WebKit::WebBackForwardListItem::decode):
* Shared/WebBackForwardListItem.h: Copied from UIProcess/WebBackForwardListItem.h.
* UIProcess/WebBackForwardListItem.cpp: Removed.
* UIProcess/WebBackForwardListItem.h: Removed.
* WebKit2.pro:
* WebKit2.xcodeproj/project.pbxproj:
* win/WebKit2.vcproj:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75100 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 2f8b9a4..3ac1ed2 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,21 @@
+2011-01-05 Brady Eidson <beidson at apple.com>
+
+ Reviewed by Darin Adler.
+
+ https://bugs.webkit.org/show_bug.cgi?id=51949
+ Make WebBackForwardListItem shared, and add encoders and decoders
+
+ * Shared/WebBackForwardListItem.cpp: Copied from UIProcess/WebBackForwardListItem.cpp.
+ (WebKit::WebBackForwardListItem::encode):
+ (WebKit::WebBackForwardListItem::decode):
+ * Shared/WebBackForwardListItem.h: Copied from UIProcess/WebBackForwardListItem.h.
+ * UIProcess/WebBackForwardListItem.cpp: Removed.
+ * UIProcess/WebBackForwardListItem.h: Removed.
+
+ * WebKit2.pro:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * win/WebKit2.vcproj:
+
2011-01-05 Anders Carlsson <andersca at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKit2/Shared/WebBackForwardListItem.cpp b/WebKit2/Shared/WebBackForwardListItem.cpp
new file mode 100644
index 0000000..02e5ed5
--- /dev/null
+++ b/WebKit2/Shared/WebBackForwardListItem.cpp
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2010, 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 "WebBackForwardListItem.h"
+
+#include "DataReference.h"
+#include "WebCoreArgumentCoders.h"
+
+namespace WebKit {
+
+WebBackForwardListItem::WebBackForwardListItem(const String& originalURL, const String& url, const String& title, const uint8_t* backForwardData, size_t backForwardDataSize, uint64_t itemID)
+ : m_originalURL(originalURL)
+ , m_url(url)
+ , m_title(title)
+ , m_itemID(itemID)
+{
+ setBackForwardData(backForwardData, backForwardDataSize);
+}
+
+WebBackForwardListItem::~WebBackForwardListItem()
+{
+}
+
+void WebBackForwardListItem::setBackForwardData(const uint8_t* data, size_t size)
+{
+ m_backForwardData.reserveCapacity(size);
+ m_backForwardData.append(data, size);
+}
+
+void WebBackForwardListItem::encode(CoreIPC::ArgumentEncoder& encoder) const
+{
+ encoder.encode(m_originalURL);
+ encoder.encode(m_url);
+ encoder.encode(m_title);
+ encoder.encode(m_itemID);
+ encoder.encode(CoreIPC::DataReference(m_backForwardData.data(), m_backForwardData.size()));
+}
+
+PassRefPtr<WebBackForwardListItem> WebBackForwardListItem::decode(CoreIPC::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;
+
+ CoreIPC::DataReference data;
+ if (!decoder.decode(data))
+ return 0;
+
+ return create(originalURL, url, title, data.data(), data.size(), itemID);
+}
+
+} // namespace WebKit
diff --git a/WebKit2/Shared/WebBackForwardListItem.h b/WebKit2/Shared/WebBackForwardListItem.h
new file mode 100644
index 0000000..9944a56
--- /dev/null
+++ b/WebKit2/Shared/WebBackForwardListItem.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2010, 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 WebBackForwardListItem_h
+#define WebBackForwardListItem_h
+
+#include "APIObject.h"
+#include <wtf/PassRefPtr.h>
+#include <wtf/text/WTFString.h>
+
+namespace CoreIPC {
+ class ArgumentDecoder;
+ class ArgumentEncoder;
+}
+
+namespace WebKit {
+
+class WebBackForwardListItem : public APIObject {
+public:
+ static const Type APIType = TypeBackForwardListItem;
+
+ 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));
+ }
+
+ virtual ~WebBackForwardListItem();
+
+ uint64_t itemID() const { return m_itemID; }
+
+ void setOriginalURL(const String& originalURL) { m_originalURL = originalURL; }
+ const String& originalURL() const { return m_originalURL; }
+
+ void setURL(const String& url) { m_url = url; }
+ const String& url() const { return m_url; }
+
+ void setTitle(const String& title) { m_title = title; }
+ const String& title() const { return m_title; }
+
+ void setBackForwardData(const uint8_t* buffer, size_t size);
+ const Vector<uint8_t>& backForwardData() const { return m_backForwardData; }
+
+ void encode(CoreIPC::ArgumentEncoder&) const;
+ static PassRefPtr<WebBackForwardListItem> decode(CoreIPC::ArgumentDecoder&);
+
+private:
+ WebBackForwardListItem(const String& originalURL, const String& url, const String& title, const uint8_t* backForwardData, size_t backForwardDataSize, uint64_t itemID);
+
+ virtual Type type() const { return APIType; }
+
+ String m_originalURL;
+ String m_url;
+ String m_title;
+ uint64_t m_itemID;
+ Vector<uint8_t> m_backForwardData;
+};
+
+} // namespace WebKit
+
+#endif // WebBackForwardListItem_h
diff --git a/WebKit2/UIProcess/WebBackForwardListItem.cpp b/WebKit2/UIProcess/WebBackForwardListItem.cpp
deleted file mode 100644
index 1d046ad..0000000
--- a/WebKit2/UIProcess/WebBackForwardListItem.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2010, 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 "WebBackForwardListItem.h"
-
-namespace WebKit {
-
-WebBackForwardListItem::WebBackForwardListItem(const String& originalURL, const String& url, const String& title, const uint8_t* backForwardData, size_t backForwardDataSize, uint64_t itemID)
- : m_originalURL(originalURL)
- , m_url(url)
- , m_title(title)
- , m_itemID(itemID)
-{
- setBackForwardData(backForwardData, backForwardDataSize);
-}
-
-WebBackForwardListItem::~WebBackForwardListItem()
-{
-}
-
-void WebBackForwardListItem::setBackForwardData(const uint8_t* data, size_t size)
-{
- m_backForwardData.reserveCapacity(size);
- m_backForwardData.append(data, size);
-}
-
-} // namespace WebKit
diff --git a/WebKit2/UIProcess/WebBackForwardListItem.h b/WebKit2/UIProcess/WebBackForwardListItem.h
deleted file mode 100644
index 4962227..0000000
--- a/WebKit2/UIProcess/WebBackForwardListItem.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2010, 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 WebBackForwardListItem_h
-#define WebBackForwardListItem_h
-
-#include "APIObject.h"
-#include <wtf/PassRefPtr.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebKit {
-
-class WebPageProxy;
-
-class WebBackForwardListItem : public APIObject {
-public:
- static const Type APIType = TypeBackForwardListItem;
-
- 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));
- }
-
- virtual ~WebBackForwardListItem();
-
- uint64_t itemID() const { return m_itemID; }
-
- void setOriginalURL(const String& originalURL) { m_originalURL = originalURL; }
- const String& originalURL() const { return m_originalURL; }
-
- void setURL(const String& url) { m_url = url; }
- const String& url() const { return m_url; }
-
- void setTitle(const String& title) { m_title = title; }
- const String& title() const { return m_title; }
-
- void setBackForwardData(const uint8_t* buffer, size_t size);
- const Vector<uint8_t>& backForwardData() const { return m_backForwardData; }
-
-private:
- WebBackForwardListItem(const String& originalURL, const String& url, const String& title, const uint8_t* backForwardData, size_t backForwardDataSize, uint64_t itemID);
-
- virtual Type type() const { return APIType; }
-
- String m_originalURL;
- String m_url;
- String m_title;
- uint64_t m_itemID;
- Vector<uint8_t> m_backForwardData;
-};
-
-} // namespace WebKit
-
-#endif // WebBackForwardListItem_h
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index b54da9d..2615eeb 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -257,6 +257,7 @@ HEADERS += \
Shared/StringPairVector.h \
Shared/UserMessageCoders.h \
Shared/VisitedLinkTable.h \
+ Shared/WebBackForwardListItem.h \
Shared/WebCertificateInfo.h \
Shared/WebContextMenuItem.h \
Shared/WebContextMenuItemData.h \
@@ -467,6 +468,7 @@ SOURCES += \
Shared/OriginAndDatabases.cpp \
Shared/PlatformPopupMenuData.cpp \
Shared/VisitedLinkTable.cpp \
+ Shared/WebBackForwardListItem.cpp \
Shared/WebContextMenuItem.cpp \
Shared/WebContextMenuItemData.cpp \
Shared/WebError.cpp \
@@ -538,7 +540,6 @@ SOURCES += \
UIProcess/TiledDrawingAreaProxy.cpp \
UIProcess/VisitedLinkProvider.cpp \
UIProcess/WebBackForwardList.cpp \
- UIProcess/WebBackForwardListItem.cpp \
UIProcess/WebContext.cpp \
UIProcess/WebContextInjectedBundleClient.cpp \
UIProcess/WebContextMenuProxy.cpp \
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index 9c5ee2e..99c7980 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -249,6 +249,8 @@
51871B5C127CB89D00F76232 /* WebContextMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 51871B5A127CB89D00F76232 /* WebContextMenu.h */; };
518ACAEA12AEE6BB00B04B83 /* WKProtectionSpaceTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 518ACAE912AEE6BB00B04B83 /* WKProtectionSpaceTypes.h */; settings = {ATTRIBUTES = (Public, ); }; };
518ACF1112B015F800B04B83 /* WKCredentialTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 518ACF1012B015F800B04B83 /* WKCredentialTypes.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 518D2CAD12D5153B003BB93B /* WebBackForwardListItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 518D2CAB12D5153B003BB93B /* WebBackForwardListItem.cpp */; };
+ 518D2CAE12D5153B003BB93B /* WebBackForwardListItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 518D2CAC12D5153B003BB93B /* WebBackForwardListItem.h */; };
51A555F5128C6C47009ABCEC /* WKContextMenuItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A555F3128C6C47009ABCEC /* WKContextMenuItem.cpp */; };
51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A555F4128C6C47009ABCEC /* WKContextMenuItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A55600128C6D92009ABCEC /* WKContextMenuItemTypes.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -431,8 +433,6 @@
BC617EE8104CB34700FB3FE1 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1C7DE100E846E0078DEBC /* JavaScriptCore.framework */; };
BC64696F11DBE603006455B0 /* ImmutableArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC64696D11DBE603006455B0 /* ImmutableArray.cpp */; };
BC64697011DBE603006455B0 /* ImmutableArray.h in Headers */ = {isa = PBXBuildFile; fileRef = BC64696E11DBE603006455B0 /* ImmutableArray.h */; };
- BC646BF911DD377B006455B0 /* WebBackForwardListItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC646BF511DD377B006455B0 /* WebBackForwardListItem.cpp */; };
- BC646BFA11DD377B006455B0 /* WebBackForwardListItem.h in Headers */ = {isa = PBXBuildFile; fileRef = BC646BF611DD377B006455B0 /* WebBackForwardListItem.h */; };
BC646C1A11DD399F006455B0 /* WKBackForwardList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC646C1611DD399F006455B0 /* WKBackForwardList.cpp */; };
BC646C1B11DD399F006455B0 /* WKBackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = BC646C1711DD399F006455B0 /* WKBackForwardList.h */; settings = {ATTRIBUTES = (Public, ); }; };
BC646C1C11DD399F006455B0 /* WKBackForwardListItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC646C1811DD399F006455B0 /* WKBackForwardListItem.cpp */; };
@@ -929,6 +929,8 @@
51871B5A127CB89D00F76232 /* WebContextMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextMenu.h; sourceTree = "<group>"; };
518ACAE912AEE6BB00B04B83 /* WKProtectionSpaceTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProtectionSpaceTypes.h; sourceTree = "<group>"; };
518ACF1012B015F800B04B83 /* WKCredentialTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKCredentialTypes.h; sourceTree = "<group>"; };
+ 518D2CAB12D5153B003BB93B /* WebBackForwardListItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebBackForwardListItem.cpp; sourceTree = "<group>"; };
+ 518D2CAC12D5153B003BB93B /* WebBackForwardListItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebBackForwardListItem.h; sourceTree = "<group>"; };
51A555F3128C6C47009ABCEC /* WKContextMenuItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKContextMenuItem.cpp; sourceTree = "<group>"; };
51A555F4128C6C47009ABCEC /* WKContextMenuItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContextMenuItem.h; sourceTree = "<group>"; };
51A55600128C6D92009ABCEC /* WKContextMenuItemTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContextMenuItemTypes.h; sourceTree = "<group>"; };
@@ -1117,8 +1119,6 @@
BC60C5781240A546008C5E29 /* WKBundleRangeHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKBundleRangeHandle.cpp; sourceTree = "<group>"; };
BC64696D11DBE603006455B0 /* ImmutableArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImmutableArray.cpp; sourceTree = "<group>"; };
BC64696E11DBE603006455B0 /* ImmutableArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImmutableArray.h; sourceTree = "<group>"; };
- BC646BF511DD377B006455B0 /* WebBackForwardListItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebBackForwardListItem.cpp; sourceTree = "<group>"; };
- BC646BF611DD377B006455B0 /* WebBackForwardListItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebBackForwardListItem.h; sourceTree = "<group>"; };
BC646C1611DD399F006455B0 /* WKBackForwardList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKBackForwardList.cpp; sourceTree = "<group>"; };
BC646C1711DD399F006455B0 /* WKBackForwardList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBackForwardList.h; sourceTree = "<group>"; };
BC646C1811DD399F006455B0 /* WKBackForwardListItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKBackForwardListItem.cpp; sourceTree = "<group>"; };
@@ -1650,6 +1650,8 @@
BCB0B0DF12305AB100B1341E /* UserMessageCoders.h */,
1A0F29C9120B37160053D1B9 /* VisitedLinkTable.cpp */,
1A0F29CA120B37160053D1B9 /* VisitedLinkTable.h */,
+ 518D2CAB12D5153B003BB93B /* WebBackForwardListItem.cpp */,
+ 518D2CAC12D5153B003BB93B /* WebBackForwardListItem.h */,
BCF50726124329AA005955AE /* WebCertificateInfo.h */,
512935D51288D19400A4B695 /* WebContextMenuItem.cpp */,
512935D61288D19400A4B695 /* WebContextMenuItem.h */,
@@ -1959,8 +1961,6 @@
1A0F29E2120B44420053D1B9 /* VisitedLinkProvider.h */,
BC72BA1B11E64907001EB4EA /* WebBackForwardList.cpp */,
BC72BA1C11E64907001EB4EA /* WebBackForwardList.h */,
- BC646BF511DD377B006455B0 /* WebBackForwardListItem.cpp */,
- BC646BF611DD377B006455B0 /* WebBackForwardListItem.h */,
BCB9E2421120DACA00A137E0 /* WebContext.cpp */,
BCB9E2411120DACA00A137E0 /* WebContext.h */,
BCEE7D0912846AED009827DA /* WebContext.messages.in */,
@@ -2584,7 +2584,6 @@
BC2E6E881141971500A63B1E /* RunLoop.h in Headers */,
BC9E95D311449B0300870E71 /* UpdateChunk.h in Headers */,
BC72BA1E11E64907001EB4EA /* WebBackForwardList.h in Headers */,
- BC646BFA11DD377B006455B0 /* WebBackForwardListItem.h in Headers */,
BC72B9FB11E6476B001EB4EA /* WebBackForwardListProxy.h in Headers */,
BC032D7510F4378D0058C15A /* WebChromeClient.h in Headers */,
BCB9E2431120DACA00A137E0 /* WebContext.h in Headers */,
@@ -2846,6 +2845,7 @@
93FC67BE12D3CCF200A60610 /* DecoderAdapter.h in Headers */,
93FC67C012D3CCF200A60610 /* EncoderAdapter.h in Headers */,
1A5E4DA412D3BD3D0099A2BB /* TextCheckerState.h in Headers */,
+ 518D2CAE12D5153B003BB93B /* WebBackForwardListItem.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3034,7 +3034,6 @@
BC0092F7115837A300E0AE2A /* RunLoopMac.mm in Sources */,
BC9E95D411449B0300870E71 /* UpdateChunk.cpp in Sources */,
BC72BA1D11E64907001EB4EA /* WebBackForwardList.cpp in Sources */,
- BC646BF911DD377B006455B0 /* WebBackForwardListItem.cpp in Sources */,
BC72B9FA11E6476B001EB4EA /* WebBackForwardListProxy.cpp in Sources */,
BC111A5A112F4FBB00337BAB /* WebChromeClient.cpp in Sources */,
BCB9E2441120DACA00A137E0 /* WebContext.cpp in Sources */,
@@ -3278,6 +3277,7 @@
BCAC112012C92C1F00B08EEE /* WebDatabaseManagerProxyClient.cpp in Sources */,
93FC67BD12D3CCF200A60610 /* DecoderAdapter.cpp in Sources */,
93FC67BF12D3CCF200A60610 /* EncoderAdapter.cpp in Sources */,
+ 518D2CAD12D5153B003BB93B /* WebBackForwardListItem.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index 8325eb9..09a57a7 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -515,6 +515,14 @@
>
</File>
<File
+ RelativePath="..\Shared\WebBackForwardListItem.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\Shared\WebBackForwardListItem.h"
+ >
+ </File>
+ <File
RelativePath="..\Shared\WebCertificateInfo.h"
>
</File>
@@ -2023,14 +2031,6 @@
>
</File>
<File
- RelativePath="..\UIProcess\WebBackForwardListItem.cpp"
- >
- </File>
- <File
- RelativePath="..\UIProcess\WebBackForwardListItem.h"
- >
- </File>
- <File
RelativePath="..\UIProcess\WebContext.cpp"
>
</File>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list