Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (185766 => 185767)
--- trunk/Source/WebKit2/CMakeLists.txt 2015-06-19 20:45:54 UTC (rev 185766)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-06-19 20:47:33 UTC (rev 185767)
@@ -295,7 +295,7 @@
Shared/API/c/WKPluginInformation.cpp
Shared/API/c/WKRenderLayer.cpp
Shared/API/c/WKRenderObject.cpp
- Shared/API/c/WKSecurityOrigin.cpp
+ Shared/API/c/WKSecurityOriginRef.cpp
Shared/API/c/WKSerializedScriptValue.cpp
Shared/API/c/WKString.cpp
Shared/API/c/WKType.cpp
Modified: trunk/Source/WebKit2/ChangeLog (185766 => 185767)
--- trunk/Source/WebKit2/ChangeLog 2015-06-19 20:45:54 UTC (rev 185766)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-19 20:47:33 UTC (rev 185767)
@@ -1,3 +1,20 @@
+2015-06-19 Brady Eidson <[email protected]>
+
+ Rename WKSecurityOrigin.h/cpp to WKSecurityOriginRef.h/cpp.
+ https://bugs.webkit.org/show_bug.cgi?id=146152
+
+ Reviewed by Dan Bernstein.
+
+ * CMakeLists.txt:
+
+ * Shared/API/c/WKSecurityOriginRef.cpp: Renamed from Source/WebKit2/Shared/API/c/WKSecurityOrigin.cpp.
+ * Shared/API/c/WKSecurityOriginRef.h: Renamed from Source/WebKit2/Shared/API/c/WKSecurityOrigin.h.
+
+ * UIProcess/API/efl/ewk_security_origin.cpp:
+ * UIProcess/API/efl/ewk_storage_manager.cpp:
+
+ * WebKit2.xcodeproj/project.pbxproj:
+
2015-06-18 Brent Fulgham <[email protected]>
[iOS] scrollIntoViewIfNeeded is not working with scroll-snap points
Deleted: trunk/Source/WebKit2/Shared/API/c/WKSecurityOrigin.cpp (185766 => 185767)
--- trunk/Source/WebKit2/Shared/API/c/WKSecurityOrigin.cpp 2015-06-19 20:45:54 UTC (rev 185766)
+++ trunk/Source/WebKit2/Shared/API/c/WKSecurityOrigin.cpp 2015-06-19 20:47:33 UTC (rev 185767)
@@ -1,92 +0,0 @@
-/*
- * 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 "config.h"
-#include "WKSecurityOrigin.h"
-
-#include "APISecurityOrigin.h"
-#include "WKAPICast.h"
-
-using namespace WebKit;
-
-WKTypeID WKSecurityOriginGetTypeID()
-{
- return toAPI(API::SecurityOrigin::APIType);
-}
-
-WKSecurityOriginRef WKSecurityOriginCreateFromString(WKStringRef string)
-{
- return toAPI(API::SecurityOrigin::create(WebCore::SecurityOrigin::createFromString(toImpl(string)->string())).leakRef());
-}
-
-WKSecurityOriginRef WKSecurityOriginCreateFromDatabaseIdentifier(WKStringRef identifier)
-{
- return toAPI(API::SecurityOrigin::create(WebCore::SecurityOrigin::createFromDatabaseIdentifier((toImpl(identifier)->string()))).leakRef());
-}
-
-WKSecurityOriginRef WKSecurityOriginCreate(WKStringRef protocol, WKStringRef host, int port)
-{
- RefPtr<API::SecurityOrigin> securityOrigin = API::SecurityOrigin::create(toImpl(protocol)->string(), toImpl(host)->string(), port);
- return toAPI(securityOrigin.release().leakRef());
-}
-
-WKStringRef WKSecurityOriginCopyDatabaseIdentifier(WKSecurityOriginRef securityOrigin)
-{
- return toCopiedAPI(toImpl(securityOrigin)->securityOrigin().databaseIdentifier());
-}
-
-WKStringRef WKSecurityOriginCopyToString(WKSecurityOriginRef securityOrigin)
-{
- return toCopiedAPI(toImpl(securityOrigin)->securityOrigin().toString());
-}
-
-WKStringRef WKSecurityOriginCopyProtocol(WKSecurityOriginRef securityOrigin)
-{
- return toCopiedAPI(toImpl(securityOrigin)->securityOrigin().protocol());
-}
-
-WKStringRef WKSecurityOriginCopyHost(WKSecurityOriginRef securityOrigin)
-{
- return toCopiedAPI(toImpl(securityOrigin)->securityOrigin().host());
-}
-
-unsigned short WKSecurityOriginGetPort(WKSecurityOriginRef securityOrigin)
-{
- return toImpl(securityOrigin)->securityOrigin().port();
-}
-
-// For backwards ABI compatibility.
-extern "C" WK_EXPORT WKStringRef WKSecurityOriginGetHost(WKSecurityOriginRef securityOrigin);
-extern "C" WK_EXPORT WKStringRef WKSecurityOriginGetProtocol(WKSecurityOriginRef securityOrigin);
-
-WKStringRef WKSecurityOriginGetHost(WKSecurityOriginRef securityOrigin)
-{
- return WKSecurityOriginCopyHost(securityOrigin);
-}
-
-WKStringRef WKSecurityOriginGetProtocol(WKSecurityOriginRef securityOrigin)
-{
- return WKSecurityOriginCopyProtocol(securityOrigin);
-}
Deleted: trunk/Source/WebKit2/Shared/API/c/WKSecurityOrigin.h (185766 => 185767)
--- trunk/Source/WebKit2/Shared/API/c/WKSecurityOrigin.h 2015-06-19 20:45:54 UTC (rev 185766)
+++ trunk/Source/WebKit2/Shared/API/c/WKSecurityOrigin.h 2015-06-19 20:47:33 UTC (rev 185767)
@@ -1,51 +0,0 @@
-/*
- * 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 <WebKit/WKBase.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-WK_EXPORT WKTypeID WKSecurityOriginGetTypeID();
-
-WK_EXPORT WKSecurityOriginRef WKSecurityOriginCreateFromString(WKStringRef string);
-WK_EXPORT WKSecurityOriginRef WKSecurityOriginCreateFromDatabaseIdentifier(WKStringRef identifier);
-WK_EXPORT WKSecurityOriginRef WKSecurityOriginCreate(WKStringRef protocol, WKStringRef host, int port);
-
-WK_EXPORT WKStringRef WKSecurityOriginCopyDatabaseIdentifier(WKSecurityOriginRef securityOrigin);
-WK_EXPORT WKStringRef WKSecurityOriginCopyToString(WKSecurityOriginRef securityOrigin);
-WK_EXPORT WKStringRef WKSecurityOriginCopyProtocol(WKSecurityOriginRef securityOrigin);
-WK_EXPORT WKStringRef WKSecurityOriginCopyHost(WKSecurityOriginRef securityOrigin);
-WK_EXPORT unsigned short WKSecurityOriginGetPort(WKSecurityOriginRef securityOrigin);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* WKSecurityOrigin_h */
Copied: trunk/Source/WebKit2/Shared/API/c/WKSecurityOriginRef.cpp (from rev 185766, trunk/Source/WebKit2/Shared/API/c/WKSecurityOrigin.cpp) (0 => 185767)
--- trunk/Source/WebKit2/Shared/API/c/WKSecurityOriginRef.cpp (rev 0)
+++ trunk/Source/WebKit2/Shared/API/c/WKSecurityOriginRef.cpp 2015-06-19 20:47:33 UTC (rev 185767)
@@ -0,0 +1,92 @@
+/*
+ * 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 "config.h"
+#include "WKSecurityOriginRef.h"
+
+#include "APISecurityOrigin.h"
+#include "WKAPICast.h"
+
+using namespace WebKit;
+
+WKTypeID WKSecurityOriginGetTypeID()
+{
+ return toAPI(API::SecurityOrigin::APIType);
+}
+
+WKSecurityOriginRef WKSecurityOriginCreateFromString(WKStringRef string)
+{
+ return toAPI(API::SecurityOrigin::create(WebCore::SecurityOrigin::createFromString(toImpl(string)->string())).leakRef());
+}
+
+WKSecurityOriginRef WKSecurityOriginCreateFromDatabaseIdentifier(WKStringRef identifier)
+{
+ return toAPI(API::SecurityOrigin::create(WebCore::SecurityOrigin::createFromDatabaseIdentifier((toImpl(identifier)->string()))).leakRef());
+}
+
+WKSecurityOriginRef WKSecurityOriginCreate(WKStringRef protocol, WKStringRef host, int port)
+{
+ RefPtr<API::SecurityOrigin> securityOrigin = API::SecurityOrigin::create(toImpl(protocol)->string(), toImpl(host)->string(), port);
+ return toAPI(securityOrigin.release().leakRef());
+}
+
+WKStringRef WKSecurityOriginCopyDatabaseIdentifier(WKSecurityOriginRef securityOrigin)
+{
+ return toCopiedAPI(toImpl(securityOrigin)->securityOrigin().databaseIdentifier());
+}
+
+WKStringRef WKSecurityOriginCopyToString(WKSecurityOriginRef securityOrigin)
+{
+ return toCopiedAPI(toImpl(securityOrigin)->securityOrigin().toString());
+}
+
+WKStringRef WKSecurityOriginCopyProtocol(WKSecurityOriginRef securityOrigin)
+{
+ return toCopiedAPI(toImpl(securityOrigin)->securityOrigin().protocol());
+}
+
+WKStringRef WKSecurityOriginCopyHost(WKSecurityOriginRef securityOrigin)
+{
+ return toCopiedAPI(toImpl(securityOrigin)->securityOrigin().host());
+}
+
+unsigned short WKSecurityOriginGetPort(WKSecurityOriginRef securityOrigin)
+{
+ return toImpl(securityOrigin)->securityOrigin().port();
+}
+
+// For backwards ABI compatibility.
+extern "C" WK_EXPORT WKStringRef WKSecurityOriginGetHost(WKSecurityOriginRef securityOrigin);
+extern "C" WK_EXPORT WKStringRef WKSecurityOriginGetProtocol(WKSecurityOriginRef securityOrigin);
+
+WKStringRef WKSecurityOriginGetHost(WKSecurityOriginRef securityOrigin)
+{
+ return WKSecurityOriginCopyHost(securityOrigin);
+}
+
+WKStringRef WKSecurityOriginGetProtocol(WKSecurityOriginRef securityOrigin)
+{
+ return WKSecurityOriginCopyProtocol(securityOrigin);
+}
Copied: trunk/Source/WebKit2/Shared/API/c/WKSecurityOriginRef.h (from rev 185766, trunk/Source/WebKit2/Shared/API/c/WKSecurityOrigin.h) (0 => 185767)
--- trunk/Source/WebKit2/Shared/API/c/WKSecurityOriginRef.h (rev 0)
+++ trunk/Source/WebKit2/Shared/API/c/WKSecurityOriginRef.h 2015-06-19 20:47:33 UTC (rev 185767)
@@ -0,0 +1,51 @@
+/*
+ * 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 WKSecurityOriginRef_h
+#define WKSecurityOriginRef_h
+
+#include <WebKit/WKBase.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WK_EXPORT WKTypeID WKSecurityOriginGetTypeID();
+
+WK_EXPORT WKSecurityOriginRef WKSecurityOriginCreateFromString(WKStringRef string);
+WK_EXPORT WKSecurityOriginRef WKSecurityOriginCreateFromDatabaseIdentifier(WKStringRef identifier);
+WK_EXPORT WKSecurityOriginRef WKSecurityOriginCreate(WKStringRef protocol, WKStringRef host, int port);
+
+WK_EXPORT WKStringRef WKSecurityOriginCopyDatabaseIdentifier(WKSecurityOriginRef securityOrigin);
+WK_EXPORT WKStringRef WKSecurityOriginCopyToString(WKSecurityOriginRef securityOrigin);
+WK_EXPORT WKStringRef WKSecurityOriginCopyProtocol(WKSecurityOriginRef securityOrigin);
+WK_EXPORT WKStringRef WKSecurityOriginCopyHost(WKSecurityOriginRef securityOrigin);
+WK_EXPORT unsigned short WKSecurityOriginGetPort(WKSecurityOriginRef securityOrigin);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* WKSecurityOriginRef_h */
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_security_origin.cpp (185766 => 185767)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_security_origin.cpp 2015-06-19 20:45:54 UTC (rev 185766)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_security_origin.cpp 2015-06-19 20:47:33 UTC (rev 185767)
@@ -27,7 +27,7 @@
#include "ewk_security_origin.h"
#include "WKAPICast.h"
-#include "WKSecurityOrigin.h"
+#include "WKSecurityOriginRef.h"
#include "WKString.h"
#include "ewk_security_origin_private.h"
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager.cpp (185766 => 185767)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager.cpp 2015-06-19 20:45:54 UTC (rev 185766)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager.cpp 2015-06-19 20:47:33 UTC (rev 185767)
@@ -28,7 +28,7 @@
#include "WKAPICast.h"
#include "WKArray.h"
-#include "WKSecurityOrigin.h"
+#include "WKSecurityOriginRef.h"
#include "WKString.h"
#include "ewk_security_origin_private.h"
#include "ewk_storage_manager_private.h"
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (185766 => 185767)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-06-19 20:45:54 UTC (rev 185766)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-06-19 20:47:33 UTC (rev 185767)
@@ -1004,6 +1004,8 @@
51C96119183D294700D2002E /* WebIDBServerConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51C96117183D294700D2002E /* WebIDBServerConnectionMessages.h */; };
51CBBA0F165219B6005BE8FD /* NetworkResourceLoadParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51CBBA0D165219B6005BE8FD /* NetworkResourceLoadParameters.cpp */; };
51CBBA10165219B6005BE8FD /* NetworkResourceLoadParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 51CBBA0E165219B6005BE8FD /* NetworkResourceLoadParameters.h */; };
+ 51CD1C5D1B3493AF00142CA5 /* WKSecurityOriginRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51CD1C591B3493A900142CA5 /* WKSecurityOriginRef.cpp */; };
+ 51CD1C5E1B3493B400142CA5 /* WKSecurityOriginRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 51CD1C5A1B3493A900142CA5 /* WKSecurityOriginRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
51D02F64132EC5B900BEAA96 /* WebIconDatabaseMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51D02F63132EC5B900BEAA96 /* WebIconDatabaseMessageReceiver.cpp */; };
51D02F6A132EC73700BEAA96 /* WebIconDatabaseMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D02F67132EC73700BEAA96 /* WebIconDatabaseMessages.h */; };
51D02F6B132EC73700BEAA96 /* WebIconDatabaseProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51D02F68132EC73700BEAA96 /* WebIconDatabaseProxyMessageReceiver.cpp */; };
@@ -1794,8 +1796,6 @@
F62A76B812B1B25F0005F1B6 /* WebDatabaseManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F62A76B412B1B25F0005F1B6 /* WebDatabaseManagerProxyMessageReceiver.cpp */; };
F62A76B912B1B25F0005F1B6 /* WebDatabaseManagerProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = F62A76B512B1B25F0005F1B6 /* WebDatabaseManagerProxyMessages.h */; };
F634445612A885C8000612D8 /* APISecurityOrigin.h in Headers */ = {isa = PBXBuildFile; fileRef = F634445512A885C8000612D8 /* APISecurityOrigin.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 = (Private, ); }; };
F67DD7BA125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F67DD7B9125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
F6A25FDC12ADC6CC00DC40CC /* WebDatabaseManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6A25FDA12ADC6CC00DC40CC /* WebDatabaseManager.cpp */; };
F6A25FDD12ADC6CC00DC40CC /* WebDatabaseManager.h in Headers */ = {isa = PBXBuildFile; fileRef = F6A25FDB12ADC6CC00DC40CC /* WebDatabaseManager.h */; };
@@ -3181,6 +3181,8 @@
51C96117183D294700D2002E /* WebIDBServerConnectionMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebIDBServerConnectionMessages.h; sourceTree = "<group>"; };
51CBBA0D165219B6005BE8FD /* NetworkResourceLoadParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkResourceLoadParameters.cpp; path = Network/NetworkResourceLoadParameters.cpp; sourceTree = "<group>"; };
51CBBA0E165219B6005BE8FD /* NetworkResourceLoadParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkResourceLoadParameters.h; path = Network/NetworkResourceLoadParameters.h; sourceTree = "<group>"; };
+ 51CD1C591B3493A900142CA5 /* WKSecurityOriginRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKSecurityOriginRef.cpp; sourceTree = "<group>"; };
+ 51CD1C5A1B3493A900142CA5 /* WKSecurityOriginRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSecurityOriginRef.h; sourceTree = "<group>"; };
51D02F63132EC5B900BEAA96 /* WebIconDatabaseMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebIconDatabaseMessageReceiver.cpp; sourceTree = "<group>"; };
51D02F65132EC6D300BEAA96 /* WebIconDatabaseProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebIconDatabaseProxy.messages.in; path = IconDatabase/WebIconDatabaseProxy.messages.in; sourceTree = "<group>"; };
51D02F67132EC73700BEAA96 /* WebIconDatabaseMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebIconDatabaseMessages.h; sourceTree = "<group>"; };
@@ -4033,8 +4035,6 @@
F62A76B412B1B25F0005F1B6 /* WebDatabaseManagerProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebDatabaseManagerProxyMessageReceiver.cpp; sourceTree = "<group>"; };
F62A76B512B1B25F0005F1B6 /* WebDatabaseManagerProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDatabaseManagerProxyMessages.h; sourceTree = "<group>"; };
F634445512A885C8000612D8 /* APISecurityOrigin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APISecurityOrigin.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>"; };
F638954F133BEF38008941D5 /* HTTPCookieAcceptPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPCookieAcceptPolicy.h; sourceTree = "<group>"; };
F67DD7B9125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSerializedScriptValuePrivate.h; sourceTree = "<group>"; };
F6A0C13F13281E6E0070430F /* ResourceCachesToClear.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceCachesToClear.h; sourceTree = "<group>"; };
@@ -7092,8 +7092,8 @@
37948407150C4B9600E52CE9 /* WKRenderLayer.h */,
37608820150414F700FC82C7 /* WKRenderObject.cpp */,
37608821150414F700FC82C7 /* WKRenderObject.h */,
- F634445A12A885E9000612D8 /* WKSecurityOrigin.cpp */,
- F634445B12A885E9000612D8 /* WKSecurityOrigin.h */,
+ 51CD1C591B3493A900142CA5 /* WKSecurityOriginRef.cpp */,
+ 51CD1C5A1B3493A900142CA5 /* WKSecurityOriginRef.h */,
BC4075E7124FF0270068F20A /* WKSerializedScriptValue.cpp */,
BC4075E8124FF0270068F20A /* WKSerializedScriptValue.h */,
F67DD7B9125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h */,
@@ -7838,6 +7838,7 @@
1AFDE65A1954A42B00C48FFA /* SessionState.h in Headers */,
1A002D49196B345D00B9AD44 /* SessionStateCoding.h in Headers */,
753E3E0E1887398900188496 /* SessionTracker.h in Headers */,
+ 51CD1C5E1B3493B400142CA5 /* WKSecurityOriginRef.h in Headers */,
1A6420E512DCE2FF00CAAE2C /* ShareableBitmap.h in Headers */,
51217461164C20E30037A5C1 /* ShareableResource.h in Headers */,
1A24BED5120894D100FBB059 /* SharedMemory.h in Headers */,
@@ -8283,7 +8284,6 @@
1A7E377518E4A33A003D0FFF /* WKScriptMessageHandler.h in Headers */,
7CC99A3618EF7CBC0048C8B4 /* WKScriptMessageInternal.h in Headers */,
0FCB4E5418BBE044000FCFC9 /* WKScrollView.h in Headers */,
- F634445D12A885E9000612D8 /* WKSecurityOrigin.h in Headers */,
BC407604124FF0270068F20A /* WKSerializedScriptValue.h in Headers */,
F67DD7BA125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h in Headers */,
75A8D2D7187D303A00C39C9E /* WKSessionRef.h in Headers */,
@@ -9579,6 +9579,7 @@
1A8EF96E1252AF6B00F7067F /* PluginControllerProxyMessageReceiver.cpp in Sources */,
1A17977F137EE82C00F97D45 /* PluginCreationParameters.cpp in Sources */,
7C3F8C90173AF52D007B7F39 /* PluginInformation.cpp in Sources */,
+ 51CD1C5D1B3493AF00142CA5 /* WKSecurityOriginRef.cpp in Sources */,
7C135AAC173B0CFF00586AE2 /* PluginInformationMac.mm in Sources */,
1AEFCC1311D01F96008219D3 /* PluginInfoStore.cpp in Sources */,
1AEFCCBD11D02C5E008219D3 /* PluginInfoStoreMac.mm in Sources */,
@@ -10042,7 +10043,6 @@
1AC75A1E1B33695E0056745B /* HangDetectionDisablerMac.mm in Sources */,
1A7E377818E4A4FE003D0FFF /* WKScriptMessage.mm in Sources */,
0FCB4E5518BBE044000FCFC9 /* WKScrollView.mm in Sources */,
- F634445C12A885E9000612D8 /* WKSecurityOrigin.cpp in Sources */,
BC407603124FF0270068F20A /* WKSerializedScriptValue.cpp in Sources */,
75A8D2D8187D304000C39C9E /* WKSessionRef.cpp in Sources */,
1ADE46B21954EC61000F7985 /* WKSessionStateRef.cpp in Sources */,
Modified: trunk/Tools/ChangeLog (185766 => 185767)
--- trunk/Tools/ChangeLog 2015-06-19 20:45:54 UTC (rev 185766)
+++ trunk/Tools/ChangeLog 2015-06-19 20:47:33 UTC (rev 185767)
@@ -1,3 +1,13 @@
+2015-06-19 Brady Eidson <[email protected]>
+
+ Rename WKSecurityOrigin.h/cpp to WKSecurityOriginRef.h/cpp.
+ https://bugs.webkit.org/show_bug.cgi?id=146152
+
+ Reviewed by Dan Bernstein.
+
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ * WebKitTestRunner/WebNotificationProvider.cpp:
+
2015-06-19 Mark Lam <[email protected]>
CheckedArithmetic's operator bool() and operator==() is broken.
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (185766 => 185767)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2015-06-19 20:45:54 UTC (rev 185766)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2015-06-19 20:47:33 UTC (rev 185767)
@@ -43,7 +43,7 @@
#include <WebKit/WKBundleNodeHandlePrivate.h>
#include <WebKit/WKBundlePagePrivate.h>
#include <WebKit/WKBundlePrivate.h>
-#include <WebKit/WKSecurityOrigin.h>
+#include <WebKit/WKSecurityOriginRef.h>
#include <WebKit/WKURLRequest.h>
#include <wtf/HashMap.h>
#include <wtf/text/CString.h>
Modified: trunk/Tools/WebKitTestRunner/WebNotificationProvider.cpp (185766 => 185767)
--- trunk/Tools/WebKitTestRunner/WebNotificationProvider.cpp 2015-06-19 20:45:54 UTC (rev 185766)
+++ trunk/Tools/WebKitTestRunner/WebNotificationProvider.cpp 2015-06-19 20:47:33 UTC (rev 185767)
@@ -29,7 +29,7 @@
#include <WebKit/WKMutableArray.h>
#include <WebKit/WKNotification.h>
#include <WebKit/WKNumber.h>
-#include <WebKit/WKSecurityOrigin.h>
+#include <WebKit/WKSecurityOriginRef.h>
#include <wtf/Assertions.h>
namespace WTR {
