[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
jberlin at webkit.org
jberlin at webkit.org
Wed Dec 22 14:43:58 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 484d4d37c6952e59a8a5fab8eaefbb8c9e0e43b4
Author: jberlin at webkit.org <jberlin at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 18 21:24:22 2010 +0000
Need a WebKit2 equivalent of the WebKit1 WebUserContentURLPattern.
https://bugs.webkit.org/show_bug.cgi?id=47783
Reviewed by Sam Weinig.
* Shared/API/c/WKBase.h:
* Shared/API/c/WKSharedAPICast.h:
* Shared/API/c/WKUserContentURLPattern.cpp: Added.
(WKUserContentURLPatternGetTypeID):
(WKUserContentURLPatternCreate):
(WKUserContentURLPatternMatchesURL):
* Shared/API/c/WKUserContentURLPattern.h: Added.
* Shared/APIObject.h:
* Shared/UserMessageCoders.h:
Use the original pattern string to encode and decode a UserContentURLPattern.
(WebKit::UserMessageEncoder::baseEncode):
(WebKit::UserMessageDecoder::baseDecode):
* Shared/WebUserContentURLPattern.h: Added.
(WebKit::WebUserContentURLPattern::create):
(WebKit::WebUserContentURLPattern::matchesURL):
Use WebCore::UserContentURLPattern::matches.
(WebKit::WebUserContentURLPattern::patternString):
Expose the pattern string used to create the UserContentURLPattern for the purpose of
encoding and decoding.
(WebKit::WebUserContentURLPattern::WebUserContentURLPattern):
(WebKit::WebUserContentURLPattern::type):
* WebKit2.pro:
* WebKit2.xcodeproj/project.pbxproj:
* win/WebKit2.vcproj:
Add WKUserContentURLPattern.h/.cpp and WebUserContentURLPattern.h
* win/WebKit2Generated.make:
Copy over WKUsercontentURLPattern into the output directory.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69991 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 97746c4..e053532 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,45 @@
+2010-10-18 Jessie Berlin <jberlin at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Need a WebKit2 equivalent of the WebKit1 WebUserContentURLPattern.
+ https://bugs.webkit.org/show_bug.cgi?id=47783
+
+ * Shared/API/c/WKBase.h:
+
+ * Shared/API/c/WKSharedAPICast.h:
+
+ * Shared/API/c/WKUserContentURLPattern.cpp: Added.
+ (WKUserContentURLPatternGetTypeID):
+ (WKUserContentURLPatternCreate):
+ (WKUserContentURLPatternMatchesURL):
+ * Shared/API/c/WKUserContentURLPattern.h: Added.
+
+ * Shared/APIObject.h:
+
+ * Shared/UserMessageCoders.h:
+ Use the original pattern string to encode and decode a UserContentURLPattern.
+ (WebKit::UserMessageEncoder::baseEncode):
+ (WebKit::UserMessageDecoder::baseDecode):
+
+ * Shared/WebUserContentURLPattern.h: Added.
+ (WebKit::WebUserContentURLPattern::create):
+ (WebKit::WebUserContentURLPattern::matchesURL):
+ Use WebCore::UserContentURLPattern::matches.
+ (WebKit::WebUserContentURLPattern::patternString):
+ Expose the pattern string used to create the UserContentURLPattern for the purpose of
+ encoding and decoding.
+ (WebKit::WebUserContentURLPattern::WebUserContentURLPattern):
+ (WebKit::WebUserContentURLPattern::type):
+
+ * WebKit2.pro:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * win/WebKit2.vcproj:
+ Add WKUserContentURLPattern.h/.cpp and WebUserContentURLPattern.h
+
+ * win/WebKit2Generated.make:
+ Copy over WKUsercontentURLPattern into the output directory.
+
2010-10-18 Anders Carlsson <andersca at apple.com>
Fix build.
diff --git a/WebKit2/Shared/API/c/WKBase.h b/WebKit2/Shared/API/c/WKBase.h
index 0e6f2fe..da4dfb7 100644
--- a/WebKit2/Shared/API/c/WKBase.h
+++ b/WebKit2/Shared/API/c/WKBase.h
@@ -54,6 +54,7 @@ typedef const struct OpaqueWKUInt64* WKUInt64Ref;
typedef const struct OpaqueWKURL* WKURLRef;
typedef const struct OpaqueWKURLRequest* WKURLRequestRef;
typedef const struct OpaqueWKURLResponse* WKURLResponseRef;
+typedef const struct OpaqueWKUserContentURLPattern* WKUserContentURLPatternRef;
/* WebKit2 main API types */
diff --git a/WebKit2/Shared/API/c/WKSharedAPICast.h b/WebKit2/Shared/API/c/WKSharedAPICast.h
index e15acac..4a6ab70 100644
--- a/WebKit2/Shared/API/c/WKSharedAPICast.h
+++ b/WebKit2/Shared/API/c/WKSharedAPICast.h
@@ -48,6 +48,7 @@ class WebError;
class WebSerializedScriptValue;
class WebURLRequest;
class WebURLResponse;
+class WebUserContentURLPattern;
template<typename APIType> struct APITypeInfo { };
template<typename ImplType> struct ImplTypeInfo { };
@@ -72,6 +73,7 @@ WK_ADD_API_MAPPING(WKUInt64Ref, WebUInt64)
WK_ADD_API_MAPPING(WKURLRef, WebURL)
WK_ADD_API_MAPPING(WKURLRequestRef, WebURLRequest)
WK_ADD_API_MAPPING(WKURLResponseRef, WebURLResponse)
+WK_ADD_API_MAPPING(WKUserContentURLPatternRef, WebUserContentURLPattern)
template<typename ImplType, typename APIType = typename ImplTypeInfo<ImplType*>::APIType>
class ProxyingRefPtr {
diff --git a/WebKit2/Shared/API/c/WKUserContentURLPattern.cpp b/WebKit2/Shared/API/c/WKUserContentURLPattern.cpp
new file mode 100644
index 0000000..3eb24c4
--- /dev/null
+++ b/WebKit2/Shared/API/c/WKUserContentURLPattern.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 "WKUserContentURLPattern.h"
+
+#include "WKAPICast.h"
+#include "WebUserContentURLPattern.h"
+
+using namespace WebKit;
+
+WKTypeID WKUserContentURLPatternGetTypeID()
+{
+ return toAPI(WebUserContentURLPattern::APIType);
+}
+
+WKUserContentURLPatternRef WKUserContentURLPatternCreate(WKStringRef patternRef)
+{
+ RefPtr<WebUserContentURLPattern> userContentURLPattern = WebUserContentURLPattern::create(toImpl(patternRef)->string());
+ return toAPI(userContentURLPattern.release().leakRef());
+}
+
+bool WKUserContentURLPatternMatchesURL(WKUserContentURLPatternRef urlPatternRef, WKURLRef urlRef)
+{
+ return toImpl(urlPatternRef)->matchesURL(toWTFString(urlRef));
+}
diff --git a/WebKit2/Shared/API/c/WKUserContentURLPattern.h b/WebKit2/Shared/API/c/WKUserContentURLPattern.h
new file mode 100644
index 0000000..80c9bab
--- /dev/null
+++ b/WebKit2/Shared/API/c/WKUserContentURLPattern.h
@@ -0,0 +1,46 @@
+/*
+ * 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 WKUserContentURLPattern_h
+#define WKUserContentURLPattern_h
+
+#include <JavaScriptCore/JavaScript.h>
+#include <WebKit2/WKBase.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WK_EXPORT WKTypeID WKUserContentURLPatternGetTypeID();
+
+WK_EXPORT WKUserContentURLPatternRef WKUserContentURLPatternCreate(WKStringRef patternRef);
+
+WK_EXPORT bool WKUserContentURLPatternMatchesURL(WKUserContentURLPatternRef urlPatternRef, WKURLRef urlRef);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* WKUserContentURLPattern_h */
diff --git a/WebKit2/Shared/APIObject.h b/WebKit2/Shared/APIObject.h
index b46e596..38fbb3a 100644
--- a/WebKit2/Shared/APIObject.h
+++ b/WebKit2/Shared/APIObject.h
@@ -45,6 +45,7 @@ public:
TypeURL,
TypeURLRequest,
TypeURLResponse,
+ TypeUserContentURLPattern,
// Base numeric types
TypeBoolean,
diff --git a/WebKit2/Shared/UserMessageCoders.h b/WebKit2/Shared/UserMessageCoders.h
index 84a8b92..fff9de7 100644
--- a/WebKit2/Shared/UserMessageCoders.h
+++ b/WebKit2/Shared/UserMessageCoders.h
@@ -32,6 +32,7 @@
#include "WebSerializedScriptValue.h"
#include "WebString.h"
#include "WebURL.h"
+#include "WebUserContentURLPattern.h"
namespace WebKit {
@@ -40,6 +41,7 @@ namespace WebKit {
// - Dictionary -> Dictionary
// - String -> String
// - SerializedScriptValue -> SerializedScriptValue
+// - UserContentURLPattern -> UserContentURLPattern
// - WebDouble -> WebDouble
// - WebUInt64 -> WebUInt64
// - WebURL -> WebURL
@@ -108,6 +110,11 @@ public:
encoder->encode(urlObject->string());
return true;
}
+ case APIObject::TypeUserContentURLPattern: {
+ WebUserContentURLPattern* urlPattern = static_cast<WebUserContentURLPattern*>(m_root);
+ encoder->encode(urlPattern->patternString());
+ return true;
+ }
default:
break;
}
@@ -131,6 +138,7 @@ protected:
// - Dictionary -> Dictionary
// - String -> String
// - SerializedScriptValue -> SerializedScriptValue
+// - UserContentURLPattern -> UserContentURLPattern
// - WebDouble -> WebDouble
// - WebUInt64 -> WebUInt64
// - WebURL -> WebURL
@@ -230,6 +238,13 @@ public:
coder.m_root = WebURL::create(string);
break;
}
+ case APIObject::TypeUserContentURLPattern: {
+ String string;
+ if (!decoder->decode(string))
+ return false;
+ coder.m_root = WebUserContentURLPattern::create(string);
+ break;
+ }
default:
break;
}
diff --git a/WebKit2/Shared/WebUserContentURLPattern.h b/WebKit2/Shared/WebUserContentURLPattern.h
new file mode 100644
index 0000000..a466e94
--- /dev/null
+++ b/WebKit2/Shared/WebUserContentURLPattern.h
@@ -0,0 +1,65 @@
+/*
+ * 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 WebUserContentURLPattern_h
+#define WebUserContentURLPattern_h
+
+#include "APIObject.h"
+
+#include <WebCore/KURL.h>
+#include <WebCore/UserContentURLPattern.h>
+#include <wtf/RefPtr.h>
+
+namespace WebKit {
+
+class WebUserContentURLPattern : public APIObject {
+public:
+ static const Type APIType = TypeUserContentURLPattern;
+
+ static PassRefPtr<WebUserContentURLPattern> create(const String& pattern)
+ {
+ return adoptRef(new WebUserContentURLPattern(pattern));
+ }
+
+ bool matchesURL(const String& url) const { return m_pattern.matches(WebCore::KURL(WebCore::ParsedURLString, url)); }
+
+ const String& patternString() const { return m_patternString; }
+
+private:
+ explicit WebUserContentURLPattern(const String& pattern)
+ : m_pattern(WebCore::UserContentURLPattern(pattern))
+ , m_patternString(pattern)
+ {
+ }
+
+ virtual Type type() const { return APIType; }
+
+ WebCore::UserContentURLPattern m_pattern;
+ String m_patternString;
+};
+
+}
+
+#endif // WebUserContentURLPattern_h
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index f5ade6b..0b22818 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -190,6 +190,7 @@ HEADERS += \
Shared/API/c/WKURL.h \
Shared/API/c/WKURLRequest.h \
Shared/API/c/WKURLResponse.h \
+ Shared/API/c/WKUserContentURLPattern.h \
Shared/CoreIPCSupport/DrawingAreaMessageKinds.h \
Shared/CoreIPCSupport/DrawingAreaProxyMessageKinds.h \
Shared/BackingStore.h \
@@ -343,6 +344,7 @@ SOURCES += \
Shared/API/c/WKURL.cpp \
Shared/API/c/WKURLRequest.cpp \
Shared/API/c/WKURLResponse.cpp \
+ Shared/API/c/WKUserContentURLPattern.cpp \
Shared/BackingStore.cpp \
Shared/ImmutableArray.cpp \
Shared/ImmutableDictionary.cpp \
@@ -364,6 +366,7 @@ SOURCES += \
Shared/WebPreferencesStore.cpp \
Shared/WebURLRequest.cpp \
Shared/WebURLResponse.cpp \
+ Shared/WebUserContentURLPattern.cpp \
UIProcess/API/C/WKContext.cpp \
UIProcess/API/C/WKFrame.cpp \
UIProcess/API/C/WKFramePolicyListener.cpp \
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index b51fa36..442c175 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -454,6 +454,9 @@
D3B9484911FF4B6500032B39 /* WebSearchPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484511FF4B6500032B39 /* WebSearchPopupMenu.h */; };
E1EE53E311F8CFC000CCBEE4 /* InjectedBundlePageEditorClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EE53DC11F8CF9F00CCBEE4 /* InjectedBundlePageEditorClient.h */; };
E1EE53E711F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1EE53E611F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp */; };
+ F6113E25126CE1820057D0A7 /* WebUserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = F6113E24126CE1820057D0A7 /* WebUserContentURLPattern.h */; };
+ F6113E28126CE19B0057D0A7 /* WKUserContentURLPattern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6113E26126CE19B0057D0A7 /* WKUserContentURLPattern.cpp */; };
+ F6113E29126CE19B0057D0A7 /* WKUserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = F6113E27126CE19B0057D0A7 /* WKUserContentURLPattern.h */; settings = {ATTRIBUTES = (Public, ); }; };
F67DD7BA125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F67DD7B9125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
/* End PBXBuildFile section */
@@ -949,6 +952,9 @@
D3B9484511FF4B6500032B39 /* WebSearchPopupMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSearchPopupMenu.h; sourceTree = "<group>"; };
E1EE53DC11F8CF9F00CCBEE4 /* InjectedBundlePageEditorClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageEditorClient.h; sourceTree = "<group>"; };
E1EE53E611F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageEditorClient.cpp; sourceTree = "<group>"; };
+ F6113E24126CE1820057D0A7 /* WebUserContentURLPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebUserContentURLPattern.h; sourceTree = "<group>"; };
+ F6113E26126CE19B0057D0A7 /* WKUserContentURLPattern.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKUserContentURLPattern.cpp; sourceTree = "<group>"; };
+ F6113E27126CE19B0057D0A7 /* WKUserContentURLPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserContentURLPattern.h; sourceTree = "<group>"; };
F67DD7B9125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSerializedScriptValuePrivate.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -1215,6 +1221,7 @@
BCE2315B122C30CA00D5C35A /* WebURLRequest.h */,
BC90A1D1122DD55E00CC8C50 /* WebURLResponse.cpp */,
BC90A1D0122DD55E00CC8C50 /* WebURLResponse.h */,
+ F6113E24126CE1820057D0A7 /* WebUserContentURLPattern.h */,
);
path = Shared;
sourceTree = "<group>";
@@ -1780,6 +1787,8 @@
BC4075F0124FF0270068F20A /* WKURLRequest.h */,
BC4075F1124FF0270068F20A /* WKURLResponse.cpp */,
BC4075F2124FF0270068F20A /* WKURLResponse.h */,
+ F6113E26126CE19B0057D0A7 /* WKUserContentURLPattern.cpp */,
+ F6113E27126CE19B0057D0A7 /* WKUserContentURLPattern.h */,
);
path = c;
sourceTree = "<group>";
@@ -2059,6 +2068,8 @@
BC5750971268F3C6006F0F12 /* WebPopupMenuProxyMac.h in Headers */,
1A910071126675C4001842F5 /* FindIndicator.h in Headers */,
1A91010A1268C8CA001842F5 /* FindIndicatorWindow.h in Headers */,
+ F6113E25126CE1820057D0A7 /* WebUserContentURLPattern.h in Headers */,
+ F6113E29126CE19B0057D0A7 /* WKUserContentURLPattern.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2369,6 +2380,7 @@
BC5750981268F3C6006F0F12 /* WebPopupMenuProxyMac.mm in Sources */,
1A910072126675C4001842F5 /* FindIndicator.cpp in Sources */,
1A91010B1268C8CA001842F5 /* FindIndicatorWindow.mm in Sources */,
+ F6113E28126CE19B0057D0A7 /* WKUserContentURLPattern.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index c303ebc..d20526f 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -580,6 +580,10 @@
RelativePath="..\Shared\WebURLResponse.h"
>
</File>
+ <File
+ RelativePath="..\Shared\WebUserContentURLPattern.h"
+ >
+ </File>
<Filter
Name="API"
>
@@ -727,6 +731,14 @@
RelativePath="..\Shared\API\c\WKURLResponse.h"
>
</File>
+ <File
+ RelativePath="..\Shared\API\c\WKUserContentURLPattern.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\Shared\API\c\WKUserContentURLPattern.h"
+ >
+ </File>
<Filter
Name="cf"
>
diff --git a/WebKit2/win/WebKit2Generated.make b/WebKit2/win/WebKit2Generated.make
index 535f666..0e5453a 100644
--- a/WebKit2/win/WebKit2Generated.make
+++ b/WebKit2/win/WebKit2Generated.make
@@ -26,6 +26,7 @@ all:
xcopy /y /d "..\Shared\API\c\WKURL.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\Shared\API\c\WKURLRequest.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\Shared\API\c\WKURLResponse.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
+ xcopy /y /d "..\Shared\API\c\WKUserContentURLPattern.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\UIProcess\API\C\WebKit2.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\UIProcess\API\C\WKBackForwardList.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\UIProcess\API\C\WKBackForwardListItem.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list