[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
beidson at apple.com
beidson at apple.com
Wed Dec 22 11:42:42 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5cac4f2f57a202d0a16d4295241699c6a0d07352
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 4 18:55:22 2010 +0000
2010-08-04 Brady Eidson <beidson at apple.com>
Reviewed by Sam Weinig.
Lay the groundwork for saving/restoring page session state to WK2
https://bugs.webkit.org/show_bug.cgi?id=43495
* WebKit2.xcodeproj/project.pbxproj:
* win/WebKit2.vcproj:
* Shared/APIObject.h:
(WebKit::APIObject::):
* UIProcess/API/C/WKAPICast.h:
* UIProcess/API/C/WKBase.h:
Arbitrary byte buffer:
* Shared/WebData.h: Added.
(WebKit::WebData::create):
(WebKit::WebData::bytes):
(WebKit::WebData::size):
(WebKit::WebData::WebData):
(WebKit::WebData::type):
API facing object to act as a byte buffer:
* UIProcess/API/C/WKData.cpp: Added.
(WKDataGetTypeID):
(WKDataCreate):
(WKDataGetBytes):
(WKDataGetSize):
(WKDataRetain):
(WKDataRelease):
* UIProcess/API/C/WKData.h: Added.
API for saving/restoring state:
* UIProcess/API/C/WKPage.cpp:
(WKPageCopySessionState):
(WKPageRestoreFromSessionState):
* UIProcess/API/C/WKPage.h:
These will be filled in later:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::sessionState):
(WebKit::WebPageProxy::restoreFromSessionState):
* UIProcess/WebPageProxy.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64662 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 842262b..09e915f 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,49 @@
+2010-08-04 Brady Eidson <beidson at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Lay the groundwork for saving/restoring page session state to WK2
+ https://bugs.webkit.org/show_bug.cgi?id=43495
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ * win/WebKit2.vcproj:
+
+ * Shared/APIObject.h:
+ (WebKit::APIObject::):
+ * UIProcess/API/C/WKAPICast.h:
+ * UIProcess/API/C/WKBase.h:
+
+ Arbitrary byte buffer:
+ * Shared/WebData.h: Added.
+ (WebKit::WebData::create):
+ (WebKit::WebData::bytes):
+ (WebKit::WebData::size):
+ (WebKit::WebData::WebData):
+ (WebKit::WebData::type):
+
+ API facing object to act as a byte buffer:
+ * UIProcess/API/C/WKData.cpp: Added.
+ (WKDataGetTypeID):
+ (WKDataCreate):
+ (WKDataGetBytes):
+ (WKDataGetSize):
+ (WKDataRetain):
+ (WKDataRelease):
+ * UIProcess/API/C/WKData.h: Added.
+
+ API for saving/restoring state:
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageCopySessionState):
+ (WKPageRestoreFromSessionState):
+ * UIProcess/API/C/WKPage.h:
+
+ These will be filled in later:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::sessionState):
+ (WebKit::WebPageProxy::restoreFromSessionState):
+ * UIProcess/WebPageProxy.h:
+
+
2010-08-04 Sam Weinig <sam at webkit.org>
Reviewed by Anders Carlsson.
diff --git a/WebKit2/Shared/APIObject.h b/WebKit2/Shared/APIObject.h
index 3825c11..a1fbb91 100644
--- a/WebKit2/Shared/APIObject.h
+++ b/WebKit2/Shared/APIObject.h
@@ -35,6 +35,7 @@ public:
enum Type {
// Base types
TypeArray,
+ TypeData,
TypeString,
TypeURL,
diff --git a/WebKit2/Shared/WebData.h b/WebKit2/Shared/WebData.h
new file mode 100644
index 0000000..dfe1ada
--- /dev/null
+++ b/WebKit2/Shared/WebData.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2010 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 WebData_h
+#define WebData_h
+
+#include "APIObject.h"
+#include <wtf/PassRefPtr.h>
+#include <wtf/Vector.h>
+
+namespace WebKit {
+
+// WebData - A data buffer type suitable for vending to an API.
+
+class WebData : public APIObject {
+public:
+ static const Type APIType = TypeData;
+
+ static PassRefPtr<WebData> create(const unsigned char* bytes, size_t size)
+ {
+ return adoptRef(new WebData(bytes, size));
+ }
+
+ static PassRefPtr<WebData> create(const Vector<unsigned char>& buffer)
+ {
+ return adoptRef(new WebData(buffer));
+ }
+
+ const unsigned char* bytes() const { return m_buffer.data(); }
+ size_t size() const { return m_buffer.size(); }
+
+private:
+ WebData(const unsigned char* bytes, size_t size)
+ : m_buffer(size)
+ {
+ memcpy(m_buffer.data(), bytes, size);
+ }
+
+ WebData(const Vector<unsigned char>& buffer)
+ : m_buffer(buffer)
+ {
+ }
+
+ virtual Type type() const { return APIType; }
+
+ Vector<unsigned char> m_buffer;
+};
+
+} // namespace WebKit
+
+#endif // WebData_h
diff --git a/WebKit2/UIProcess/API/C/WKAPICast.h b/WebKit2/UIProcess/API/C/WKAPICast.h
index 979cf07..7b79b04 100644
--- a/WebKit2/UIProcess/API/C/WKAPICast.h
+++ b/WebKit2/UIProcess/API/C/WKAPICast.h
@@ -42,6 +42,7 @@ class ImmutableArray;
class WebBackForwardList;
class WebBackForwardListItem;
class WebContext;
+class WebData;
class WebFramePolicyListenerProxy;
class WebFrameProxy;
class WebNavigationData;
@@ -52,33 +53,37 @@ class WebString;
template<typename APIType> struct APITypeInfo { };
template<> struct APITypeInfo<WKTypeRef> { typedef APIObject* ImplType; };
-template<> struct APITypeInfo<WKFrameRef> { typedef WebFrameProxy* ImplType; };
-template<> struct APITypeInfo<WKPageRef> { typedef WebPageProxy* ImplType; };
+template<> struct APITypeInfo<WKArrayRef> { typedef ImmutableArray* ImplType; };
+template<> struct APITypeInfo<WKBackForwardListItemRef> { typedef WebBackForwardListItem* ImplType; };
+template<> struct APITypeInfo<WKBackForwardListRef> { typedef WebBackForwardList* ImplType; };
template<> struct APITypeInfo<WKContextRef> { typedef WebContext* ImplType; };
-template<> struct APITypeInfo<WKPageNamespaceRef> { typedef WebPageNamespace* ImplType; };
+template<> struct APITypeInfo<WKDataRef> { typedef WebData* ImplType; };
template<> struct APITypeInfo<WKFramePolicyListenerRef> { typedef WebFramePolicyListenerProxy* ImplType; };
+template<> struct APITypeInfo<WKFrameRef> { typedef WebFrameProxy* ImplType; };
+template<> struct APITypeInfo<WKNavigationDataRef> { typedef WebNavigationData* ImplType; };
+template<> struct APITypeInfo<WKPageNamespaceRef> { typedef WebPageNamespace* ImplType; };
+template<> struct APITypeInfo<WKPageRef> { typedef WebPageProxy* ImplType; };
template<> struct APITypeInfo<WKPreferencesRef> { typedef WebPreferences* ImplType; };
template<> struct APITypeInfo<WKStringRef> { typedef WebString* ImplType; };
template<> struct APITypeInfo<WKURLRef> { typedef WebURL* ImplType; };
-template<> struct APITypeInfo<WKNavigationDataRef> { typedef WebNavigationData* ImplType; };
-template<> struct APITypeInfo<WKArrayRef> { typedef ImmutableArray* ImplType; };
-template<> struct APITypeInfo<WKBackForwardListItemRef> { typedef WebBackForwardListItem* ImplType; };
-template<> struct APITypeInfo<WKBackForwardListRef> { typedef WebBackForwardList* ImplType; };
+
template<typename ImplType> struct ImplTypeInfo { };
template<> struct ImplTypeInfo<APIObject*> { typedef WKTypeRef APIType; };
-template<> struct ImplTypeInfo<WebFrameProxy*> { typedef WKFrameRef APIType; };
-template<> struct ImplTypeInfo<WebPageProxy*> { typedef WKPageRef APIType; };
+template<> struct ImplTypeInfo<ImmutableArray*> { typedef WKArrayRef APIType; };
+template<> struct ImplTypeInfo<WebBackForwardList*> { typedef WKBackForwardListRef APIType; };
+template<> struct ImplTypeInfo<WebBackForwardListItem*> { typedef WKBackForwardListItemRef APIType; };
template<> struct ImplTypeInfo<WebContext*> { typedef WKContextRef APIType; };
-template<> struct ImplTypeInfo<WebPageNamespace*> { typedef WKPageNamespaceRef APIType; };
+template<> struct ImplTypeInfo<WebData*> { typedef WKDataRef APIType; };
template<> struct ImplTypeInfo<WebFramePolicyListenerProxy*> { typedef WKFramePolicyListenerRef APIType; };
+template<> struct ImplTypeInfo<WebFrameProxy*> { typedef WKFrameRef APIType; };
+template<> struct ImplTypeInfo<WebNavigationData*> { typedef WKNavigationDataRef APIType; };
+template<> struct ImplTypeInfo<WebPageNamespace*> { typedef WKPageNamespaceRef APIType; };
+template<> struct ImplTypeInfo<WebPageProxy*> { typedef WKPageRef APIType; };
template<> struct ImplTypeInfo<WebPreferences*> { typedef WKPreferencesRef APIType; };
template<> struct ImplTypeInfo<WebString*> { typedef WKStringRef APIType; };
template<> struct ImplTypeInfo<WebURL*> { typedef WKURLRef APIType; };
-template<> struct ImplTypeInfo<WebNavigationData*> { typedef WKNavigationDataRef APIType; };
-template<> struct ImplTypeInfo<ImmutableArray*> { typedef WKArrayRef APIType; };
-template<> struct ImplTypeInfo<WebBackForwardListItem*> { typedef WKBackForwardListItemRef APIType; };
-template<> struct ImplTypeInfo<WebBackForwardList*> { typedef WKBackForwardListRef APIType; };
+
template<typename ImplType, typename APIType = typename ImplTypeInfo<ImplType*>::APIType>
class ProxyingRefPtr {
diff --git a/WebKit2/UIProcess/API/C/WKBase.h b/WebKit2/UIProcess/API/C/WKBase.h
index 7444ff8..c3e5ac6 100644
--- a/WebKit2/UIProcess/API/C/WKBase.h
+++ b/WebKit2/UIProcess/API/C/WKBase.h
@@ -39,6 +39,7 @@ typedef struct OpaqueWKArrayRef* WKArrayRef;
typedef struct OpaqueWKBackForwardListItemRef* WKBackForwardListItemRef;
typedef struct OpaqueWKBackForwardListRef* WKBackForwardListRef;
typedef struct OpaqueWKContext* WKContextRef;
+typedef struct OpaqueWKData* WKDataRef;
typedef struct OpaqueWKFrame* WKFrameRef;
typedef struct OpaqueWKFramePolicyListener* WKFramePolicyListenerRef;
typedef struct OpaqueWKNavigationDataRef* WKNavigationDataRef;
diff --git a/WebKit2/UIProcess/API/C/WKData.cpp b/WebKit2/UIProcess/API/C/WKData.cpp
new file mode 100644
index 0000000..08d8371
--- /dev/null
+++ b/WebKit2/UIProcess/API/C/WKData.cpp
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2010 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 "WKData.h"
+
+#include "WebData.h"
+#include "WKAPICast.h"
+
+using namespace WebKit;
+
+WKTypeID WKDataGetTypeID()
+{
+ return toRef(WebData::APIType);
+}
+
+WKDataRef WKDataCreate(const unsigned char* bytes, size_t size)
+{
+ RefPtr<WebData> data = WebData::create(bytes, size);
+ return toRef(data.release().releaseRef());
+}
+
+const unsigned char* WKDataGetBytes(WKDataRef dataRef)
+{
+ return toWK(dataRef)->bytes();
+}
+
+size_t WKDataGetSize(WKDataRef dataRef)
+{
+ return toWK(dataRef)->size();
+}
+
+WKDataRef WKDataRetain(WKDataRef dataRef)
+{
+ toWK(dataRef)->ref();
+ return dataRef;
+}
+
+void WKDataRelease(WKDataRef dataRef)
+{
+ toWK(dataRef)->deref();
+}
diff --git a/WebKit2/UIProcess/API/C/WKData.h b/WebKit2/UIProcess/API/C/WKData.h
new file mode 100644
index 0000000..4453b38
--- /dev/null
+++ b/WebKit2/UIProcess/API/C/WKData.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2010 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 WKData_h
+#define WKData_h
+
+#include <WebKit2/WKBase.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WK_EXPORT WKTypeID WKDataGetTypeID();
+
+WK_EXPORT WKDataRef WKDataCreate(const unsigned char* bytes, size_t size);
+
+WK_EXPORT const unsigned char* WKDataGetBytes(WKDataRef data);
+WK_EXPORT size_t WKDataGetSize(WKDataRef data);
+
+WK_EXPORT WKDataRef WKDataRetain(WKDataRef data);
+WK_EXPORT void WKDataRelease(WKDataRef data);
+
+#ifdef __cplusplus
+}
+#endif
+
+WK_DECLARE_RETAIN_RELEASE_OVERLOADS(WKData)
+
+#endif // WKData_h
diff --git a/WebKit2/UIProcess/API/C/WKPage.cpp b/WebKit2/UIProcess/API/C/WKPage.cpp
index ff35dd2..b6fa844 100644
--- a/WebKit2/UIProcess/API/C/WKPage.cpp
+++ b/WebKit2/UIProcess/API/C/WKPage.cpp
@@ -28,6 +28,7 @@
#include "WKAPICast.h"
#include "WebBackForwardList.h"
+#include "WebData.h"
#include "WebPageProxy.h"
#ifdef __BLOCKS__
@@ -131,6 +132,17 @@ void WKPageTerminate(WKPageRef pageRef)
toWK(pageRef)->terminateProcess();
}
+WKDataRef WKPageCopySessionState(WKPageRef pageRef)
+{
+ RefPtr<WebData> state = toWK(pageRef)->sessionState();
+ return toRef(state.release().releaseRef());
+}
+
+void WKPageRestoreFromSessionState(WKPageRef pageRef, WKDataRef sessionStateData)
+{
+ toWK(pageRef)->restoreFromSessionState(toWK(sessionStateData));
+}
+
void WKPageSetPageLoaderClient(WKPageRef pageRef, const WKPageLoaderClient* wkClient)
{
if (wkClient && !wkClient->version)
diff --git a/WebKit2/UIProcess/API/C/WKPage.h b/WebKit2/UIProcess/API/C/WKPage.h
index ad37421..999eb01 100644
--- a/WebKit2/UIProcess/API/C/WKPage.h
+++ b/WebKit2/UIProcess/API/C/WKPage.h
@@ -160,6 +160,9 @@ WK_EXPORT double WKPageGetEstimatedProgress(WKPageRef page);
WK_EXPORT void WKPageTerminate(WKPageRef page);
+WK_EXPORT WKDataRef WKPageCopySessionState(WKPageRef page);
+WK_EXPORT void WKPageRestoreFromSessionState(WKPageRef page, WKDataRef sessionStateData);
+
WK_EXPORT void WKPageSetPageLoaderClient(WKPageRef page, const WKPageLoaderClient* client);
WK_EXPORT void WKPageSetPagePolicyClient(WKPageRef page, const WKPagePolicyClient* client);
WK_EXPORT void WKPageSetPageUIClient(WKPageRef page, const WKPageUIClient* client);
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index e455b3b..af4b089 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -32,6 +32,7 @@
#include "WebBackForwardListItem.h"
#include "WebContext.h"
#include "WebCoreArgumentCoders.h"
+#include "WebData.h"
#include "WebEvent.h"
#include "WebPageMessageKinds.h"
#include "WebPageNamespace.h"
@@ -340,6 +341,17 @@ void WebPageProxy::terminateProcess()
process()->terminate();
}
+PassRefPtr<WebData> WebPageProxy::sessionState() const
+{
+ // FIXME: Return session state data for saving Page state.
+ return 0;
+}
+
+void WebPageProxy::restoreFromSessionState(WebData*)
+{
+ // FIXME: Restore the Page from the passed in session state data.
+}
+
void WebPageProxy::runJavaScriptInMainFrame(const String& script, PassRefPtr<ScriptReturnValueCallback> prpCallback)
{
RefPtr<ScriptReturnValueCallback> callback = prpCallback;
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index 77c2881..b1d7b1a 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -63,6 +63,7 @@ class DrawingAreaProxy;
class PageClient;
class WebBackForwardList;
class WebBackForwardListItem;
+class WebData;
class WebKeyboardEvent;
class WebMouseEvent;
class WebPageNamespace;
@@ -130,6 +131,9 @@ public:
double estimatedProgress() const { return m_estimatedProgress; }
void terminateProcess();
+
+ PassRefPtr<WebData> sessionState() const;
+ void restoreFromSessionState(WebData*);
void runJavaScriptInMainFrame(const WebCore::String&, PassRefPtr<ScriptReturnValueCallback>);
void getRenderTreeExternalRepresentation(PassRefPtr<RenderTreeExternalRepresentationCallback>);
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index f6b4516..b747279 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -86,6 +86,9 @@
1AEFD27911D16C81008219D3 /* ArgumentCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEFD27811D16C81008219D3 /* ArgumentCoder.h */; };
1AEFD2F711D1807B008219D3 /* ArgumentCoders.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEFD2F611D1807B008219D3 /* ArgumentCoders.h */; };
1AF3060A111B599E00F96436 /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */; };
+ 514AF6C81209EE7300A26C97 /* WKData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 514AF6C61209EE7300A26C97 /* WKData.cpp */; };
+ 514AF6C91209EE7300A26C97 /* WKData.h in Headers */ = {isa = PBXBuildFile; fileRef = 514AF6C71209EE7300A26C97 /* WKData.h */; };
+ 51578B831209ECEF00A37C4A /* WebData.h in Headers */ = {isa = PBXBuildFile; fileRef = 51578B821209ECEF00A37C4A /* WebData.h */; };
5DAD729C116FF86200EE5396 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
6D8A91A611F0EFD100DD01FE /* com.apple.WebProcess.sb in Resources */ = {isa = PBXBuildFile; fileRef = 6D8A91A511F0EFD100DD01FE /* com.apple.WebProcess.sb */; };
8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
@@ -388,6 +391,9 @@
1AEFD27811D16C81008219D3 /* ArgumentCoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArgumentCoder.h; sourceTree = "<group>"; };
1AEFD2F611D1807B008219D3 /* ArgumentCoders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArgumentCoders.h; sourceTree = "<group>"; };
32DBCF5E0370ADEE00C91783 /* WebKit2Prefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit2Prefix.h; sourceTree = "<group>"; };
+ 514AF6C61209EE7300A26C97 /* WKData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKData.cpp; sourceTree = "<group>"; };
+ 514AF6C71209EE7300A26C97 /* WKData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKData.h; sourceTree = "<group>"; };
+ 51578B821209ECEF00A37C4A /* WebData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebData.h; sourceTree = "<group>"; };
5DAD7294116FF70B00EE5396 /* WebProcess.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebProcess.xcconfig; sourceTree = "<group>"; };
5DAD73F1116FF90C00EE5396 /* BaseTarget.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = BaseTarget.xcconfig; sourceTree = "<group>"; };
6D8A91A511F0EFD100DD01FE /* com.apple.WebProcess.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = com.apple.WebProcess.sb; path = WebProcess/com.apple.WebProcess.sb; sourceTree = "<group>"; };
@@ -772,19 +778,20 @@
BCF04C8C11FF9B7D00F86A58 /* APIObject.h */,
0FB659221208B4DB0044816C /* DrawingAreaBase.h */,
0FB659A51208B9EE0044816C /* DrawingAreaBase.cpp */,
- BCF04C8E11FF9F6E00F86A58 /* WebString.h */,
- BCDB86C01200FB97007254BE /* WebURL.h */,
1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */,
BC64696D11DBE603006455B0 /* ImmutableArray.cpp */,
BC64696E11DBE603006455B0 /* ImmutableArray.h */,
BCC57161115ADB42001CCAF9 /* NotImplemented.h */,
BC1DD7B1114DC396005ADAF3 /* WebCoreArgumentCoders.h */,
+ 51578B821209ECEF00A37C4A /* WebData.h */,
BC032DAF10F4380F0058C15A /* WebEvent.h */,
BC032DB010F4380F0058C15A /* WebEventConversion.cpp */,
BC032DB110F4380F0058C15A /* WebEventConversion.h */,
BCF69F981176CED600471A52 /* WebNavigationDataStore.h */,
BCD598AB112B7FDF00EC8C23 /* WebPreferencesStore.cpp */,
BCD598AA112B7FDF00EC8C23 /* WebPreferencesStore.h */,
+ BCF04C8E11FF9F6E00F86A58 /* WebString.h */,
+ BCDB86C01200FB97007254BE /* WebURL.h */,
);
path = Shared;
sourceTree = "<group>";
@@ -982,6 +989,8 @@
BCB9E24A1120E15C00A137E0 /* WKContext.cpp */,
BCB9E2491120E15C00A137E0 /* WKContext.h */,
BCC938E01180DE440085E5FE /* WKContextPrivate.h */,
+ 514AF6C61209EE7300A26C97 /* WKData.cpp */,
+ 514AF6C71209EE7300A26C97 /* WKData.h */,
BCD01398110FA420003B8A67 /* WKFrame.cpp */,
BCD01397110FA420003B8A67 /* WKFrame.h */,
BCB9F6A41123DD0D00A137E0 /* WKFramePolicyListener.cpp */,
@@ -1346,6 +1355,8 @@
D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */,
D3B9484911FF4B6500032B39 /* WebSearchPopupMenu.h in Headers */,
0FB659231208B4DB0044816C /* DrawingAreaBase.h in Headers */,
+ 51578B831209ECEF00A37C4A /* WebData.h in Headers */,
+ 514AF6C91209EE7300A26C97 /* WKData.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1550,6 +1561,7 @@
D3B9484611FF4B6500032B39 /* WebPopupMenu.cpp in Sources */,
D3B9484811FF4B6500032B39 /* WebSearchPopupMenu.cpp in Sources */,
0FB659A61208B9EE0044816C /* DrawingAreaBase.cpp in Sources */,
+ 514AF6C81209EE7300A26C97 /* WKData.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index 3004389..ff38a53 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -973,6 +973,10 @@
>
</File>
<File
+ RelativePath="..\UIProcess\WebData.h"
+ >
+ </File>
+ <File
RelativePath="..\UIProcess\WebFramePolicyListenerProxy.cpp"
>
</File>
@@ -1123,6 +1127,14 @@
>
</File>
<File
+ RelativePath="..\UIProcess\API\C\WKData.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\UIProcess\API\C\WKData.h"
+ >
+ </File>
+ <File
RelativePath="..\UIProcess\API\C\WKFrame.cpp"
>
</File>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list