[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:56:52 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit c2c3314b9ebd864b02fd6d3ebabc0fa9ba89b5f4
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 2 18:32:14 2010 +0000
Add WKMutableDictionary API for WebKit2
https://bugs.webkit.org/show_bug.cgi?id=45117
Reviewed by Anders Carlsson.
Add WKMutableDictionary API that inherits from WKDictionaryRef
the same way WKMutableArrayRef inherits from WKArrayRef.
* Shared/ImmutableDictionary.h:
(WebKit::ImmutableDictionary::get):
(WebKit::ImmutableDictionary::isMutable):
* Shared/MutableDictionary.cpp: Added.
(WebKit::MutableDictionary::MutableDictionary):
(WebKit::MutableDictionary::~MutableDictionary):
(WebKit::MutableDictionary::add):
(WebKit::MutableDictionary::set):
* Shared/MutableDictionary.h: Added.
(WebKit::MutableDictionary::create):
(WebKit::MutableDictionary::isMutable):
* UIProcess/API/C/WKAPICast.h:
(toWK):
* UIProcess/API/C/WKBase.h:
* UIProcess/API/C/WKMutableDictionary.cpp: Added.
(WKMutableDictionaryCreate):
(WKDictionaryIsMutable):
(WKDictionaryAddItem):
(WKDictionarySetItem):
* UIProcess/API/C/WKMutableDictionary.h: Added.
* UIProcess/API/C/WebKit2.h:
* WebKit2.pro:
* WebKit2.xcodeproj/project.pbxproj:
* win/WebKit2.vcproj:
* win/WebKit2Generated.make:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66676 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index a59e4de..04464f8 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,39 @@
+2010-09-02 Sam Weinig <sam at webkit.org>
+
+ Reviewed by Anders Carlsson.
+
+ Add WKMutableDictionary API for WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=45117
+
+ Add WKMutableDictionary API that inherits from WKDictionaryRef
+ the same way WKMutableArrayRef inherits from WKArrayRef.
+
+ * Shared/ImmutableDictionary.h:
+ (WebKit::ImmutableDictionary::get):
+ (WebKit::ImmutableDictionary::isMutable):
+ * Shared/MutableDictionary.cpp: Added.
+ (WebKit::MutableDictionary::MutableDictionary):
+ (WebKit::MutableDictionary::~MutableDictionary):
+ (WebKit::MutableDictionary::add):
+ (WebKit::MutableDictionary::set):
+ * Shared/MutableDictionary.h: Added.
+ (WebKit::MutableDictionary::create):
+ (WebKit::MutableDictionary::isMutable):
+ * UIProcess/API/C/WKAPICast.h:
+ (toWK):
+ * UIProcess/API/C/WKBase.h:
+ * UIProcess/API/C/WKMutableDictionary.cpp: Added.
+ (WKMutableDictionaryCreate):
+ (WKDictionaryIsMutable):
+ (WKDictionaryAddItem):
+ (WKDictionarySetItem):
+ * UIProcess/API/C/WKMutableDictionary.h: Added.
+ * UIProcess/API/C/WebKit2.h:
+ * WebKit2.pro:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * win/WebKit2.vcproj:
+ * win/WebKit2Generated.make:
+
2010-09-02 Jessie Berlin <jberlin at apple.com>
Windows build fix. Unreviewed.
diff --git a/WebKit2/Shared/ImmutableDictionary.h b/WebKit2/Shared/ImmutableDictionary.h
index e5e7dc7..4dc0d5c 100644
--- a/WebKit2/Shared/ImmutableDictionary.h
+++ b/WebKit2/Shared/ImmutableDictionary.h
@@ -42,7 +42,7 @@ class ImmutableDictionary : public APIObject {
public:
static const Type APIType = TypeDictionary;
- typedef HashMap<WTF::String, RefPtr<APIObject> > MapType;
+ typedef HashMap<String, RefPtr<APIObject> > MapType;
static PassRefPtr<ImmutableDictionary> create()
{
@@ -55,7 +55,7 @@ public:
~ImmutableDictionary();
template<typename T>
- T* get(const WTF::String& key)
+ T* get(const String& key)
{
RefPtr<APIObject> item = m_map.get(key);
if (!item)
@@ -67,7 +67,7 @@ public:
return static_cast<T*>(item.get());
}
- APIObject* get(const WTF::String& key)
+ APIObject* get(const String& key)
{
return m_map.get(key).get();
}
@@ -76,7 +76,9 @@ public:
size_t size() { return m_map.size(); }
-private:
+ virtual bool isMutable() { return false; }
+
+protected:
ImmutableDictionary();
enum AdoptTag { Adopt };
ImmutableDictionary(MapType& map, AdoptTag);
diff --git a/WebKit2/Shared/MutableDictionary.cpp b/WebKit2/Shared/MutableDictionary.cpp
new file mode 100644
index 0000000..c151dd6
--- /dev/null
+++ b/WebKit2/Shared/MutableDictionary.cpp
@@ -0,0 +1,50 @@
+/*
+ * 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 "MutableDictionary.h"
+
+namespace WebKit {
+
+MutableDictionary::MutableDictionary()
+{
+}
+
+MutableDictionary::~MutableDictionary()
+{
+}
+
+bool MutableDictionary::add(const String& key, APIObject* item)
+{
+ std::pair<MapType::iterator, bool> result = m_map.add(key, item);
+ return result.second;
+}
+
+bool MutableDictionary::set(const String& key, APIObject* item)
+{
+ std::pair<MapType::iterator, bool> result = m_map.set(key, item);
+ return result.second;
+}
+
+} // namespace WebKit
diff --git a/WebKit2/Shared/MutableDictionary.h b/WebKit2/Shared/MutableDictionary.h
new file mode 100644
index 0000000..f5ee4e7
--- /dev/null
+++ b/WebKit2/Shared/MutableDictionary.h
@@ -0,0 +1,55 @@
+/*
+ * 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 MutableDictionary_h
+#define MutableDictionary_h
+
+#include "ImmutableDictionary.h"
+
+namespace WebKit {
+
+// MutableDictionary - A mutable dictionary type suitable for vending to an API.
+
+class MutableDictionary : public ImmutableDictionary {
+public:
+ static PassRefPtr<MutableDictionary> create()
+ {
+ return adoptRef(new MutableDictionary);
+ }
+
+ ~MutableDictionary();
+
+ bool add(const String& key, APIObject*);
+ bool set(const String& key, APIObject*);
+
+ virtual bool isMutable() { return true; }
+
+private:
+ MutableDictionary();
+};
+
+} // namespace WebKit
+
+#endif // MutableDictionary_h
diff --git a/WebKit2/UIProcess/API/C/WKAPICast.h b/WebKit2/UIProcess/API/C/WKAPICast.h
index 3e285fb..ae3bc5c 100644
--- a/WebKit2/UIProcess/API/C/WKAPICast.h
+++ b/WebKit2/UIProcess/API/C/WKAPICast.h
@@ -43,6 +43,7 @@ namespace WebKit {
class ImmutableArray;
class ImmutableDictionary;
class MutableArray;
+class MutableDictionary;
class WebBackForwardList;
class WebBackForwardListItem;
class WebContext;
@@ -69,6 +70,7 @@ template<> struct APITypeInfo<WKFormSubmissionListenerRef> { typedef WebFor
template<> struct APITypeInfo<WKFramePolicyListenerRef> { typedef WebFramePolicyListenerProxy* ImplType; };
template<> struct APITypeInfo<WKFrameRef> { typedef WebFrameProxy* ImplType; };
template<> struct APITypeInfo<WKMutableArrayRef> { typedef MutableArray* ImplType; };
+template<> struct APITypeInfo<WKMutableDictionaryRef> { typedef MutableDictionary* ImplType; };
template<> struct APITypeInfo<WKNavigationDataRef> { typedef WebNavigationData* ImplType; };
template<> struct APITypeInfo<WKPageNamespaceRef> { typedef WebPageNamespace* ImplType; };
template<> struct APITypeInfo<WKPageRef> { typedef WebPageProxy* ImplType; };
@@ -85,6 +87,7 @@ template<> struct ImplTypeInfo<APIObject*> { typedef WKType
template<> struct ImplTypeInfo<ImmutableArray*> { typedef WKArrayRef APIType; };
template<> struct ImplTypeInfo<ImmutableDictionary*> { typedef WKDictionaryRef APIType; };
template<> struct ImplTypeInfo<MutableArray*> { typedef WKMutableArrayRef APIType; };
+template<> struct ImplTypeInfo<MutableDictionary*> { typedef WKMutableDictionaryRef APIType; };
template<> struct ImplTypeInfo<WebBackForwardList*> { typedef WKBackForwardListRef APIType; };
template<> struct ImplTypeInfo<WebBackForwardListItem*> { typedef WKBackForwardListItemRef APIType; };
template<> struct ImplTypeInfo<WebContext*> { typedef WKContextRef APIType; };
@@ -124,6 +127,7 @@ private:
template<typename T>
inline typename WebKit::APITypeInfo<T>::ImplType toWK(T t)
{
+ // An example of the conversions that take place:
// const struct OpaqueWKArray* -> const struct OpaqueWKArray -> struct OpaqueWKArray -> struct OpaqueWKArray* -> ImmutableArray*
typedef typename WTF::RemovePointer<T>::Type PotentiallyConstValueType;
diff --git a/WebKit2/UIProcess/API/C/WKBase.h b/WebKit2/UIProcess/API/C/WKBase.h
index d6f8638..9f76434 100644
--- a/WebKit2/UIProcess/API/C/WKBase.h
+++ b/WebKit2/UIProcess/API/C/WKBase.h
@@ -38,11 +38,13 @@ typedef const void* WKTypeRef;
typedef const struct OpaqueWKArray* WKArrayRef;
typedef struct OpaqueWKArray* WKMutableArrayRef;
+typedef const struct OpaqueWKDictionary* WKDictionaryRef;
+typedef struct OpaqueWKDictionary* WKMutableDictionaryRef;
+
typedef const struct OpaqueWKBackForwardList* WKBackForwardListRef;
typedef const struct OpaqueWKBackForwardListItem* WKBackForwardListItemRef;
typedef const struct OpaqueWKContext* WKContextRef;
typedef const struct OpaqueWKData* WKDataRef;
-typedef const struct OpaqueWKDictionary* WKDictionaryRef;
typedef const struct OpaqueWKError* WKErrorRef;
typedef const struct OpaqueWKFormSubmissionListener* WKFormSubmissionListenerRef;
typedef const struct OpaqueWKFrame* WKFrameRef;
diff --git a/WebKit2/UIProcess/API/C/WKMutableDictionary.cpp b/WebKit2/UIProcess/API/C/WKMutableDictionary.cpp
new file mode 100644
index 0000000..bacaee3
--- /dev/null
+++ b/WebKit2/UIProcess/API/C/WKMutableDictionary.cpp
@@ -0,0 +1,52 @@
+/*
+ * 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 "WKMutableDictionary.h"
+
+#include "MutableDictionary.h"
+#include "WKAPICast.h"
+
+using namespace WebKit;
+
+WKMutableDictionaryRef WKMutableDictionaryCreate()
+{
+ RefPtr<MutableDictionary> dictionary = MutableDictionary::create();
+ return toRef(dictionary.release().releaseRef());
+}
+
+bool WKDictionaryIsMutable(WKMutableDictionaryRef dictionaryRef)
+{
+ return toWK(dictionaryRef)->isMutable();
+}
+
+bool WKDictionaryAddItem(WKMutableDictionaryRef dictionaryRef, WKStringRef keyRef, WKTypeRef itemRef)
+{
+ return toWK(dictionaryRef)->add(toWK(keyRef)->string(), toWK(itemRef));
+}
+
+bool WKDictionarySetItem(WKMutableDictionaryRef dictionaryRef, WKStringRef keyRef, WKTypeRef itemRef)
+{
+ return toWK(dictionaryRef)->set(toWK(keyRef)->string(), toWK(itemRef));
+}
diff --git a/WebKit2/UIProcess/API/C/WKMutableDictionary.h b/WebKit2/UIProcess/API/C/WKMutableDictionary.h
new file mode 100644
index 0000000..41edee9
--- /dev/null
+++ b/WebKit2/UIProcess/API/C/WKMutableDictionary.h
@@ -0,0 +1,50 @@
+/*
+ * 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 WKMutableDictionary_h
+#define WKMutableDictionary_h
+
+#include <WebKit2/WKBase.h>
+
+#ifndef __cplusplus
+#include <stdbool.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WK_EXPORT WKMutableDictionaryRef WKMutableDictionaryCreate();
+
+WK_EXPORT bool WKDictionaryIsMutable(WKMutableDictionaryRef dictionary);
+
+WK_EXPORT bool WKDictionaryAddItem(WKMutableDictionaryRef dictionary, WKStringRef key, WKTypeRef item);
+WK_EXPORT bool WKDictionarySetItem(WKMutableDictionaryRef dictionary, WKStringRef key, WKTypeRef item);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* WKMutableDictionary_h */
diff --git a/WebKit2/UIProcess/API/C/WebKit2.h b/WebKit2/UIProcess/API/C/WebKit2.h
index 59393c3..946c2a1 100644
--- a/WebKit2/UIProcess/API/C/WebKit2.h
+++ b/WebKit2/UIProcess/API/C/WebKit2.h
@@ -34,11 +34,12 @@
#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>
+#include <WebKit2/WKMutableArray.h>
+#include <WebKit2/WKMutableDictionary.h>
#include <WebKit2/WKNavigationData.h>
#include <WebKit2/WKPage.h>
#include <WebKit2/WKPageNamespace.h>
@@ -46,6 +47,7 @@
#include <WebKit2/WKString.h>
#include <WebKit2/WKURL.h>
#include <WebKit2/WKURLRequest.h>
+#include <WebKit2/WKURLResponse.h>
#if !__APPLE__ || __OBJC__
#include <WebKit2/WKView.h>
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 0e611c5..2c65036 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -159,6 +159,7 @@ HEADERS += \
Shared/ImmutableArray.h \
Shared/ImmutableDictionary.h \
Shared/MutableArray.h \
+ Shared/MutableDictionary.h \
Shared/NotImplemented.h \
Shared/qt/WebEventFactoryQt.h \
Shared/VisitedLinkTable.h \
@@ -269,6 +270,7 @@ SOURCES += \
Shared/ImmutableArray.cpp \
Shared/ImmutableDictionary.cpp \
Shared/MutableArray.cpp \
+ Shared/MutableDictionary.cpp \
Shared/VisitedLinkTable.cpp \
Shared/WebEventConversion.cpp \
Shared/WebPreferencesStore.cpp \
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index 1336e55..388f476 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -251,6 +251,10 @@
BCB0AD2E122F284700B1341E /* WKMutableArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC804A2122F0E7B00103529 /* WKMutableArray.cpp */; };
BCB0AD33122F285800B1341E /* MutableArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC8049D122F0D6B00103529 /* MutableArray.cpp */; };
BCB0AD34122F285800B1341E /* MutableArray.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC8049E122F0D6B00103529 /* MutableArray.h */; };
+ BCB0AEE9122F53E300B1341E /* MutableDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB0AEE7122F53E300B1341E /* MutableDictionary.h */; };
+ BCB0AEEA122F53E300B1341E /* MutableDictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB0AEE8122F53E300B1341E /* MutableDictionary.cpp */; };
+ BCB0AF3512301DFB00B1341E /* WKMutableDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB0AF3312301DFB00B1341E /* WKMutableDictionary.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ BCB0AF3612301DFB00B1341E /* WKMutableDictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB0AF3412301DFB00B1341E /* WKMutableDictionary.cpp */; };
BCB28CC0120233D9007D99BC /* InjectedBundleMessageKinds.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB28CBF120233D9007D99BC /* InjectedBundleMessageKinds.h */; };
BCB63478116BF10600603215 /* WebKit2.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB63477116BF10600603215 /* WebKit2.h */; settings = {ATTRIBUTES = (Public, ); }; };
BCB7346E11CEE3FF00EC5002 /* WebProcessProxyMessageKinds.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB7346D11CEE3FF00EC5002 /* WebProcessProxyMessageKinds.h */; };
@@ -610,6 +614,10 @@
BCA8C6AE11E3C08700812FB7 /* InjectedBundlePageUIClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageUIClient.h; sourceTree = "<group>"; };
BCA8C9DA11E4086500812FB7 /* WebBackForwardControllerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebBackForwardControllerClient.h; sourceTree = "<group>"; };
BCA8C9DB11E4086500812FB7 /* WebBackForwardControllerClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebBackForwardControllerClient.cpp; sourceTree = "<group>"; };
+ BCB0AEE7122F53E300B1341E /* MutableDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MutableDictionary.h; sourceTree = "<group>"; };
+ BCB0AEE8122F53E300B1341E /* MutableDictionary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MutableDictionary.cpp; sourceTree = "<group>"; };
+ BCB0AF3312301DFB00B1341E /* WKMutableDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMutableDictionary.h; sourceTree = "<group>"; };
+ BCB0AF3412301DFB00B1341E /* WKMutableDictionary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKMutableDictionary.cpp; sourceTree = "<group>"; };
BCB28CBF120233D9007D99BC /* InjectedBundleMessageKinds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleMessageKinds.h; sourceTree = "<group>"; };
BCB63477116BF10600603215 /* WebKit2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit2.h; sourceTree = "<group>"; };
BCB7346D11CEE3FF00EC5002 /* WebProcessProxyMessageKinds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebProcessProxyMessageKinds.h; sourceTree = "<group>"; };
@@ -900,6 +908,8 @@
BCBCB0CA1215E32100DE59CA /* ImmutableDictionary.h */,
BCC8049D122F0D6B00103529 /* MutableArray.cpp */,
BCC8049E122F0D6B00103529 /* MutableArray.h */,
+ BCB0AEE8122F53E300B1341E /* MutableDictionary.cpp */,
+ BCB0AEE7122F53E300B1341E /* MutableDictionary.h */,
BCC57161115ADB42001CCAF9 /* NotImplemented.h */,
1A0F29C9120B37160053D1B9 /* VisitedLinkTable.cpp */,
1A0F29CA120B37160053D1B9 /* VisitedLinkTable.h */,
@@ -1138,6 +1148,8 @@
BCB9F6A31123DD0D00A137E0 /* WKFramePolicyListener.h */,
BCC804A2122F0E7B00103529 /* WKMutableArray.cpp */,
BCC804A1122F0E7B00103529 /* WKMutableArray.h */,
+ BCB0AF3412301DFB00B1341E /* WKMutableDictionary.cpp */,
+ BCB0AF3312301DFB00B1341E /* WKMutableDictionary.h */,
BCF69FA81176D1CB00471A52 /* WKNavigationData.cpp */,
BCF69FA71176D1CB00471A52 /* WKNavigationData.h */,
BCD597D4112B56DC00EC8C23 /* WKPage.cpp */,
@@ -1570,6 +1582,8 @@
BC90A1E0122DD8EE00CC8C50 /* WKURLResponseNS.h in Headers */,
BCB0AD2D122F284300B1341E /* WKMutableArray.h in Headers */,
BCB0AD34122F285800B1341E /* MutableArray.h in Headers */,
+ BCB0AEE9122F53E300B1341E /* MutableDictionary.h in Headers */,
+ BCB0AF3512301DFB00B1341E /* WKMutableDictionary.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1804,6 +1818,8 @@
BC90A1E1122DD8EE00CC8C50 /* WKURLResponseNS.mm in Sources */,
BCB0AD2E122F284700B1341E /* WKMutableArray.cpp in Sources */,
BCB0AD33122F285800B1341E /* MutableArray.cpp in Sources */,
+ BCB0AEEA122F53E300B1341E /* MutableDictionary.cpp in Sources */,
+ BCB0AF3612301DFB00B1341E /* WKMutableDictionary.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index abfccd9..d796557 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -433,6 +433,14 @@
>
</File>
<File
+ RelativePath="..\Shared\MutableDictionary.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\Shared\MutableDictionary.h"
+ >
+ </File>
+ <File
RelativePath="..\Shared\NotImplemented.h"
>
</File>
@@ -1339,6 +1347,14 @@
>
</File>
<File
+ RelativePath="..\UIProcess\API\C\WKMutableDictionary.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\UIProcess\API\C\WKMutableDictionary.h"
+ >
+ </File>
+ <File
RelativePath="..\UIProcess\API\C\WKNavigationData.cpp"
>
</File>
diff --git a/WebKit2/win/WebKit2Generated.make b/WebKit2/win/WebKit2Generated.make
index f2fb013..5b1eb65 100644
--- a/WebKit2/win/WebKit2Generated.make
+++ b/WebKit2/win/WebKit2Generated.make
@@ -16,6 +16,7 @@ all:
xcopy /y /d "..\UIProcess\API\C\WKFramePolicyListener.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\UIProcess\API\C\WKNavigationData.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\UIProcess\API\C\WKMutableArray.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
+ xcopy /y /d "..\UIProcess\API\C\WKMutableDictionary.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\UIProcess\API\C\WKPage.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\UIProcess\API\C\WKPageNamespace.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\UIProcess\API\C\WKPreferences.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list