[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
jberlin at webkit.org
jberlin at webkit.org
Wed Dec 22 17:57:59 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b6d662bc4004f46b03b29e5ab6ec9a8b3f2f29ef
Author: jberlin at webkit.org <jberlin at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 3 17:30:57 2010 +0000
Need a WebKit2 Equivalent of WebSecurityOrigin
https://bugs.webkit.org/show_bug.cgi?id=50170
Reviewed by Sam Weinig.
WebCore:
* WebCore.exp.in:
Export the symbol for SecurityOrigin::createFromDatabaseIdentifier.
WebKit2:
* Shared/API/c/WKBase.h:
Add the WKSecurityOriginRef typedef.
* Shared/APIObject.h:
Add the SecurityOrigin type as a Shared type.
* Shared/API/c/WKSharedAPICast.h::
Add the mapping between WKSecurityOriginRef and WebSecurityOrigin.
* UIProcess/API/C/WKSecurityOrigin.cpp: Added.
(WKSecurityOriginGetTypeID):
(WKSecurityOriginCreate):
(WKSecurityOriginGetProtocol):
(WKSecurityOriginGetHost):
(WKSecurityOriginGetPort):
* UIProcess/API/C/WKSecurityOrigin.h: Added.
* UIProcess/WebSecurityOrigin.h: Added.
(WebKit::WebSecurityOrigin::create):
Create based on the database identifier, which contains the protocol, host and port.
(WebKit::WebSecurityOrigin::protocol):
(WebKit::WebSecurityOrigin::host):
(WebKit::WebSecurityOrigin::port):
(WebKit::WebSecurityOrigin::databaseIdentifier):
(WebKit::WebSecurityOrigin::WebSecurityOrigin):
(WebKit::WebSecurityOrigin::type):
* WebKit2.pro:
Add WKSecurityOrigin.cpp/.h.
* WebKit2.xcodeproj/project.pbxproj:
* win/WebKit2.vcproj:
Add the WebSecurityOrigin.h and WKSecurityOrigin.cpp/.h.
* win/WebKit2Generated.make:
Make sure WKSecurityOrigin.h file gets copied over to the WebKitBuild directory on Windows.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73267 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a232c3c..fce9151 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-03 Jessie Berlin <jberlin at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Need a WebKit2 Equivalent of WebSecurityOrigin
+ https://bugs.webkit.org/show_bug.cgi?id=50170
+
+ * WebCore.exp.in:
+ Export the symbol for SecurityOrigin::createFromDatabaseIdentifier.
+
2010-12-03 Andras Becsi <abecsi at inf.u-szeged.hu>
Unreviewed build fix after r73254.
diff --git a/WebCore/WebCore.exp.in b/WebCore/WebCore.exp.in
index 95811a5..b28b4d6 100644
--- a/WebCore/WebCore.exp.in
+++ b/WebCore/WebCore.exp.in
@@ -322,6 +322,7 @@ __ZN7WebCore14SchemeRegistry24registerURLSchemeAsLocalERKN3WTF6StringE
__ZN7WebCore14SchemeRegistry25registerURLSchemeAsSecureERKN3WTF6StringE
__ZN7WebCore14SchemeRegistry32registerURLSchemeAsEmptyDocumentERKN3WTF6StringE
__ZN7WebCore14SecurityOrigin14threadsafeCopyEv
+__ZN7WebCore14SecurityOrigin28createFromDatabaseIdentifierERKN3WTF6StringE
__ZN7WebCore14SecurityOrigin16createFromStringERKN3WTF6StringE
__ZN7WebCore14SecurityOrigin18setLocalLoadPolicyENS0_15LocalLoadPolicyE
__ZN7WebCore14SecurityOrigin18shouldHideReferrerERKNS_4KURLERKN3WTF6StringE
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index f143182..7397fbb 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,47 @@
+2010-12-03 Jessie Berlin <jberlin at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Need a WebKit2 Equivalent of WebSecurityOrigin
+ https://bugs.webkit.org/show_bug.cgi?id=50170
+
+ * Shared/API/c/WKBase.h:
+ Add the WKSecurityOriginRef typedef.
+
+ * Shared/APIObject.h:
+ Add the SecurityOrigin type as a Shared type.
+
+ * Shared/API/c/WKSharedAPICast.h::
+ Add the mapping between WKSecurityOriginRef and WebSecurityOrigin.
+
+ * UIProcess/API/C/WKSecurityOrigin.cpp: Added.
+ (WKSecurityOriginGetTypeID):
+ (WKSecurityOriginCreate):
+ (WKSecurityOriginGetProtocol):
+ (WKSecurityOriginGetHost):
+ (WKSecurityOriginGetPort):
+ * UIProcess/API/C/WKSecurityOrigin.h: Added.
+
+ * UIProcess/WebSecurityOrigin.h: Added.
+ (WebKit::WebSecurityOrigin::create):
+ Create based on the database identifier, which contains the protocol, host and port.
+ (WebKit::WebSecurityOrigin::protocol):
+ (WebKit::WebSecurityOrigin::host):
+ (WebKit::WebSecurityOrigin::port):
+ (WebKit::WebSecurityOrigin::databaseIdentifier):
+ (WebKit::WebSecurityOrigin::WebSecurityOrigin):
+ (WebKit::WebSecurityOrigin::type):
+
+ * WebKit2.pro:
+ Add WKSecurityOrigin.cpp/.h.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ * win/WebKit2.vcproj:
+ Add the WebSecurityOrigin.h and WKSecurityOrigin.cpp/.h.
+
+ * win/WebKit2Generated.make:
+ Make sure WKSecurityOrigin.h file gets copied over to the WebKitBuild directory on Windows.
+
2010-12-02 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Reviewed by Csaba Osztrogonác.
diff --git a/WebKit2/Shared/API/c/WKBase.h b/WebKit2/Shared/API/c/WKBase.h
index f2cf12b..186c839 100644
--- a/WebKit2/Shared/API/c/WKBase.h
+++ b/WebKit2/Shared/API/c/WKBase.h
@@ -49,6 +49,7 @@ typedef const struct OpaqueWKData* WKDataRef;
typedef const struct OpaqueWKDouble* WKDoubleRef;
typedef const struct OpaqueWKError* WKErrorRef;
typedef const struct OpaqueWKCertificateInfo* WKCertificateInfoRef;
+typedef const struct OpaqueWKSecurityOrigin* WKSecurityOriginRef;
typedef const struct OpaqueWKSerializedScriptValue* WKSerializedScriptValueRef;
typedef const struct OpaqueWKString* WKStringRef;
typedef const struct OpaqueWKUInt64* WKUInt64Ref;
diff --git a/WebKit2/Shared/API/c/WKSecurityOrigin.cpp b/WebKit2/Shared/API/c/WKSecurityOrigin.cpp
new file mode 100644
index 0000000..7765658
--- /dev/null
+++ b/WebKit2/Shared/API/c/WKSecurityOrigin.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 "WKSecurityOrigin.h"
+
+#include "WKAPICast.h"
+#include "WebSecurityOrigin.h"
+
+using namespace WebKit;
+
+WKTypeID WKSecurityOriginGetTypeID()
+{
+ return toAPI(WebSecurityOrigin::APIType);
+}
+
+WKSecurityOriginRef WKSecurityOriginCreate(WKStringRef identifier)
+{
+ RefPtr<WebSecurityOrigin> securityOrigin = WebSecurityOrigin::create(toImpl(identifier)->string());
+ return toAPI(securityOrigin.release().leakRef());
+}
+
+WKStringRef WKSecurityOriginGetProtocol(WKSecurityOriginRef securityOrigin)
+{
+ return toCopiedAPI(toImpl(securityOrigin)->protocol());
+}
+
+WKStringRef WKSecurityOriginGetHost(WKSecurityOriginRef securityOrigin)
+{
+ return toCopiedAPI(toImpl(securityOrigin)->host());
+}
+
+unsigned short WKSecurityOriginGetPort(WKSecurityOriginRef securityOrigin)
+{
+ return toImpl(securityOrigin)->port();
+}
diff --git a/WebKit2/Shared/API/c/WKSecurityOrigin.h b/WebKit2/Shared/API/c/WKSecurityOrigin.h
new file mode 100644
index 0000000..a19a36c
--- /dev/null
+++ b/WebKit2/Shared/API/c/WKSecurityOrigin.h
@@ -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.
+ */
+
+#ifndef WKSecurityOrigin_h
+#define WKSecurityOrigin_h
+
+#include <WebKit2/WKBase.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WK_EXPORT WKTypeID WKSecurityOriginGetTypeID();
+
+WK_EXPORT WKSecurityOriginRef WKSecurityOriginCreate(WKStringRef identifier);
+
+WK_EXPORT WKStringRef WKSecurityOriginGetProtocol(WKSecurityOriginRef securityOrigin);
+WK_EXPORT WKStringRef WKSecurityOriginGetHost(WKSecurityOriginRef securityOrigin);
+WK_EXPORT unsigned short WKSecurityOriginGetPort(WKSecurityOriginRef securityOrigin);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* WKSecurityOrigin_h */
diff --git a/WebKit2/Shared/API/c/WKSharedAPICast.h b/WebKit2/Shared/API/c/WKSharedAPICast.h
index 8ecb628..ae1b273 100644
--- a/WebKit2/Shared/API/c/WKSharedAPICast.h
+++ b/WebKit2/Shared/API/c/WKSharedAPICast.h
@@ -52,6 +52,7 @@ class MutableDictionary;
class WebCertificateInfo;
class WebContextMenuItem;
class WebData;
+class WebSecurityOrigin;
class WebSerializedScriptValue;
class WebURLRequest;
class WebURLResponse;
@@ -74,6 +75,7 @@ WK_ADD_API_MAPPING(WKDoubleRef, WebDouble)
WK_ADD_API_MAPPING(WKErrorRef, WebError)
WK_ADD_API_MAPPING(WKMutableArrayRef, MutableArray)
WK_ADD_API_MAPPING(WKMutableDictionaryRef, MutableDictionary)
+WK_ADD_API_MAPPING(WKSecurityOriginRef, WebSecurityOrigin)
WK_ADD_API_MAPPING(WKSerializedScriptValueRef, WebSerializedScriptValue)
WK_ADD_API_MAPPING(WKStringRef, WebString)
WK_ADD_API_MAPPING(WKTypeRef, APIObject)
diff --git a/WebKit2/Shared/APIObject.h b/WebKit2/Shared/APIObject.h
index 85ccba9..158979c 100644
--- a/WebKit2/Shared/APIObject.h
+++ b/WebKit2/Shared/APIObject.h
@@ -41,6 +41,7 @@ public:
TypeData,
TypeDictionary,
TypeError,
+ TypeSecurityOrigin,
TypeSerializedScriptValue,
TypeString,
TypeURL,
diff --git a/WebKit2/Shared/WebSecurityOrigin.h b/WebKit2/Shared/WebSecurityOrigin.h
new file mode 100644
index 0000000..f462d00
--- /dev/null
+++ b/WebKit2/Shared/WebSecurityOrigin.h
@@ -0,0 +1,66 @@
+/*
+ * 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 WebSecurityOrigin_h
+#define WebSecurityOrigin_h
+
+#include "APIObject.h"
+#include <WebCore/SecurityOrigin.h>
+#include <wtf/PassRefPtr.h>
+
+namespace WebKit {
+
+class WebSecurityOrigin : public APIObject {
+public:
+ static const Type APIType = TypeSecurityOrigin;
+
+ static PassRefPtr<WebSecurityOrigin> create(const String& identifier)
+ {
+ RefPtr<WebCore::SecurityOrigin> securityOrigin = WebCore::SecurityOrigin::createFromDatabaseIdentifier(identifier);
+ if (!securityOrigin)
+ return 0;
+ return adoptRef(new WebSecurityOrigin(securityOrigin.release()));
+ }
+
+ const String protocol() const { return m_securityOrigin->domain(); }
+ const String host() const { return m_securityOrigin->host(); }
+ unsigned short port() const { return m_securityOrigin->port(); }
+
+ const String databaseIdentifier() const { return m_securityOrigin->databaseIdentifier(); }
+
+private:
+ WebSecurityOrigin(PassRefPtr<WebCore::SecurityOrigin> securityOrigin)
+ : m_securityOrigin(securityOrigin)
+ {
+ }
+
+ virtual Type type() const { return APIType; }
+
+ RefPtr<WebCore::SecurityOrigin> m_securityOrigin;
+};
+
+} // namespace WebKit
+
+#endif
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index d5e48da..1b718b4 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -214,6 +214,7 @@ HEADERS += \
Shared/API/c/WKContextMenuItemTypes.h \
Shared/API/c/WKGeometry.h \
Shared/API/c/WKNumber.h \
+ Shared/API/c/WKSecurityOrigin.h \
Shared/API/c/WKSerializedScriptValue.h \
Shared/API/c/WKSharedAPICast.h \
Shared/API/c/WKString.h \
@@ -406,6 +407,7 @@ SOURCES += \
Shared/API/c/WKCertificateInfo.cpp \
Shared/API/c/WKContextMenuItem.cpp \
Shared/API/c/WKNumber.cpp \
+ Shared/API/c/WKSecurityOrigin.cpp \
Shared/API/c/WKSerializedScriptValue.cpp \
Shared/API/c/WKString.cpp \
Shared/API/c/WKType.cpp \
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index f487b6e..84850f5 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -557,6 +557,9 @@
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, ); }; };
+ F634445612A885C8000612D8 /* WebSecurityOrigin.h in Headers */ = {isa = PBXBuildFile; fileRef = F634445512A885C8000612D8 /* WebSecurityOrigin.h */; };
+ F634445C12A885E9000612D8 /* WKSecurityOrigin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F634445A12A885E9000612D8 /* WKSecurityOrigin.cpp */; };
+ F634445D12A885E9000612D8 /* WKSecurityOrigin.h in Headers */ = {isa = PBXBuildFile; fileRef = F634445B12A885E9000612D8 /* WKSecurityOrigin.h */; settings = {ATTRIBUTES = (Public, ); }; };
F67DD7BA125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F67DD7B9125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
/* End PBXBuildFile section */
@@ -1177,6 +1180,9 @@
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>"; };
+ F634445512A885C8000612D8 /* WebSecurityOrigin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSecurityOrigin.h; sourceTree = "<group>"; };
+ F634445A12A885E9000612D8 /* WKSecurityOrigin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKSecurityOrigin.cpp; sourceTree = "<group>"; };
+ F634445B12A885E9000612D8 /* WKSecurityOrigin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSecurityOrigin.h; sourceTree = "<group>"; };
F67DD7B9125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSerializedScriptValuePrivate.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -1498,6 +1504,7 @@
BC306822125A6B9400E71278 /* WebProcessCreationParameters.h */,
BCD598AB112B7FDF00EC8C23 /* WebPreferencesStore.cpp */,
BCD598AA112B7FDF00EC8C23 /* WebPreferencesStore.h */,
+ F634445512A885C8000612D8 /* WebSecurityOrigin.h */,
A72D5D7F1236CBA800A88B15 /* WebSerializedScriptValue.h */,
BCF04C8E11FF9F6E00F86A58 /* WebString.h */,
C0337DD7127A51B6008FF4F4 /* WebTouchEvent.cpp */,
@@ -2153,6 +2160,8 @@
BC4075E4124FF0270068F20A /* WKMutableDictionary.h */,
BC4075E5124FF0270068F20A /* WKNumber.cpp */,
BC4075E6124FF0270068F20A /* WKNumber.h */,
+ F634445A12A885E9000612D8 /* WKSecurityOrigin.cpp */,
+ F634445B12A885E9000612D8 /* WKSecurityOrigin.h */,
BC4075E7124FF0270068F20A /* WKSerializedScriptValue.cpp */,
BC4075E8124FF0270068F20A /* WKSerializedScriptValue.h */,
F67DD7B9125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h */,
@@ -2519,6 +2528,8 @@
BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */,
BC7B633D12A45D1200D174A4 /* WKBundlePageGroup.h in Headers */,
37F623B812A57B6200E3FDF6 /* WKFindOptions.h in Headers */,
+ F634445612A885C8000612D8 /* WebSecurityOrigin.h in Headers */,
+ F634445D12A885E9000612D8 /* WKSecurityOrigin.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2914,6 +2925,7 @@
1AA4792312A59FD9008236C3 /* PluginProcessMac.mm in Sources */,
BC84EB1812A7100C0083F2DA /* WebPreferencesMac.mm in Sources */,
BC2DFBA312A761A500E732A3 /* WebPreferencesCF.cpp in Sources */,
+ F634445C12A885E9000612D8 /* WKSecurityOrigin.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index 69c4faa..ad8e788 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -611,6 +611,10 @@
>
</File>
<File
+ RelativePath="..\Shared\WebSecurityOrigin.h"
+ >
+ </File>
+ <File
RelativePath="..\Shared\WebSerializedScriptValue.h"
>
</File>
@@ -754,6 +758,14 @@
>
</File>
<File
+ RelativePath="..\Shared\API\c\WKSecurityOrigin.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\Shared\API\c\WKSecurityOrigin.h"
+ >
+ </File>
+ <File
RelativePath="..\Shared\API\c\WKSerializedScriptValue.cpp"
>
</File>
diff --git a/WebKit2/win/WebKit2Generated.make b/WebKit2/win/WebKit2Generated.make
index 72a694d..d1aaace 100644
--- a/WebKit2/win/WebKit2Generated.make
+++ b/WebKit2/win/WebKit2Generated.make
@@ -21,6 +21,7 @@ all:
xcopy /y /d "..\Shared\API\c\WKMutableArray.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\Shared\API\c\WKMutableDictionary.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\Shared\API\c\WKNumber.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
+ xcopy /y /d "..\Shared\API\C\WKSecurityOrigin.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\Shared\API\c\WKSerializedScriptValue.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\Shared\API\c\WKSerializedScriptValuePrivate.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\Shared\API\c\WKString.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list