Modified: trunk/Source/WebKit2/ChangeLog (201932 => 201933)
--- trunk/Source/WebKit2/ChangeLog 2016-06-10 18:43:11 UTC (rev 201932)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-10 18:49:57 UTC (rev 201933)
@@ -1,3 +1,16 @@
+2016-06-10 Anders Carlsson <[email protected]>
+
+ Remove CommandLine class
+ https://bugs.webkit.org/show_bug.cgi?id=158628
+
+ Reviewed by Tim Horton.
+
+ * Shared/CommandLine.h: Removed.
+ (WebKit::CommandLine::operator[]): Deleted.
+ * Shared/posix/CommandLinePOSIX.cpp: Removed.
+ (WebKit::CommandLine::parse): Deleted.
+ * WebKit2.xcodeproj/project.pbxproj:
+
2016-06-10 Simon Fraser <[email protected]>
[iOS WK2] Rare RELEASE_ASSERT under RemoteLayerTreeDrawingArea::flushLayers()
Deleted: trunk/Source/WebKit2/Shared/CommandLine.h (201932 => 201933)
--- trunk/Source/WebKit2/Shared/CommandLine.h 2016-06-10 18:43:11 UTC (rev 201932)
+++ trunk/Source/WebKit2/Shared/CommandLine.h 2016-06-10 18:49:57 UTC (rev 201933)
@@ -1,54 +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 CommandLine_h
-#define CommandLine_h
-
-#include <wtf/HashMap.h>
-#include <wtf/text/StringHash.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebKit {
-
-// Very specialized command line parser. Expects the command line arguments in
-// -key value and will store the parsed arguments in a map.
-
-class CommandLine {
-public:
-#if OS(UNIX)
- bool parse(int argc, char** argv);
-#endif
- String operator[](const String& key) const
- {
- return m_args.get(key);
- }
-
-private:
- HashMap<String, String> m_args;
-};
-
-}
-
-#endif // CommandLine_h
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (201932 => 201933)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-06-10 18:43:11 UTC (rev 201932)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-06-10 18:49:57 UTC (rev 201933)
@@ -286,8 +286,6 @@
1A6563E51B7A8C50009CF787 /* APIWindowFeatures.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6563E31B7A8C50009CF787 /* APIWindowFeatures.h */; };
1A66BF8F18A052ED002071B4 /* WKWebViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A66BF8E18A052ED002071B4 /* WKWebViewInternal.h */; };
1A67CD2E1CBC513F00BFE3EA /* WKOpenPanelParametersInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A67CD2D1CBC513F00BFE3EA /* WKOpenPanelParametersInternal.h */; };
- 1A6F9F9011E13EFC00DB1371 /* CommandLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */; };
- 1A6F9FB711E1408500DB1371 /* CommandLinePOSIX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6F9FB611E1408500DB1371 /* CommandLinePOSIX.cpp */; };
1A6FA21E1BD0435B00AAA650 /* WKFrameInfoPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6FA21D1BD0435B00AAA650 /* WKFrameInfoPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
1A6FB7AE11E64B6800DB1371 /* PluginView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FB7AC11E64B6800DB1371 /* PluginView.cpp */; };
1A6FB7AF11E64B6800DB1371 /* PluginView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6FB7AD11E64B6800DB1371 /* PluginView.h */; };
@@ -2246,8 +2244,6 @@
1A67CD2D1CBC513F00BFE3EA /* WKOpenPanelParametersInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKOpenPanelParametersInternal.h; sourceTree = "<group>"; };
1A6D141F1B0167D500785FF0 /* Info-OSX-10.9-10.10.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-OSX-10.9-10.10.plist"; sourceTree = "<group>"; };
1A6D14211B01681600785FF0 /* PluginService.32-64-10.9-10.10.Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "PluginService.32-64-10.9-10.10.Info.plist"; path = "PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist"; sourceTree = SOURCE_ROOT; };
- 1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommandLine.h; sourceTree = "<group>"; };
- 1A6F9FB611E1408500DB1371 /* CommandLinePOSIX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommandLinePOSIX.cpp; sourceTree = "<group>"; };
1A6FA21D1BD0435B00AAA650 /* WKFrameInfoPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFrameInfoPrivate.h; sourceTree = "<group>"; };
1A6FB7AC11E64B6800DB1371 /* PluginView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginView.cpp; sourceTree = "<group>"; };
1A6FB7AD11E64B6800DB1371 /* PluginView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginView.h; sourceTree = "<group>"; };
@@ -4427,7 +4423,6 @@
2DA944961884E4DA00ED86DB /* ios */,
BC111B5A112F628200337BAB /* mac */,
1AAE058C1279DCD400852418 /* Plugins */,
- 3709504918A9FAD20087AE5D /* posix */,
0F5947A0187B3B7100437857 /* Scrolling */,
1ABF43781A368035003FB0E6 /* WebsiteData */,
A7D792D51767CB6E00881CBE /* ActivityAssertion.cpp */,
@@ -4449,7 +4444,6 @@
1A2D956D12848564001EB962 /* ChildProcess.h */,
5164C0941B05B757004F102A /* ChildProcess.messages.in */,
290F4271172A0C7400939FF0 /* ChildProcessSupplement.h */,
- 1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */,
5106D7BF18BDBE73000AB166 /* ContextMenuContextData.cpp */,
5106D7C018BDBE73000AB166 /* ContextMenuContextData.h */,
C517388012DF8F4F00EE3F47 /* DragControllerAction.h */,
@@ -4995,14 +4989,6 @@
path = foundation;
sourceTree = "<group>";
};
- 3709504918A9FAD20087AE5D /* posix */ = {
- isa = PBXGroup;
- children = (
- 1A6F9FB611E1408500DB1371 /* CommandLinePOSIX.cpp */,
- );
- path = posix;
- sourceTree = "<group>";
- };
3754D5411B3A2998003A4C7F /* Cocoa */ = {
isa = PBXGroup;
children = (
@@ -7379,7 +7365,6 @@
E1513C67166EABB200149FCB /* ChildProcessProxy.h in Headers */,
290F4272172A0C7400939FF0 /* ChildProcessSupplement.h in Headers */,
CE11AD521CBC482F00681EE5 /* CodeSigning.h in Headers */,
- 1A6F9F9011E13EFC00DB1371 /* CommandLine.h in Headers */,
37BEC4E119491486008B4286 /* CompletionHandlerCallChecker.h in Headers */,
37C4E9F6131C6E7E0029BD5A /* config.h in Headers */,
BC032DAB10F437D10058C15A /* Connection.h in Headers */,
@@ -8833,7 +8818,6 @@
E1513C66166EABB200149FCB /* ChildProcessProxy.cpp in Sources */,
CE11AD501CBC47F800681EE5 /* CodeSigning.mm in Sources */,
1A2A4B0E1586A2240090C9E9 /* ColorSpaceData.mm in Sources */,
- 1A6F9FB711E1408500DB1371 /* CommandLinePOSIX.cpp in Sources */,
37BEC4E019491486008B4286 /* CompletionHandlerCallChecker.mm in Sources */,
BC032DAA10F437D10058C15A /* Connection.cpp in Sources */,
1A30EAC6115D7DA30053E937 /* ConnectionMac.mm in Sources */,
