[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
oliver at apple.com
oliver at apple.com
Wed Dec 22 13:11:35 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 8342d97f0493fd2c61c94731d9fbade43c443f7a
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 8 17:58:23 2010 +0000
2010-09-07 Oliver Hunt <oliver at apple.com>
Reviewed by Anders Carlsson.
Support SerializedScriptValue in WebKit2
https://bugs.webkit.org/show_bug.cgi?id=45340
Add a new constructor that allows WebKit2 to create a SerializedScriptValue
directly from serialized data.
* WebCore.exp.in:
* bindings/js/SerializedScriptValue.h:
(WebCore::SerializedScriptValue::adopt):
(WebCore::SerializedScriptValue::data):
2010-09-07 Oliver Hunt <oliver at apple.com>
Reviewed by Anders Carlsson.
Support SerializedScriptValue in WebKit2
https://bugs.webkit.org/show_bug.cgi?id=45340
Add wrappers and IPC serialization for SerializedScriptValue
* Shared/APIObject.h:
* Shared/UserMessageCoders.h:
(WebKit::UserMessageEncoder::baseEncode):
(WebKit::UserMessageDecoder::baseDecode):
* Shared/WebSerializedScriptValue.h: Added.
(WebKit::WebSerializedScriptValue::create):
(WebKit::WebSerializedScriptValue::adopt):
(WebKit::WebSerializedScriptValue::deserialize):
(WebKit::WebSerializedScriptValue::data):
(WebKit::WebSerializedScriptValue::WebSerializedScriptValue):
(WebKit::WebSerializedScriptValue::type):
* UIProcess/API/C/WKAPICast.h:
* UIProcess/API/C/WKBase.h:
* UIProcess/API/C/WKSerializedScriptValue.cpp: Added.
(WKSerializedScriptValueGetTypeID):
(WKSerializedScriptValueCreate):
(WKSerializedScriptValueDeserialize):
* UIProcess/API/C/WKSerializedScriptValue.h: Added.
* WebKit2.xcodeproj/project.pbxproj:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66995 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c1554e1..d6421ca 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-07 Oliver Hunt <oliver at apple.com>
+
+ Reviewed by Anders Carlsson.
+
+ Support SerializedScriptValue in WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=45340
+
+ Add a new constructor that allows WebKit2 to create a SerializedScriptValue
+ directly from serialized data.
+
+ * WebCore.exp.in:
+ * bindings/js/SerializedScriptValue.h:
+ (WebCore::SerializedScriptValue::adopt):
+ (WebCore::SerializedScriptValue::data):
+
2010-09-08 Andy Estes <aestes at apple.com>
Reviewed by Eric Carlson.
diff --git a/WebCore/WebCore.exp.in b/WebCore/WebCore.exp.in
index 5e6c6b3..d35bb4b 100644
--- a/WebCore/WebCore.exp.in
+++ b/WebCore/WebCore.exp.in
@@ -443,6 +443,7 @@ __ZN7WebCore21PlatformKeyboardEventC1EP7NSEvent
__ZN7WebCore21SVGDocumentExtensions21sampleAnimationAtTimeERKN3WTF6StringEPNS_14SVGSMILElementEd
__ZN7WebCore21SerializedScriptValue11deserializeEPK15OpaqueJSContextPPK13OpaqueJSValue
__ZN7WebCore21SerializedScriptValue6createEPK15OpaqueJSContextPK13OpaqueJSValuePS6_
+__ZN7WebCore21SerializedScriptValueC1ERN3WTF6VectorIhLm0EEE
__ZN7WebCore21SerializedScriptValueD1Ev
__ZN7WebCore21UserContentURLPattern5parseERKN3WTF6StringE
__ZN7WebCore21WindowsLatin1EncodingEv
diff --git a/WebCore/bindings/js/SerializedScriptValue.h b/WebCore/bindings/js/SerializedScriptValue.h
index b41d9a3..94bc477 100644
--- a/WebCore/bindings/js/SerializedScriptValue.h
+++ b/WebCore/bindings/js/SerializedScriptValue.h
@@ -42,13 +42,19 @@ public:
static PassRefPtr<SerializedScriptValue> create(JSC::ExecState* exec, JSC::JSValue value);
static PassRefPtr<SerializedScriptValue> create(JSContextRef, JSValueRef value, JSValueRef* exception);
static PassRefPtr<SerializedScriptValue> create(String string);
+ static PassRefPtr<SerializedScriptValue> adopt(Vector<uint8_t>& buffer)
+ {
+ return adoptRef(new SerializedScriptValue(buffer));
+ }
+
static PassRefPtr<SerializedScriptValue> create();
static SerializedScriptValue* nullValue();
JSC::JSValue deserialize(JSC::ExecState* exec, JSC::JSGlobalObject* globalObject);
String toString();
JSValueRef deserialize(JSContextRef, JSValueRef* exception);
-
+ const Vector<uint8_t>& data() { return m_data; }
+
~SerializedScriptValue();
private:
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 2254bbe..5b1f23a 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,32 @@
+2010-09-07 Oliver Hunt <oliver at apple.com>
+
+ Reviewed by Anders Carlsson.
+
+ Support SerializedScriptValue in WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=45340
+
+ Add wrappers and IPC serialization for SerializedScriptValue
+
+ * Shared/APIObject.h:
+ * Shared/UserMessageCoders.h:
+ (WebKit::UserMessageEncoder::baseEncode):
+ (WebKit::UserMessageDecoder::baseDecode):
+ * Shared/WebSerializedScriptValue.h: Added.
+ (WebKit::WebSerializedScriptValue::create):
+ (WebKit::WebSerializedScriptValue::adopt):
+ (WebKit::WebSerializedScriptValue::deserialize):
+ (WebKit::WebSerializedScriptValue::data):
+ (WebKit::WebSerializedScriptValue::WebSerializedScriptValue):
+ (WebKit::WebSerializedScriptValue::type):
+ * UIProcess/API/C/WKAPICast.h:
+ * UIProcess/API/C/WKBase.h:
+ * UIProcess/API/C/WKSerializedScriptValue.cpp: Added.
+ (WKSerializedScriptValueGetTypeID):
+ (WKSerializedScriptValueCreate):
+ (WKSerializedScriptValueDeserialize):
+ * UIProcess/API/C/WKSerializedScriptValue.h: Added.
+ * WebKit2.xcodeproj/project.pbxproj:
+
2010-09-08 Sam Weinig <sam at webkit.org>
Reviewed by Jon Honeycutt.
diff --git a/WebKit2/Shared/APIObject.h b/WebKit2/Shared/APIObject.h
index 8acb1ef..050b63f 100644
--- a/WebKit2/Shared/APIObject.h
+++ b/WebKit2/Shared/APIObject.h
@@ -39,6 +39,7 @@ public:
TypeData,
TypeDictionary,
TypeError,
+ TypeSerializedScriptValue,
TypeString,
TypeURL,
TypeURLRequest,
diff --git a/WebKit2/Shared/UserMessageCoders.h b/WebKit2/Shared/UserMessageCoders.h
index 51a1dcd..d9442f3 100644
--- a/WebKit2/Shared/UserMessageCoders.h
+++ b/WebKit2/Shared/UserMessageCoders.h
@@ -28,6 +28,7 @@
#include "ImmutableArray.h"
#include "ImmutableDictionary.h"
#include "WebCoreArgumentCoders.h"
+#include "WebSerializedScriptValue.h"
#include "WebString.h"
namespace WebKit {
@@ -36,6 +37,7 @@ namespace WebKit {
// - Array -> Array
// - Dictionary -> Dictionary
// - String -> String
+// - SerializedScriptValue -> SerializedScriptValue
template<typename Owner>
class UserMessageEncoder {
@@ -76,6 +78,11 @@ public:
encoder->encode(string->string());
return true;
}
+ case APIObject::TypeSerializedScriptValue: {
+ WebSerializedScriptValue* scriptValue = static_cast<WebSerializedScriptValue*>(m_root);
+ encoder->encodeBytes(scriptValue->data().data(), scriptValue->data().size());
+ return true;
+ }
default:
break;
}
@@ -159,6 +166,13 @@ public:
coder.m_root = WebString::create(string);
break;
}
+ case APIObject::TypeSerializedScriptValue: {
+ Vector<uint8_t> buffer;
+ if (!decoder->decodeBytes(buffer))
+ return false;
+ coder.m_root = WebSerializedScriptValue::adopt(buffer);
+ break;
+ }
default:
break;
}
diff --git a/WebKit2/Shared/WebSerializedScriptValue.h b/WebKit2/Shared/WebSerializedScriptValue.h
new file mode 100644
index 0000000..55513ad
--- /dev/null
+++ b/WebKit2/Shared/WebSerializedScriptValue.h
@@ -0,0 +1,78 @@
+/*
+ * 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 WebSerializedScriptValue_h
+#define WebSerializedScriptValue_h
+
+#include "APIObject.h"
+
+#include <WebCore/SerializedScriptValue.h>
+#include <wtf/RefPtr.h>
+
+namespace WebKit {
+
+class WebSerializedScriptValue : public APIObject {
+public:
+ static const Type APIType = TypeSerializedScriptValue;
+
+ static PassRefPtr<WebSerializedScriptValue> create(WebCore::SerializedScriptValue* serializedValue)
+ {
+ return adoptRef(new WebSerializedScriptValue(serializedValue));
+ }
+
+ static PassRefPtr<WebSerializedScriptValue> create(JSContextRef context, JSValueRef value, JSValueRef* exception)
+ {
+ RefPtr<WebCore::SerializedScriptValue> serializedValue = WebCore::SerializedScriptValue::create(context, value, exception);
+ if (!serializedValue)
+ return 0;
+ return adoptRef(new WebSerializedScriptValue(serializedValue.get()));
+ }
+
+ static PassRefPtr<WebSerializedScriptValue> adopt(Vector<uint8_t>& buffer)
+ {
+ return adoptRef(new WebSerializedScriptValue(WebCore::SerializedScriptValue::adopt(buffer)));
+ }
+
+ JSValueRef deserialize(JSContextRef context, JSValueRef* exception)
+ {
+ return m_serializedScriptValue->deserialize(context, exception);
+ }
+
+ const Vector<uint8_t>& data() { return m_serializedScriptValue->data(); }
+
+private:
+ explicit WebSerializedScriptValue(PassRefPtr<WebCore::SerializedScriptValue> serializedScriptValue)
+ : m_serializedScriptValue(serializedScriptValue)
+ {
+ }
+
+ virtual Type type() const { return APIType; }
+
+ RefPtr<WebCore::SerializedScriptValue> m_serializedScriptValue;
+};
+
+}
+
+#endif // WebSerializedScriptValue_h
diff --git a/WebKit2/UIProcess/API/C/WKAPICast.h b/WebKit2/UIProcess/API/C/WKAPICast.h
index 9993e2e..6347478 100644
--- a/WebKit2/UIProcess/API/C/WKAPICast.h
+++ b/WebKit2/UIProcess/API/C/WKAPICast.h
@@ -56,6 +56,7 @@ class WebNavigationData;
class WebPageNamespace;
class WebPageProxy;
class WebPreferences;
+class WebSerializedScriptValue;
class WebURLRequest;
class WebURLResponse;
@@ -75,6 +76,7 @@ template<> struct APITypeInfo<WKNavigationDataRef> { typedef WebNav
template<> struct APITypeInfo<WKPageNamespaceRef> { typedef WebPageNamespace* ImplType; };
template<> struct APITypeInfo<WKPageRef> { typedef WebPageProxy* ImplType; };
template<> struct APITypeInfo<WKPreferencesRef> { typedef WebPreferences* ImplType; };
+template<> struct APITypeInfo<WKSerializedScriptValueRef> { typedef WebSerializedScriptValue* ImplType; };
template<> struct APITypeInfo<WKStringRef> { typedef WebString* ImplType; };
template<> struct APITypeInfo<WKTypeRef> { typedef APIObject* ImplType; };
template<> struct APITypeInfo<WKURLRef> { typedef WebURL* ImplType; };
@@ -100,6 +102,7 @@ template<> struct ImplTypeInfo<WebNavigationData*> { typedef WKNavi
template<> struct ImplTypeInfo<WebPageNamespace*> { typedef WKPageNamespaceRef APIType; };
template<> struct ImplTypeInfo<WebPageProxy*> { typedef WKPageRef APIType; };
template<> struct ImplTypeInfo<WebPreferences*> { typedef WKPreferencesRef APIType; };
+template<> struct ImplTypeInfo<WebSerializedScriptValue*> { typedef WKSerializedScriptValueRef APIType; };
template<> struct ImplTypeInfo<WebString*> { typedef WKStringRef APIType; };
template<> struct ImplTypeInfo<WebURL*> { typedef WKURLRef APIType; };
template<> struct ImplTypeInfo<WebURLRequest*> { typedef WKURLRequestRef APIType; };
diff --git a/WebKit2/UIProcess/API/C/WKBase.h b/WebKit2/UIProcess/API/C/WKBase.h
index 9f76434..7489b56 100644
--- a/WebKit2/UIProcess/API/C/WKBase.h
+++ b/WebKit2/UIProcess/API/C/WKBase.h
@@ -53,6 +53,7 @@ typedef const struct OpaqueWKNavigationData* WKNavigationDataRef;
typedef const struct OpaqueWKPage* WKPageRef;
typedef const struct OpaqueWKPageNamespace* WKPageNamespaceRef;
typedef const struct OpaqueWKPreferences* WKPreferencesRef;
+typedef const struct OpaqueWKSerializedScriptValue* WKSerializedScriptValueRef;
typedef const struct OpaqueWKString* WKStringRef;
typedef const struct OpaqueWKURL* WKURLRef;
typedef const struct OpaqueWKURLRequest* WKURLRequestRef;
diff --git a/WebKit2/UIProcess/API/C/WKSerializedScriptValue.cpp b/WebKit2/UIProcess/API/C/WKSerializedScriptValue.cpp
new file mode 100644
index 0000000..4298e85
--- /dev/null
+++ b/WebKit2/UIProcess/API/C/WKSerializedScriptValue.cpp
@@ -0,0 +1,47 @@
+/*
+ * 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 "WKSerializedScriptValue.h"
+
+#include "WKAPICast.h"
+#include "WebSerializedScriptValue.h"
+
+using namespace WebKit;
+
+WKTypeID WKSerializedScriptValueGetTypeID()
+{
+ return toRef(WebSerializedScriptValue::APIType);
+}
+
+WKSerializedScriptValueRef WKSerializedScriptValueCreate(JSContextRef context, JSValueRef value, JSValueRef* exception)
+{
+ RefPtr<WebSerializedScriptValue> serializedValue = WebSerializedScriptValue::create(context, value, exception);
+ return toRef(serializedValue.release().leakRef());
+}
+
+JSValueRef WKSerializedScriptValueDeserialize(WKSerializedScriptValueRef scriptValueRef, JSContextRef contextRef, JSValueRef* exception)
+{
+ return toWK(scriptValueRef)->deserialize(contextRef, exception);
+}
diff --git a/WebKit2/UIProcess/API/C/WKSerializedScriptValue.h b/WebKit2/UIProcess/API/C/WKSerializedScriptValue.h
new file mode 100644
index 0000000..95fc048
--- /dev/null
+++ b/WebKit2/UIProcess/API/C/WKSerializedScriptValue.h
@@ -0,0 +1,45 @@
+/*
+ * 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 WKSerializedScriptValue_h
+#define WKSerializedScriptValue_h
+
+#include <JavaScriptCore/JavaScript.h>
+#include <WebKit2/WKBase.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WK_EXPORT WKTypeID WKSerializedScriptValueGetTypeID();
+
+WK_EXPORT WKSerializedScriptValueRef WKSerializedScriptValueCreate(JSContextRef context, JSValueRef value, JSValueRef* exception);
+WK_EXPORT JSValueRef WKSerializedScriptValueDeserialize(WKSerializedScriptValueRef scriptValue, JSContextRef constext, JSValueRef* exception);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* WKSerializedScriptValue_h */
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index ecca6ac..8ca6e6c 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -191,6 +191,7 @@ HEADERS += \
UIProcess/API/C/WKURL.h \
UIProcess/API/C/WKURLRequest.h \
UIProcess/API/C/WKURLResponse.h \
+ UIProcess/API/C/WKSerializedScriptValue.h \
UIProcess/API/qt/qgraphicswkview.h \
UIProcess/API/qt/qwkpage.h \
UIProcess/API/qt/qwkpage_p.h \
@@ -295,6 +296,7 @@ SOURCES += \
UIProcess/API/C/WKPage.cpp \
UIProcess/API/C/WKPageNamespace.cpp \
UIProcess/API/C/WKPreferences.cpp \
+ UIProcess/API/C/WKSerializedScriptValue.cpp \
UIProcess/API/C/WKString.cpp \
UIProcess/API/C/WKType.cpp \
UIProcess/API/C/WKURL.cpp \
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index 221ab33..56812f8 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -105,6 +105,11 @@
8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; };
9391F2CA121B679A00EBF7E8 /* WebFrameNetworkingContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9391F284121B38F500EBF7E8 /* WebFrameNetworkingContext.mm */; };
9391F2CB121B67AD00EBF7E8 /* WebFrameNetworkingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 9391F283121B38F500EBF7E8 /* WebFrameNetworkingContext.h */; };
+ A72D5D811236CBA800A88B15 /* WebSerializedScriptValue.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = A72D5D7F1236CBA800A88B15 /* WebSerializedScriptValue.h */; };
+ A72D5F301236F9E800A88B15 /* WKSerializedScriptValue.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = A72D5F2E1236F9E800A88B15 /* WKSerializedScriptValue.h */; };
+ A72D5F311236F9E800A88B15 /* WKSerializedScriptValue.cpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A72D5F2F1236F9E800A88B15 /* WKSerializedScriptValue.cpp */; };
+ A72D610B1237144F00A88B15 /* WKSerializedScriptValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A72D5F2F1236F9E800A88B15 /* WKSerializedScriptValue.cpp */; };
+ A72D610C1237145000A88B15 /* WKSerializedScriptValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A72D5F2F1236F9E800A88B15 /* WKSerializedScriptValue.cpp */; };
BC0092F7115837A300E0AE2A /* RunLoopMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC0092F5115837A300E0AE2A /* RunLoopMac.mm */; };
BC0092F8115837A300E0AE2A /* WorkQueueMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC0092F6115837A300E0AE2A /* WorkQueueMac.cpp */; };
BC032D7510F4378D0058C15A /* WebChromeClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BC032D6010F4378D0058C15A /* WebChromeClient.h */; };
@@ -382,6 +387,9 @@
dstSubfolderSpec = 1;
files = (
1A50DB66110A3D57000D3FE5 /* WebProcess.app in CopyFiles */,
+ A72D5D811236CBA800A88B15 /* WebSerializedScriptValue.h in CopyFiles */,
+ A72D5F301236F9E800A88B15 /* WKSerializedScriptValue.h in CopyFiles */,
+ A72D5F311236F9E800A88B15 /* WKSerializedScriptValue.cpp in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -479,6 +487,9 @@
8DC2EF5B0486A6940098B216 /* WebKit2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9391F283121B38F500EBF7E8 /* WebFrameNetworkingContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameNetworkingContext.h; sourceTree = "<group>"; };
9391F284121B38F500EBF7E8 /* WebFrameNetworkingContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebFrameNetworkingContext.mm; sourceTree = "<group>"; };
+ A72D5D7F1236CBA800A88B15 /* WebSerializedScriptValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSerializedScriptValue.h; sourceTree = "<group>"; };
+ A72D5F2E1236F9E800A88B15 /* WKSerializedScriptValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSerializedScriptValue.h; sourceTree = "<group>"; };
+ A72D5F2F1236F9E800A88B15 /* WKSerializedScriptValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKSerializedScriptValue.cpp; sourceTree = "<group>"; };
BC0092F5115837A300E0AE2A /* RunLoopMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RunLoopMac.mm; sourceTree = "<group>"; };
BC0092F6115837A300E0AE2A /* WorkQueueMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkQueueMac.cpp; sourceTree = "<group>"; };
BC032D6010F4378D0058C15A /* WebChromeClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebChromeClient.h; sourceTree = "<group>"; };
@@ -943,6 +954,7 @@
BCE2315B122C30CA00D5C35A /* WebURLRequest.h */,
BC90A1D1122DD55E00CC8C50 /* WebURLResponse.cpp */,
BC90A1D0122DD55E00CC8C50 /* WebURLResponse.h */,
+ A72D5D7F1236CBA800A88B15 /* WebSerializedScriptValue.h */,
);
path = Shared;
sourceTree = "<group>";
@@ -1191,6 +1203,8 @@
BCE231C5122C492300D5C35A /* WKURLRequest.h */,
BC90A1DB122DD89800CC8C50 /* WKURLResponse.cpp */,
BC90A1DA122DD89800CC8C50 /* WKURLResponse.h */,
+ A72D5F2E1236F9E800A88B15 /* WKSerializedScriptValue.h */,
+ A72D5F2F1236F9E800A88B15 /* WKSerializedScriptValue.cpp */,
);
path = C;
sourceTree = "<group>";
@@ -1660,7 +1674,14 @@
isa = PBXProject;
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "WebKit2" */;
compatibilityVersion = "Xcode 3.1";
+ developmentRegion = English;
hasScannedForEncodings = 1;
+ knownRegions = (
+ English,
+ Japanese,
+ French,
+ German,
+ );
mainGroup = 0867D691FE84028FC02AAC07 /* WebKit2 */;
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
projectDirPath = "";
@@ -1698,6 +1719,7 @@
buildActionMask = 2147483647;
files = (
1A6FA31111E3921E00DB1371 /* MainMac.cpp in Sources */,
+ A72D610C1237145000A88B15 /* WKSerializedScriptValue.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1848,6 +1870,7 @@
BCB0AF3612301DFB00B1341E /* WKMutableDictionary.cpp in Sources */,
BCA0EF8012331E78007D3CFB /* WebEditCommand.cpp in Sources */,
BCA0EFA012332642007D3CFB /* WebEditCommandProxy.cpp in Sources */,
+ A72D610B1237144F00A88B15 /* WKSerializedScriptValue.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index 655b7ab..ad0230e 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -485,6 +485,10 @@
>
</File>
<File
+ RelativePath="..\Shared\WebSerializedScriptValue.h"
+ >
+ </File>
+ <File
RelativePath="..\Shared\WebString.h"
>
</File>
@@ -1427,6 +1431,14 @@
>
</File>
<File
+ RelativePath="..\UIProcess\API\C\WKSerializedScriptValue.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\UIProcess\API\C\WKSerializedScriptValue.h"
+ >
+ </File>
+ <File
RelativePath="..\UIProcess\API\C\WKString.cpp"
>
</File>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list