[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
weinig at apple.com
weinig at apple.com
Wed Dec 22 12:05:17 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 79dc7d5f745aeb001ff566b0e2803afe3b6668a8
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Aug 13 21:33:40 2010 +0000
Add dictionary API type
https://bugs.webkit.org/show_bug.cgi?id=43990
Reviewed by Brady Eidson.
Add an immutable dictionary type (WKStringRef -> WKTypeRef).
* Shared/APIObject.h:
(WebKit::APIObject::):
Add new APIType.
* Shared/ImmutableDictionary.cpp: Added.
(WebKit::ImmutableDictionary::ImmutableDictionary):
(WebKit::ImmutableDictionary::~ImmutableDictionary):
* Shared/ImmutableDictionary.h: Added.
(WebKit::ImmutableDictionary::create):
(WebKit::ImmutableDictionary::adopt):
(WebKit::ImmutableDictionary::get):
(WebKit::ImmutableDictionary::size):
(WebKit::ImmutableDictionary::):
(WebKit::ImmutableDictionary::type):
Add basic implementation
* UIProcess/API/C/WKAPICast.h:
(WebKit::):
Add new mappings.
* UIProcess/API/C/WKBase.h:
Add new opaque type.
* UIProcess/API/C/WKDictionary.cpp: Added.
(WKDictionaryGetTypeID):
(WKDictionaryGetItemForKey):
(WKDictionaryGetSize):
(WKDictionaryRetain):
(WKDictionaryRelease):
* UIProcess/API/C/WKDictionary.h: Added.
Add API wrappings.
* UIProcess/API/C/WebKit2.h:
Add missing public headers.
* WebKit2.xcodeproj/project.pbxproj:
* win/WebKit2.vcproj:
* win/WebKit2Generated.make:
Add new files.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65339 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 4c02636..a08486a 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,54 @@
2010-08-13 Sam Weinig <sam at webkit.org>
+ Reviewed by Brady Eidson.
+
+ Add dictionary API type
+ https://bugs.webkit.org/show_bug.cgi?id=43990
+
+ Add an immutable dictionary type (WKStringRef -> WKTypeRef).
+
+ * Shared/APIObject.h:
+ (WebKit::APIObject::):
+ Add new APIType.
+
+ * Shared/ImmutableDictionary.cpp: Added.
+ (WebKit::ImmutableDictionary::ImmutableDictionary):
+ (WebKit::ImmutableDictionary::~ImmutableDictionary):
+ * Shared/ImmutableDictionary.h: Added.
+ (WebKit::ImmutableDictionary::create):
+ (WebKit::ImmutableDictionary::adopt):
+ (WebKit::ImmutableDictionary::get):
+ (WebKit::ImmutableDictionary::size):
+ (WebKit::ImmutableDictionary::):
+ (WebKit::ImmutableDictionary::type):
+ Add basic implementation
+
+ * UIProcess/API/C/WKAPICast.h:
+ (WebKit::):
+ Add new mappings.
+
+ * UIProcess/API/C/WKBase.h:
+ Add new opaque type.
+
+ * UIProcess/API/C/WKDictionary.cpp: Added.
+ (WKDictionaryGetTypeID):
+ (WKDictionaryGetItemForKey):
+ (WKDictionaryGetSize):
+ (WKDictionaryRetain):
+ (WKDictionaryRelease):
+ * UIProcess/API/C/WKDictionary.h: Added.
+ Add API wrappings.
+
+ * UIProcess/API/C/WebKit2.h:
+ Add missing public headers.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ * win/WebKit2.vcproj:
+ * win/WebKit2Generated.make:
+ Add new files.
+
+2010-08-13 Sam Weinig <sam at webkit.org>
+
Reviewed by Jon Honeycutt.
Add form submission listener to WebKit2
diff --git a/WebKit2/Shared/APIObject.h b/WebKit2/Shared/APIObject.h
index 9cd2ff6..54d6685 100644
--- a/WebKit2/Shared/APIObject.h
+++ b/WebKit2/Shared/APIObject.h
@@ -35,6 +35,7 @@ public:
enum Type {
// Base types
TypeArray,
+ TypeDictionary,
TypeData,
TypeError,
TypeString,
diff --git a/WebKit2/Shared/ImmutableDictionary.cpp b/WebKit2/Shared/ImmutableDictionary.cpp
new file mode 100644
index 0000000..4a8adf2
--- /dev/null
+++ b/WebKit2/Shared/ImmutableDictionary.cpp
@@ -0,0 +1,43 @@
+/*
+ * 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 "ImmutableDictionary.h"
+
+namespace WebKit {
+
+ImmutableDictionary::ImmutableDictionary()
+{
+}
+
+ImmutableDictionary::ImmutableDictionary(MapType& map, AdoptTag)
+{
+ m_map.swap(map);
+}
+
+ImmutableDictionary::~ImmutableDictionary()
+{
+}
+
+} // namespace WebKit
diff --git a/WebKit2/Shared/ImmutableDictionary.h b/WebKit2/Shared/ImmutableDictionary.h
new file mode 100644
index 0000000..17f2fa4
--- /dev/null
+++ b/WebKit2/Shared/ImmutableDictionary.h
@@ -0,0 +1,87 @@
+/*
+ * 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 ImmutableDictionary_h
+#define ImmutableDictionary_h
+
+#include "APIObject.h"
+#include <wtf/HashMap.h>
+#include <wtf/PassRefPtr.h>
+#include <wtf/text/StringHash.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebKit {
+
+// ImmutableDictionary - An immutable dictionary type suitable for vending to an API.
+
+class ImmutableDictionary : public APIObject {
+public:
+ static const Type APIType = TypeDictionary;
+
+ typedef HashMap<WTF::String, RefPtr<APIObject> > MapType;
+
+ static PassRefPtr<ImmutableDictionary> create()
+ {
+ return adoptRef(new ImmutableDictionary);
+ }
+ static PassRefPtr<ImmutableDictionary> adopt(MapType& map, size_t size)
+ {
+ return adoptRef(new ImmutableDictionary(map, Adopt));
+ }
+ ~ImmutableDictionary();
+
+ template<typename T>
+ T* get(const WTF::String& key)
+ {
+ RefPtr<APIObject> item = m_map.get(key);
+ if (!item)
+ return 0;
+
+ if (item->type() != T::APIType)
+ return 0;
+
+ return static_cast<T*>(item.get());
+ }
+
+ APIObject* get(const WTF::String& key)
+ {
+ return m_map.get(key).get();
+ }
+
+ size_t size() { return m_map.size(); }
+
+private:
+ ImmutableDictionary();
+ enum AdoptTag { Adopt };
+ ImmutableDictionary(MapType& map, AdoptTag);
+
+ virtual Type type() const { return APIType; }
+
+ MapType m_map;
+};
+
+} // namespace WebKit
+
+#endif // ImmutableDictionary_h
diff --git a/WebKit2/UIProcess/API/C/WKAPICast.h b/WebKit2/UIProcess/API/C/WKAPICast.h
index 3178c4c..cb26f79 100644
--- a/WebKit2/UIProcess/API/C/WKAPICast.h
+++ b/WebKit2/UIProcess/API/C/WKAPICast.h
@@ -39,6 +39,7 @@
namespace WebKit {
class ImmutableArray;
+class ImmutableDictionary;
class WebBackForwardList;
class WebBackForwardListItem;
class WebContext;
@@ -60,6 +61,7 @@ template<> struct APITypeInfo<WKBackForwardListItemRef> { typedef WebBac
template<> struct APITypeInfo<WKBackForwardListRef> { typedef WebBackForwardList* ImplType; };
template<> struct APITypeInfo<WKContextRef> { typedef WebContext* ImplType; };
template<> struct APITypeInfo<WKDataRef> { typedef WebData* ImplType; };
+template<> struct APITypeInfo<WKDictionaryRef> { typedef ImmutableDictionary* ImplType; };
template<> struct APITypeInfo<WKFormSubmissionListenerRef> { typedef WebFormSubmissionListenerProxy* ImplType; };
template<> struct APITypeInfo<WKFramePolicyListenerRef> { typedef WebFramePolicyListenerProxy* ImplType; };
template<> struct APITypeInfo<WKFrameRef> { typedef WebFrameProxy* ImplType; };
@@ -74,6 +76,7 @@ template<> struct APITypeInfo<WKURLRef> { typedef WebURL
template<typename ImplType> struct ImplTypeInfo { };
template<> struct ImplTypeInfo<APIObject*> { typedef WKTypeRef APIType; };
template<> struct ImplTypeInfo<ImmutableArray*> { typedef WKArrayRef APIType; };
+template<> struct ImplTypeInfo<ImmutableDictionary*> { typedef WKDictionaryRef APIType; };
template<> struct ImplTypeInfo<WebBackForwardList*> { typedef WKBackForwardListRef APIType; };
template<> struct ImplTypeInfo<WebBackForwardListItem*> { typedef WKBackForwardListItemRef APIType; };
template<> struct ImplTypeInfo<WebContext*> { typedef WKContextRef APIType; };
diff --git a/WebKit2/UIProcess/API/C/WKBase.h b/WebKit2/UIProcess/API/C/WKBase.h
index c6777ef..800cca9 100644
--- a/WebKit2/UIProcess/API/C/WKBase.h
+++ b/WebKit2/UIProcess/API/C/WKBase.h
@@ -40,6 +40,7 @@ typedef struct OpaqueWKBackForwardList* WKBackForwardListRef;
typedef struct OpaqueWKBackForwardListItem* WKBackForwardListItemRef;
typedef struct OpaqueWKContext* WKContextRef;
typedef struct OpaqueWKData* WKDataRef;
+typedef struct OpaqueWKDictionary* WKDictionaryRef;
typedef struct OpaqueWKError* WKErrorRef;
typedef struct OpaqueWKFormSubmissionListener* WKFormSubmissionListenerRef;
typedef struct OpaqueWKFrame* WKFrameRef;
diff --git a/WebKit2/UIProcess/API/C/WKDictionary.cpp b/WebKit2/UIProcess/API/C/WKDictionary.cpp
new file mode 100644
index 0000000..5093175
--- /dev/null
+++ b/WebKit2/UIProcess/API/C/WKDictionary.cpp
@@ -0,0 +1,57 @@
+/*
+ * 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 "WKDictionary.h"
+
+#include "ImmutableDictionary.h"
+#include "WKAPICast.h"
+
+using namespace WebKit;
+
+WKTypeID WKDictionaryGetTypeID()
+{
+ return toRef(ImmutableDictionary::APIType);
+}
+
+WKTypeRef WKDictionaryGetItemForKey(WKDictionaryRef dictionaryRef, WKStringRef key)
+{
+ return toWK(dictionaryRef)->get(toWK(key)->string());
+}
+
+size_t WKDictionaryGetSize(WKDictionaryRef dictionaryRef)
+{
+ return toWK(dictionaryRef)->size();
+}
+
+WKDictionaryRef WKDictionaryRetain(WKDictionaryRef dictionaryRef)
+{
+ toWK(dictionaryRef)->ref();
+ return dictionaryRef;
+}
+
+void WKDictionaryRelease(WKDictionaryRef dictionaryRef)
+{
+ toWK(dictionaryRef)->deref();
+}
diff --git a/WebKit2/UIProcess/API/C/WKDictionary.h b/WebKit2/UIProcess/API/C/WKDictionary.h
new file mode 100644
index 0000000..2f80b58
--- /dev/null
+++ b/WebKit2/UIProcess/API/C/WKDictionary.h
@@ -0,0 +1,49 @@
+/*
+ * 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 WKDictionary_h
+#define WKDictionary_h
+
+#include <WebKit2/WKBase.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WK_EXPORT WKTypeID WKDictionaryGetTypeID();
+
+WK_EXPORT WKTypeRef WKDictionaryGetItemForKey(WKDictionaryRef dictionary, WKStringRef key);
+WK_EXPORT size_t WKDictionaryGetSize(WKDictionaryRef dictionary);
+
+WK_EXPORT WKDictionaryRef WKDictionaryRetain(WKDictionaryRef dictionary);
+WK_EXPORT void WKDictionaryRelease(WKDictionaryRef dictionary);
+
+#ifdef __cplusplus
+}
+#endif
+
+WK_DECLARE_RETAIN_RELEASE_OVERLOADS(WKDictionary)
+
+#endif /* WKDictionary_h */
diff --git a/WebKit2/UIProcess/API/C/WebKit2.h b/WebKit2/UIProcess/API/C/WebKit2.h
index 0bb796b..e84c0c5 100644
--- a/WebKit2/UIProcess/API/C/WebKit2.h
+++ b/WebKit2/UIProcess/API/C/WebKit2.h
@@ -29,9 +29,13 @@
#include <WebKit2/WKBase.h>
#include <WebKit2/WKType.h>
+#include <WebKit2/WKArray.h>
#include <WebKit2/WKBackForwardList.h>
#include <WebKit2/WKBackForwardListItem.h>
#include <WebKit2/WKContext.h>
+#include <WebKit2/WKData.h>
+#include <WebKit2/WKDictionary.h>
+#include <WebKit2/WKError.h>
#include <WebKit2/WKFormSubmissionListener.h>
#include <WebKit2/WKFrame.h>
#include <WebKit2/WKFramePolicyListener.h>
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index 48a6a37..60a4393 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -252,6 +252,10 @@
BCB9F6A61123DD0D00A137E0 /* WKFramePolicyListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB9F6A41123DD0D00A137E0 /* WKFramePolicyListener.cpp */; };
BCB9F8AF1124E07700A137E0 /* WebPolicyClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB9F8AD1124E07700A137E0 /* WebPolicyClient.cpp */; };
BCB9F8B01124E07700A137E0 /* WebPolicyClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB9F8AE1124E07700A137E0 /* WebPolicyClient.h */; };
+ BCBCB0CB1215E32100DE59CA /* ImmutableDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = BCBCB0CA1215E32100DE59CA /* ImmutableDictionary.h */; };
+ BCBCB0CD1215E33A00DE59CA /* ImmutableDictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCBCB0CC1215E33A00DE59CA /* ImmutableDictionary.cpp */; };
+ BCBCB0E31215E54D00DE59CA /* WKDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = BCBCB0E11215E54D00DE59CA /* WKDictionary.h */; };
+ BCBCB0E41215E54D00DE59CA /* WKDictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCBCB0E21215E54D00DE59CA /* WKDictionary.cpp */; };
BCC56F791159957D001CCAF9 /* MachPort.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC56F771159957D001CCAF9 /* MachPort.h */; };
BCC5715B115ADAEF001CCAF9 /* WebSystemInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC57159115ADAEF001CCAF9 /* WebSystemInterface.h */; };
BCC5715C115ADAEF001CCAF9 /* WebSystemInterface.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCC5715A115ADAEF001CCAF9 /* WebSystemInterface.mm */; };
@@ -591,6 +595,10 @@
BCB9F6A41123DD0D00A137E0 /* WKFramePolicyListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKFramePolicyListener.cpp; sourceTree = "<group>"; };
BCB9F8AD1124E07700A137E0 /* WebPolicyClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPolicyClient.cpp; sourceTree = "<group>"; };
BCB9F8AE1124E07700A137E0 /* WebPolicyClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPolicyClient.h; sourceTree = "<group>"; };
+ BCBCB0CA1215E32100DE59CA /* ImmutableDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImmutableDictionary.h; sourceTree = "<group>"; };
+ BCBCB0CC1215E33A00DE59CA /* ImmutableDictionary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImmutableDictionary.cpp; sourceTree = "<group>"; };
+ BCBCB0E11215E54D00DE59CA /* WKDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDictionary.h; sourceTree = "<group>"; };
+ BCBCB0E21215E54D00DE59CA /* WKDictionary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKDictionary.cpp; sourceTree = "<group>"; };
BCC56F771159957D001CCAF9 /* MachPort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MachPort.h; sourceTree = "<group>"; };
BCC57159115ADAEF001CCAF9 /* WebSystemInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSystemInterface.h; sourceTree = "<group>"; };
BCC5715A115ADAEF001CCAF9 /* WebSystemInterface.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebSystemInterface.mm; sourceTree = "<group>"; };
@@ -846,6 +854,8 @@
762B7481120BBA0100819339 /* FontSmoothingLevel.h */,
BC64696D11DBE603006455B0 /* ImmutableArray.cpp */,
BC64696E11DBE603006455B0 /* ImmutableArray.h */,
+ BCBCB0CC1215E33A00DE59CA /* ImmutableDictionary.cpp */,
+ BCBCB0CA1215E32100DE59CA /* ImmutableDictionary.h */,
BCC57161115ADB42001CCAF9 /* NotImplemented.h */,
1A0F29C9120B37160053D1B9 /* VisitedLinkTable.cpp */,
1A0F29CA120B37160053D1B9 /* VisitedLinkTable.h */,
@@ -1067,6 +1077,8 @@
BCC938E01180DE440085E5FE /* WKContextPrivate.h */,
514AF6C61209EE7300A26C97 /* WKData.cpp */,
514AF6C71209EE7300A26C97 /* WKData.h */,
+ BCBCB0E21215E54D00DE59CA /* WKDictionary.cpp */,
+ BCBCB0E11215E54D00DE59CA /* WKDictionary.h */,
516A4A58120A1AB500C05B7F /* WKError.cpp */,
516A4A57120A1AB500C05B7F /* WKError.h */,
BCE469571214EDF4000B98EB /* WKFormSubmissionListener.cpp */,
@@ -1476,6 +1488,8 @@
BCE469561214E6CB000B98EB /* WebFormSubmissionListenerProxy.h in Headers */,
BCE4695A1214EDF4000B98EB /* WKFormSubmissionListener.h in Headers */,
BCE469771214F27B000B98EB /* WebFrameListenerProxy.h in Headers */,
+ BCBCB0CB1215E32100DE59CA /* ImmutableDictionary.h in Headers */,
+ BCBCB0E31215E54D00DE59CA /* WKDictionary.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1696,6 +1710,8 @@
BCE469551214E6CB000B98EB /* WebFormSubmissionListenerProxy.cpp in Sources */,
BCE469591214EDF4000B98EB /* WKFormSubmissionListener.cpp in Sources */,
BCE469791214F2B4000B98EB /* WebFrameListenerProxy.cpp in Sources */,
+ BCBCB0CD1215E33A00DE59CA /* ImmutableDictionary.cpp in Sources */,
+ BCBCB0E41215E54D00DE59CA /* WKDictionary.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index 3813965..0b8b9e9 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -417,6 +417,14 @@
>
</File>
<File
+ RelativePath="..\Shared\ImmutableDictionary.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\Shared\ImmutableDictionary.h"
+ >
+ </File>
+ <File
RelativePath="..\Shared\NotImplemented.h"
>
</File>
@@ -1239,6 +1247,14 @@
>
</File>
<File
+ RelativePath="..\UIProcess\API\C\WKDictionary.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\UIProcess\API\C\WKDictionary.h"
+ >
+ </File>
+ <File
RelativePath="..\UIProcess\API\C\WKError.cpp"
>
</File>
diff --git a/WebKit2/win/WebKit2Generated.make b/WebKit2/win/WebKit2Generated.make
index 7435519..015b2b2 100644
--- a/WebKit2/win/WebKit2Generated.make
+++ b/WebKit2/win/WebKit2Generated.make
@@ -9,6 +9,7 @@ all:
xcopy /y /d "..\UIProcess\API\C\WKContext.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\UIProcess\API\C\WKContextPrivate.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\UIProcess\API\C\WKData.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
+ xcopy /y /d "..\UIProcess\API\C\WKDictionary.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\UIProcess\API\C\WKError.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\UIProcess\API\C\WKFormSubmissionListener.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\UIProcess\API\C\WKFrame.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list