[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:55:47 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 3305fa6e8298b639aec78b69f86540f94047e18b
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 2 03:37:10 2010 +0000
Add mutable array API to WebKit2
https://bugs.webkit.org/show_bug.cgi?id=45082
Reviewed by Adam Roben.
Add a mutable API to WebKit2 called WKMutableArrayRef. Make it "inherit" from
WKArrayRef in the same way JSObjectRef can inherit from JSValueRef in the JSC
API, by abusing the c type system (WKArrayRef is defined as a const version of
WKMutableArrayRef). Add very basic mutable API to go along with it.
* Shared/ImmutableArray.h:
(WebKit::ImmutableArray::isMutable):
Add ability to ask it an array is mutable.
* Shared/MutableArray.cpp: Added.
(WebKit::MutableArray::MutableArray):
(WebKit::MutableArray::~MutableArray):
(WebKit::MutableArray::append):
* Shared/MutableArray.h: Added.
(WebKit::MutableArray::create):
(WebKit::MutableArray::isMutable):
Sketch out the mutable array interface.
* UIProcess/API/C/WKAPICast.h:
(toWK):
Now that the opaque types can be const, use template magic to const_cast
it away.
* UIProcess/API/C/WKBase.h:
Add new type and re-type WKArrayRef as const.
* UIProcess/API/C/WKMutableArray.cpp: Added.
(WKMutableArrayCreate):
(WKArrayIsMutable):
(WKArrayAppendItem):
* UIProcess/API/C/WKMutableArray.h: Added.
Fill in basic API.
* WebKit2.pro:
* WebKit2.xcodeproj/project.pbxproj:
* win/WebKit2.vcproj:
* win/WebKit2Generated.make:
Add files.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66638 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 6a88791..6da0f73 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,49 @@
+2010-09-01 Sam Weinig <sam at webkit.org>
+
+ Reviewed by Adam Roben.
+
+ Add mutable array API to WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=45082
+
+ Add a mutable API to WebKit2 called WKMutableArrayRef. Make it "inherit" from
+ WKArrayRef in the same way JSObjectRef can inherit from JSValueRef in the JSC
+ API, by abusing the c type system (WKArrayRef is defined as a const version of
+ WKMutableArrayRef). Add very basic mutable API to go along with it.
+
+ * Shared/ImmutableArray.h:
+ (WebKit::ImmutableArray::isMutable):
+ Add ability to ask it an array is mutable.
+
+ * Shared/MutableArray.cpp: Added.
+ (WebKit::MutableArray::MutableArray):
+ (WebKit::MutableArray::~MutableArray):
+ (WebKit::MutableArray::append):
+ * Shared/MutableArray.h: Added.
+ (WebKit::MutableArray::create):
+ (WebKit::MutableArray::isMutable):
+ Sketch out the mutable array interface.
+
+ * UIProcess/API/C/WKAPICast.h:
+ (toWK):
+ Now that the opaque types can be const, use template magic to const_cast
+ it away.
+
+ * UIProcess/API/C/WKBase.h:
+ Add new type and re-type WKArrayRef as const.
+
+ * UIProcess/API/C/WKMutableArray.cpp: Added.
+ (WKMutableArrayCreate):
+ (WKArrayIsMutable):
+ (WKArrayAppendItem):
+ * UIProcess/API/C/WKMutableArray.h: Added.
+ Fill in basic API.
+
+ * WebKit2.pro:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * win/WebKit2.vcproj:
+ * win/WebKit2Generated.make:
+ Add files.
+
2010-09-01 Balazs Kelemen <kb at inf.u-szeged.hu>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/Shared/ImmutableArray.h b/WebKit2/Shared/ImmutableArray.h
index 5841ca7..042597c 100644
--- a/WebKit2/Shared/ImmutableArray.h
+++ b/WebKit2/Shared/ImmutableArray.h
@@ -60,6 +60,8 @@ public:
APIObject* at(size_t i) { return m_entries[i]; }
size_t size() { return m_entries.size(); }
+ virtual bool isMutable() { return false; }
+
protected:
ImmutableArray();
ImmutableArray(APIObject** entries, size_t size);
diff --git a/WebKit2/Shared/MutableArray.cpp b/WebKit2/Shared/MutableArray.cpp
new file mode 100644
index 0000000..f76c70a
--- /dev/null
+++ b/WebKit2/Shared/MutableArray.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 "MutableArray.h"
+
+namespace WebKit {
+
+MutableArray::MutableArray()
+{
+}
+
+MutableArray::~MutableArray()
+{
+}
+
+void MutableArray::append(APIObject* item)
+{
+ m_entries.append(item);
+}
+
+} // namespace WebKit
diff --git a/WebKit2/Shared/MutableArray.h b/WebKit2/Shared/MutableArray.h
new file mode 100644
index 0000000..59b7b2d
--- /dev/null
+++ b/WebKit2/Shared/MutableArray.h
@@ -0,0 +1,54 @@
+/*
+ * 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 MutableArray_h
+#define MutableArray_h
+
+#include "ImmutableArray.h"
+
+namespace WebKit {
+
+// MutableArray - A mutable array type suitable for vending to an API.
+
+class MutableArray : public ImmutableArray {
+public:
+ static PassRefPtr<MutableArray> create()
+ {
+ return adoptRef(new MutableArray);
+ }
+
+ ~MutableArray();
+
+ void append(APIObject*);
+
+ virtual bool isMutable() { return true; }
+
+private:
+ MutableArray();
+};
+
+} // namespace WebKit
+
+#endif // MutableArray_h
diff --git a/WebKit2/UIProcess/API/C/WKAPICast.h b/WebKit2/UIProcess/API/C/WKAPICast.h
index 7c604ce..3e285fb 100644
--- a/WebKit2/UIProcess/API/C/WKAPICast.h
+++ b/WebKit2/UIProcess/API/C/WKAPICast.h
@@ -32,6 +32,7 @@
#include "WebString.h"
#include "WebURL.h"
#include <WebCore/FrameLoaderTypes.h>
+#include <wtf/TypeTraits.h>
#if defined(WIN32) || defined(_WIN32)
#include "WKAPICastWin.h"
@@ -41,6 +42,7 @@ namespace WebKit {
class ImmutableArray;
class ImmutableDictionary;
+class MutableArray;
class WebBackForwardList;
class WebBackForwardListItem;
class WebContext;
@@ -57,7 +59,6 @@ class WebURLRequest;
class WebURLResponse;
template<typename APIType> struct APITypeInfo { };
-template<> struct APITypeInfo<WKTypeRef> { typedef APIObject* ImplType; };
template<> struct APITypeInfo<WKArrayRef> { typedef ImmutableArray* ImplType; };
template<> struct APITypeInfo<WKBackForwardListItemRef> { typedef WebBackForwardListItem* ImplType; };
template<> struct APITypeInfo<WKBackForwardListRef> { typedef WebBackForwardList* ImplType; };
@@ -67,11 +68,13 @@ template<> struct APITypeInfo<WKDictionaryRef> { typedef Immuta
template<> struct APITypeInfo<WKFormSubmissionListenerRef> { typedef WebFormSubmissionListenerProxy* ImplType; };
template<> struct APITypeInfo<WKFramePolicyListenerRef> { typedef WebFramePolicyListenerProxy* ImplType; };
template<> struct APITypeInfo<WKFrameRef> { typedef WebFrameProxy* ImplType; };
+template<> struct APITypeInfo<WKMutableArrayRef> { typedef MutableArray* 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<WKTypeRef> { typedef APIObject* ImplType; };
template<> struct APITypeInfo<WKURLRef> { typedef WebURL* ImplType; };
template<> struct APITypeInfo<WKURLRequestRef> { typedef WebURLRequest* ImplType; };
template<> struct APITypeInfo<WKURLResponseRef> { typedef WebURLResponse* ImplType; };
@@ -81,6 +84,7 @@ 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<MutableArray*> { typedef WKMutableArrayRef APIType; };
template<> struct ImplTypeInfo<WebBackForwardList*> { typedef WKBackForwardListRef APIType; };
template<> struct ImplTypeInfo<WebBackForwardListItem*> { typedef WKBackForwardListItemRef APIType; };
template<> struct ImplTypeInfo<WebContext*> { typedef WKContextRef APIType; };
@@ -120,7 +124,12 @@ private:
template<typename T>
inline typename WebKit::APITypeInfo<T>::ImplType toWK(T t)
{
- return reinterpret_cast<typename WebKit::APITypeInfo<T>::ImplType>(t);
+ // const struct OpaqueWKArray* -> const struct OpaqueWKArray -> struct OpaqueWKArray -> struct OpaqueWKArray* -> ImmutableArray*
+
+ typedef typename WTF::RemovePointer<T>::Type PotentiallyConstValueType;
+ typedef typename WTF::RemoveConst<PotentiallyConstValueType>::Type NonConstValueType;
+
+ return reinterpret_cast<typename WebKit::APITypeInfo<T>::ImplType>(const_cast<NonConstValueType*>(t));
}
template<typename T>
diff --git a/WebKit2/UIProcess/API/C/WKBase.h b/WebKit2/UIProcess/API/C/WKBase.h
index ac52360..e5768d1 100644
--- a/WebKit2/UIProcess/API/C/WKBase.h
+++ b/WebKit2/UIProcess/API/C/WKBase.h
@@ -35,7 +35,9 @@
typedef uint32_t WKTypeID;
typedef void* WKTypeRef;
-typedef struct OpaqueWKArray* WKArrayRef;
+typedef const struct OpaqueWKArray* WKArrayRef;
+typedef struct OpaqueWKArray* WKMutableArrayRef;
+
typedef struct OpaqueWKBackForwardList* WKBackForwardListRef;
typedef struct OpaqueWKBackForwardListItem* WKBackForwardListItemRef;
typedef struct OpaqueWKContext* WKContextRef;
diff --git a/WebKit2/UIProcess/API/C/WKMutableArray.cpp b/WebKit2/UIProcess/API/C/WKMutableArray.cpp
new file mode 100644
index 0000000..9d121e0
--- /dev/null
+++ b/WebKit2/UIProcess/API/C/WKMutableArray.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 "WKMutableArray.h"
+
+#include "MutableArray.h"
+#include "WKAPICast.h"
+
+using namespace WebKit;
+
+WKMutableArrayRef WKMutableArrayCreate()
+{
+ RefPtr<MutableArray> array = MutableArray::create();
+ return toRef(array.release().releaseRef());
+}
+
+bool WKArrayIsMutable(WKArrayRef arrayRef)
+{
+ return toWK(arrayRef)->isMutable();
+}
+
+void WKArrayAppendItem(WKMutableArrayRef arrayRef, WKTypeRef itemRef)
+{
+ toWK(arrayRef)->append(toWK(itemRef));
+}
diff --git a/WebKit2/UIProcess/API/C/WKMutableArray.h b/WebKit2/UIProcess/API/C/WKMutableArray.h
new file mode 100644
index 0000000..6618626
--- /dev/null
+++ b/WebKit2/UIProcess/API/C/WKMutableArray.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 WKMutableArray_h
+#define WKMutableArray_h
+
+#include <WebKit2/WKBase.h>
+
+#ifndef __cplusplus
+#include <stdbool.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WK_EXPORT WKMutableArrayRef WKMutableArrayCreate();
+
+WK_EXPORT bool WKArrayIsMutable(WKArrayRef array);
+
+WK_EXPORT void WKArrayAppendItem(WKMutableArrayRef array, WKTypeRef item);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* WKMutableArray_h */
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 6e99d91..0e611c5 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -158,6 +158,7 @@ HEADERS += \
Shared/DrawingAreaBase.h \
Shared/ImmutableArray.h \
Shared/ImmutableDictionary.h \
+ Shared/MutableArray.h \
Shared/NotImplemented.h \
Shared/qt/WebEventFactoryQt.h \
Shared/VisitedLinkTable.h \
@@ -267,6 +268,7 @@ SOURCES += \
Shared/DrawingAreaBase.cpp \
Shared/ImmutableArray.cpp \
Shared/ImmutableDictionary.cpp \
+ Shared/MutableArray.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 f1cc630..1336e55 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -247,6 +247,10 @@
BCA8C6B011E3C08700812FB7 /* InjectedBundlePageUIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA8C6AE11E3C08700812FB7 /* InjectedBundlePageUIClient.h */; };
BCA8C9DC11E4086500812FB7 /* WebBackForwardControllerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA8C9DA11E4086500812FB7 /* WebBackForwardControllerClient.h */; };
BCA8C9DD11E4086500812FB7 /* WebBackForwardControllerClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA8C9DB11E4086500812FB7 /* WebBackForwardControllerClient.cpp */; };
+ BCB0AD2D122F284300B1341E /* WKMutableArray.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC804A1122F0E7B00103529 /* WKMutableArray.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 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 */; };
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 */; };
@@ -629,6 +633,10 @@
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>"; };
BCC57161115ADB42001CCAF9 /* NotImplemented.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotImplemented.h; sourceTree = "<group>"; };
+ BCC8049D122F0D6B00103529 /* MutableArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MutableArray.cpp; sourceTree = "<group>"; };
+ BCC8049E122F0D6B00103529 /* MutableArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MutableArray.h; sourceTree = "<group>"; };
+ BCC804A1122F0E7B00103529 /* WKMutableArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMutableArray.h; sourceTree = "<group>"; };
+ BCC804A2122F0E7B00103529 /* WKMutableArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKMutableArray.cpp; sourceTree = "<group>"; };
BCC938E01180DE440085E5FE /* WKContextPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContextPrivate.h; sourceTree = "<group>"; };
BCCB75C51203A1CE00222D1B /* WebContextMessageKinds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextMessageKinds.h; sourceTree = "<group>"; };
BCD0042C110C1E27003B8A67 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
@@ -890,6 +898,8 @@
BC64696E11DBE603006455B0 /* ImmutableArray.h */,
BCBCB0CC1215E33A00DE59CA /* ImmutableDictionary.cpp */,
BCBCB0CA1215E32100DE59CA /* ImmutableDictionary.h */,
+ BCC8049D122F0D6B00103529 /* MutableArray.cpp */,
+ BCC8049E122F0D6B00103529 /* MutableArray.h */,
BCC57161115ADB42001CCAF9 /* NotImplemented.h */,
1A0F29C9120B37160053D1B9 /* VisitedLinkTable.cpp */,
1A0F29CA120B37160053D1B9 /* VisitedLinkTable.h */,
@@ -1126,6 +1136,8 @@
BCD01397110FA420003B8A67 /* WKFrame.h */,
BCB9F6A41123DD0D00A137E0 /* WKFramePolicyListener.cpp */,
BCB9F6A31123DD0D00A137E0 /* WKFramePolicyListener.h */,
+ BCC804A2122F0E7B00103529 /* WKMutableArray.cpp */,
+ BCC804A1122F0E7B00103529 /* WKMutableArray.h */,
BCF69FA81176D1CB00471A52 /* WKNavigationData.cpp */,
BCF69FA71176D1CB00471A52 /* WKNavigationData.h */,
BCD597D4112B56DC00EC8C23 /* WKPage.cpp */,
@@ -1556,6 +1568,8 @@
BC90A1D2122DD55E00CC8C50 /* WebURLResponse.h in Headers */,
BC90A1DC122DD89800CC8C50 /* WKURLResponse.h in Headers */,
BC90A1E0122DD8EE00CC8C50 /* WKURLResponseNS.h in Headers */,
+ BCB0AD2D122F284300B1341E /* WKMutableArray.h in Headers */,
+ BCB0AD34122F285800B1341E /* MutableArray.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1788,6 +1802,8 @@
BC90A1D7122DD66A00CC8C50 /* WebURLResponseMac.mm in Sources */,
BC90A1DD122DD89800CC8C50 /* WKURLResponse.cpp in Sources */,
BC90A1E1122DD8EE00CC8C50 /* WKURLResponseNS.mm in Sources */,
+ BCB0AD2E122F284700B1341E /* WKMutableArray.cpp in Sources */,
+ BCB0AD33122F285800B1341E /* MutableArray.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index 15bd489..abfccd9 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -425,6 +425,14 @@
>
</File>
<File
+ RelativePath="..\Shared\MutableArray.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\Shared\MutableArray.h"
+ >
+ </File>
+ <File
RelativePath="..\Shared\NotImplemented.h"
>
</File>
@@ -1323,6 +1331,14 @@
>
</File>
<File
+ RelativePath="..\UIProcess\API\C\WKMutableArray.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\UIProcess\API\C\WKMutableArray.h"
+ >
+ </File>
+ <File
RelativePath="..\UIProcess\API\C\WKNavigationData.cpp"
>
</File>
diff --git a/WebKit2/win/WebKit2Generated.make b/WebKit2/win/WebKit2Generated.make
index f20843e..f2fb013 100644
--- a/WebKit2/win/WebKit2Generated.make
+++ b/WebKit2/win/WebKit2Generated.make
@@ -15,6 +15,7 @@ all:
xcopy /y /d "..\UIProcess\API\C\WKFrame.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
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\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