Diff
Modified: trunk/Source/WebKit2/ChangeLog (204742 => 204743)
--- trunk/Source/WebKit2/ChangeLog 2016-08-22 22:10:43 UTC (rev 204742)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-22 22:44:42 UTC (rev 204743)
@@ -1,5 +1,35 @@
2016-08-22 Anders Carlsson <[email protected]>
+ Remove Arguments.h
+ https://bugs.webkit.org/show_bug.cgi?id=161060
+
+ Reviewed by Tim Horton.
+
+ * Platform/IPC/Arguments.h: Removed.
+ (IPC::Arguments::Arguments): Deleted.
+ (IPC::Arguments::encode): Deleted.
+ (IPC::Arguments::decode): Deleted.
+ * Platform/IPC/Connection.h:
+ * Platform/IPC/HandleMessage.h:
+ * Shared/AssistedNodeInformation.cpp:
+ * Shared/Cocoa/DataDetectionResult.mm:
+ * Shared/EditorState.cpp:
+ * Shared/WebContextMenuItemData.cpp:
+ * Shared/WebMouseEvent.cpp:
+ * Shared/WebPlatformTouchPoint.cpp:
+ * Shared/WebPopupItem.cpp:
+ * Shared/WebTouchEvent.cpp:
+ * Shared/WebWheelEvent.cpp:
+ * Shared/ios/InteractionInformationAtPosition.mm:
+ * Shared/ios/WebPlatformTouchPointIOS.cpp:
+ * Shared/ios/WebTouchEventIOS.cpp:
+ * Shared/mac/WebGestureEvent.cpp:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ * WebProcess/WebPage/WebPage.cpp:
+
+2016-08-22 Anders Carlsson <[email protected]>
+
Move tuple coding to ArgumentCoders.h
https://bugs.webkit.org/show_bug.cgi?id=161059
Deleted: trunk/Source/WebKit2/Platform/IPC/Arguments.h (204742 => 204743)
--- trunk/Source/WebKit2/Platform/IPC/Arguments.h 2016-08-22 22:10:43 UTC (rev 204742)
+++ trunk/Source/WebKit2/Platform/IPC/Arguments.h 2016-08-22 22:44:42 UTC (rev 204743)
@@ -1,59 +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 Arguments_h
-#define Arguments_h
-
-#include "Decoder.h"
-#include "Encoder.h"
-
-namespace IPC {
-
-
-template<typename... Types>
-struct Arguments {
- typedef std::tuple<typename std::decay<Types>::type...> ValueType;
-
- Arguments(Types&&... values)
- : arguments(std::forward<Types>(values)...)
- {
- }
-
- void encode(Encoder& encoder) const
- {
- ArgumentCoder<std::tuple<Types...>>::encode(encoder, arguments);
- }
-
- static bool decode(Decoder& decoder, Arguments& result)
- {
- return ArgumentCoder<std::tuple<Types...>>::decode(decoder, result.arguments);
- }
-
- std::tuple<Types...> arguments;
-};
-
-} // namespace IPC
-
-#endif // Arguments_h
Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (204742 => 204743)
--- trunk/Source/WebKit2/Platform/IPC/Connection.h 2016-08-22 22:10:43 UTC (rev 204742)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h 2016-08-22 22:44:42 UTC (rev 204743)
@@ -27,7 +27,6 @@
#pragma once
-#include "Arguments.h"
#include "Decoder.h"
#include "Encoder.h"
#include "MessageReceiver.h"
Modified: trunk/Source/WebKit2/Platform/IPC/HandleMessage.h (204742 => 204743)
--- trunk/Source/WebKit2/Platform/IPC/HandleMessage.h 2016-08-22 22:10:43 UTC (rev 204742)
+++ trunk/Source/WebKit2/Platform/IPC/HandleMessage.h 2016-08-22 22:44:42 UTC (rev 204743)
@@ -1,9 +1,6 @@
-#ifndef HandleMessage_h
-#define HandleMessage_h
+#pragma once
-#include "Arguments.h"
-#include "Decoder.h"
-#include "Encoder.h"
+#include "ArgumentCoders.h"
#include <wtf/StdLibExtras.h>
namespace IPC {
@@ -155,5 +152,3 @@
}
} // namespace IPC
-
-#endif // HandleMessage_h
Modified: trunk/Source/WebKit2/Shared/AssistedNodeInformation.cpp (204742 => 204743)
--- trunk/Source/WebKit2/Shared/AssistedNodeInformation.cpp 2016-08-22 22:10:43 UTC (rev 204742)
+++ trunk/Source/WebKit2/Shared/AssistedNodeInformation.cpp 2016-08-22 22:44:42 UTC (rev 204743)
@@ -26,7 +26,6 @@
#include "config.h"
#include "AssistedNodeInformation.h"
-#include "Arguments.h"
#include "WebCoreArgumentCoders.h"
namespace WebKit {
Modified: trunk/Source/WebKit2/Shared/Cocoa/DataDetectionResult.mm (204742 => 204743)
--- trunk/Source/WebKit2/Shared/Cocoa/DataDetectionResult.mm 2016-08-22 22:10:43 UTC (rev 204742)
+++ trunk/Source/WebKit2/Shared/Cocoa/DataDetectionResult.mm 2016-08-22 22:44:42 UTC (rev 204743)
@@ -27,7 +27,6 @@
#import "DataDetectionResult.h"
#import "ArgumentCodersCF.h"
-#import "Arguments.h"
#import "WebCoreArgumentCoders.h"
#import <WebCore/DataDetectorsCoreSPI.h>
#import <WebCore/SoftLinking.h>
Modified: trunk/Source/WebKit2/Shared/EditorState.cpp (204742 => 204743)
--- trunk/Source/WebKit2/Shared/EditorState.cpp 2016-08-22 22:10:43 UTC (rev 204742)
+++ trunk/Source/WebKit2/Shared/EditorState.cpp 2016-08-22 22:44:42 UTC (rev 204743)
@@ -26,7 +26,6 @@
#include "config.h"
#include "EditorState.h"
-#include "Arguments.h"
#include "WebCoreArgumentCoders.h"
namespace WebKit {
Modified: trunk/Source/WebKit2/Shared/WebContextMenuItemData.cpp (204742 => 204743)
--- trunk/Source/WebKit2/Shared/WebContextMenuItemData.cpp 2016-08-22 22:10:43 UTC (rev 204742)
+++ trunk/Source/WebKit2/Shared/WebContextMenuItemData.cpp 2016-08-22 22:44:42 UTC (rev 204743)
@@ -31,7 +31,6 @@
#include "APIObject.h"
#include "ArgumentCoders.h"
-#include "Arguments.h"
#include <wtf/text/CString.h>
#include <WebCore/ContextMenu.h>
Modified: trunk/Source/WebKit2/Shared/WebMouseEvent.cpp (204742 => 204743)
--- trunk/Source/WebKit2/Shared/WebMouseEvent.cpp 2016-08-22 22:10:43 UTC (rev 204742)
+++ trunk/Source/WebKit2/Shared/WebMouseEvent.cpp 2016-08-22 22:44:42 UTC (rev 204743)
@@ -26,7 +26,6 @@
#include "config.h"
#include "WebEvent.h"
-#include "Arguments.h"
#include "WebCoreArgumentCoders.h"
using namespace WebCore;
Modified: trunk/Source/WebKit2/Shared/WebPlatformTouchPoint.cpp (204742 => 204743)
--- trunk/Source/WebKit2/Shared/WebPlatformTouchPoint.cpp 2016-08-22 22:10:43 UTC (rev 204742)
+++ trunk/Source/WebKit2/Shared/WebPlatformTouchPoint.cpp 2016-08-22 22:44:42 UTC (rev 204743)
@@ -29,7 +29,6 @@
#if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS)
-#include "Arguments.h"
#include "WebCoreArgumentCoders.h"
using namespace WebCore;
Modified: trunk/Source/WebKit2/Shared/WebPopupItem.cpp (204742 => 204743)
--- trunk/Source/WebKit2/Shared/WebPopupItem.cpp 2016-08-22 22:10:43 UTC (rev 204742)
+++ trunk/Source/WebKit2/Shared/WebPopupItem.cpp 2016-08-22 22:44:42 UTC (rev 204743)
@@ -28,7 +28,6 @@
#include "WebPopupItem.h"
#include "ArgumentCoders.h"
-#include "Arguments.h"
using namespace WebCore;
Modified: trunk/Source/WebKit2/Shared/WebTouchEvent.cpp (204742 => 204743)
--- trunk/Source/WebKit2/Shared/WebTouchEvent.cpp 2016-08-22 22:10:43 UTC (rev 204742)
+++ trunk/Source/WebKit2/Shared/WebTouchEvent.cpp 2016-08-22 22:44:42 UTC (rev 204743)
@@ -29,7 +29,6 @@
#if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS)
#include "ArgumentCoders.h"
-#include "Arguments.h"
namespace WebKit {
Modified: trunk/Source/WebKit2/Shared/WebWheelEvent.cpp (204742 => 204743)
--- trunk/Source/WebKit2/Shared/WebWheelEvent.cpp 2016-08-22 22:10:43 UTC (rev 204742)
+++ trunk/Source/WebKit2/Shared/WebWheelEvent.cpp 2016-08-22 22:44:42 UTC (rev 204743)
@@ -26,7 +26,6 @@
#include "config.h"
#include "WebEvent.h"
-#include "Arguments.h"
#include "WebCoreArgumentCoders.h"
using namespace WebCore;
Modified: trunk/Source/WebKit2/Shared/ios/InteractionInformationAtPosition.mm (204742 => 204743)
--- trunk/Source/WebKit2/Shared/ios/InteractionInformationAtPosition.mm 2016-08-22 22:10:43 UTC (rev 204742)
+++ trunk/Source/WebKit2/Shared/ios/InteractionInformationAtPosition.mm 2016-08-22 22:44:42 UTC (rev 204743)
@@ -27,7 +27,6 @@
#import "InteractionInformationAtPosition.h"
#import "ArgumentCodersCF.h"
-#import "Arguments.h"
#import "WebCoreArgumentCoders.h"
#import <WebCore/DataDetectorsCoreSPI.h>
#import <WebCore/SoftLinking.h>
Modified: trunk/Source/WebKit2/Shared/ios/WebPlatformTouchPointIOS.cpp (204742 => 204743)
--- trunk/Source/WebKit2/Shared/ios/WebPlatformTouchPointIOS.cpp 2016-08-22 22:10:43 UTC (rev 204742)
+++ trunk/Source/WebKit2/Shared/ios/WebPlatformTouchPointIOS.cpp 2016-08-22 22:44:42 UTC (rev 204743)
@@ -28,7 +28,6 @@
#if ENABLE(TOUCH_EVENTS)
-#include "Arguments.h"
#include "WebCoreArgumentCoders.h"
using namespace WebCore;
Modified: trunk/Source/WebKit2/Shared/ios/WebTouchEventIOS.cpp (204742 => 204743)
--- trunk/Source/WebKit2/Shared/ios/WebTouchEventIOS.cpp 2016-08-22 22:10:43 UTC (rev 204742)
+++ trunk/Source/WebKit2/Shared/ios/WebTouchEventIOS.cpp 2016-08-22 22:44:42 UTC (rev 204743)
@@ -29,7 +29,6 @@
#if ENABLE(TOUCH_EVENTS)
#include "ArgumentCoders.h"
-#include "Arguments.h"
#include "WebCoreArgumentCoders.h"
namespace WebKit {
Modified: trunk/Source/WebKit2/Shared/mac/WebGestureEvent.cpp (204742 => 204743)
--- trunk/Source/WebKit2/Shared/mac/WebGestureEvent.cpp 2016-08-22 22:10:43 UTC (rev 204742)
+++ trunk/Source/WebKit2/Shared/mac/WebGestureEvent.cpp 2016-08-22 22:44:42 UTC (rev 204743)
@@ -29,7 +29,6 @@
#if ENABLE(MAC_GESTURE_EVENTS)
#include "ArgumentCoders.h"
-#include "Arguments.h"
#include "WebCoreArgumentCoders.h"
namespace WebKit {
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (204742 => 204743)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-08-22 22:10:43 UTC (rev 204742)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-08-22 22:44:42 UTC (rev 204743)
@@ -1337,7 +1337,6 @@
BC032DA610F437D10058C15A /* Decoder.h in Headers */ = {isa = PBXBuildFile; fileRef = BC032D9E10F437D10058C15A /* Decoder.h */; };
BC032DA710F437D10058C15A /* Encoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC032D9F10F437D10058C15A /* Encoder.cpp */; };
BC032DA810F437D10058C15A /* Encoder.h in Headers */ = {isa = PBXBuildFile; fileRef = BC032DA010F437D10058C15A /* Encoder.h */; };
- BC032DA910F437D10058C15A /* Arguments.h in Headers */ = {isa = PBXBuildFile; fileRef = BC032DA110F437D10058C15A /* Arguments.h */; };
BC032DAA10F437D10058C15A /* Connection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC032DA210F437D10058C15A /* Connection.cpp */; };
BC032DAB10F437D10058C15A /* Connection.h in Headers */ = {isa = PBXBuildFile; fileRef = BC032DA310F437D10058C15A /* Connection.h */; };
BC032DB910F4380F0058C15A /* WebEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = BC032DAF10F4380F0058C15A /* WebEvent.h */; };
@@ -3425,7 +3424,6 @@
BC032D9E10F437D10058C15A /* Decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Decoder.h; sourceTree = "<group>"; };
BC032D9F10F437D10058C15A /* Encoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Encoder.cpp; sourceTree = "<group>"; };
BC032DA010F437D10058C15A /* Encoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Encoder.h; sourceTree = "<group>"; };
- BC032DA110F437D10058C15A /* Arguments.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Arguments.h; sourceTree = "<group>"; };
BC032DA210F437D10058C15A /* Connection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Connection.cpp; sourceTree = "<group>"; };
BC032DA310F437D10058C15A /* Connection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Connection.h; sourceTree = "<group>"; };
BC032DAF10F4380F0058C15A /* WebEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebEvent.h; sourceTree = "<group>"; };
@@ -4810,7 +4808,6 @@
BC032D9E10F437D10058C15A /* Decoder.h */,
BC032D9F10F437D10058C15A /* Encoder.cpp */,
BC032DA010F437D10058C15A /* Encoder.h */,
- BC032DA110F437D10058C15A /* Arguments.h */,
BCEE966A112FAF57006BCC24 /* Attachment.cpp */,
BCEE966B112FAF57006BCC24 /* Attachment.h */,
BC032DA210F437D10058C15A /* Connection.cpp */,
@@ -7506,7 +7503,6 @@
E179FD9C134D38060015B883 /* ArgumentCodersMac.h in Headers */,
BC032DA610F437D10058C15A /* Decoder.h in Headers */,
BC032DA810F437D10058C15A /* Encoder.h in Headers */,
- BC032DA910F437D10058C15A /* Arguments.h in Headers */,
CE1A0BD21A48E6C60054EF74 /* AssertionServicesSPI.h in Headers */,
C59C4A5918B81174007BDCB6 /* AssistedNodeInformation.h in Headers */,
515E7728183DD6F60007203F /* AsyncRequest.h in Headers */,
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (204742 => 204743)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2016-08-22 22:10:43 UTC (rev 204742)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2016-08-22 22:44:42 UTC (rev 204743)
@@ -28,7 +28,6 @@
#include "APIArray.h"
#include "APIData.h"
-#include "Arguments.h"
#include "InjectedBundleScriptWorld.h"
#include "NotificationPermissionRequestManager.h"
#include "SessionTracker.h"
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (204742 => 204743)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-08-22 22:10:43 UTC (rev 204742)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-08-22 22:44:42 UTC (rev 204743)
@@ -31,7 +31,6 @@
#include "APIArray.h"
#include "APIGeometry.h"
-#include "Arguments.h"
#include "AssistedNodeInformation.h"
#include "DataReference.h"
#include "DragControllerAction.h"
