Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (201896 => 201897)
--- trunk/Source/WebKit2/CMakeLists.txt 2016-06-10 00:42:19 UTC (rev 201896)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-06-10 01:11:47 UTC (rev 201897)
@@ -239,7 +239,6 @@
Shared/FontInfo.cpp
Shared/LayerTreeContext.cpp
Shared/NavigationActionData.cpp
- Shared/OriginAndDatabases.cpp
Shared/PlatformPopupMenuData.cpp
Shared/PrintInfo.cpp
Shared/SessionState.cpp
Modified: trunk/Source/WebKit2/ChangeLog (201896 => 201897)
--- trunk/Source/WebKit2/ChangeLog 2016-06-10 00:42:19 UTC (rev 201896)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-10 01:11:47 UTC (rev 201897)
@@ -1,3 +1,17 @@
+2016-06-09 Anders Carlsson <[email protected]>
+
+ Remove OriginAndDatabases.cpp, it's unused
+ https://bugs.webkit.org/show_bug.cgi?id=158595
+
+ Reviewed by Sam Weinig.
+
+ * CMakeLists.txt:
+ * Shared/OriginAndDatabases.cpp: Removed.
+ (WebKit::OriginAndDatabases::encode): Deleted.
+ (WebKit::OriginAndDatabases::decode): Deleted.
+ * Shared/OriginAndDatabases.h: Removed.
+ * WebKit2.xcodeproj/project.pbxproj:
+
2016-06-09 Alex Christensen <[email protected]>
Clean up EditorClient lifetime
Deleted: trunk/Source/WebKit2/Shared/OriginAndDatabases.cpp (201896 => 201897)
--- trunk/Source/WebKit2/Shared/OriginAndDatabases.cpp 2016-06-10 00:42:19 UTC (rev 201896)
+++ trunk/Source/WebKit2/Shared/OriginAndDatabases.cpp 2016-06-10 01:11:47 UTC (rev 201897)
@@ -1,57 +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 "OriginAndDatabases.h"
-
-#include "WebCoreArgumentCoders.h"
-
-using namespace WebCore;
-
-namespace WebKit {
-
-void OriginAndDatabases::encode(IPC::ArgumentEncoder& encoder) const
-{
- encoder << originIdentifier;
- encoder << originQuota;
- encoder << originUsage;
- encoder << databases;
-}
-
-bool OriginAndDatabases::decode(IPC::ArgumentDecoder& decoder, OriginAndDatabases& originAndDatabases)
-{
- if (!decoder.decode(originAndDatabases.originIdentifier))
- return false;
- if (!decoder.decode(originAndDatabases.originQuota))
- return false;
- if (!decoder.decode(originAndDatabases.originUsage))
- return false;
- if (!decoder.decode(originAndDatabases.databases))
- return false;
-
- return true;
-}
-
-} // namespace WebKit
Deleted: trunk/Source/WebKit2/Shared/OriginAndDatabases.h (201896 => 201897)
--- trunk/Source/WebKit2/Shared/OriginAndDatabases.h 2016-06-10 00:42:19 UTC (rev 201896)
+++ trunk/Source/WebKit2/Shared/OriginAndDatabases.h 2016-06-10 01:11:47 UTC (rev 201897)
@@ -1,52 +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 OriginAndDatabases_h
-#define OriginAndDatabases_h
-
-#include <WebCore/DatabaseDetails.h>
-#include <wtf/Vector.h>
-#include <wtf/text/WTFString.h>
-
-namespace IPC {
- class ArgumentDecoder;
- class ArgumentEncoder;
-}
-
-namespace WebKit {
-
-struct OriginAndDatabases {
- void encode(IPC::ArgumentEncoder&) const;
- static bool decode(IPC::ArgumentDecoder&, OriginAndDatabases&);
-
- String originIdentifier;
- uint64_t originQuota;
- uint64_t originUsage;
- Vector<WebCore::DatabaseDetails> databases;
-};
-
-} // namespace WebKit
-
-#endif // OriginAndDatabases_h
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (201896 => 201897)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-06-10 00:42:19 UTC (rev 201896)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-06-10 01:11:47 UTC (rev 201897)
@@ -1578,8 +1578,6 @@
BCC5715C115ADAEF001CCAF9 /* WebSystemInterface.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCC5715A115ADAEF001CCAF9 /* WebSystemInterface.mm */; };
BCC8B374125FB69000DE46A4 /* WKGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC8B373125FB69000DE46A4 /* WKGeometry.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC938E01180DE440085E5FE /* WKContextPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
- BCCF672D12C7EDF7008F9C35 /* OriginAndDatabases.h in Headers */ = {isa = PBXBuildFile; fileRef = BCCF672C12C7EDF7008F9C35 /* OriginAndDatabases.h */; };
- BCCF673312C7F15C008F9C35 /* OriginAndDatabases.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCCF673212C7F15C008F9C35 /* OriginAndDatabases.cpp */; };
BCCF6ABC12C91EF9008F9C35 /* WebImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCCF6ABA12C91EF9008F9C35 /* WebImage.cpp */; };
BCCF6ABD12C91EF9008F9C35 /* WebImage.h in Headers */ = {isa = PBXBuildFile; fileRef = BCCF6ABB12C91EF9008F9C35 /* WebImage.h */; };
BCCF6AC212C91F34008F9C35 /* WKImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCCF6AC012C91F34008F9C35 /* WKImage.cpp */; };
@@ -3655,8 +3653,6 @@
BCC5715A115ADAEF001CCAF9 /* WebSystemInterface.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebSystemInterface.mm; sourceTree = "<group>"; };
BCC8B373125FB69000DE46A4 /* WKGeometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKGeometry.h; sourceTree = "<group>"; };
BCC938E01180DE440085E5FE /* WKContextPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContextPrivate.h; sourceTree = "<group>"; };
- BCCF672C12C7EDF7008F9C35 /* OriginAndDatabases.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OriginAndDatabases.h; sourceTree = "<group>"; };
- BCCF673212C7F15C008F9C35 /* OriginAndDatabases.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OriginAndDatabases.cpp; sourceTree = "<group>"; };
BCCF6ABA12C91EF9008F9C35 /* WebImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebImage.cpp; sourceTree = "<group>"; };
BCCF6ABB12C91EF9008F9C35 /* WebImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebImage.h; sourceTree = "<group>"; };
BCCF6AC012C91F34008F9C35 /* WKImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKImage.cpp; sourceTree = "<group>"; };
@@ -4476,8 +4472,6 @@
DF58C6311371AC5800F9A37C /* NativeWebWheelEvent.h */,
1ADCB868189831B30022EE5A /* NavigationActionData.cpp */,
1ADCB869189831B30022EE5A /* NavigationActionData.h */,
- BCCF673212C7F15C008F9C35 /* OriginAndDatabases.cpp */,
- BCCF672C12C7EDF7008F9C35 /* OriginAndDatabases.h */,
BCC43AB8127B95DC00317F16 /* PlatformPopupMenuData.cpp */,
BCC43AB9127B95DC00317F16 /* PlatformPopupMenuData.h */,
E18C92F312DB9E7100CF2AEB /* PrintInfo.cpp */,
@@ -7538,7 +7532,6 @@
1A2D84A3127F6AD1001EB962 /* NPVariantData.h in Headers */,
3754D5451B3A29FD003A4C7F /* NSInvocationSPI.h in Headers */,
BC8ACA1316670D89004C1941 /* ObjCObjectGraph.h in Headers */,
- BCCF672D12C7EDF7008F9C35 /* OriginAndDatabases.h in Headers */,
7CF47FFB17275C57008ACB91 /* PageBanner.h in Headers */,
BC6EDAA6111271C600E7678B /* PageClient.h in Headers */,
0FCB4E6218BBE3D9000FCFC9 /* PageClientImpl.h in Headers */,
@@ -9005,7 +8998,6 @@
1A2162B011F38971008AD0F5 /* NPRuntimeUtilities.cpp in Sources */,
1A2D84A4127F6AD1001EB962 /* NPVariantData.cpp in Sources */,
BC8ACA1416670D89004C1941 /* ObjCObjectGraph.mm in Sources */,
- BCCF673312C7F15C008F9C35 /* OriginAndDatabases.cpp in Sources */,
7C387434172F5615001BD88A /* PageBanner.cpp in Sources */,
7C6D37FC172F555F009D2847 /* PageBannerMac.mm in Sources */,
0FCB4E6318BBE3D9000FCFC9 /* PageClientImpl.mm in Sources */,
