Merge MessageDecoder and ArgumentDecoder into Decoder
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 20 Aug 2016 00:11:17 +0000 (00:11 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 20 Aug 2016 00:11:17 +0000 (00:11 +0000)
https://bugs.webkit.org/show_bug.cgi?id=161019

Reviewed by Tim Horton.

* DatabaseProcess/DatabaseProcess.cpp:
* DatabaseProcess/DatabaseProcess.h:
* DatabaseProcess/DatabaseToWebProcessConnection.cpp:
* DatabaseProcess/DatabaseToWebProcessConnection.h:
* DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h:
* NetworkProcess/CustomProtocols/CustomProtocolManager.h:
* NetworkProcess/Downloads/DownloadID.h:
* NetworkProcess/NetworkConnectionToWebProcess.cpp:
* NetworkProcess/NetworkConnectionToWebProcess.h:
* NetworkProcess/NetworkProcess.cpp:
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/NetworkProcessCreationParameters.cpp:
* NetworkProcess/NetworkProcessCreationParameters.h:
* NetworkProcess/NetworkResourceLoadParameters.cpp:
* NetworkProcess/NetworkResourceLoadParameters.h:
* NetworkProcess/NetworkResourceLoader.h:
* Platform/IPC/ArgumentCoder.h:
* Platform/IPC/ArgumentCoders.cpp:
* Platform/IPC/ArgumentCoders.h:
* Platform/IPC/ArgumentDecoder.cpp:
* Platform/IPC/ArgumentDecoder.h:
* Platform/IPC/Arguments.h:
* Platform/IPC/Attachment.cpp:
* Platform/IPC/Attachment.h:
* Platform/IPC/Connection.cpp:
* Platform/IPC/Connection.h:
* Platform/IPC/DataReference.cpp:
* Platform/IPC/DataReference.h:
* Platform/IPC/Decoder.cpp: Renamed from Source/WebKit2/Platform/IPC/ArgumentDecoder.cpp.
* Platform/IPC/Decoder.h: Renamed from Source/WebKit2/Platform/IPC/ArgumentDecoder.h.
* Platform/IPC/HandleMessage.h:
* Platform/IPC/MessageDecoder.cpp: Removed.
* Platform/IPC/MessageDecoder.h: Removed.
* Platform/IPC/MessageReceiver.h:
* Platform/IPC/MessageReceiverMap.cpp:
* Platform/IPC/MessageReceiverMap.h:
* Platform/IPC/MessageRecorder.cpp:
* Platform/IPC/MessageRecorder.h:
* Platform/IPC/StringReference.cpp:
* Platform/IPC/StringReference.h:
* Platform/IPC/mac/ConnectionMac.mm:
* Platform/IPC/mac/MachPort.h:
* Platform/SharedMemory.h:
* Platform/mac/SharedMemoryMac.cpp:
* PluginProcess/PluginControllerProxy.h:
* PluginProcess/PluginCreationParameters.cpp:
* PluginProcess/PluginCreationParameters.h:
* PluginProcess/PluginProcess.cpp:
* PluginProcess/PluginProcess.h:
* PluginProcess/WebProcessConnection.cpp:
* PluginProcess/WebProcessConnection.h:
* Scripts/webkit/messages.py:
* Shared/API/APIData.cpp:
* Shared/API/APIData.h:
* Shared/API/APIError.cpp:
* Shared/API/APIError.h:
* Shared/API/APIFrameHandle.cpp:
* Shared/API/APIFrameHandle.h:
* Shared/API/APIGeometry.cpp:
* Shared/API/APIGeometry.h:
* Shared/API/APINumber.h:
* Shared/API/APIPageGroupHandle.cpp:
* Shared/API/APIPageGroupHandle.h:
* Shared/API/APIPageHandle.cpp:
* Shared/API/APIPageHandle.h:
* Shared/API/APIURL.h:
* Shared/API/APIURLRequest.cpp:
* Shared/API/APIURLRequest.h:
* Shared/API/APIURLResponse.cpp:
* Shared/API/APIURLResponse.h:
* Shared/API/Cocoa/RemoteObjectInvocation.h:
* Shared/API/Cocoa/RemoteObjectInvocation.mm:
* Shared/API/Cocoa/RemoteObjectRegistry.h:
* Shared/AssistedNodeInformation.cpp:
* Shared/AssistedNodeInformation.h:
* Shared/Authentication/AuthenticationManager.h:
* Shared/ChildProcess.h:
* Shared/Cocoa/DataDetectionResult.h:
* Shared/Cocoa/DataDetectionResult.mm:
* Shared/Cocoa/LoadParametersCocoa.mm:
* Shared/Cocoa/WebCoreArgumentCodersCocoa.mm:
* Shared/ContextMenuContextData.cpp:
* Shared/ContextMenuContextData.h:
* Shared/Databases/DatabaseProcessCreationParameters.cpp:
* Shared/Databases/DatabaseProcessCreationParameters.h:
* Shared/Databases/IndexedDB/WebIDBResult.cpp:
* Shared/Databases/IndexedDB/WebIDBResult.h:
* Shared/EditorState.cpp:
* Shared/EditorState.h:
* Shared/FontInfo.cpp:
* Shared/FontInfo.h:
* Shared/Gamepad/GamepadData.cpp:
* Shared/Gamepad/GamepadData.h:
* Shared/LayerTreeContext.cpp:
* Shared/LayerTreeContext.h:
* Shared/LoadParameters.cpp:
* Shared/LoadParameters.h:
* Shared/NavigationActionData.cpp:
* Shared/NavigationActionData.h:
* Shared/PlatformPopupMenuData.cpp:
* Shared/PlatformPopupMenuData.h:
* Shared/Plugins/NPIdentifierData.cpp:
* Shared/Plugins/NPIdentifierData.h:
* Shared/Plugins/NPObjectMessageReceiver.h:
* Shared/Plugins/NPRemoteObjectMap.cpp:
* Shared/Plugins/NPRemoteObjectMap.h:
* Shared/Plugins/NPVariantData.cpp:
* Shared/Plugins/NPVariantData.h:
* Shared/Plugins/PluginProcessCreationParameters.cpp:
* Shared/Plugins/PluginProcessCreationParameters.h:
* Shared/PrintInfo.cpp:
* Shared/PrintInfo.h:
* Shared/SandboxExtension.h:
* Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
* Shared/Scrolling/RemoteScrollingCoordinatorTransaction.h:
* Shared/SessionState.cpp:
* Shared/SessionState.h:
* Shared/ShareableBitmap.cpp:
* Shared/ShareableBitmap.h:
* Shared/ShareableResource.cpp:
* Shared/ShareableResource.h:
* Shared/StatisticsData.cpp:
* Shared/StatisticsData.h:
* Shared/UpdateInfo.cpp:
* Shared/UpdateInfo.h:
* Shared/UserData.cpp:
* Shared/UserData.h:
* Shared/VisibleContentRectUpdateInfo.cpp:
* Shared/VisibleContentRectUpdateInfo.h:
* Shared/WebBackForwardListItem.h:
* Shared/WebCompiledContentExtensionData.cpp:
* Shared/WebCompiledContentExtensionData.h:
* Shared/WebConnection.h:
* Shared/WebContextMenuItemData.cpp:
* Shared/WebContextMenuItemData.h:
* Shared/WebCoreArgumentCoders.cpp:
* Shared/WebCoreArgumentCoders.h:
* Shared/WebEvent.cpp:
* Shared/WebEvent.h:
* Shared/WebGeolocationPosition.cpp:
* Shared/WebGeolocationPosition.h:
* Shared/WebHitTestResultData.cpp:
* Shared/WebHitTestResultData.h:
* Shared/WebKeyboardEvent.cpp:
* Shared/WebMouseEvent.cpp:
* Shared/WebNavigationDataStore.h:
* Shared/WebPageCreationParameters.cpp:
* Shared/WebPageCreationParameters.h:
* Shared/WebPageGroupData.cpp:
* Shared/WebPageGroupData.h:
* Shared/WebPlatformTouchPoint.cpp:
* Shared/WebPopupItem.cpp:
* Shared/WebPopupItem.h:
* Shared/WebPreferencesStore.cpp:
* Shared/WebPreferencesStore.h:
* Shared/WebProcessCreationParameters.cpp:
* Shared/WebProcessCreationParameters.h:
* Shared/WebTouchEvent.cpp:
* Shared/WebUserContentControllerDataTypes.cpp:
* Shared/WebUserContentControllerDataTypes.h:
* Shared/WebWheelEvent.cpp:
* Shared/WebsiteData/WebsiteData.cpp:
* Shared/WebsiteData/WebsiteData.h:
* Shared/cf/ArgumentCodersCF.cpp:
* Shared/cf/ArgumentCodersCF.h:
* Shared/ios/InteractionInformationAtPosition.h:
* Shared/ios/InteractionInformationAtPosition.mm:
* Shared/ios/QuickLookDocumentData.cpp:
* Shared/ios/QuickLookDocumentData.h:
* Shared/ios/WebPlatformTouchPointIOS.cpp:
* Shared/ios/WebTouchEventIOS.cpp:
* Shared/mac/ArgumentCodersMac.h:
* Shared/mac/ArgumentCodersMac.mm:
* Shared/mac/AttributedString.h:
* Shared/mac/AttributedString.mm:
* Shared/mac/ColorSpaceData.h:
* Shared/mac/ColorSpaceData.mm:
* Shared/mac/ObjCObjectGraph.h:
* Shared/mac/ObjCObjectGraph.mm:
* Shared/mac/RemoteLayerBackingStore.h:
* Shared/mac/RemoteLayerBackingStore.mm:
* Shared/mac/RemoteLayerTreeTransaction.h:
* Shared/mac/RemoteLayerTreeTransaction.mm:
* Shared/mac/SandboxExtensionMac.mm:
* Shared/mac/SecItemRequestData.cpp:
* Shared/mac/SecItemRequestData.h:
* Shared/mac/SecItemResponseData.cpp:
* Shared/mac/SecItemResponseData.h:
* Shared/mac/SecItemShim.h:
* Shared/mac/WebCoreArgumentCodersMac.mm:
* Shared/mac/WebGestureEvent.cpp:
* Shared/mac/WebGestureEvent.h:
* Shared/mac/WebHitTestResultData.mm:
* UIProcess/API/APIHitTestResult.h:
* UIProcess/ApplePay/WebPaymentCoordinatorProxy.h:
* UIProcess/Automation/WebAutomationSession.h:
* UIProcess/ChildProcessProxy.cpp:
* UIProcess/ChildProcessProxy.h:
* UIProcess/Cocoa/WebPlaybackSessionManagerProxy.h:
* UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h:
* UIProcess/Databases/DatabaseProcessProxy.cpp:
* UIProcess/Databases/DatabaseProcessProxy.h:
* UIProcess/Downloads/DownloadProxy.h:
* UIProcess/DrawingAreaProxy.h:
* UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h:
* UIProcess/Network/NetworkProcessProxy.cpp:
* UIProcess/Network/NetworkProcessProxy.h:
* UIProcess/Plugins/PluginProcessProxy.h:
* UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:
* UIProcess/Storage/StorageManager.h:
* UIProcess/UserContent/WebUserContentControllerProxy.h:
* UIProcess/VisitedLinkStore.h:
* UIProcess/WebCookieManagerProxy.h:
* UIProcess/WebFrameProxy.h:
* UIProcess/WebFullScreenManagerProxy.h:
* UIProcess/WebGeolocationManagerProxy.h:
* UIProcess/WebIconDatabase.h:
* UIProcess/WebInspectorProxy.h:
* UIProcess/WebPageProxy.h:
* UIProcess/WebPasteboardProxy.h:
* UIProcess/WebProcessPool.cpp:
* UIProcess/WebProcessPool.h:
* UIProcess/WebProcessProxy.cpp:
* UIProcess/WebProcessProxy.h:
* UIProcess/WebResourceLoadStatisticsStore.h:
* UIProcess/ios/SmartMagnificationController.h:
* UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:
* UIProcess/mac/SecItemShimProxy.h:
* UIProcess/mac/ViewGestureController.h:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/ApplePay/WebPaymentCoordinator.h:
* WebProcess/Automation/WebAutomationSessionProxy.h:
* WebProcess/Cookies/WebCookieManager.h:
* WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h:
* WebProcess/Databases/WebToDatabaseProcessConnection.cpp:
* WebProcess/Databases/WebToDatabaseProcessConnection.h:
* WebProcess/FullScreen/WebFullScreenManager.cpp:
* WebProcess/FullScreen/WebFullScreenManager.h:
* WebProcess/Geolocation/WebGeolocationManager.h:
* WebProcess/IconDatabase/WebIconDatabaseProxy.h:
* WebProcess/InjectedBundle/InjectedBundle.h:
* WebProcess/Network/NetworkProcessConnection.cpp:
* WebProcess/Network/NetworkProcessConnection.h:
* WebProcess/Network/WebResourceLoader.h:
* WebProcess/Notifications/WebNotificationManager.h:
* WebProcess/Plugins/Plugin.cpp:
* WebProcess/Plugins/Plugin.h:
* WebProcess/Plugins/PluginProcessConnection.cpp:
* WebProcess/Plugins/PluginProcessConnection.h:
* WebProcess/Plugins/PluginProcessConnectionManager.cpp:
* WebProcess/Plugins/PluginProcessConnectionManager.h:
* WebProcess/Plugins/PluginProxy.h:
* WebProcess/Scrolling/RemoteScrollingCoordinator.h:
* WebProcess/Scrolling/RemoteScrollingCoordinator.mm:
* WebProcess/Storage/StorageAreaMap.h:
* WebProcess/UserContent/WebUserContentController.h:
* WebProcess/WebPage/DrawingArea.h:
* WebProcess/WebPage/EventDispatcher.h:
* WebProcess/WebPage/ViewGestureGeometryCollector.h:
* WebProcess/WebPage/ViewUpdateDispatcher.h:
* WebProcess/WebPage/VisitedLinkTableController.h:
* WebProcess/WebPage/WebInspector.h:
* WebProcess/WebPage/WebInspectorUI.h:
* WebProcess/WebPage/WebPage.cpp:
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/mac/PlatformCAAnimationRemote.h:
* WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm:
* WebProcess/WebProcess.cpp:
* WebProcess/WebProcess.h:
* WebProcess/cocoa/WebPlaybackSessionManager.h:
* WebProcess/cocoa/WebVideoFullscreenManager.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@204668 268f45cc-cd09-0410-ab3c-d52691b4dbfc

270 files changed:
Source/WebKit2/ChangeLog
Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp
Source/WebKit2/DatabaseProcess/DatabaseProcess.h
Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp
Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h
Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h
Source/WebKit2/NetworkProcess/CustomProtocols/CustomProtocolManager.h
Source/WebKit2/NetworkProcess/Downloads/DownloadID.h
Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp
Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h
Source/WebKit2/NetworkProcess/NetworkProcess.cpp
Source/WebKit2/NetworkProcess/NetworkProcess.h
Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp
Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h
Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.cpp
Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.h
Source/WebKit2/NetworkProcess/NetworkResourceLoader.h
Source/WebKit2/Platform/IPC/ArgumentCoder.h
Source/WebKit2/Platform/IPC/ArgumentCoders.cpp
Source/WebKit2/Platform/IPC/ArgumentCoders.h
Source/WebKit2/Platform/IPC/Arguments.h
Source/WebKit2/Platform/IPC/Attachment.cpp
Source/WebKit2/Platform/IPC/Attachment.h
Source/WebKit2/Platform/IPC/Connection.cpp
Source/WebKit2/Platform/IPC/Connection.h
Source/WebKit2/Platform/IPC/DataReference.cpp
Source/WebKit2/Platform/IPC/DataReference.h
Source/WebKit2/Platform/IPC/Decoder.cpp [moved from Source/WebKit2/Platform/IPC/ArgumentDecoder.cpp with 68% similarity]
Source/WebKit2/Platform/IPC/Decoder.h [moved from Source/WebKit2/Platform/IPC/ArgumentDecoder.h with 72% similarity]
Source/WebKit2/Platform/IPC/HandleMessage.h
Source/WebKit2/Platform/IPC/MessageDecoder.cpp [deleted file]
Source/WebKit2/Platform/IPC/MessageDecoder.h [deleted file]
Source/WebKit2/Platform/IPC/MessageReceiver.h
Source/WebKit2/Platform/IPC/MessageReceiverMap.cpp
Source/WebKit2/Platform/IPC/MessageReceiverMap.h
Source/WebKit2/Platform/IPC/MessageRecorder.cpp
Source/WebKit2/Platform/IPC/MessageRecorder.h
Source/WebKit2/Platform/IPC/StringReference.cpp
Source/WebKit2/Platform/IPC/StringReference.h
Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm
Source/WebKit2/Platform/IPC/mac/MachPort.h
Source/WebKit2/Platform/SharedMemory.h
Source/WebKit2/Platform/mac/SharedMemoryMac.cpp
Source/WebKit2/PluginProcess/PluginControllerProxy.h
Source/WebKit2/PluginProcess/PluginCreationParameters.cpp
Source/WebKit2/PluginProcess/PluginCreationParameters.h
Source/WebKit2/PluginProcess/PluginProcess.cpp
Source/WebKit2/PluginProcess/PluginProcess.h
Source/WebKit2/PluginProcess/WebProcessConnection.cpp
Source/WebKit2/PluginProcess/WebProcessConnection.h
Source/WebKit2/Scripts/webkit/messages.py
Source/WebKit2/Shared/API/APIData.cpp
Source/WebKit2/Shared/API/APIData.h
Source/WebKit2/Shared/API/APIError.cpp
Source/WebKit2/Shared/API/APIError.h
Source/WebKit2/Shared/API/APIFrameHandle.cpp
Source/WebKit2/Shared/API/APIFrameHandle.h
Source/WebKit2/Shared/API/APIGeometry.cpp
Source/WebKit2/Shared/API/APIGeometry.h
Source/WebKit2/Shared/API/APINumber.h
Source/WebKit2/Shared/API/APIPageGroupHandle.cpp
Source/WebKit2/Shared/API/APIPageGroupHandle.h
Source/WebKit2/Shared/API/APIPageHandle.cpp
Source/WebKit2/Shared/API/APIPageHandle.h
Source/WebKit2/Shared/API/APIURL.h
Source/WebKit2/Shared/API/APIURLRequest.cpp
Source/WebKit2/Shared/API/APIURLRequest.h
Source/WebKit2/Shared/API/APIURLResponse.cpp
Source/WebKit2/Shared/API/APIURLResponse.h
Source/WebKit2/Shared/API/Cocoa/RemoteObjectInvocation.h
Source/WebKit2/Shared/API/Cocoa/RemoteObjectInvocation.mm
Source/WebKit2/Shared/API/Cocoa/RemoteObjectRegistry.h
Source/WebKit2/Shared/AssistedNodeInformation.cpp
Source/WebKit2/Shared/AssistedNodeInformation.h
Source/WebKit2/Shared/Authentication/AuthenticationManager.h
Source/WebKit2/Shared/ChildProcess.h
Source/WebKit2/Shared/Cocoa/DataDetectionResult.h
Source/WebKit2/Shared/Cocoa/DataDetectionResult.mm
Source/WebKit2/Shared/Cocoa/LoadParametersCocoa.mm
Source/WebKit2/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm
Source/WebKit2/Shared/ContextMenuContextData.cpp
Source/WebKit2/Shared/ContextMenuContextData.h
Source/WebKit2/Shared/Databases/DatabaseProcessCreationParameters.cpp
Source/WebKit2/Shared/Databases/DatabaseProcessCreationParameters.h
Source/WebKit2/Shared/Databases/IndexedDB/WebIDBResult.cpp
Source/WebKit2/Shared/Databases/IndexedDB/WebIDBResult.h
Source/WebKit2/Shared/EditorState.cpp
Source/WebKit2/Shared/EditorState.h
Source/WebKit2/Shared/FontInfo.cpp
Source/WebKit2/Shared/FontInfo.h
Source/WebKit2/Shared/Gamepad/GamepadData.cpp
Source/WebKit2/Shared/Gamepad/GamepadData.h
Source/WebKit2/Shared/LayerTreeContext.cpp
Source/WebKit2/Shared/LayerTreeContext.h
Source/WebKit2/Shared/LoadParameters.cpp
Source/WebKit2/Shared/LoadParameters.h
Source/WebKit2/Shared/NavigationActionData.cpp
Source/WebKit2/Shared/NavigationActionData.h
Source/WebKit2/Shared/PlatformPopupMenuData.cpp
Source/WebKit2/Shared/PlatformPopupMenuData.h
Source/WebKit2/Shared/Plugins/NPIdentifierData.cpp
Source/WebKit2/Shared/Plugins/NPIdentifierData.h
Source/WebKit2/Shared/Plugins/NPObjectMessageReceiver.h
Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.cpp
Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.h
Source/WebKit2/Shared/Plugins/NPVariantData.cpp
Source/WebKit2/Shared/Plugins/NPVariantData.h
Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp
Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h
Source/WebKit2/Shared/PrintInfo.cpp
Source/WebKit2/Shared/PrintInfo.h
Source/WebKit2/Shared/SandboxExtension.h
Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp
Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.h
Source/WebKit2/Shared/SessionState.cpp
Source/WebKit2/Shared/SessionState.h
Source/WebKit2/Shared/ShareableBitmap.cpp
Source/WebKit2/Shared/ShareableBitmap.h
Source/WebKit2/Shared/ShareableResource.cpp
Source/WebKit2/Shared/ShareableResource.h
Source/WebKit2/Shared/StatisticsData.cpp
Source/WebKit2/Shared/StatisticsData.h
Source/WebKit2/Shared/UpdateInfo.cpp
Source/WebKit2/Shared/UpdateInfo.h
Source/WebKit2/Shared/UserData.cpp
Source/WebKit2/Shared/UserData.h
Source/WebKit2/Shared/VisibleContentRectUpdateInfo.cpp
Source/WebKit2/Shared/VisibleContentRectUpdateInfo.h
Source/WebKit2/Shared/WebBackForwardListItem.h
Source/WebKit2/Shared/WebCompiledContentExtensionData.cpp
Source/WebKit2/Shared/WebCompiledContentExtensionData.h
Source/WebKit2/Shared/WebConnection.h
Source/WebKit2/Shared/WebContextMenuItemData.cpp
Source/WebKit2/Shared/WebContextMenuItemData.h
Source/WebKit2/Shared/WebCoreArgumentCoders.cpp
Source/WebKit2/Shared/WebCoreArgumentCoders.h
Source/WebKit2/Shared/WebEvent.cpp
Source/WebKit2/Shared/WebEvent.h
Source/WebKit2/Shared/WebGeolocationPosition.cpp
Source/WebKit2/Shared/WebGeolocationPosition.h
Source/WebKit2/Shared/WebHitTestResultData.cpp
Source/WebKit2/Shared/WebHitTestResultData.h
Source/WebKit2/Shared/WebKeyboardEvent.cpp
Source/WebKit2/Shared/WebMouseEvent.cpp
Source/WebKit2/Shared/WebNavigationDataStore.h
Source/WebKit2/Shared/WebPageCreationParameters.cpp
Source/WebKit2/Shared/WebPageCreationParameters.h
Source/WebKit2/Shared/WebPageGroupData.cpp
Source/WebKit2/Shared/WebPageGroupData.h
Source/WebKit2/Shared/WebPlatformTouchPoint.cpp
Source/WebKit2/Shared/WebPopupItem.cpp
Source/WebKit2/Shared/WebPopupItem.h
Source/WebKit2/Shared/WebPreferencesStore.cpp
Source/WebKit2/Shared/WebPreferencesStore.h
Source/WebKit2/Shared/WebProcessCreationParameters.cpp
Source/WebKit2/Shared/WebProcessCreationParameters.h
Source/WebKit2/Shared/WebTouchEvent.cpp
Source/WebKit2/Shared/WebUserContentControllerDataTypes.cpp
Source/WebKit2/Shared/WebUserContentControllerDataTypes.h
Source/WebKit2/Shared/WebWheelEvent.cpp
Source/WebKit2/Shared/WebsiteData/WebsiteData.cpp
Source/WebKit2/Shared/WebsiteData/WebsiteData.h
Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp
Source/WebKit2/Shared/cf/ArgumentCodersCF.h
Source/WebKit2/Shared/ios/InteractionInformationAtPosition.h
Source/WebKit2/Shared/ios/InteractionInformationAtPosition.mm
Source/WebKit2/Shared/ios/QuickLookDocumentData.cpp
Source/WebKit2/Shared/ios/QuickLookDocumentData.h
Source/WebKit2/Shared/ios/WebPlatformTouchPointIOS.cpp
Source/WebKit2/Shared/ios/WebTouchEventIOS.cpp
Source/WebKit2/Shared/mac/ArgumentCodersMac.h
Source/WebKit2/Shared/mac/ArgumentCodersMac.mm
Source/WebKit2/Shared/mac/AttributedString.h
Source/WebKit2/Shared/mac/AttributedString.mm
Source/WebKit2/Shared/mac/ColorSpaceData.h
Source/WebKit2/Shared/mac/ColorSpaceData.mm
Source/WebKit2/Shared/mac/ObjCObjectGraph.h
Source/WebKit2/Shared/mac/ObjCObjectGraph.mm
Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h
Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm
Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h
Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm
Source/WebKit2/Shared/mac/SandboxExtensionMac.mm
Source/WebKit2/Shared/mac/SecItemRequestData.cpp
Source/WebKit2/Shared/mac/SecItemRequestData.h
Source/WebKit2/Shared/mac/SecItemResponseData.cpp
Source/WebKit2/Shared/mac/SecItemResponseData.h
Source/WebKit2/Shared/mac/SecItemShim.h
Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm
Source/WebKit2/Shared/mac/WebGestureEvent.cpp
Source/WebKit2/Shared/mac/WebGestureEvent.h
Source/WebKit2/Shared/mac/WebHitTestResultData.mm
Source/WebKit2/UIProcess/API/APIHitTestResult.h
Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h
Source/WebKit2/UIProcess/Automation/WebAutomationSession.h
Source/WebKit2/UIProcess/ChildProcessProxy.cpp
Source/WebKit2/UIProcess/ChildProcessProxy.h
Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.h
Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h
Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp
Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h
Source/WebKit2/UIProcess/Downloads/DownloadProxy.h
Source/WebKit2/UIProcess/DrawingAreaProxy.h
Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h
Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp
Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h
Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h
Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp
Source/WebKit2/UIProcess/Storage/StorageManager.h
Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h
Source/WebKit2/UIProcess/VisitedLinkStore.h
Source/WebKit2/UIProcess/WebCookieManagerProxy.h
Source/WebKit2/UIProcess/WebFrameProxy.h
Source/WebKit2/UIProcess/WebFullScreenManagerProxy.h
Source/WebKit2/UIProcess/WebGeolocationManagerProxy.h
Source/WebKit2/UIProcess/WebIconDatabase.h
Source/WebKit2/UIProcess/WebInspectorProxy.h
Source/WebKit2/UIProcess/WebPageProxy.h
Source/WebKit2/UIProcess/WebPasteboardProxy.h
Source/WebKit2/UIProcess/WebProcessPool.cpp
Source/WebKit2/UIProcess/WebProcessPool.h
Source/WebKit2/UIProcess/WebProcessProxy.cpp
Source/WebKit2/UIProcess/WebProcessProxy.h
Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.h
Source/WebKit2/UIProcess/ios/SmartMagnificationController.h
Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h
Source/WebKit2/UIProcess/mac/SecItemShimProxy.h
Source/WebKit2/UIProcess/mac/ViewGestureController.h
Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.h
Source/WebKit2/WebProcess/Automation/WebAutomationSessionProxy.h
Source/WebKit2/WebProcess/Cookies/WebCookieManager.h
Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h
Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp
Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.h
Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp
Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.h
Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.h
Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h
Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp
Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h
Source/WebKit2/WebProcess/Network/WebResourceLoader.h
Source/WebKit2/WebProcess/Notifications/WebNotificationManager.h
Source/WebKit2/WebProcess/Plugins/Plugin.cpp
Source/WebKit2/WebProcess/Plugins/Plugin.h
Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp
Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.h
Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp
Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h
Source/WebKit2/WebProcess/Plugins/PluginProxy.h
Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.h
Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm
Source/WebKit2/WebProcess/Storage/StorageAreaMap.h
Source/WebKit2/WebProcess/UserContent/WebUserContentController.h
Source/WebKit2/WebProcess/WebPage/DrawingArea.h
Source/WebKit2/WebProcess/WebPage/EventDispatcher.h
Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.h
Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.h
Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.h
Source/WebKit2/WebProcess/WebPage/WebInspector.h
Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h
Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Source/WebKit2/WebProcess/WebPage/WebPage.h
Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.h
Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm
Source/WebKit2/WebProcess/WebProcess.cpp
Source/WebKit2/WebProcess/WebProcess.h
Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.h
Source/WebKit2/WebProcess/cocoa/WebVideoFullscreenManager.h

index 600a7c1..1240ea2 100644 (file)
@@ -1,5 +1,284 @@
 2016-08-19  Anders Carlsson  <andersca@apple.com>
 
+        Merge MessageDecoder and ArgumentDecoder into Decoder
+        https://bugs.webkit.org/show_bug.cgi?id=161019
+
+        Reviewed by Tim Horton.
+
+        * DatabaseProcess/DatabaseProcess.cpp:
+        * DatabaseProcess/DatabaseProcess.h:
+        * DatabaseProcess/DatabaseToWebProcessConnection.cpp:
+        * DatabaseProcess/DatabaseToWebProcessConnection.h:
+        * DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h:
+        * NetworkProcess/CustomProtocols/CustomProtocolManager.h:
+        * NetworkProcess/Downloads/DownloadID.h:
+        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+        * NetworkProcess/NetworkConnectionToWebProcess.h:
+        * NetworkProcess/NetworkProcess.cpp:
+        * NetworkProcess/NetworkProcess.h:
+        * NetworkProcess/NetworkProcessCreationParameters.cpp:
+        * NetworkProcess/NetworkProcessCreationParameters.h:
+        * NetworkProcess/NetworkResourceLoadParameters.cpp:
+        * NetworkProcess/NetworkResourceLoadParameters.h:
+        * NetworkProcess/NetworkResourceLoader.h:
+        * Platform/IPC/ArgumentCoder.h:
+        * Platform/IPC/ArgumentCoders.cpp:
+        * Platform/IPC/ArgumentCoders.h:
+        * Platform/IPC/ArgumentDecoder.cpp:
+        * Platform/IPC/ArgumentDecoder.h:
+        * Platform/IPC/Arguments.h:
+        * Platform/IPC/Attachment.cpp:
+        * Platform/IPC/Attachment.h:
+        * Platform/IPC/Connection.cpp:
+        * Platform/IPC/Connection.h:
+        * Platform/IPC/DataReference.cpp:
+        * Platform/IPC/DataReference.h:
+        * Platform/IPC/Decoder.cpp: Renamed from Source/WebKit2/Platform/IPC/ArgumentDecoder.cpp.
+        * Platform/IPC/Decoder.h: Renamed from Source/WebKit2/Platform/IPC/ArgumentDecoder.h.
+        * Platform/IPC/HandleMessage.h:
+        * Platform/IPC/MessageDecoder.cpp: Removed.
+        * Platform/IPC/MessageDecoder.h: Removed.
+        * Platform/IPC/MessageReceiver.h:
+        * Platform/IPC/MessageReceiverMap.cpp:
+        * Platform/IPC/MessageReceiverMap.h:
+        * Platform/IPC/MessageRecorder.cpp:
+        * Platform/IPC/MessageRecorder.h:
+        * Platform/IPC/StringReference.cpp:
+        * Platform/IPC/StringReference.h:
+        * Platform/IPC/mac/ConnectionMac.mm:
+        * Platform/IPC/mac/MachPort.h:
+        * Platform/SharedMemory.h:
+        * Platform/mac/SharedMemoryMac.cpp:
+        * PluginProcess/PluginControllerProxy.h:
+        * PluginProcess/PluginCreationParameters.cpp:
+        * PluginProcess/PluginCreationParameters.h:
+        * PluginProcess/PluginProcess.cpp:
+        * PluginProcess/PluginProcess.h:
+        * PluginProcess/WebProcessConnection.cpp:
+        * PluginProcess/WebProcessConnection.h:
+        * Scripts/webkit/messages.py:
+        * Shared/API/APIData.cpp:
+        * Shared/API/APIData.h:
+        * Shared/API/APIError.cpp:
+        * Shared/API/APIError.h:
+        * Shared/API/APIFrameHandle.cpp:
+        * Shared/API/APIFrameHandle.h:
+        * Shared/API/APIGeometry.cpp:
+        * Shared/API/APIGeometry.h:
+        * Shared/API/APINumber.h:
+        * Shared/API/APIPageGroupHandle.cpp:
+        * Shared/API/APIPageGroupHandle.h:
+        * Shared/API/APIPageHandle.cpp:
+        * Shared/API/APIPageHandle.h:
+        * Shared/API/APIURL.h:
+        * Shared/API/APIURLRequest.cpp:
+        * Shared/API/APIURLRequest.h:
+        * Shared/API/APIURLResponse.cpp:
+        * Shared/API/APIURLResponse.h:
+        * Shared/API/Cocoa/RemoteObjectInvocation.h:
+        * Shared/API/Cocoa/RemoteObjectInvocation.mm:
+        * Shared/API/Cocoa/RemoteObjectRegistry.h:
+        * Shared/AssistedNodeInformation.cpp:
+        * Shared/AssistedNodeInformation.h:
+        * Shared/Authentication/AuthenticationManager.h:
+        * Shared/ChildProcess.h:
+        * Shared/Cocoa/DataDetectionResult.h:
+        * Shared/Cocoa/DataDetectionResult.mm:
+        * Shared/Cocoa/LoadParametersCocoa.mm:
+        * Shared/Cocoa/WebCoreArgumentCodersCocoa.mm:
+        * Shared/ContextMenuContextData.cpp:
+        * Shared/ContextMenuContextData.h:
+        * Shared/Databases/DatabaseProcessCreationParameters.cpp:
+        * Shared/Databases/DatabaseProcessCreationParameters.h:
+        * Shared/Databases/IndexedDB/WebIDBResult.cpp:
+        * Shared/Databases/IndexedDB/WebIDBResult.h:
+        * Shared/EditorState.cpp:
+        * Shared/EditorState.h:
+        * Shared/FontInfo.cpp:
+        * Shared/FontInfo.h:
+        * Shared/Gamepad/GamepadData.cpp:
+        * Shared/Gamepad/GamepadData.h:
+        * Shared/LayerTreeContext.cpp:
+        * Shared/LayerTreeContext.h:
+        * Shared/LoadParameters.cpp:
+        * Shared/LoadParameters.h:
+        * Shared/NavigationActionData.cpp:
+        * Shared/NavigationActionData.h:
+        * Shared/PlatformPopupMenuData.cpp:
+        * Shared/PlatformPopupMenuData.h:
+        * Shared/Plugins/NPIdentifierData.cpp:
+        * Shared/Plugins/NPIdentifierData.h:
+        * Shared/Plugins/NPObjectMessageReceiver.h:
+        * Shared/Plugins/NPRemoteObjectMap.cpp:
+        * Shared/Plugins/NPRemoteObjectMap.h:
+        * Shared/Plugins/NPVariantData.cpp:
+        * Shared/Plugins/NPVariantData.h:
+        * Shared/Plugins/PluginProcessCreationParameters.cpp:
+        * Shared/Plugins/PluginProcessCreationParameters.h:
+        * Shared/PrintInfo.cpp:
+        * Shared/PrintInfo.h:
+        * Shared/SandboxExtension.h:
+        * Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
+        * Shared/Scrolling/RemoteScrollingCoordinatorTransaction.h:
+        * Shared/SessionState.cpp:
+        * Shared/SessionState.h:
+        * Shared/ShareableBitmap.cpp:
+        * Shared/ShareableBitmap.h:
+        * Shared/ShareableResource.cpp:
+        * Shared/ShareableResource.h:
+        * Shared/StatisticsData.cpp:
+        * Shared/StatisticsData.h:
+        * Shared/UpdateInfo.cpp:
+        * Shared/UpdateInfo.h:
+        * Shared/UserData.cpp:
+        * Shared/UserData.h:
+        * Shared/VisibleContentRectUpdateInfo.cpp:
+        * Shared/VisibleContentRectUpdateInfo.h:
+        * Shared/WebBackForwardListItem.h:
+        * Shared/WebCompiledContentExtensionData.cpp:
+        * Shared/WebCompiledContentExtensionData.h:
+        * Shared/WebConnection.h:
+        * Shared/WebContextMenuItemData.cpp:
+        * Shared/WebContextMenuItemData.h:
+        * Shared/WebCoreArgumentCoders.cpp:
+        * Shared/WebCoreArgumentCoders.h:
+        * Shared/WebEvent.cpp:
+        * Shared/WebEvent.h:
+        * Shared/WebGeolocationPosition.cpp:
+        * Shared/WebGeolocationPosition.h:
+        * Shared/WebHitTestResultData.cpp:
+        * Shared/WebHitTestResultData.h:
+        * Shared/WebKeyboardEvent.cpp:
+        * Shared/WebMouseEvent.cpp:
+        * Shared/WebNavigationDataStore.h:
+        * Shared/WebPageCreationParameters.cpp:
+        * Shared/WebPageCreationParameters.h:
+        * Shared/WebPageGroupData.cpp:
+        * Shared/WebPageGroupData.h:
+        * Shared/WebPlatformTouchPoint.cpp:
+        * Shared/WebPopupItem.cpp:
+        * Shared/WebPopupItem.h:
+        * Shared/WebPreferencesStore.cpp:
+        * Shared/WebPreferencesStore.h:
+        * Shared/WebProcessCreationParameters.cpp:
+        * Shared/WebProcessCreationParameters.h:
+        * Shared/WebTouchEvent.cpp:
+        * Shared/WebUserContentControllerDataTypes.cpp:
+        * Shared/WebUserContentControllerDataTypes.h:
+        * Shared/WebWheelEvent.cpp:
+        * Shared/WebsiteData/WebsiteData.cpp:
+        * Shared/WebsiteData/WebsiteData.h:
+        * Shared/cf/ArgumentCodersCF.cpp:
+        * Shared/cf/ArgumentCodersCF.h:
+        * Shared/ios/InteractionInformationAtPosition.h:
+        * Shared/ios/InteractionInformationAtPosition.mm:
+        * Shared/ios/QuickLookDocumentData.cpp:
+        * Shared/ios/QuickLookDocumentData.h:
+        * Shared/ios/WebPlatformTouchPointIOS.cpp:
+        * Shared/ios/WebTouchEventIOS.cpp:
+        * Shared/mac/ArgumentCodersMac.h:
+        * Shared/mac/ArgumentCodersMac.mm:
+        * Shared/mac/AttributedString.h:
+        * Shared/mac/AttributedString.mm:
+        * Shared/mac/ColorSpaceData.h:
+        * Shared/mac/ColorSpaceData.mm:
+        * Shared/mac/ObjCObjectGraph.h:
+        * Shared/mac/ObjCObjectGraph.mm:
+        * Shared/mac/RemoteLayerBackingStore.h:
+        * Shared/mac/RemoteLayerBackingStore.mm:
+        * Shared/mac/RemoteLayerTreeTransaction.h:
+        * Shared/mac/RemoteLayerTreeTransaction.mm:
+        * Shared/mac/SandboxExtensionMac.mm:
+        * Shared/mac/SecItemRequestData.cpp:
+        * Shared/mac/SecItemRequestData.h:
+        * Shared/mac/SecItemResponseData.cpp:
+        * Shared/mac/SecItemResponseData.h:
+        * Shared/mac/SecItemShim.h:
+        * Shared/mac/WebCoreArgumentCodersMac.mm:
+        * Shared/mac/WebGestureEvent.cpp:
+        * Shared/mac/WebGestureEvent.h:
+        * Shared/mac/WebHitTestResultData.mm:
+        * UIProcess/API/APIHitTestResult.h:
+        * UIProcess/ApplePay/WebPaymentCoordinatorProxy.h:
+        * UIProcess/Automation/WebAutomationSession.h:
+        * UIProcess/ChildProcessProxy.cpp:
+        * UIProcess/ChildProcessProxy.h:
+        * UIProcess/Cocoa/WebPlaybackSessionManagerProxy.h:
+        * UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h:
+        * UIProcess/Databases/DatabaseProcessProxy.cpp:
+        * UIProcess/Databases/DatabaseProcessProxy.h:
+        * UIProcess/Downloads/DownloadProxy.h:
+        * UIProcess/DrawingAreaProxy.h:
+        * UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h:
+        * UIProcess/Network/NetworkProcessProxy.cpp:
+        * UIProcess/Network/NetworkProcessProxy.h:
+        * UIProcess/Plugins/PluginProcessProxy.h:
+        * UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:
+        * UIProcess/Storage/StorageManager.h:
+        * UIProcess/UserContent/WebUserContentControllerProxy.h:
+        * UIProcess/VisitedLinkStore.h:
+        * UIProcess/WebCookieManagerProxy.h:
+        * UIProcess/WebFrameProxy.h:
+        * UIProcess/WebFullScreenManagerProxy.h:
+        * UIProcess/WebGeolocationManagerProxy.h:
+        * UIProcess/WebIconDatabase.h:
+        * UIProcess/WebInspectorProxy.h:
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/WebPasteboardProxy.h:
+        * UIProcess/WebProcessPool.cpp:
+        * UIProcess/WebProcessPool.h:
+        * UIProcess/WebProcessProxy.cpp:
+        * UIProcess/WebProcessProxy.h:
+        * UIProcess/WebResourceLoadStatisticsStore.h:
+        * UIProcess/ios/SmartMagnificationController.h:
+        * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:
+        * UIProcess/mac/SecItemShimProxy.h:
+        * UIProcess/mac/ViewGestureController.h:
+        * WebKit2.xcodeproj/project.pbxproj:
+        * WebProcess/ApplePay/WebPaymentCoordinator.h:
+        * WebProcess/Automation/WebAutomationSessionProxy.h:
+        * WebProcess/Cookies/WebCookieManager.h:
+        * WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h:
+        * WebProcess/Databases/WebToDatabaseProcessConnection.cpp:
+        * WebProcess/Databases/WebToDatabaseProcessConnection.h:
+        * WebProcess/FullScreen/WebFullScreenManager.cpp:
+        * WebProcess/FullScreen/WebFullScreenManager.h:
+        * WebProcess/Geolocation/WebGeolocationManager.h:
+        * WebProcess/IconDatabase/WebIconDatabaseProxy.h:
+        * WebProcess/InjectedBundle/InjectedBundle.h:
+        * WebProcess/Network/NetworkProcessConnection.cpp:
+        * WebProcess/Network/NetworkProcessConnection.h:
+        * WebProcess/Network/WebResourceLoader.h:
+        * WebProcess/Notifications/WebNotificationManager.h:
+        * WebProcess/Plugins/Plugin.cpp:
+        * WebProcess/Plugins/Plugin.h:
+        * WebProcess/Plugins/PluginProcessConnection.cpp:
+        * WebProcess/Plugins/PluginProcessConnection.h:
+        * WebProcess/Plugins/PluginProcessConnectionManager.cpp:
+        * WebProcess/Plugins/PluginProcessConnectionManager.h:
+        * WebProcess/Plugins/PluginProxy.h:
+        * WebProcess/Scrolling/RemoteScrollingCoordinator.h:
+        * WebProcess/Scrolling/RemoteScrollingCoordinator.mm:
+        * WebProcess/Storage/StorageAreaMap.h:
+        * WebProcess/UserContent/WebUserContentController.h:
+        * WebProcess/WebPage/DrawingArea.h:
+        * WebProcess/WebPage/EventDispatcher.h:
+        * WebProcess/WebPage/ViewGestureGeometryCollector.h:
+        * WebProcess/WebPage/ViewUpdateDispatcher.h:
+        * WebProcess/WebPage/VisitedLinkTableController.h:
+        * WebProcess/WebPage/WebInspector.h:
+        * WebProcess/WebPage/WebInspectorUI.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/mac/PlatformCAAnimationRemote.h:
+        * WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm:
+        * WebProcess/WebProcess.cpp:
+        * WebProcess/WebProcess.h:
+        * WebProcess/cocoa/WebPlaybackSessionManager.h:
+        * WebProcess/cocoa/WebVideoFullscreenManager.h:
+
+2016-08-19  Anders Carlsson  <andersca@apple.com>
+
         Update Xcode project.
 
         * WebKit2.xcodeproj/project.pbxproj:
index 4d5eb2a..451d850 100644 (file)
@@ -79,7 +79,7 @@ void DatabaseProcess::didClose(IPC::Connection&)
     stopRunLoop();
 }
 
-void DatabaseProcess::didReceiveMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder)
+void DatabaseProcess::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
 {
     if (messageReceiverMap().dispatchMessage(connection, decoder))
         return;
index b8c28a4..e15150f 100644 (file)
@@ -91,12 +91,12 @@ private:
     bool shouldTerminate() override;
 
     // IPC::Connection::Client
-    void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
+    void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
     void didClose(IPC::Connection&) override;
     void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
     IPC::ProcessType localProcessType() override { return IPC::ProcessType::Database; }
     IPC::ProcessType remoteProcessType() override { return IPC::ProcessType::UI; }
-    void didReceiveDatabaseProcessMessage(IPC::Connection&, IPC::MessageDecoder&);
+    void didReceiveDatabaseProcessMessage(IPC::Connection&, IPC::Decoder&);
 
     // Message Handlers
     void initializeDatabaseProcess(const DatabaseProcessCreationParameters&);
index 94ba257..ba426de 100644 (file)
@@ -53,7 +53,7 @@ DatabaseToWebProcessConnection::~DatabaseToWebProcessConnection()
 
 }
 
-void DatabaseToWebProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder)
+void DatabaseToWebProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
 {
     if (decoder.messageReceiverName() == Messages::DatabaseToWebProcessConnection::messageReceiverName()) {
         didReceiveDatabaseToWebProcessConnectionMessage(connection, decoder);
@@ -72,7 +72,7 @@ void DatabaseToWebProcessConnection::didReceiveMessage(IPC::Connection& connecti
     ASSERT_NOT_REACHED();
 }
 
-void DatabaseToWebProcessConnection::didReceiveSyncMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::Encoder>& replyEncoder)
+void DatabaseToWebProcessConnection::didReceiveSyncMessage(IPC::Connection& connection, IPC::Decoder& decoder, std::unique_ptr<IPC::Encoder>& replyEncoder)
 {
     if (decoder.messageReceiverName() == Messages::DatabaseToWebProcessConnection::messageReceiverName()) {
         didReceiveSyncDatabaseToWebProcessConnectionMessage(connection, decoder, replyEncoder);
index 2b0ed16..b818ab5 100644 (file)
@@ -48,14 +48,14 @@ private:
     DatabaseToWebProcessConnection(IPC::Connection::Identifier);
 
     // IPC::Connection::Client
-    void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
-    void didReceiveSyncMessage(IPC::Connection&, IPC::MessageDecoder&, std::unique_ptr<IPC::Encoder>&) override;
+    void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
+    void didReceiveSyncMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&) override;
     void didClose(IPC::Connection&) override;
     void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
     IPC::ProcessType localProcessType() override { return IPC::ProcessType::Database; }
     IPC::ProcessType remoteProcessType() override { return IPC::ProcessType::Web; }
-    void didReceiveDatabaseToWebProcessConnectionMessage(IPC::Connection&, IPC::MessageDecoder&);
-    void didReceiveSyncDatabaseToWebProcessConnectionMessage(IPC::Connection&, IPC::MessageDecoder&, std::unique_ptr<IPC::Encoder>&);
+    void didReceiveDatabaseToWebProcessConnectionMessage(IPC::Connection&, IPC::Decoder&);
+    void didReceiveSyncDatabaseToWebProcessConnectionMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&);
 
     // IPC::MessageSender
     IPC::Connection* messageSenderConnection() override { return m_connection.ptr(); }
index e937630..8125ed9 100644 (file)
@@ -113,7 +113,7 @@ public:
 
     void disconnectedFromWebProcess();
 
-    void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&);
+    void didReceiveMessage(IPC::Connection&, IPC::Decoder&);
 
 private:
     WebIDBConnectionToClient(DatabaseToWebProcessConnection&, uint64_t serverConnectionIdentifier);
index 9af8ba9..439d8b0 100644 (file)
@@ -88,7 +88,7 @@ private:
     void initialize(const NetworkProcessCreationParameters&) override;
 
     // IPC::MessageReceiver
-    void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
+    void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
 
     void didFailWithError(uint64_t customProtocolID, const WebCore::ResourceError&);
     void didLoadData(uint64_t customProtocolID, const IPC::DataReference&);
index 3d296d6..04df707 100644 (file)
@@ -27,7 +27,7 @@
 #define DownloadID_h
 
 #include "ArgumentCoder.h"
-#include "ArgumentDecoder.h"
+#include "Decoder.h"
 #include "Encoder.h"
 #include <wtf/HashTraits.h>
 
@@ -61,7 +61,7 @@ template<> struct ArgumentCoder<WebKit::DownloadID> {
     {
         encoder << downloadID.downloadID();
     }
-    static bool decode(ArgumentDecoder& decoder, WebKit::DownloadID& downloadID)
+    static bool decode(Decoder& decoder, WebKit::DownloadID& downloadID)
     {
         uint64_t id;
         if (!decoder.decode(id))
index 138d998..8b5d0db 100644 (file)
@@ -75,7 +75,7 @@ void NetworkConnectionToWebProcess::didCleanupResourceLoader(NetworkResourceLoad
     m_networkResourceLoaders.remove(loader.identifier());
 }
     
-void NetworkConnectionToWebProcess::didReceiveMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder)
+void NetworkConnectionToWebProcess::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
 {
     if (decoder.messageReceiverName() == Messages::NetworkConnectionToWebProcess::messageReceiverName()) {
         didReceiveNetworkConnectionToWebProcessMessage(connection, decoder);
@@ -92,7 +92,7 @@ void NetworkConnectionToWebProcess::didReceiveMessage(IPC::Connection& connectio
     ASSERT_NOT_REACHED();
 }
 
-void NetworkConnectionToWebProcess::didReceiveSyncMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::Encoder>& reply)
+void NetworkConnectionToWebProcess::didReceiveSyncMessage(IPC::Connection& connection, IPC::Decoder& decoder, std::unique_ptr<IPC::Encoder>& reply)
 {
     if (decoder.messageReceiverName() == Messages::NetworkConnectionToWebProcess::messageReceiverName()) {
         didReceiveSyncNetworkConnectionToWebProcessMessage(connection, decoder, reply);
index 0a9ed41..86bc67e 100644 (file)
@@ -59,16 +59,16 @@ private:
     NetworkConnectionToWebProcess(IPC::Connection::Identifier);
 
     // IPC::Connection::Client
-    void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
-    void didReceiveSyncMessage(IPC::Connection&, IPC::MessageDecoder&, std::unique_ptr<IPC::Encoder>&) override;
+    void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
+    void didReceiveSyncMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&) override;
     void didClose(IPC::Connection&) override;
     void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
     IPC::ProcessType localProcessType() override { return IPC::ProcessType::Network; }
     IPC::ProcessType remoteProcessType() override { return IPC::ProcessType::Web; }
 
     // Message handlers.
-    void didReceiveNetworkConnectionToWebProcessMessage(IPC::Connection&, IPC::MessageDecoder&);
-    void didReceiveSyncNetworkConnectionToWebProcessMessage(IPC::Connection&, IPC::MessageDecoder&, std::unique_ptr<IPC::Encoder>&);
+    void didReceiveNetworkConnectionToWebProcessMessage(IPC::Connection&, IPC::Decoder&);
+    void didReceiveSyncNetworkConnectionToWebProcessMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&);
     
     void scheduleResourceLoad(const NetworkResourceLoadParameters&);
     void performSynchronousLoad(const NetworkResourceLoadParameters&, RefPtr<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply>&&);
index 98846f0..1846da5 100644 (file)
@@ -133,7 +133,7 @@ bool NetworkProcess::shouldTerminate()
     return false;
 }
 
-void NetworkProcess::didReceiveMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder)
+void NetworkProcess::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
 {
     if (messageReceiverMap().dispatchMessage(connection, decoder))
         return;
@@ -146,7 +146,7 @@ void NetworkProcess::didReceiveMessage(IPC::Connection& connection, IPC::Message
     didReceiveNetworkProcessMessage(connection, decoder);
 }
 
-void NetworkProcess::didReceiveSyncMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::Encoder>& replyEncoder)
+void NetworkProcess::didReceiveSyncMessage(IPC::Connection& connection, IPC::Decoder& decoder, std::unique_ptr<IPC::Encoder>& replyEncoder)
 {
     if (messageReceiverMap().dispatchSyncMessage(connection, decoder, replyEncoder))
         return;
index 4713106..a7f88f9 100644 (file)
@@ -140,8 +140,8 @@ private:
     bool shouldTerminate() override;
 
     // IPC::Connection::Client
-    void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
-    void didReceiveSyncMessage(IPC::Connection&, IPC::MessageDecoder&, std::unique_ptr<IPC::Encoder>&) override;
+    void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
+    void didReceiveSyncMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&) override;
     void didClose(IPC::Connection&) override;
     void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
     IPC::ProcessType localProcessType() override { return IPC::ProcessType::Network; }
@@ -157,8 +157,8 @@ private:
 #endif
 
     // Message Handlers
-    void didReceiveNetworkProcessMessage(IPC::Connection&, IPC::MessageDecoder&);
-    void didReceiveSyncNetworkProcessMessage(IPC::Connection&, IPC::MessageDecoder&, std::unique_ptr<IPC::Encoder>&);
+    void didReceiveNetworkProcessMessage(IPC::Connection&, IPC::Decoder&);
+    void didReceiveSyncNetworkProcessMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&);
     void initializeNetworkProcess(NetworkProcessCreationParameters&&);
     void createNetworkConnectionToWebProcess();
     void destroyPrivateBrowsingSession(WebCore::SessionID);
index 75b306a..bcdba74 100644 (file)
@@ -88,7 +88,7 @@ void NetworkProcessCreationParameters::encode(IPC::Encoder& encoder) const
 #endif
 }
 
-bool NetworkProcessCreationParameters::decode(IPC::ArgumentDecoder& decoder, NetworkProcessCreationParameters& result)
+bool NetworkProcessCreationParameters::decode(IPC::Decoder& decoder, NetworkProcessCreationParameters& result)
 {
     if (!decoder.decode(result.privateBrowsingEnabled))
         return false;
index 2409cc0..e4722b8 100644 (file)
@@ -36,7 +36,7 @@
 #endif
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
@@ -46,7 +46,7 @@ struct NetworkProcessCreationParameters {
     NetworkProcessCreationParameters();
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, NetworkProcessCreationParameters&);
+    static bool decode(IPC::Decoder&, NetworkProcessCreationParameters&);
 
     bool privateBrowsingEnabled;
     CacheModel cacheModel;
index 5e48d3e..053dcdf 100644 (file)
@@ -81,7 +81,7 @@ void NetworkResourceLoadParameters::encode(IPC::Encoder& encoder) const
     encoder << maximumBufferingTime;
 }
 
-bool NetworkResourceLoadParameters::decode(IPC::ArgumentDecoder& decoder, NetworkResourceLoadParameters& result)
+bool NetworkResourceLoadParameters::decode(IPC::Decoder& decoder, NetworkResourceLoadParameters& result)
 {
     if (!decoder.decode(result.identifier))
         return false;
index 9279534..4255ade 100644 (file)
@@ -34,7 +34,7 @@
 #include <WebCore/SessionID.h>
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
@@ -45,7 +45,7 @@ typedef uint64_t ResourceLoadIdentifier;
 class NetworkResourceLoadParameters : public NetworkLoadParameters {
 public:
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, NetworkResourceLoadParameters&);
+    static bool decode(IPC::Decoder&, NetworkResourceLoadParameters&);
 
     ResourceLoadIdentifier identifier { 0 };
     Vector<RefPtr<SandboxExtension>> requestBodySandboxExtensions; // Created automatically for the sender.
index 356926e..cfeb1d5 100644 (file)
@@ -66,7 +66,7 @@ public:
     void setDefersLoading(bool);
 
     // Message handlers.
-    void didReceiveNetworkResourceLoaderMessage(IPC::Connection&, IPC::MessageDecoder&);
+    void didReceiveNetworkResourceLoaderMessage(IPC::Connection&, IPC::Decoder&);
 
 #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
     void continueCanAuthenticateAgainstProtectionSpace(bool);
index 7babb81..5df6c1b 100644 (file)
@@ -28,7 +28,7 @@
 
 namespace IPC {
 
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
     
 template<typename T> struct ArgumentCoder {
@@ -37,7 +37,7 @@ template<typename T> struct ArgumentCoder {
         t.encode(encoder);
     }
 
-    static bool decode(ArgumentDecoder& decoder, T& t)
+    static bool decode(Decoder& decoder, T& t)
     {
         return T::decode(decoder, t);
     }
index 7f7deb4..e8b978c 100644 (file)
@@ -37,7 +37,7 @@ void ArgumentCoder<std::chrono::system_clock::time_point>::encode(IPC::Encoder&
     encoder << static_cast<int64_t>(timePoint.time_since_epoch().count());
 }
 
-bool ArgumentCoder<std::chrono::system_clock::time_point>::decode(ArgumentDecoder& decoder, std::chrono::system_clock::time_point& result)
+bool ArgumentCoder<std::chrono::system_clock::time_point>::decode(Decoder& decoder, std::chrono::system_clock::time_point& result)
 {
     int64_t time;
     if (!decoder.decode(time))
@@ -52,7 +52,7 @@ void ArgumentCoder<AtomicString>::encode(Encoder& encoder, const AtomicString& a
     encoder << atomicString.string();
 }
 
-bool ArgumentCoder<AtomicString>::decode(ArgumentDecoder& decoder, AtomicString& atomicString)
+bool ArgumentCoder<AtomicString>::decode(Decoder& decoder, AtomicString& atomicString)
 {
     String string;
     if (!decoder.decode(string))
@@ -75,7 +75,7 @@ void ArgumentCoder<CString>::encode(Encoder& encoder, const CString& string)
     encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(string.data()), length, 1);
 }
 
-bool ArgumentCoder<CString>::decode(ArgumentDecoder& decoder, CString& result)
+bool ArgumentCoder<CString>::decode(Decoder& decoder, CString& result)
 {
     uint32_t length;
     if (!decoder.decode(length))
@@ -123,7 +123,7 @@ void ArgumentCoder<String>::encode(Encoder& encoder, const String& string)
 }
 
 template <typename CharacterType>
-static inline bool decodeStringText(ArgumentDecoder& decoder, uint32_t length, String& result)
+static inline bool decodeStringText(Decoder& decoder, uint32_t length, String& result)
 {
     // Before allocating the string, make sure that the decoder buffer is big enough.
     if (!decoder.bufferIsLargeEnoughToContain<CharacterType>(length)) {
@@ -140,7 +140,7 @@ static inline bool decodeStringText(ArgumentDecoder& decoder, uint32_t length, S
     return true;    
 }
 
-bool ArgumentCoder<String>::decode(ArgumentDecoder& decoder, String& result)
+bool ArgumentCoder<String>::decode(Decoder& decoder, String& result)
 {
     uint32_t length;
     if (!decoder.decode(length))
@@ -168,7 +168,7 @@ void ArgumentCoder<uuid_t>::encode(Encoder& encoder, const uuid_t& uuid)
     SimpleArgumentCoder<uuid_t>::encode(encoder, uuid);
 }
 
-bool ArgumentCoder<uuid_t>::decode(ArgumentDecoder& decoder, uuid_t& uuid)
+bool ArgumentCoder<uuid_t>::decode(Decoder& decoder, uuid_t& uuid)
 {
     return SimpleArgumentCoder<uuid_t>::decode(decoder, uuid);
 }
index 1d49813..22fc0c2 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef ArgumentCoders_h
 #define ArgumentCoders_h
 
-#include "ArgumentDecoder.h"
+#include "Decoder.h"
 #include "Encoder.h"
 #include <utility>
 #include <wtf/Forward.h>
@@ -50,7 +50,7 @@ template<typename T> struct SimpleArgumentCoder {
         encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(&t), sizeof(T), alignof(T));
     }
 
-    static bool decode(ArgumentDecoder& decoder, T& t)
+    static bool decode(Decoder& decoder, T& t)
     {
         return decoder.decodeFixedLengthData(reinterpret_cast<uint8_t*>(&t), sizeof(T), alignof(T));
     }
@@ -62,7 +62,7 @@ template<typename T> struct ArgumentCoder<OptionSet<T>> {
         encoder << (static_cast<uint64_t>(optionSet.toRaw()));
     }
 
-    static bool decode(ArgumentDecoder& decoder, OptionSet<T>& optionSet)
+    static bool decode(Decoder& decoder, OptionSet<T>& optionSet)
     {
         uint64_t value;
         if (!decoder.decode(value))
@@ -85,7 +85,7 @@ template<typename T> struct ArgumentCoder<WTF::Optional<T>> {
         encoder << optional.value();
     }
 
-    static bool decode(ArgumentDecoder& decoder, WTF::Optional<T>& optional)
+    static bool decode(Decoder& decoder, WTF::Optional<T>& optional)
     {
         bool isEngaged;
         if (!decoder.decode(isEngaged))
@@ -111,7 +111,7 @@ template<typename T, typename U> struct ArgumentCoder<std::pair<T, U>> {
         encoder << pair.first << pair.second;
     }
 
-    static bool decode(ArgumentDecoder& decoder, std::pair<T, U>& pair)
+    static bool decode(Decoder& decoder, std::pair<T, U>& pair)
     {
         T first;
         if (!decoder.decode(first))
@@ -134,7 +134,7 @@ template<typename Rep, typename Period> struct ArgumentCoder<std::chrono::durati
         encoder << static_cast<int64_t>(duration.count());
     }
 
-    static bool decode(ArgumentDecoder& decoder, std::chrono::duration<Rep, Period>& result)
+    static bool decode(Decoder& decoder, std::chrono::duration<Rep, Period>& result)
     {
         int64_t count;
         if (!decoder.decode(count))
@@ -150,7 +150,7 @@ template<typename KeyType, typename ValueType> struct ArgumentCoder<WTF::KeyValu
         encoder << pair.key << pair.value;
     }
 
-    static bool decode(ArgumentDecoder& decoder, WTF::KeyValuePair<KeyType, ValueType>& pair)
+    static bool decode(Decoder& decoder, WTF::KeyValuePair<KeyType, ValueType>& pair)
     {
         KeyType key;
         if (!decoder.decode(key))
@@ -176,7 +176,7 @@ template<typename T, size_t inlineCapacity> struct VectorArgumentCoder<false, T,
             encoder << vector[i];
     }
 
-    static bool decode(ArgumentDecoder& decoder, Vector<T, inlineCapacity>& vector)
+    static bool decode(Decoder& decoder, Vector<T, inlineCapacity>& vector)
     {
         uint64_t size;
         if (!decoder.decode(size))
@@ -204,7 +204,7 @@ template<typename T, size_t inlineCapacity> struct VectorArgumentCoder<true, T,
         encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(vector.data()), vector.size() * sizeof(T), alignof(T));
     }
     
-    static bool decode(ArgumentDecoder& decoder, Vector<T, inlineCapacity>& vector)
+    static bool decode(Decoder& decoder, Vector<T, inlineCapacity>& vector)
     {
         uint64_t size;
         if (!decoder.decode(size))
@@ -240,7 +240,7 @@ template<typename KeyArg, typename MappedArg, typename HashArg, typename KeyTrai
             encoder << *it;
     }
 
-    static bool decode(ArgumentDecoder& decoder, HashMapType& hashMap)
+    static bool decode(Decoder& decoder, HashMapType& hashMap)
     {
         uint64_t hashMapSize;
         if (!decoder.decode(hashMapSize))
@@ -277,7 +277,7 @@ template<typename KeyArg, typename HashArg, typename KeyTraitsArg> struct Argume
             encoder << *it;
     }
 
-    static bool decode(ArgumentDecoder& decoder, HashSetType& hashSet)
+    static bool decode(Decoder& decoder, HashSetType& hashSet)
     {
         uint64_t hashSetSize;
         if (!decoder.decode(hashSetSize))
@@ -314,7 +314,7 @@ template<typename KeyArg, typename HashArg, typename KeyTraitsArg> struct Argume
         }
     }
     
-    static bool decode(ArgumentDecoder& decoder, HashCountedSetType& hashCountedSet)
+    static bool decode(Decoder& decoder, HashCountedSetType& hashCountedSet)
     {
         uint64_t hashCountedSetSize;
         if (!decoder.decode(hashCountedSetSize))
@@ -344,28 +344,28 @@ template<typename KeyArg, typename HashArg, typename KeyTraitsArg> struct Argume
 
 template<> struct ArgumentCoder<std::chrono::system_clock::time_point> {
     static void encode(Encoder&, const std::chrono::system_clock::time_point&);
-    static bool decode(ArgumentDecoder&, std::chrono::system_clock::time_point&);
+    static bool decode(Decoder&, std::chrono::system_clock::time_point&);
 };
 
 template<> struct ArgumentCoder<AtomicString> {
     static void encode(Encoder&, const AtomicString&);
-    static bool decode(ArgumentDecoder&, AtomicString&);
+    static bool decode(Decoder&, AtomicString&);
 };
 
 template<> struct ArgumentCoder<CString> {
     static void encode(Encoder&, const CString&);
-    static bool decode(ArgumentDecoder&, CString&);
+    static bool decode(Decoder&, CString&);
 };
 
 template<> struct ArgumentCoder<String> {
     static void encode(Encoder&, const String&);
-    static bool decode(ArgumentDecoder&, String&);
+    static bool decode(Decoder&, String&);
 };
 
 #if HAVE(DTRACE)
 template<> struct ArgumentCoder<uuid_t> {
     static void encode(Encoder&, const uuid_t&);
-    static bool decode(ArgumentDecoder&, uuid_t&);
+    static bool decode(Decoder&, uuid_t&);
 };
 #endif
 
index e20efcc..0dd34aa 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef Arguments_h
 #define Arguments_h
 
-#include "ArgumentDecoder.h"
+#include "Decoder.h"
 #include "Encoder.h"
 
 namespace IPC {
@@ -39,7 +39,7 @@ struct TupleCoder {
         TupleCoder<index - 1, Elements...>::encode(encoder, tuple);
     }
 
-    static bool decode(ArgumentDecoder& decoder, std::tuple<Elements...>& tuple)
+    static bool decode(Decoder& decoder, std::tuple<Elements...>& tuple)
     {
         if (!decoder.decode(std::get<sizeof...(Elements) - index>(tuple)))
             return false;
@@ -53,7 +53,7 @@ struct TupleCoder<0, Elements...> {
     {
     }
 
-    static bool decode(ArgumentDecoder&, std::tuple<Elements...>&)
+    static bool decode(Decoder&, std::tuple<Elements...>&)
     {
         return true;
     }
@@ -65,7 +65,7 @@ template<typename... Elements> struct ArgumentCoder<std::tuple<Elements...>> {
         TupleCoder<sizeof...(Elements), Elements...>::encode(encoder, tuple);
     }
 
-    static bool decode(ArgumentDecoder& decoder, std::tuple<Elements...>& tuple)
+    static bool decode(Decoder& decoder, std::tuple<Elements...>& tuple)
     {
         return TupleCoder<sizeof...(Elements), Elements...>::decode(decoder, tuple);
     }
@@ -85,7 +85,7 @@ struct Arguments {
         ArgumentCoder<std::tuple<Types...>>::encode(encoder, arguments);
     }
 
-    static bool decode(ArgumentDecoder& decoder, Arguments& result)
+    static bool decode(Decoder& decoder, Arguments& result)
     {
         return ArgumentCoder<std::tuple<Types...>>::decode(decoder, result.arguments);
     }
index c62fd9f..2c5ce0e 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "Attachment.h"
 
-#include "ArgumentDecoder.h"
+#include "Decoder.h"
 #include "Encoder.h"
 
 namespace IPC {
@@ -55,7 +55,7 @@ void Attachment::encode(Encoder& encoder) const
     encoder.addAttachment(WTFMove(*const_cast<Attachment*>(this)));
 }
 
-bool Attachment::decode(ArgumentDecoder& decoder, Attachment& attachment)
+bool Attachment::decode(Decoder& decoder, Attachment& attachment)
 {
     if (!decoder.removeAttachment(attachment))
         return false;
index 6d06daf..a684c0d 100644 (file)
@@ -33,7 +33,7 @@
 
 namespace IPC {
 
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 
 class Attachment {
@@ -76,7 +76,7 @@ public:
 #endif
 
     void encode(Encoder&) const;
-    static bool decode(ArgumentDecoder&, Attachment&);
+    static bool decode(Decoder&, Attachment&);
     
 private:
     Type m_type;
index aef260e..d27b2b0 100644 (file)
@@ -52,7 +52,7 @@ struct WaitForMessageState {
     unsigned waitForMessageFlags;
     bool messageWaitingInterrupted = false;
 
-    std::unique_ptr<MessageDecoder> decoder;
+    std::unique_ptr<Decoder> decoder;
 };
 
 class Connection::SyncMessageState {
@@ -74,7 +74,7 @@ public:
 
     // Returns true if this message will be handled on a client thread that is currently
     // waiting for a reply to a synchronous message.
-    bool processIncomingMessage(Connection&, std::unique_ptr<MessageDecoder>&);
+    bool processIncomingMessage(Connection&, std::unique_ptr<Decoder>&);
 
     // Dispatch pending sync messages. if allowedConnection is not null, will only dispatch messages
     // from that connection and put the other messages back in the queue.
@@ -93,7 +93,7 @@ private:
 
     struct ConnectionAndIncomingMessage {
         Ref<Connection> connection;
-        std::unique_ptr<MessageDecoder> message;
+        std::unique_ptr<Decoder> message;
     };
     Vector<ConnectionAndIncomingMessage> m_messagesToDispatchWhileWaitingForSyncReply;
 };
@@ -101,7 +101,7 @@ private:
 class Connection::SecondaryThreadPendingSyncReply {
 public:
     // The reply decoder, will be null if there was an error processing the sync message on the other side.
-    std::unique_ptr<MessageDecoder> replyDecoder;
+    std::unique_ptr<Decoder> replyDecoder;
 
     BinarySemaphore semaphore;
 };
@@ -123,7 +123,7 @@ Connection::SyncMessageState::SyncMessageState()
 {
 }
 
-bool Connection::SyncMessageState::processIncomingMessage(Connection& connection, std::unique_ptr<MessageDecoder>& message)
+bool Connection::SyncMessageState::processIncomingMessage(Connection& connection, std::unique_ptr<Decoder>& message)
 {
     if (!message->shouldDispatchMessageWhenWaitingForSyncReply())
         return false;
@@ -268,7 +268,7 @@ void Connection::removeWorkQueueMessageReceiver(StringReference messageReceiverN
     });
 }
 
-void Connection::dispatchWorkQueueMessageReceiverMessage(WorkQueueMessageReceiver& workQueueMessageReceiver, MessageDecoder& decoder)
+void Connection::dispatchWorkQueueMessageReceiverMessage(WorkQueueMessageReceiver& workQueueMessageReceiver, Decoder& decoder)
 {
     if (!decoder.isSyncMessage()) {
         workQueueMessageReceiver.didReceiveMessage(*this, decoder);
@@ -388,7 +388,7 @@ std::chrono::milliseconds Connection::timeoutRespectingIgnoreTimeoutsForTesting(
     return m_ignoreTimeoutsForTesting ? std::chrono::milliseconds::max() : timeout;
 }
 
-std::unique_ptr<MessageDecoder> Connection::waitForMessage(StringReference messageReceiverName, StringReference messageName, uint64_t destinationID, std::chrono::milliseconds timeout, unsigned waitForMessageFlags)
+std::unique_ptr<Decoder> Connection::waitForMessage(StringReference messageReceiverName, StringReference messageName, uint64_t destinationID, std::chrono::milliseconds timeout, unsigned waitForMessageFlags)
 {
     ASSERT(RunLoop::isMain());
 
@@ -401,10 +401,10 @@ std::unique_ptr<MessageDecoder> Connection::waitForMessage(StringReference messa
         std::lock_guard<Lock> lock(m_incomingMessagesMutex);
 
         for (auto it = m_incomingMessages.begin(), end = m_incomingMessages.end(); it != end; ++it) {
-            std::unique_ptr<MessageDecoder>& message = *it;
+            std::unique_ptr<Decoder>& message = *it;
 
             if (message->messageReceiverName() == messageReceiverName && message->messageName() == messageName && message->destinationID() == destinationID) {
-                std::unique_ptr<MessageDecoder> returnedMessage = WTFMove(message);
+                std::unique_ptr<Decoder> returnedMessage = WTFMove(message);
 
                 m_incomingMessages.remove(it);
                 return returnedMessage;
@@ -459,7 +459,7 @@ std::unique_ptr<MessageDecoder> Connection::waitForMessage(StringReference messa
     return nullptr;
 }
 
-std::unique_ptr<MessageDecoder> Connection::sendSyncMessage(uint64_t syncRequestID, std::unique_ptr<Encoder> encoder, std::chrono::milliseconds timeout, unsigned syncSendFlags)
+std::unique_ptr<Decoder> Connection::sendSyncMessage(uint64_t syncRequestID, std::unique_ptr<Encoder> encoder, std::chrono::milliseconds timeout, unsigned syncSendFlags)
 {
     if (!RunLoop::isMain()) {
         // No flags are supported for synchronous messages sent from secondary threads.
@@ -495,7 +495,7 @@ std::unique_ptr<MessageDecoder> Connection::sendSyncMessage(uint64_t syncRequest
     // Then wait for a reply. Waiting for a reply could involve dispatching incoming sync messages, so
     // keep an extra reference to the connection here in case it's invalidated.
     Ref<Connection> protect(*this);
-    std::unique_ptr<MessageDecoder> reply = waitForSyncReply(syncRequestID, timeout, syncSendFlags);
+    std::unique_ptr<Decoder> reply = waitForSyncReply(syncRequestID, timeout, syncSendFlags);
 
     --m_inSendSyncCount;
 
@@ -512,7 +512,7 @@ std::unique_ptr<MessageDecoder> Connection::sendSyncMessage(uint64_t syncRequest
     return reply;
 }
 
-std::unique_ptr<MessageDecoder> Connection::sendSyncMessageFromSecondaryThread(uint64_t syncRequestID, std::unique_ptr<Encoder> encoder, std::chrono::milliseconds timeout)
+std::unique_ptr<Decoder> Connection::sendSyncMessageFromSecondaryThread(uint64_t syncRequestID, std::unique_ptr<Encoder> encoder, std::chrono::milliseconds timeout)
 {
     ASSERT(!RunLoop::isMain());
 
@@ -550,7 +550,7 @@ std::unique_ptr<MessageDecoder> Connection::sendSyncMessageFromSecondaryThread(u
     return WTFMove(pendingReply.replyDecoder);
 }
 
-std::unique_ptr<MessageDecoder> Connection::waitForSyncReply(uint64_t syncRequestID, std::chrono::milliseconds timeout, unsigned syncSendFlags)
+std::unique_ptr<Decoder> Connection::waitForSyncReply(uint64_t syncRequestID, std::chrono::milliseconds timeout, unsigned syncSendFlags)
 {
     timeout = timeoutRespectingIgnoreTimeoutsForTesting(timeout);
     double absoluteTime = currentTime() + (timeout.count() / 1000.0);
@@ -600,7 +600,7 @@ std::unique_ptr<MessageDecoder> Connection::waitForSyncReply(uint64_t syncReques
     return nullptr;
 }
 
-void Connection::processIncomingSyncReply(std::unique_ptr<MessageDecoder> decoder)
+void Connection::processIncomingSyncReply(std::unique_ptr<Decoder> decoder)
 {
     LockHolder locker(m_syncReplyStateMutex);
 
@@ -637,7 +637,7 @@ void Connection::processIncomingSyncReply(std::unique_ptr<MessageDecoder> decode
     // This can happen if the send timed out, so it's fine to ignore.
 }
 
-void Connection::processIncomingMessage(std::unique_ptr<MessageDecoder> message)
+void Connection::processIncomingMessage(std::unique_ptr<Decoder> message)
 {
     ASSERT(!message->messageReceiverName().isEmpty());
     ASSERT(!message->messageName().isEmpty());
@@ -820,7 +820,7 @@ void Connection::sendOutgoingMessages()
     }
 }
 
-void Connection::dispatchSyncMessage(MessageDecoder& decoder)
+void Connection::dispatchSyncMessage(Decoder& decoder)
 {
     ASSERT(decoder.isSyncMessage());
 
@@ -842,7 +842,7 @@ void Connection::dispatchSyncMessage(MessageDecoder& decoder)
             decoder.markInvalid();
             return;
         }
-        std::unique_ptr<MessageDecoder> unwrappedDecoder = MessageDecoder::unwrapForTesting(decoder);
+        std::unique_ptr<Decoder> unwrappedDecoder = Decoder::unwrapForTesting(decoder);
         RELEASE_ASSERT(unwrappedDecoder);
         processIncomingMessage(WTFMove(unwrappedDecoder));
 
@@ -877,7 +877,7 @@ void Connection::didFailToSendSyncMessage()
     exit(0);
 }
 
-void Connection::enqueueIncomingMessage(std::unique_ptr<MessageDecoder> incomingMessage)
+void Connection::enqueueIncomingMessage(std::unique_ptr<Decoder> incomingMessage)
 {
     {
         std::lock_guard<Lock> lock(m_incomingMessagesMutex);
@@ -889,12 +889,12 @@ void Connection::enqueueIncomingMessage(std::unique_ptr<MessageDecoder> incoming
     });
 }
 
-void Connection::dispatchMessage(MessageDecoder& decoder)
+void Connection::dispatchMessage(Decoder& decoder)
 {
     m_client->didReceiveMessage(*this, decoder);
 }
 
-void Connection::dispatchMessage(std::unique_ptr<MessageDecoder> message)
+void Connection::dispatchMessage(std::unique_ptr<Decoder> message)
 {
 #if HAVE(DTRACE)
     MessageRecorder::recordIncomingMessage(*this, *message);
@@ -943,7 +943,7 @@ void Connection::dispatchMessage(std::unique_ptr<MessageDecoder> message)
 
 void Connection::dispatchOneMessage()
 {
-    std::unique_ptr<MessageDecoder> message;
+    std::unique_ptr<Decoder> message;
 
     {
         std::lock_guard<Lock> lock(m_incomingMessagesMutex);
index 91351bc..95093c5 100644 (file)
@@ -28,8 +28,8 @@
 #pragma once
 
 #include "Arguments.h"
+#include "Decoder.h"
 #include "Encoder.h"
-#include "MessageDecoder.h"
 #include "MessageReceiver.h"
 #include "ProcessType.h"
 #include <atomic>
@@ -174,8 +174,8 @@ public:
 
     std::unique_ptr<Encoder> createSyncMessageEncoder(StringReference messageReceiverName, StringReference messageName, uint64_t destinationID, uint64_t& syncRequestID);
     bool sendMessage(std::unique_ptr<Encoder>, unsigned messageSendFlags = 0, bool alreadyRecordedMessage = false);
-    std::unique_ptr<MessageDecoder> sendSyncMessage(uint64_t syncRequestID, std::unique_ptr<Encoder>, std::chrono::milliseconds timeout, unsigned syncSendFlags = 0);
-    std::unique_ptr<MessageDecoder> sendSyncMessageFromSecondaryThread(uint64_t syncRequestID, std::unique_ptr<Encoder>, std::chrono::milliseconds timeout);
+    std::unique_ptr<Decoder> sendSyncMessage(uint64_t syncRequestID, std::unique_ptr<Encoder>, std::chrono::milliseconds timeout, unsigned syncSendFlags = 0);
+    std::unique_ptr<Decoder> sendSyncMessageFromSecondaryThread(uint64_t syncRequestID, std::unique_ptr<Encoder>, std::chrono::milliseconds timeout);
     bool sendSyncReply(std::unique_ptr<Encoder>);
 
     void wakeUpRunLoop();
@@ -211,15 +211,15 @@ private:
     void platformInitialize(Identifier);
     void platformInvalidate();
     
-    std::unique_ptr<MessageDecoder> waitForMessage(StringReference messageReceiverName, StringReference messageName, uint64_t destinationID, std::chrono::milliseconds timeout, unsigned waitForMessageFlags);
+    std::unique_ptr<Decoder> waitForMessage(StringReference messageReceiverName, StringReference messageName, uint64_t destinationID, std::chrono::milliseconds timeout, unsigned waitForMessageFlags);
     
-    std::unique_ptr<MessageDecoder> waitForSyncReply(uint64_t syncRequestID, std::chrono::milliseconds timeout, unsigned syncSendFlags);
+    std::unique_ptr<Decoder> waitForSyncReply(uint64_t syncRequestID, std::chrono::milliseconds timeout, unsigned syncSendFlags);
 
     // Called on the connection work queue.
-    void processIncomingMessage(std::unique_ptr<MessageDecoder>);
-    void processIncomingSyncReply(std::unique_ptr<MessageDecoder>);
+    void processIncomingMessage(std::unique_ptr<Decoder>);
+    void processIncomingSyncReply(std::unique_ptr<Decoder>);
 
-    void dispatchWorkQueueMessageReceiverMessage(WorkQueueMessageReceiver&, MessageDecoder&);
+    void dispatchWorkQueueMessageReceiverMessage(WorkQueueMessageReceiver&, Decoder&);
 
     bool canSendOutgoingMessages() const;
     bool platformCanSendOutgoingMessages() const;
@@ -229,14 +229,14 @@ private:
     
     // Called on the listener thread.
     void dispatchOneMessage();
-    void dispatchMessage(std::unique_ptr<MessageDecoder>);
-    void dispatchMessage(MessageDecoder&);
-    void dispatchSyncMessage(MessageDecoder&);
+    void dispatchMessage(std::unique_ptr<Decoder>);
+    void dispatchMessage(Decoder&);
+    void dispatchSyncMessage(Decoder&);
     void dispatchDidReceiveInvalidMessage(const CString& messageReceiverNameString, const CString& messageNameString);
     void didFailToSendSyncMessage();
 
     // Can be called on any thread.
-    void enqueueIncomingMessage(std::unique_ptr<MessageDecoder>);
+    void enqueueIncomingMessage(std::unique_ptr<Decoder>);
 
     void willSendSyncMessage(unsigned syncSendFlags);
     void didReceiveSyncReply(unsigned syncSendFlags);
@@ -266,7 +266,7 @@ private:
 
     // Incoming messages.
     Lock m_incomingMessagesMutex;
-    Deque<std::unique_ptr<MessageDecoder>> m_incomingMessages;
+    Deque<std::unique_ptr<Decoder>> m_incomingMessages;
 
     // Outgoing messages.
     Lock m_outgoingMessagesMutex;
@@ -284,7 +284,7 @@ private:
 
         // The reply decoder, will be null if there was an error processing the sync
         // message on the other side.
-        std::unique_ptr<MessageDecoder> replyDecoder;
+        std::unique_ptr<Decoder> replyDecoder;
 
         // Will be set to true once a reply has been received.
         bool didReceiveReply;
@@ -384,7 +384,7 @@ template<typename T> bool Connection::sendSync(T&& message, typename T::Reply&&
     encoder->encode(message.arguments());
 
     // Now send the message and wait for a reply.
-    std::unique_ptr<MessageDecoder> replyDecoder = sendSyncMessage(syncRequestID, WTFMove(encoder), timeout, syncSendFlags);
+    std::unique_ptr<Decoder> replyDecoder = sendSyncMessage(syncRequestID, WTFMove(encoder), timeout, syncSendFlags);
     if (!replyDecoder)
         return false;
 
@@ -394,7 +394,7 @@ template<typename T> bool Connection::sendSync(T&& message, typename T::Reply&&
 
 template<typename T> bool Connection::waitForAndDispatchImmediately(uint64_t destinationID, std::chrono::milliseconds timeout, unsigned waitForMessageFlags)
 {
-    std::unique_ptr<MessageDecoder> decoder = waitForMessage(T::receiverName(), T::name(), destinationID, timeout, waitForMessageFlags);
+    std::unique_ptr<Decoder> decoder = waitForMessage(T::receiverName(), T::name(), destinationID, timeout, waitForMessageFlags);
     if (!decoder)
         return false;
 
index ef6c1dd..9bdec4f 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "DataReference.h"
 
-#include "ArgumentDecoder.h"
+#include "Decoder.h"
 #include "Encoder.h"
 
 namespace IPC {
@@ -36,7 +36,7 @@ void DataReference::encode(Encoder& encoder) const
     encoder.encodeVariableLengthByteArray(*this);
 }
 
-bool DataReference::decode(ArgumentDecoder& decoder, DataReference& dataReference)
+bool DataReference::decode(Decoder& decoder, DataReference& dataReference)
 {
     return decoder.decodeVariableLengthByteArray(dataReference);
 }
index c22e64f..fb57591 100644 (file)
@@ -31,7 +31,7 @@
 
 namespace IPC {
 
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
     
 class DataReference {
@@ -74,7 +74,7 @@ public:
     }
 
     virtual void encode(Encoder&) const;
-    static bool decode(ArgumentDecoder&, DataReference&);
+    static bool decode(Decoder&, DataReference&);
 
     virtual ~DataReference() { }
 
similarity index 68%
rename from Source/WebKit2/Platform/IPC/ArgumentDecoder.cpp
rename to Source/WebKit2/Platform/IPC/Decoder.cpp
index 97dce46..2fa3f68 100644 (file)
  */
 
 #include "config.h"
-#include "ArgumentDecoder.h"
+#include "Decoder.h"
 
 #include "DataReference.h"
+#include "MessageFlags.h"
 #include <stdio.h>
 
-namespace IPC {
+#if PLATFORM(MAC)
+#include "ImportanceAssertion.h"
+#endif
 
-ArgumentDecoder::ArgumentDecoder(const uint8_t* buffer, size_t bufferSize)
-{
-    initialize(buffer, bufferSize);
-}
+namespace IPC {
 
-ArgumentDecoder::ArgumentDecoder(const uint8_t* buffer, size_t bufferSize, Vector<Attachment> attachments)
+Decoder::Decoder(const DataReference& buffer, Vector<Attachment> attachments)
 {
-    initialize(buffer, bufferSize);
+    initialize(buffer.data(), buffer.size());
 
     m_attachments = WTFMove(attachments);
+
+    if (!decode(m_messageFlags))
+        return;
+
+    if (!decode(m_messageReceiverName))
+        return;
+
+    if (!decode(m_messageName))
+        return;
+
+    if (!decode(m_destinationID))
+        return;
 }
 
-ArgumentDecoder::~ArgumentDecoder()
+Decoder::~Decoder()
 {
     ASSERT(m_buffer);
     fastFree(m_buffer);
     // FIXME: We need to dispose of the mach ports in cases of failure.
+
+#if HAVE(QOS_CLASSES)
+    if (m_qosClassOverride)
+        pthread_override_qos_class_end_np(m_qosClassOverride);
+#endif
+}
+
+bool Decoder::isSyncMessage() const
+{
+    return m_messageFlags & SyncMessage;
+}
+
+bool Decoder::shouldDispatchMessageWhenWaitingForSyncReply() const
+{
+    return m_messageFlags & DispatchMessageWhenWaitingForSyncReply;
+}
+
+bool Decoder::shouldUseFullySynchronousModeForTesting() const
+{
+    return m_messageFlags & UseFullySynchronousModeForTesting;
+}
+
+#if PLATFORM(MAC)
+void Decoder::setImportanceAssertion(std::unique_ptr<ImportanceAssertion> assertion)
+{
+    m_importanceAssertion = WTFMove(assertion);
+}
+#endif
+
+std::unique_ptr<Decoder> Decoder::unwrapForTesting(Decoder& decoder)
+{
+    ASSERT(decoder.isSyncMessage());
+
+    Vector<Attachment> attachments;
+    Attachment attachment;
+    while (decoder.removeAttachment(attachment))
+        attachments.append(WTFMove(attachment));
+    attachments.reverse();
+
+    DataReference wrappedMessage;
+    if (!decoder.decode(wrappedMessage))
+        return nullptr;
+
+    return std::make_unique<Decoder>(wrappedMessage, WTFMove(attachments));
 }
 
 static inline uint8_t* roundUpToAlignment(uint8_t* ptr, unsigned alignment)
@@ -59,7 +115,7 @@ static inline uint8_t* roundUpToAlignment(uint8_t* ptr, unsigned alignment)
     return reinterpret_cast<uint8_t*>((reinterpret_cast<uintptr_t>(ptr) + alignmentMask) & ~alignmentMask);
 }
 
-void ArgumentDecoder::initialize(const uint8_t* buffer, size_t bufferSize)
+void Decoder::initialize(const uint8_t* buffer, size_t bufferSize)
 {
     m_buffer = static_cast<uint8_t*>(fastMalloc(bufferSize));
 
@@ -75,7 +131,7 @@ static inline bool alignedBufferIsLargeEnoughToContain(const uint8_t* alignedPos
     return bufferEnd >= alignedPosition && static_cast<size_t>(bufferEnd - alignedPosition) >= size;
 }
 
-bool ArgumentDecoder::alignBufferPosition(unsigned alignment, size_t size)
+bool Decoder::alignBufferPosition(unsigned alignment, size_t size)
 {
     uint8_t* alignedPosition = roundUpToAlignment(m_bufferPos, alignment);
     if (!alignedBufferIsLargeEnoughToContain(alignedPosition, m_bufferEnd, size)) {
@@ -88,12 +144,12 @@ bool ArgumentDecoder::alignBufferPosition(unsigned alignment, size_t size)
     return true;
 }
 
-bool ArgumentDecoder::bufferIsLargeEnoughToContain(unsigned alignment, size_t size) const
+bool Decoder::bufferIsLargeEnoughToContain(unsigned alignment, size_t size) const
 {
     return alignedBufferIsLargeEnoughToContain(roundUpToAlignment(m_bufferPos, alignment), m_bufferEnd, size);
 }
 
-bool ArgumentDecoder::decodeFixedLengthData(uint8_t* data, size_t size, unsigned alignment)
+bool Decoder::decodeFixedLengthData(uint8_t* data, size_t size, unsigned alignment)
 {
     if (!alignBufferPosition(alignment, size))
         return false;
@@ -104,7 +160,7 @@ bool ArgumentDecoder::decodeFixedLengthData(uint8_t* data, size_t size, unsigned
     return true;
 }
 
-bool ArgumentDecoder::decodeVariableLengthByteArray(DataReference& dataReference)
+bool Decoder::decodeVariableLengthByteArray(DataReference& dataReference)
 {
     uint64_t size;
     if (!decode(size))
@@ -127,7 +183,7 @@ static void decodeValueFromBuffer(Type& value, uint8_t*& bufferPosition)
     bufferPosition += sizeof(Type);
 }
 
-bool ArgumentDecoder::decode(bool& result)
+bool Decoder::decode(bool& result)
 {
     if (!alignBufferPosition(sizeof(result), sizeof(result)))
         return false;
@@ -136,7 +192,7 @@ bool ArgumentDecoder::decode(bool& result)
     return true;
 }
 
-bool ArgumentDecoder::decode(uint8_t& result)
+bool Decoder::decode(uint8_t& result)
 {
     if (!alignBufferPosition(sizeof(result), sizeof(result)))
         return false;
@@ -145,7 +201,7 @@ bool ArgumentDecoder::decode(uint8_t& result)
     return true;
 }
 
-bool ArgumentDecoder::decode(uint16_t& result)
+bool Decoder::decode(uint16_t& result)
 {
     if (!alignBufferPosition(sizeof(result), sizeof(result)))
         return false;
@@ -154,7 +210,7 @@ bool ArgumentDecoder::decode(uint16_t& result)
     return true;
 }
 
-bool ArgumentDecoder::decode(uint32_t& result)
+bool Decoder::decode(uint32_t& result)
 {
     if (!alignBufferPosition(sizeof(result), sizeof(result)))
         return false;
@@ -163,7 +219,7 @@ bool ArgumentDecoder::decode(uint32_t& result)
     return true;
 }
 
-bool ArgumentDecoder::decode(uint64_t& result)
+bool Decoder::decode(uint64_t& result)
 {
     if (!alignBufferPosition(sizeof(result), sizeof(result)))
         return false;
@@ -172,7 +228,7 @@ bool ArgumentDecoder::decode(uint64_t& result)
     return true;
 }
 
-bool ArgumentDecoder::decode(int32_t& result)
+bool Decoder::decode(int32_t& result)
 {
     if (!alignBufferPosition(sizeof(result), sizeof(result)))
         return false;
@@ -181,7 +237,7 @@ bool ArgumentDecoder::decode(int32_t& result)
     return true;
 }
 
-bool ArgumentDecoder::decode(int64_t& result)
+bool Decoder::decode(int64_t& result)
 {
     if (!alignBufferPosition(sizeof(result), sizeof(result)))
         return false;
@@ -190,7 +246,7 @@ bool ArgumentDecoder::decode(int64_t& result)
     return true;
 }
 
-bool ArgumentDecoder::decode(float& result)
+bool Decoder::decode(float& result)
 {
     if (!alignBufferPosition(sizeof(result), sizeof(result)))
         return false;
@@ -199,7 +255,7 @@ bool ArgumentDecoder::decode(float& result)
     return true;
 }
 
-bool ArgumentDecoder::decode(double& result)
+bool Decoder::decode(double& result)
 {
     if (!alignBufferPosition(sizeof(result), sizeof(result)))
         return false;
@@ -208,7 +264,7 @@ bool ArgumentDecoder::decode(double& result)
     return true;
 }
 
-bool ArgumentDecoder::removeAttachment(Attachment& attachment)
+bool Decoder::removeAttachment(Attachment& attachment)
 {
     if (m_attachments.isEmpty())
         return false;
similarity index 72%
rename from Source/WebKit2/Platform/IPC/ArgumentDecoder.h
rename to Source/WebKit2/Platform/IPC/Decoder.h
index 0ca0c19..b06618e 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef ArgumentDecoder_h
-#define ArgumentDecoder_h
+#pragma once
 
 #include "ArgumentCoder.h"
 #include "Attachment.h"
+#include "StringReference.h"
 #include <wtf/Vector.h>
 
+#if HAVE(QOS_CLASSES)
+#include <pthread/qos.h>
+#endif
+
 namespace IPC {
 
 class DataReference;
-    
-class ArgumentDecoder {
+class ImportanceAssertion;
+
+class Decoder {
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    ArgumentDecoder(const uint8_t* buffer, size_t bufferSize);
-    virtual ~ArgumentDecoder();
+    Decoder(const DataReference& buffer, Vector<Attachment>);
+    ~Decoder();
+
+    StringReference messageReceiverName() const { return m_messageReceiverName; }
+    StringReference messageName() const { return m_messageName; }
+    uint64_t destinationID() const { return m_destinationID; }
+
+    bool isSyncMessage() const;
+    bool shouldDispatchMessageWhenWaitingForSyncReply() const;
+    bool shouldUseFullySynchronousModeForTesting() const;
+
+#if PLATFORM(MAC)
+    void setImportanceAssertion(std::unique_ptr<ImportanceAssertion>);
+#endif
+
+#if HAVE(QOS_CLASSES)
+    void setQOSClassOverride(pthread_override_t override) { m_qosClassOverride = override; }
+#endif
+
+    static std::unique_ptr<Decoder> unwrapForTesting(Decoder&);
 
     size_t length() const { return m_bufferEnd - m_buffer; }
 
@@ -92,12 +115,10 @@ public:
     bool removeAttachment(Attachment&);
 
 protected:
-    ArgumentDecoder(const uint8_t* buffer, size_t bufferSize, Vector<Attachment>);
-
     void initialize(const uint8_t* buffer, size_t bufferSize);
 
-    bool alignBufferPosition(unsigned alignment, size_t size);
-    bool bufferIsLargeEnoughToContain(unsigned alignment, size_t size) const;
+    bool alignBufferPosition(unsigned alignment, size_t);
+    bool bufferIsLargeEnoughToContain(unsigned alignment, size_t) const;
 
 private:
     uint8_t* m_buffer;
@@ -105,8 +126,21 @@ private:
     uint8_t* m_bufferEnd;
 
     Vector<Attachment> m_attachments;
+
+    uint8_t m_messageFlags;
+    StringReference m_messageReceiverName;
+    StringReference m_messageName;
+
+    uint64_t m_destinationID;
+
+
+#if PLATFORM(MAC)
+    std::unique_ptr<ImportanceAssertion> m_importanceAssertion;
+#endif
+
+#if HAVE(QOS_CLASSES)
+    pthread_override_t m_qosClassOverride { nullptr };
+#endif
 };
 
 } // namespace IPC
-
-#endif // ArgumentDecoder_h
index cc526db..ece41db 100644 (file)
@@ -2,8 +2,8 @@
 #define HandleMessage_h
 
 #include "Arguments.h"
+#include "Decoder.h"
 #include "Encoder.h"
-#include "MessageDecoder.h"
 #include <wtf/StdLibExtras.h>
 
 namespace IPC {
@@ -81,7 +81,7 @@ void callMemberFunction(Connection& connection, ArgsTuple&& args, ReplyArgsTuple
 // Main dispatch functions
 
 template<typename T, typename C, typename MF>
-void handleMessage(MessageDecoder& decoder, C* object, MF function)
+void handleMessage(Decoder& decoder, C* object, MF function)
 {
     typename T::DecodeType arguments;
     if (!decoder.decode(arguments)) {
@@ -93,7 +93,7 @@ void handleMessage(MessageDecoder& decoder, C* object, MF function)
 }
 
 template<typename T, typename C, typename MF>
-void handleMessage(MessageDecoder& decoder, Encoder& replyEncoder, C* object, MF function)
+void handleMessage(Decoder& decoder, Encoder& replyEncoder, C* object, MF function)
 {
     typename T::DecodeType arguments;
     if (!decoder.decode(arguments)) {
@@ -107,7 +107,7 @@ void handleMessage(MessageDecoder& decoder, Encoder& replyEncoder, C* object, MF
 }
 
 template<typename T, typename C, typename MF>
-void handleMessage(Connection& connection, MessageDecoder& decoder, Encoder& replyEncoder, C* object, MF function)
+void handleMessage(Connection& connection, Decoder& decoder, Encoder& replyEncoder, C* object, MF function)
 {
     typename T::DecodeType arguments;
     if (!decoder.decode(arguments)) {
@@ -121,7 +121,7 @@ void handleMessage(Connection& connection, MessageDecoder& decoder, Encoder& rep
 }
 
 template<typename T, typename C, typename MF>
-void handleMessage(Connection& connection, MessageDecoder& decoder, C* object, MF function)
+void handleMessage(Connection& connection, Decoder& decoder, C* object, MF function)
 {
     typename T::DecodeType arguments;
     if (!decoder.decode(arguments)) {
@@ -132,7 +132,7 @@ void handleMessage(Connection& connection, MessageDecoder& decoder, C* object, M
 }
 
 template<typename T, typename C, typename MF>
-void handleMessageDelayed(Connection& connection, MessageDecoder& decoder, std::unique_ptr<Encoder>& replyEncoder, C* object, MF function)
+void handleMessageDelayed(Connection& connection, Decoder& decoder, std::unique_ptr<Encoder>& replyEncoder, C* object, MF function)
 {
     typename T::DecodeType arguments;
     if (!decoder.decode(arguments)) {
diff --git a/Source/WebKit2/Platform/IPC/MessageDecoder.cpp b/Source/WebKit2/Platform/IPC/MessageDecoder.cpp
deleted file mode 100644 (file)
index 4779f46..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2012 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 "MessageDecoder.h"
-
-#include "ArgumentCoders.h"
-#include "DataReference.h"
-#include "MessageFlags.h"
-#include "StringReference.h"
-
-#if PLATFORM(MAC)
-#include "ImportanceAssertion.h"
-#endif
-
-namespace IPC {
-
-MessageDecoder::~MessageDecoder()
-{
-#if HAVE(QOS_CLASSES)
-    if (m_qosClassOverride)
-        pthread_override_qos_class_end_np(m_qosClassOverride);
-#endif
-}
-
-MessageDecoder::MessageDecoder(const DataReference& buffer, Vector<Attachment> attachments)
-    : ArgumentDecoder(buffer.data(), buffer.size(), WTFMove(attachments))
-{
-    if (!decode(m_messageFlags))
-        return;
-
-    if (!decode(m_messageReceiverName))
-        return;
-
-    if (!decode(m_messageName))
-        return;
-
-    if (!decode(m_destinationID))
-        return;
-#if HAVE(DTRACE)
-    decode(m_UUID);
-#endif
-}
-
-bool MessageDecoder::isSyncMessage() const
-{
-    return m_messageFlags & SyncMessage;
-}
-
-bool MessageDecoder::shouldDispatchMessageWhenWaitingForSyncReply() const
-{
-    return m_messageFlags & DispatchMessageWhenWaitingForSyncReply;
-}
-
-bool MessageDecoder::shouldUseFullySynchronousModeForTesting() const
-{
-    return m_messageFlags & UseFullySynchronousModeForTesting;
-}
-
-#if PLATFORM(MAC)
-void MessageDecoder::setImportanceAssertion(std::unique_ptr<ImportanceAssertion> assertion)
-{
-    m_importanceAssertion = WTFMove(assertion);
-}
-#endif
-
-std::unique_ptr<MessageDecoder> MessageDecoder::unwrapForTesting(MessageDecoder& decoder)
-{
-    ASSERT(decoder.isSyncMessage());
-
-    Vector<Attachment> attachments;
-    Attachment attachment;
-    while (decoder.removeAttachment(attachment))
-        attachments.append(WTFMove(attachment));
-    attachments.reverse();
-
-    DataReference wrappedMessage;
-    if (!decoder.decode(wrappedMessage))
-        return nullptr;
-
-    return std::make_unique<MessageDecoder>(wrappedMessage, WTFMove(attachments));
-}
-
-} // namespace IPC
diff --git a/Source/WebKit2/Platform/IPC/MessageDecoder.h b/Source/WebKit2/Platform/IPC/MessageDecoder.h
deleted file mode 100644 (file)
index 39c560d..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2012 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 MessageDecoder_h
-#define MessageDecoder_h
-
-#include "ArgumentDecoder.h"
-#include "MessageRecorder.h"
-#include "StringReference.h"
-
-#if HAVE(DTRACE)
-#include <uuid/uuid.h>
-#endif
-
-#if HAVE(QOS_CLASSES)
-#include <pthread/qos.h>
-#endif
-
-namespace IPC {
-
-class DataReference;
-class ImportanceAssertion;
-
-class MessageDecoder : public ArgumentDecoder {
-public:
-    MessageDecoder(const DataReference& buffer, Vector<Attachment>);
-    virtual ~MessageDecoder();
-
-    StringReference messageReceiverName() const { return m_messageReceiverName; }
-    StringReference messageName() const { return m_messageName; }
-    uint64_t destinationID() const { return m_destinationID; }
-
-    bool isSyncMessage() const;
-    bool shouldDispatchMessageWhenWaitingForSyncReply() const;
-    bool shouldUseFullySynchronousModeForTesting() const;
-
-#if PLATFORM(MAC)
-    void setImportanceAssertion(std::unique_ptr<ImportanceAssertion>);
-#endif
-
-#if HAVE(QOS_CLASSES)
-    void setQOSClassOverride(pthread_override_t override) { m_qosClassOverride = override; }
-#endif
-
-#if HAVE(DTRACE)
-    void setMessageProcessingToken(std::unique_ptr<MessageRecorder::MessageProcessingToken> token) { m_processingToken = WTFMove(token); }
-
-    const uuid_t& UUID() const { return m_UUID; }
-#endif
-
-    static std::unique_ptr<MessageDecoder> unwrapForTesting(MessageDecoder&);
-
-private:
-    uint8_t m_messageFlags;
-    StringReference m_messageReceiverName;
-    StringReference m_messageName;
-
-    uint64_t m_destinationID;
-
-#if HAVE(DTRACE)
-    uuid_t m_UUID;
-    std::unique_ptr<MessageRecorder::MessageProcessingToken> m_processingToken;
-#endif
-
-#if PLATFORM(MAC)
-    std::unique_ptr<ImportanceAssertion> m_importanceAssertion;
-#endif
-
-#if HAVE(QOS_CLASSES)
-    pthread_override_t m_qosClassOverride { nullptr };
-#endif
-};
-
-} // namespace IPC
-
-#endif // MessageDecoder_h
index 5974214..ef890c1 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef MessageReceiver_h
-#define MessageReceiver_h
+#pragma once
 
 #include <wtf/Assertions.h>
 
 namespace IPC {
 
 class Connection;
+class Decoder;
 class Encoder;
-class MessageDecoder;
 
 class MessageReceiver {
 public:
@@ -41,8 +40,8 @@ public:
         ASSERT(!m_messageReceiverMapCount);
     }
 
-    virtual void didReceiveMessage(Connection&, MessageDecoder&) = 0;
-    virtual void didReceiveSyncMessage(Connection&, MessageDecoder&, std::unique_ptr<Encoder>&)
+    virtual void didReceiveMessage(Connection&, Decoder&) = 0;
+    virtual void didReceiveSyncMessage(Connection&, Decoder&, std::unique_ptr<Encoder>&)
     {
         ASSERT_NOT_REACHED();
     }
@@ -71,5 +70,3 @@ private:
 };
 
 } // namespace IPC
-
-#endif // MessageReceiver_h
index 1d0d2de..aa5eba8 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "MessageReceiverMap.h"
 
-#include "MessageDecoder.h"
+#include "Decoder.h"
 #include "MessageReceiver.h"
 
 namespace IPC {
@@ -110,7 +110,7 @@ void MessageReceiverMap::invalidate()
     m_messageReceivers.clear();
 }
 
-bool MessageReceiverMap::dispatchMessage(Connection& connection, MessageDecoder& decoder)
+bool MessageReceiverMap::dispatchMessage(Connection& connection, Decoder& decoder)
 {
     if (MessageReceiver* messageReceiver = m_globalMessageReceivers.get(decoder.messageReceiverName())) {
         ASSERT(!decoder.destinationID());
@@ -127,7 +127,7 @@ bool MessageReceiverMap::dispatchMessage(Connection& connection, MessageDecoder&
     return false;
 }
 
-bool MessageReceiverMap::dispatchSyncMessage(Connection& connection, MessageDecoder& decoder, std::unique_ptr<Encoder>& replyEncoder)
+bool MessageReceiverMap::dispatchSyncMessage(Connection& connection, Decoder& decoder, std::unique_ptr<Encoder>& replyEncoder)
 {
     if (MessageReceiver* messageReceiver = m_globalMessageReceivers.get(decoder.messageReceiverName())) {
         ASSERT(!decoder.destinationID());
index 95bbf32..4fc7512 100644 (file)
@@ -34,7 +34,7 @@ namespace IPC {
 
 class Connection;
 class Encoder;
-class MessageDecoder;
+class Decoder;
 class MessageReceiver;
 
 class MessageReceiverMap {
@@ -51,8 +51,8 @@ public:
 
     void invalidate();
 
-    bool dispatchMessage(Connection&, MessageDecoder&);
-    bool dispatchSyncMessage(Connection&, MessageDecoder&, std::unique_ptr<Encoder>&);
+    bool dispatchMessage(Connection&, Decoder&);
+    bool dispatchSyncMessage(Connection&, Decoder&, std::unique_ptr<Encoder>&);
 
 private:
     // Message receivers that don't require a destination ID.
index 463966a..2d8f3df 100644 (file)
@@ -69,7 +69,7 @@ std::unique_ptr<MessageRecorder::MessageProcessingToken> MessageRecorder::record
     return std::make_unique<MessageProcessingToken>(WTFMove(record));
 }
 
-void MessageRecorder::recordIncomingMessage(Connection& connection, MessageDecoder& decoder)
+void MessageRecorder::recordIncomingMessage(Connection& connection, Decoder& decoder)
 {
     if (!isEnabled() || !connection.isValid())
         return;
index 15ec05d..968fff9 100644 (file)
@@ -59,7 +59,7 @@ struct WebKitMessageRecord {
 namespace IPC {
 
 class Connection;
-class MessageDecoder;
+class Decoder;
 class MessageEncoder;
 
 class MessageRecorder {
@@ -77,7 +77,7 @@ public:
     };
 
     static std::unique_ptr<MessageRecorder::MessageProcessingToken> recordOutgoingMessage(IPC::Connection&, IPC::Encoder&);
-    static void recordIncomingMessage(IPC::Connection&, IPC::MessageDecoder&);
+    static void recordIncomingMessage(IPC::Connection&, IPC::Decoder&);
 
 private:
     explicit MessageRecorder() { }
index 821519f..852ef43 100644 (file)
@@ -26,8 +26,8 @@
 #include "config.h"
 #include "StringReference.h"
 
-#include "ArgumentDecoder.h"
 #include "DataReference.h"
+#include "Decoder.h"
 #include "Encoder.h"
 #include <wtf/Hasher.h>
 #include <wtf/text/CString.h>
@@ -44,7 +44,7 @@ void StringReference::encode(Encoder& encoder) const
     encoder << DataReference(reinterpret_cast<const uint8_t*>(m_data), m_size);
 }
 
-bool StringReference::decode(ArgumentDecoder& decoder, StringReference& result)
+bool StringReference::decode(Decoder& decoder, StringReference& result)
 {
     DataReference dataReference;
     if (!decoder.decode(dataReference))
index dae06bd..e98e911 100644 (file)
@@ -33,7 +33,7 @@
 namespace IPC {
 
 class Encoder;
-class ArgumentDecoder;
+class Decoder;
 
 class StringReference {
 public:
@@ -69,7 +69,7 @@ public:
     }
 
     void encode(Encoder&) const;
-    static bool decode(ArgumentDecoder&, StringReference&);
+    static bool decode(Decoder&, StringReference&);
 
     struct Hash {
         static unsigned hash(const StringReference& a);
index 35a4ec7..b5fdcb6 100644 (file)
@@ -382,14 +382,14 @@ void Connection::initializeDeadNameSource()
     });
 }
 
-static std::unique_ptr<MessageDecoder> createMessageDecoder(mach_msg_header_t* header)
+static std::unique_ptr<Decoder> createMessageDecoder(mach_msg_header_t* header)
 {
     if (!(header->msgh_bits & MACH_MSGH_BITS_COMPLEX)) {
         // We have a simple message.
         uint8_t* body = reinterpret_cast<uint8_t*>(header + 1);
         size_t bodySize = header->msgh_size - sizeof(mach_msg_header_t);
 
-        return std::make_unique<MessageDecoder>(DataReference(body, bodySize), Vector<Attachment>());
+        return std::make_unique<Decoder>(DataReference(body, bodySize), Vector<Attachment>());
     }
 
     bool messageBodyIsOOL = header->msgh_id & MessageBodyIsOutOfLine;
@@ -428,7 +428,7 @@ static std::unique_ptr<MessageDecoder> createMessageDecoder(mach_msg_header_t* h
         uint8_t* messageBody = static_cast<uint8_t*>(descriptor->out_of_line.address);
         size_t messageBodySize = descriptor->out_of_line.size;
 
-        auto decoder = std::make_unique<MessageDecoder>(DataReference(messageBody, messageBodySize), WTFMove(attachments));
+        auto decoder = std::make_unique<Decoder>(DataReference(messageBody, messageBodySize), WTFMove(attachments));
 
         vm_deallocate(mach_task_self(), reinterpret_cast<vm_address_t>(descriptor->out_of_line.address), descriptor->out_of_line.size);
 
@@ -438,7 +438,7 @@ static std::unique_ptr<MessageDecoder> createMessageDecoder(mach_msg_header_t* h
     uint8_t* messageBody = descriptorData;
     size_t messageBodySize = header->msgh_size - (descriptorData - reinterpret_cast<uint8_t*>(header));
 
-    return std::make_unique<MessageDecoder>(DataReference(messageBody, messageBodySize), attachments);
+    return std::make_unique<Decoder>(DataReference(messageBody, messageBodySize), attachments);
 }
 
 // The receive buffer size should always include the maximum trailer size.
@@ -493,7 +493,7 @@ void Connection::receiveSourceEventHandler()
         break;
     }
 
-    std::unique_ptr<MessageDecoder> decoder = createMessageDecoder(header);
+    std::unique_ptr<Decoder> decoder = createMessageDecoder(header);
     ASSERT(decoder);
 
 #if PLATFORM(MAC)
index 173688a..9144a05 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef MachPort_h
 #define MachPort_h
 
-#include "ArgumentDecoder.h"
 #include "Attachment.h"
+#include "Decoder.h"
 #include "Encoder.h"
 
 namespace IPC {
@@ -51,7 +51,7 @@ public:
         encoder << Attachment(m_port, m_disposition);
     }
 
-    static bool decode(ArgumentDecoder& decoder, MachPort& p)
+    static bool decode(Decoder& decoder, MachPort& p)
     {
         Attachment attachment;
         if (!decoder.decode(attachment))
index 9a45be0..0cc62dd 100644 (file)
@@ -36,7 +36,7 @@
 #endif
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
@@ -66,7 +66,7 @@ public:
         void clear();
 
         void encode(IPC::Encoder&) const;
-        static bool decode(IPC::ArgumentDecoder&, Handle&);
+        static bool decode(IPC::Decoder&, Handle&);
 
 #if USE(UNIX_DOMAIN_SOCKETS)
         IPC::Attachment releaseAttachment() const;
index c052a97..544fb99 100644 (file)
@@ -26,8 +26,7 @@
 #include "config.h"
 #include "SharedMemory.h"
 
-#include "ArgumentDecoder.h"
-#include "Arguments.h"
+#include "Decoder.h"
 #include "Encoder.h"
 #include "MachPort.h"
 #include <WebCore/MachSendRight.h>
@@ -71,7 +70,7 @@ void SharedMemory::Handle::encode(IPC::Encoder& encoder) const
     m_port = MACH_PORT_NULL;
 }
 
-bool SharedMemory::Handle::decode(IPC::ArgumentDecoder& decoder, Handle& handle)
+bool SharedMemory::Handle::decode(IPC::Decoder& decoder, Handle& handle)
 {
     ASSERT(!handle.m_port);
     ASSERT(!handle.m_size);
index 2d5b0b6..764d097 100644 (file)
@@ -62,8 +62,8 @@ public:
     bool initialize(const PluginCreationParameters&);
     void destroy();
 
-    void didReceivePluginControllerProxyMessage(IPC::Connection&, IPC::MessageDecoder&);
-    void didReceiveSyncPluginControllerProxyMessage(IPC::Connection&, IPC::MessageDecoder&, std::unique_ptr<IPC::Encoder>&);
+    void didReceivePluginControllerProxyMessage(IPC::Connection&, IPC::Decoder&);
+    void didReceiveSyncPluginControllerProxyMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&);
 
     bool wantsWheelEvents() const;
 
index 5dbaf13..ec27eed 100644 (file)
@@ -58,7 +58,7 @@ void PluginCreationParameters::encode(IPC::Encoder& encoder) const
     encoder << isAcceleratedCompositingEnabled;
 }
 
-bool PluginCreationParameters::decode(IPC::ArgumentDecoder& decoder, PluginCreationParameters& result)
+bool PluginCreationParameters::decode(IPC::Decoder& decoder, PluginCreationParameters& result)
 {
     if (!decoder.decode(result.pluginInstanceID) || !result.pluginInstanceID)
         return false;
index cc444f4..c375168 100644 (file)
@@ -31,8 +31,8 @@
 #include "Plugin.h"
 
 namespace IPC {
-    class ArgumentDecoder;
-    class Encoder;
+class Decoder;
+class Encoder;
 }
 
 namespace WebKit {
@@ -41,7 +41,7 @@ struct PluginCreationParameters {
     PluginCreationParameters();
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, PluginCreationParameters&);
+    static bool decode(IPC::Decoder&, PluginCreationParameters&);
 
     // The unique ID of this plug-in instance.
     uint64_t pluginInstanceID;
index 61e66f0..f1307b3 100644 (file)
@@ -110,7 +110,7 @@ bool PluginProcess::shouldTerminate()
     return m_webProcessConnections.isEmpty();
 }
 
-void PluginProcess::didReceiveMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder)
+void PluginProcess::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
 {
     didReceivePluginProcessMessage(connection, decoder);
 }
index 9be5b4a..7d2ddd6 100644 (file)
@@ -88,14 +88,14 @@ private:
 #endif
 
     // IPC::Connection::Client
-    void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
+    void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
     void didClose(IPC::Connection&) override;
     void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
     IPC::ProcessType localProcessType() override { return IPC::ProcessType::Plugin; }
     IPC::ProcessType remoteProcessType() override { return IPC::ProcessType::UI; }
 
     // Message handlers.
-    void didReceivePluginProcessMessage(IPC::Connection&, IPC::MessageDecoder&);
+    void didReceivePluginProcessMessage(IPC::Connection&, IPC::Decoder&);
     void initializePluginProcess(PluginProcessCreationParameters&&);
     void createWebProcessConnection();
 
index 8f16028..10075cd 100644 (file)
@@ -118,7 +118,7 @@ void WebProcessConnection::setGlobalException(const String& exceptionString)
     currentConnection->sendSync(Messages::PluginProcessConnection::SetException(exceptionString), Messages::PluginProcessConnection::SetException::Reply(), 0);
 }
 
-void WebProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder)
+void WebProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
 {
     TemporaryChange<IPC::Connection*> currentConnectionChange(currentConnection, &connection);
 
@@ -140,7 +140,7 @@ void WebProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::M
     pluginControllerProxy->didReceivePluginControllerProxyMessage(connection, decoder);
 }
 
-void WebProcessConnection::didReceiveSyncMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::Encoder>& replyEncoder)
+void WebProcessConnection::didReceiveSyncMessage(IPC::Connection& connection, IPC::Decoder& decoder, std::unique_ptr<IPC::Encoder>& replyEncoder)
 {
     TemporaryChange<IPC::Connection*> currentConnectionChange(currentConnection, &connection);
 
index 3c13bdd..19929f3 100644 (file)
@@ -65,16 +65,16 @@ private:
     void destroyPluginControllerProxy(PluginControllerProxy*);
 
     // IPC::Connection::Client
-    void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
-    void didReceiveSyncMessage(IPC::Connection&, IPC::MessageDecoder&, std::unique_ptr<IPC::Encoder>&) override;
+    void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
+    void didReceiveSyncMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&) override;
     void didClose(IPC::Connection&) override;
     void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
     IPC::ProcessType localProcessType() override { return IPC::ProcessType::Plugin; }
     IPC::ProcessType remoteProcessType() override { return IPC::ProcessType::Web; }
 
     // Message handlers.
-    void didReceiveWebProcessConnectionMessage(IPC::Connection&, IPC::MessageDecoder&);
-    void didReceiveSyncWebProcessConnectionMessage(IPC::Connection&, IPC::MessageDecoder&, std::unique_ptr<IPC::Encoder>&);
+    void didReceiveWebProcessConnectionMessage(IPC::Connection&, IPC::Decoder&);
+    void didReceiveSyncWebProcessConnectionMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&);
     void createPlugin(const PluginCreationParameters&, PassRefPtr<Messages::WebProcessConnection::CreatePlugin::DelayedReply>);
     void createPluginAsynchronously(const PluginCreationParameters&);
     void destroyPlugin(uint64_t pluginInstanceID, bool asynchronousCreationIncomplete, PassRefPtr<Messages::WebProcessConnection::DestroyPlugin::DelayedReply>);
index 4b09955..cb16a1a 100644 (file)
@@ -404,7 +404,7 @@ def generate_message_handler(file):
     header_conditions = {
         '"%s"' % messages_header_filename(receiver): [None],
         '"HandleMessage.h"': [None],
-        '"MessageDecoder.h"': [None],
+        '"Decoder.h"': [None],
     }
 
     type_conditions = {}
@@ -520,7 +520,7 @@ def generate_message_handler(file):
             async_messages.append(message)
 
     if async_messages:
-        result.append('void %s::didReceive%sMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder)\n' % (receiver.name, receiver.name if receiver.has_attribute(LEGACY_RECEIVER_ATTRIBUTE) else ''))
+        result.append('void %s::didReceive%sMessage(IPC::Connection& connection, IPC::Decoder& decoder)\n' % (receiver.name, receiver.name if receiver.has_attribute(LEGACY_RECEIVER_ATTRIBUTE) else ''))
         result.append('{\n')
         result += [async_message_statement(receiver, message) for message in async_messages]
         if (receiver.superclass):
@@ -533,7 +533,7 @@ def generate_message_handler(file):
 
     if sync_messages:
         result.append('\n')
-        result.append('void %s::didReceiveSync%sMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::Encoder>& replyEncoder)\n' % (receiver.name, receiver.name if receiver.has_attribute(LEGACY_RECEIVER_ATTRIBUTE) else ''))
+        result.append('void %s::didReceiveSync%sMessage(IPC::Connection& connection, IPC::Decoder& decoder, std::unique_ptr<IPC::Encoder>& replyEncoder)\n' % (receiver.name, receiver.name if receiver.has_attribute(LEGACY_RECEIVER_ATTRIBUTE) else ''))
         result.append('{\n')
         result += [sync_message_statement(receiver, message) for message in sync_messages]
         result.append('    UNUSED_PARAM(connection);\n')
index 983750a..61343bd 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "APIData.h"
 
-#include "ArgumentDecoder.h"
+#include "Decoder.h"
 #include "Encoder.h"
 
 namespace API {
@@ -36,7 +36,7 @@ void Data::encode(IPC::Encoder& encoder) const
     encoder << dataReference();
 }
 
-bool Data::decode(IPC::ArgumentDecoder& decoder, RefPtr<API::Object>& result)
+bool Data::decode(IPC::Decoder& decoder, RefPtr<API::Object>& result)
 {
     IPC::DataReference dataReference;
     if (!decoder.decode(dataReference))
index 18f01d0..066fa44 100644 (file)
@@ -32,7 +32,7 @@
 #include <wtf/Vector.h>
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
@@ -81,7 +81,7 @@ public:
     IPC::DataReference dataReference() const { return IPC::DataReference(m_bytes, m_size); }
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, RefPtr<API::Object>&);
+    static bool decode(IPC::Decoder&, RefPtr<API::Object>&);
 
 private:
     Data(const unsigned char* bytes, size_t size, FreeDataFunction freeDataFunction, const void* context)
index d85f943..839fb0f 100644 (file)
@@ -43,7 +43,7 @@ void Error::encode(IPC::Encoder& encoder) const
     encoder << platformError();
 }
 
-bool Error::decode(IPC::ArgumentDecoder& decoder, RefPtr<Object>& result)
+bool Error::decode(IPC::Decoder& decoder, RefPtr<Object>& result)
 {
     WebCore::ResourceError error;
     if (!decoder.decode(error))
index 3a09571..8c36027 100644 (file)
@@ -30,7 +30,7 @@
 #include <WebCore/ResourceError.h>
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
@@ -58,7 +58,7 @@ public:
     const WebCore::ResourceError& platformError() const { return m_platformError; }
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, RefPtr<Object>&);
+    static bool decode(IPC::Decoder&, RefPtr<Object>&);
 
 private:
     Error()
index 8a32000..79646ac 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "APIFrameHandle.h"
 
-#include "ArgumentDecoder.h"
+#include "Decoder.h"
 #include "Encoder.h"
 
 namespace API {
@@ -57,7 +57,7 @@ void FrameHandle::encode(IPC::Encoder& encoder) const
     encoder << m_isAutoconverting;
 }
 
-bool FrameHandle::decode(IPC::ArgumentDecoder& decoder, RefPtr<Object>& result)
+bool FrameHandle::decode(IPC::Decoder& decoder, RefPtr<Object>& result)
 {
     uint64_t frameID;
     if (!decoder.decode(frameID))
index 227f984..b10e808 100644 (file)
@@ -30,7 +30,7 @@
 #include <wtf/Ref.h>
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
@@ -48,7 +48,7 @@ public:
     bool isAutoconverting() const { return m_isAutoconverting; }
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, RefPtr<Object>&);
+    static bool decode(IPC::Decoder&, RefPtr<Object>&);
 
 private:
     const uint64_t m_frameID;
index eafa732..3d8cb61 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "APIGeometry.h"
 
-#include "ArgumentDecoder.h"
+#include "Decoder.h"
 #include "Encoder.h"
 
 namespace API {
@@ -37,7 +37,7 @@ void Point::encode(IPC::Encoder& encoder) const
     encoder << m_point.y;
 }
 
-bool Point::decode(IPC::ArgumentDecoder& decoder, RefPtr<API::Object>& result)
+bool Point::decode(IPC::Decoder& decoder, RefPtr<API::Object>& result)
 {
     WKPoint point;
     if (!decoder.decode(point.x))
@@ -56,7 +56,7 @@ void Size::encode(IPC::Encoder& encoder) const
     encoder << m_size.height;
 }
 
-bool Size::decode(IPC::ArgumentDecoder& decoder, RefPtr<API::Object>& result)
+bool Size::decode(IPC::Decoder& decoder, RefPtr<API::Object>& result)
 {
     WKSize size;
     if (!decoder.decode(size.width))
@@ -77,7 +77,7 @@ void Rect::encode(IPC::Encoder& encoder) const
     encoder << m_rect.size.height;
 }
 
-bool Rect::decode(IPC::ArgumentDecoder& decoder, RefPtr<API::Object>& result)
+bool Rect::decode(IPC::Decoder& decoder, RefPtr<API::Object>& result)
 {
     WKRect rect;
     if (!decoder.decode(rect.origin.x))
index c9c1d18..0ff94cc 100644 (file)
@@ -31,7 +31,7 @@
 #include <WebCore/FloatRect.h>
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
@@ -47,7 +47,7 @@ public:
     const WKSize& size() const { return m_size; }
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, RefPtr<API::Object>&);
+    static bool decode(IPC::Decoder&, RefPtr<API::Object>&);
 
 private:
     explicit Size(const WKSize& size)
@@ -68,7 +68,7 @@ public:
     const WKPoint& point() const { return m_point; }
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, RefPtr<API::Object>&);
+    static bool decode(IPC::Decoder&, RefPtr<API::Object>&);
 
 private:
     explicit Point(const WKPoint& point)
@@ -88,7 +88,7 @@ public:
     const WKRect& rect() const { return m_rect; }
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, RefPtr<API::Object>&);
+    static bool decode(IPC::Decoder&, RefPtr<API::Object>&);
 
 private:
     explicit Rect(const WKRect& rect)
index 4a4a987..fe57349 100644 (file)
@@ -27,7 +27,7 @@
 #define APINumber_h
 
 #include "APIObject.h"
-#include "ArgumentDecoder.h"
+#include "Decoder.h"
 #include "Encoder.h"
 
 namespace API {
@@ -47,7 +47,7 @@ public:
         encoder << m_value;
     }
 
-    static bool decode(IPC::ArgumentDecoder& decoder, RefPtr<Object>& result)
+    static bool decode(IPC::Decoder& decoder, RefPtr<Object>& result)
     {
         NumberType value;
         if (!decoder.decode(value))
index d115c51..c8fd224 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "APIPageGroupHandle.h"
 
-#include "ArgumentDecoder.h"
+#include "Decoder.h"
 #include "Encoder.h"
 
 namespace API {
@@ -50,7 +50,7 @@ void PageGroupHandle::encode(IPC::Encoder& encoder) const
     encoder << m_webPageGroupData;
 }
 
-bool PageGroupHandle::decode(IPC::ArgumentDecoder& decoder, RefPtr<Object>& result)
+bool PageGroupHandle::decode(IPC::Decoder& decoder, RefPtr<Object>& result)
 {
     WebKit::WebPageGroupData webPageGroupData;
     if (!decoder.decode(webPageGroupData))
index bc032c9..eaca5df 100644 (file)
@@ -31,7 +31,7 @@
 #include <wtf/RefPtr.h>
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
@@ -45,7 +45,7 @@ public:
     const WebKit::WebPageGroupData& webPageGroupData() const { return m_webPageGroupData; }
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, RefPtr<Object>&);
+    static bool decode(IPC::Decoder&, RefPtr<Object>&);
 
 private:
     explicit PageGroupHandle(WebKit::WebPageGroupData&&);
index dcb0849..a6a0099 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "APIPageHandle.h"
 
-#include "ArgumentDecoder.h"
+#include "Decoder.h"
 #include "Encoder.h"
 
 namespace API {
@@ -57,7 +57,7 @@ void PageHandle::encode(IPC::Encoder& encoder) const
     encoder << m_isAutoconverting;
 }
 
-bool PageHandle::decode(IPC::ArgumentDecoder& decoder, RefPtr<Object>& result)
+bool PageHandle::decode(IPC::Decoder& decoder, RefPtr<Object>& result)
 {
     uint64_t pageID;
     if (!decoder.decode(pageID))
index 42f83c7..f30fafb 100644 (file)
@@ -30,7 +30,7 @@
 #include <wtf/Ref.h>
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
@@ -46,7 +46,7 @@ public:
     bool isAutoconverting() const { return m_isAutoconverting; }
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, RefPtr<Object>&);
+    static bool decode(IPC::Decoder&, RefPtr<Object>&);
 
 private:
     explicit PageHandle(uint64_t pageID, bool isAutoconverting);
index d4760f5..57251aa 100644 (file)
@@ -90,7 +90,7 @@ public:
         encoder << m_string;
     }
 
-    static bool decode(IPC::ArgumentDecoder& decoder, RefPtr<Object>& result)
+    static bool decode(IPC::Decoder& decoder, RefPtr<Object>& result)
     {
         WTF::String string;
         if (!decoder.decode(string))
index d07df56..ac904d4 100644 (file)
@@ -58,7 +58,7 @@ void URLRequest::encode(IPC::Encoder& encoder) const
     encoder << resourceRequest();
 }
 
-bool URLRequest::decode(IPC::ArgumentDecoder& decoder, RefPtr<Object>& result)
+bool URLRequest::decode(IPC::Decoder& decoder, RefPtr<Object>& result)
 {
     ResourceRequest request;
     if (!decoder.decode(request))
index f272575..2a01602 100644 (file)
@@ -31,7 +31,7 @@
 #include <wtf/Forward.h>
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
@@ -50,7 +50,7 @@ public:
     static void setDefaultTimeoutInterval(double);
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, RefPtr<Object>&);
+    static bool decode(IPC::Decoder&, RefPtr<Object>&);
 
 private:
     explicit URLRequest(const WebCore::ResourceRequest&);
index 412ccf8..1d93b62 100644 (file)
@@ -42,7 +42,7 @@ void URLResponse::encode(IPC::Encoder& encoder) const
     encoder << resourceResponse();
 }
 
-bool URLResponse::decode(IPC::ArgumentDecoder& decoder, RefPtr<Object>& result)
+bool URLResponse::decode(IPC::Decoder& decoder, RefPtr<Object>& result)
 {
     ResourceResponse response;
     if (!decoder.decode(response))
index c18abed..125e037 100644 (file)
@@ -31,7 +31,7 @@
 #include <wtf/Forward.h>
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
@@ -47,7 +47,7 @@ public:
     const WebCore::ResourceResponse& resourceResponse() const { return m_response; }
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, RefPtr<Object>&);
+    static bool decode(IPC::Decoder&, RefPtr<Object>&);
 
 private:
     explicit URLResponse(const WebCore::ResourceResponse&);
index 1870d36..48a700f 100644 (file)
@@ -31,7 +31,7 @@
 
 namespace IPC {
 class Encoder;
-class ArgumentDecoder;
+class Decoder;
 }
 
 namespace WebKit {
@@ -58,7 +58,7 @@ public:
     const ReplyInfo* replyInfo() const { return m_replyInfo.get(); }
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, RemoteObjectInvocation&);
+    static bool decode(IPC::Decoder&, RemoteObjectInvocation&);
 
 private:
     String m_interfaceIdentifier;
index 576474e..2592847 100644 (file)
@@ -56,7 +56,7 @@ void RemoteObjectInvocation::encode(IPC::Encoder& encoder) const
     encoder << m_replyInfo->blockSignature;
 }
 
-bool RemoteObjectInvocation::decode(IPC::ArgumentDecoder& decoder, RemoteObjectInvocation& result)
+bool RemoteObjectInvocation::decode(IPC::Decoder& decoder, RemoteObjectInvocation& result)
 {
     if (!decoder.decode(result.m_interfaceIdentifier))
         return false;
index e5f365d..12f96f4 100644 (file)
@@ -50,7 +50,7 @@ public:
 
 private:
     // IPC::MessageReceiver
-    void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
+    void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
 
     // Message handlers
     void invokeMethod(const RemoteObjectInvocation&);
index cbc110c..829911a 100644 (file)
@@ -41,7 +41,7 @@ void OptionItem::encode(IPC::Encoder& encoder) const
     encoder << parentGroupID;
 }
 
-bool OptionItem::decode(IPC::ArgumentDecoder& decoder, OptionItem& result)
+bool OptionItem::decode(IPC::Decoder& decoder, OptionItem& result)
 {
     if (!decoder.decode(result.text))
         return false;
@@ -88,7 +88,7 @@ void AssistedNodeInformation::encode(IPC::Encoder& encoder) const
     encoder.encodeEnum(autofillFieldName);
 }
 
-bool AssistedNodeInformation::decode(IPC::ArgumentDecoder& decoder, AssistedNodeInformation& result)
+bool AssistedNodeInformation::decode(IPC::Decoder& decoder, AssistedNodeInformation& result)
 {
     if (!decoder.decode(result.elementRect))
         return false;
index 1900d19..dee6639 100644 (file)
@@ -83,7 +83,7 @@ struct OptionItem {
     int parentGroupID { 0 };
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, OptionItem&);
+    static bool decode(IPC::Decoder&, OptionItem&);
 };
 
 struct AssistedNodeInformation {
@@ -112,7 +112,7 @@ struct AssistedNodeInformation {
     WebCore::AutofillFieldName autofillFieldName { WebCore::AutofillFieldName::None };
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, AssistedNodeInformation&);
+    static bool decode(IPC::Decoder&, AssistedNodeInformation&);
 };
 #endif
 
index 8855f45..cb17d75 100644 (file)
@@ -92,7 +92,7 @@ private:
     };
     
     // IPC::MessageReceiver
-    void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
+    void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
 
     bool tryUseCertificateInfoForChallenge(const WebCore::AuthenticationChallenge&, const WebCore::CertificateInfo&, const ChallengeCompletionHandler&);
 
index 5f4e4ba..a06e349 100644 (file)
@@ -101,7 +101,7 @@ protected:
     static void stopNSAppRunLoop();
 #endif
 
-    void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
+    void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
 
 private:
     // IPC::MessageSender
index 0a40d06..27443ce 100644 (file)
@@ -38,7 +38,7 @@ struct DataDetectionResult {
     RetainPtr<NSArray> results;
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, DataDetectionResult&);
+    static bool decode(IPC::Decoder&, DataDetectionResult&);
 };
 
 }
index 21ca6be..522a348 100644 (file)
@@ -50,7 +50,7 @@ void DataDetectionResult::encode(IPC::Encoder& encoder) const
     IPC::encode(encoder, reinterpret_cast<CFDataRef>(data.get()));        
 }
 
-bool DataDetectionResult::decode(IPC::ArgumentDecoder& decoder, DataDetectionResult& result)
+bool DataDetectionResult::decode(IPC::Decoder& decoder, DataDetectionResult& result)
 {
     RetainPtr<CFDataRef> data;
     if (!IPC::decode(decoder, data))
index f9630de..8170f22 100644 (file)
@@ -38,7 +38,7 @@ void LoadParameters::platformEncode(IPC::Encoder& encoder) const
     IPC::encode(encoder, dataDetectionContext.get());
 }
 
-bool LoadParameters::platformDecode(IPC::ArgumentDecoder& decoder, LoadParameters& data)
+bool LoadParameters::platformDecode(IPC::Decoder& decoder, LoadParameters& data)
 {
     if (!IPC::decode(decoder, data.dataDetectionContext))
         return false;
index 531b8fc..37b2d71 100644 (file)
@@ -60,7 +60,7 @@ void ArgumentCoder<WebCore::Payment>::encode(Encoder& encoder, const WebCore::Pa
     encoder << DataReference(static_cast<const uint8_t*>([data bytes]), [data length]);
 }
 
-bool ArgumentCoder<WebCore::Payment>::decode(ArgumentDecoder& decoder, WebCore::Payment& payment)
+bool ArgumentCoder<WebCore::Payment>::decode(Decoder& decoder, WebCore::Payment& payment)
 {
     IPC::DataReference dataReference;
     if (!decoder.decode(dataReference))
@@ -94,7 +94,7 @@ void ArgumentCoder<WebCore::PaymentContact>::encode(Encoder& encoder, const WebC
     encoder << DataReference(static_cast<const uint8_t*>([data bytes]), [data length]);
 }
 
-bool ArgumentCoder<WebCore::PaymentContact>::decode(ArgumentDecoder& decoder, WebCore::PaymentContact& paymentContact)
+bool ArgumentCoder<WebCore::PaymentContact>::decode(Decoder& decoder, WebCore::PaymentContact& paymentContact)
 {
     IPC::DataReference dataReference;
     if (!decoder.decode(dataReference))
@@ -128,7 +128,7 @@ void ArgumentCoder<WebCore::PaymentMerchantSession>::encode(Encoder& encoder, co
     encoder << DataReference(static_cast<const uint8_t*>([data bytes]), [data length]);
 }
 
-bool ArgumentCoder<WebCore::PaymentMerchantSession>::decode(ArgumentDecoder& decoder, WebCore::PaymentMerchantSession& paymentMerchantSession)
+bool ArgumentCoder<WebCore::PaymentMerchantSession>::decode(Decoder& decoder, WebCore::PaymentMerchantSession& paymentMerchantSession)
 {
     IPC::DataReference dataReference;
     if (!decoder.decode(dataReference))
@@ -163,7 +163,7 @@ void ArgumentCoder<WebCore::PaymentMethod>::encode(Encoder& encoder, const WebCo
     encoder << DataReference(static_cast<const uint8_t*>([data bytes]), [data length]);
 }
 
-bool ArgumentCoder<WebCore::PaymentMethod>::decode(ArgumentDecoder& decoder, WebCore::PaymentMethod& paymentMethod)
+bool ArgumentCoder<WebCore::PaymentMethod>::decode(Decoder& decoder, WebCore::PaymentMethod& paymentMethod)
 {
     IPC::DataReference dataReference;
     if (!decoder.decode(dataReference))
@@ -201,7 +201,7 @@ void ArgumentCoder<PaymentRequest>::encode(Encoder& encoder, const PaymentReques
     encoder << request.applicationData();
 }
 
-bool ArgumentCoder<PaymentRequest>::decode(ArgumentDecoder& decoder, PaymentRequest& request)
+bool ArgumentCoder<PaymentRequest>::decode(Decoder& decoder, PaymentRequest& request)
 {
     String countryCode;
     if (!decoder.decode(countryCode))
@@ -279,7 +279,7 @@ void ArgumentCoder<PaymentRequest::ContactFields>::encode(Encoder& encoder, cons
     encoder << contactFields.name;
 }
 
-bool ArgumentCoder<PaymentRequest::ContactFields>::decode(ArgumentDecoder& decoder, PaymentRequest::ContactFields& contactFields)
+bool ArgumentCoder<PaymentRequest::ContactFields>::decode(Decoder& decoder, PaymentRequest::ContactFields& contactFields)
 {
     if (!decoder.decode(contactFields.postalAddress))
         return false;
@@ -300,7 +300,7 @@ void ArgumentCoder<PaymentRequest::LineItem>::encode(Encoder& encoder, const Pay
     encoder << lineItem.amount;
 }
 
-bool ArgumentCoder<PaymentRequest::LineItem>::decode(ArgumentDecoder& decoder, PaymentRequest::LineItem& lineItem)
+bool ArgumentCoder<PaymentRequest::LineItem>::decode(Decoder& decoder, PaymentRequest::LineItem& lineItem)
 {
     if (!decoder.decodeEnum(lineItem.type))
         return false;
@@ -320,7 +320,7 @@ void ArgumentCoder<PaymentRequest::MerchantCapabilities>::encode(Encoder& encode
     encoder << merchantCapabilities.supportsDebit;
 }
 
-bool ArgumentCoder<PaymentRequest::MerchantCapabilities>::decode(ArgumentDecoder& decoder, PaymentRequest::MerchantCapabilities& merchantCapabilities)
+bool ArgumentCoder<PaymentRequest::MerchantCapabilities>::decode(Decoder& decoder, PaymentRequest::MerchantCapabilities& merchantCapabilities)
 {
     if (!decoder.decode(merchantCapabilities.supports3DS))
         return false;
@@ -342,7 +342,7 @@ void ArgumentCoder<PaymentRequest::ShippingMethod>::encode(Encoder& encoder, con
     encoder << shippingMethod.identifier;
 }
 
-bool ArgumentCoder<PaymentRequest::ShippingMethod>::decode(ArgumentDecoder& decoder, PaymentRequest::ShippingMethod& shippingMethod)
+bool ArgumentCoder<PaymentRequest::ShippingMethod>::decode(Decoder& decoder, PaymentRequest::ShippingMethod& shippingMethod)
 {
     if (!decoder.decode(shippingMethod.label))
         return false;
@@ -361,7 +361,7 @@ void ArgumentCoder<PaymentRequest::TotalAndLineItems>::encode(Encoder& encoder,
     encoder << totalAndLineItems.lineItems;
 }
 
-bool ArgumentCoder<PaymentRequest::TotalAndLineItems>::decode(ArgumentDecoder& decoder, PaymentRequest::TotalAndLineItems& totalAndLineItems)
+bool ArgumentCoder<PaymentRequest::TotalAndLineItems>::decode(Decoder& decoder, PaymentRequest::TotalAndLineItems& totalAndLineItems)
 {
     if (!decoder.decode(totalAndLineItems.total))
         return false;
index 1bbfd65..39bdb32 100644 (file)
@@ -89,7 +89,7 @@ void ContextMenuContextData::encode(IPC::Encoder& encoder) const
 #endif
 }
 
-bool ContextMenuContextData::decode(IPC::ArgumentDecoder& decoder, ContextMenuContextData& result)
+bool ContextMenuContextData::decode(IPC::Decoder& decoder, ContextMenuContextData& result)
 {
     if (!decoder.decodeEnum(result.m_type))
         return false;
index a1b6afc..734973a 100644 (file)
@@ -34,7 +34,7 @@
 #include "WebHitTestResultData.h"
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
@@ -80,7 +80,7 @@ public:
 #endif
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, ContextMenuContextData&);
+    static bool decode(IPC::Decoder&, ContextMenuContextData&);
 
 private:
     Type m_type;
index c4bf427..e433201 100644 (file)
@@ -44,7 +44,7 @@ void DatabaseProcessCreationParameters::encode(IPC::Encoder& encoder) const
 #endif
 }
 
-bool DatabaseProcessCreationParameters::decode(IPC::ArgumentDecoder& decoder, DatabaseProcessCreationParameters& result)
+bool DatabaseProcessCreationParameters::decode(IPC::Decoder& decoder, DatabaseProcessCreationParameters& result)
 {
 #if ENABLE(INDEXED_DATABASE)
     if (!decoder.decode(result.indexedDatabaseDirectory))
index 988ee5d..0d450f8 100644 (file)
@@ -33,7 +33,7 @@
 #if ENABLE(DATABASE_PROCESS)
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
@@ -43,7 +43,7 @@ struct DatabaseProcessCreationParameters {
     DatabaseProcessCreationParameters();
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, DatabaseProcessCreationParameters&);
+    static bool decode(IPC::Decoder&, DatabaseProcessCreationParameters&);
 
 #if ENABLE(INDEXED_DATABASE)
     String indexedDatabaseDirectory;
index b2d2b65..a0ec81a 100644 (file)
@@ -38,7 +38,7 @@ void WebIDBResult::encode(IPC::Encoder& encoder) const
     m_handles.encode(encoder);
 }
 
-bool WebIDBResult::decode(IPC::ArgumentDecoder& decoder, WebIDBResult& result)
+bool WebIDBResult::decode(IPC::Decoder& decoder, WebIDBResult& result)
 {
     if (!WebCore::IDBResultData::decode(decoder, result.m_resultData))
         return false;
index 7f2b455..777b8e2 100644 (file)
@@ -55,7 +55,7 @@ public:
     const SandboxExtension::HandleArray& handles() const { return m_handles; }
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, WebIDBResult&);
+    static bool decode(IPC::Decoder&, WebIDBResult&);
 
 private:
     WebCore::IDBResultData m_resultData;
index 84abe80..b486d1f 100644 (file)
@@ -55,7 +55,7 @@ void EditorState::encode(IPC::Encoder& encoder) const
 #endif
 }
 
-bool EditorState::decode(IPC::ArgumentDecoder& decoder, EditorState& result)
+bool EditorState::decode(IPC::Decoder& decoder, EditorState& result)
 {
     if (!decoder.decode(result.shouldIgnoreCompositionSelectionChange))
         return false;
@@ -134,7 +134,7 @@ void EditorState::PostLayoutData::encode(IPC::Encoder& encoder) const
 #endif
 }
 
-bool EditorState::PostLayoutData::decode(IPC::ArgumentDecoder& decoder, PostLayoutData& result)
+bool EditorState::PostLayoutData::decode(IPC::Decoder& decoder, PostLayoutData& result)
 {
     if (!decoder.decode(result.typingAttributes))
         return false;
index 993ca4a..ddd0243 100644 (file)
@@ -107,7 +107,7 @@ struct EditorState {
 #endif
 
         void encode(IPC::Encoder&) const;
-        static bool decode(IPC::ArgumentDecoder&, PostLayoutData&);
+        static bool decode(IPC::Decoder&, PostLayoutData&);
     };
 
     const PostLayoutData& postLayoutData() const;
@@ -115,7 +115,7 @@ struct EditorState {
 #endif // PLATFORM(IOS) || PLATFORM(GTK) || PLATFORM(MAC)
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, EditorState&);
+    static bool decode(IPC::Decoder&, EditorState&);
 
 #if PLATFORM(IOS) || PLATFORM(GTK) || PLATFORM(MAC)
 private:
index 4ada7a5..2eb9af4 100644 (file)
@@ -45,7 +45,7 @@ void FontInfo::encode(IPC::Encoder& encoder) const
 #endif
 }
 
-bool FontInfo::decode(IPC::ArgumentDecoder& decoder, FontInfo& fontInfo)
+bool FontInfo::decode(IPC::Decoder& decoder, FontInfo& fontInfo)
 {    
 #if PLATFORM(COCOA)
     bool hasFontAttributeDictionary;
index 0803adf..3a69767 100644 (file)
 #endif
 
 namespace IPC {
-    class ArgumentDecoder;
-    class Encoder;
+class Decoder;
+class Encoder;
 }
 
 namespace WebKit {
     
 struct FontInfo {
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, FontInfo&);
+    static bool decode(IPC::Decoder&, FontInfo&);
     
 #if PLATFORM(COCOA)
     RetainPtr<CFDictionaryRef> fontAttributeDictionary;
index 6a1b003..262dcec 100644 (file)
@@ -38,7 +38,7 @@ void GamepadData::encode(IPC::Encoder& encoder) const
     encoder << index << axisValues << buttonValues;
 }
 
-bool GamepadData::decode(IPC::ArgumentDecoder& decoder, GamepadData& data)
+bool GamepadData::decode(IPC::Decoder& decoder, GamepadData& data)
 {
     if (!decoder.decode(data.index))
         return false;
index d746435..d900ef9 100644 (file)
@@ -31,7 +31,7 @@
 #include <wtf/text/WTFString.h>
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
@@ -39,7 +39,7 @@ namespace WebKit {
 
 struct GamepadData {
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, GamepadData&);
+    static bool decode(IPC::Decoder&, GamepadData&);
 
     bool isNull() const;
 
index 84313de..c3174dc 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "LayerTreeContext.h"
 
-#include "ArgumentDecoder.h"
+#include "Decoder.h"
 #include "Encoder.h"
 
 namespace WebKit {
@@ -45,7 +45,7 @@ void LayerTreeContext::encode(IPC::Encoder& encoder) const
     encoder << contextID;
 }
 
-bool LayerTreeContext::decode(IPC::ArgumentDecoder& decoder, LayerTreeContext& result)
+bool LayerTreeContext::decode(IPC::Decoder& decoder, LayerTreeContext& result)
 {
     if (!decoder.decode(result.contextID))
         return false;
index d654e41..47fb613 100644 (file)
@@ -29,7 +29,7 @@
 #include <stdint.h>
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
@@ -48,7 +48,7 @@ public:
     ~LayerTreeContext();
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, LayerTreeContext&);
+    static bool decode(IPC::Decoder&, LayerTreeContext&);
 
     bool isEmpty() const;
 
index 9f07a47..94a2145 100644 (file)
@@ -48,7 +48,7 @@ void LoadParameters::encode(IPC::Encoder& encoder) const
     platformEncode(encoder);
 }
 
-bool LoadParameters::decode(IPC::ArgumentDecoder& decoder, LoadParameters& data)
+bool LoadParameters::decode(IPC::Decoder& decoder, LoadParameters& data)
 {
     if (!decoder.decode(data.navigationID))
         return false;
@@ -98,7 +98,7 @@ void LoadParameters::platformEncode(IPC::Encoder&) const
 {
 }
 
-bool LoadParameters::platformDecode(IPC::ArgumentDecoder&, LoadParameters&)
+bool LoadParameters::platformDecode(IPC::Decoder&, LoadParameters&)
 {
     return true;
 }
index 47bf3c9..d926175 100644 (file)
@@ -34,7 +34,7 @@
 OBJC_CLASS NSDictionary;
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
@@ -42,10 +42,10 @@ namespace WebKit {
 
 struct LoadParameters {
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, LoadParameters&);
+    static bool decode(IPC::Decoder&, LoadParameters&);
 
     void platformEncode(IPC::Encoder&) const;
-    static bool platformDecode(IPC::ArgumentDecoder&, LoadParameters&);
+    static bool platformDecode(IPC::Decoder&, LoadParameters&);
 
     uint64_t navigationID;
 
index ed5c7ee..e31286d 100644 (file)
@@ -27,7 +27,7 @@
 #include "NavigationActionData.h"
 
 #include "ArgumentCoders.h"
-#include "ArgumentDecoder.h"
+#include "Decoder.h"
 #include "Encoder.h"
 
 using namespace WebCore;
@@ -46,7 +46,7 @@ void NavigationActionData::encode(IPC::Encoder& encoder) const
     encoder << downloadAttribute;
 }
 
-bool NavigationActionData::decode(IPC::ArgumentDecoder& decoder, NavigationActionData& result)
+bool NavigationActionData::decode(IPC::Decoder& decoder, NavigationActionData& result)
 {
     if (!decoder.decodeEnum(result.navigationType))
         return false;
index 64c9391..10db63c 100644 (file)
@@ -30,7 +30,7 @@
 #include <WebCore/FrameLoaderTypes.h>
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
@@ -38,7 +38,7 @@ namespace WebKit {
 
 struct NavigationActionData {
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, NavigationActionData&);
+    static bool decode(IPC::Decoder&, NavigationActionData&);
 
     WebCore::NavigationType navigationType { WebCore::NavigationType::Other };
     WebEvent::Modifiers modifiers { };
index 5bee1f7..efa7976 100644 (file)
@@ -46,7 +46,7 @@ void PlatformPopupMenuData::encode(IPC::Encoder& encoder) const
 #endif
 }
 
-bool PlatformPopupMenuData::decode(IPC::ArgumentDecoder& decoder, PlatformPopupMenuData& data)
+bool PlatformPopupMenuData::decode(IPC::Decoder& decoder, PlatformPopupMenuData& data)
 {
 #if PLATFORM(COCOA)
     if (!decoder.decode(data.fontInfo))
index 7b99698..a156963 100644 (file)
@@ -32,8 +32,8 @@
 #include <wtf/text/WTFString.h>
 
 namespace IPC {
-    class ArgumentDecoder;
-    class Encoder;
+class Decoder;
+class Encoder;
 }
 
 namespace WebKit {
@@ -42,7 +42,7 @@ struct PlatformPopupMenuData {
     PlatformPopupMenuData();
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, PlatformPopupMenuData&);
+    static bool decode(IPC::Decoder&, PlatformPopupMenuData&);
 
 #if PLATFORM(COCOA)
     FontInfo fontInfo;
index 1016f26..93c3ce9 100644 (file)
@@ -28,7 +28,7 @@
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
 
-#include "ArgumentDecoder.h"
+#include "Decoder.h"
 #include "Encoder.h"
 #include "WebCoreArgumentCoders.h"
 #include <WebCore/IdentifierRep.h>
@@ -76,7 +76,7 @@ void NPIdentifierData::encode(IPC::Encoder& encoder) const
         encoder << m_number;
 }
 
-bool NPIdentifierData::decode(IPC::ArgumentDecoder& decoder, NPIdentifierData& result)
+bool NPIdentifierData::decode(IPC::Decoder& decoder, NPIdentifierData& result)
 {
     if (!decoder.decode(result.m_isString))
         return false;
index 24aaf6f..4f678a4 100644 (file)
@@ -32,8 +32,8 @@
 #include <wtf/text/CString.h>
 
 namespace IPC {
-    class ArgumentDecoder;
-    class Encoder;
+class Decoder;
+class Encoder;
 }
 
 namespace WebKit {
@@ -46,7 +46,7 @@ public:
     NPIdentifier createNPIdentifier() const;
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, NPIdentifierData&);
+    static bool decode(IPC::Decoder&, NPIdentifierData&);
 
 private:
     bool m_isString;
index 518e6a3..2759893 100644 (file)
@@ -46,7 +46,7 @@ public:
     NPObjectMessageReceiver(NPRemoteObjectMap*, Plugin*, uint64_t npObjectID, NPObject*);
     ~NPObjectMessageReceiver();
 
-    void didReceiveSyncNPObjectMessageReceiverMessage(IPC::Connection&, IPC::MessageDecoder&, std::unique_ptr<IPC::Encoder>&);
+    void didReceiveSyncNPObjectMessageReceiverMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&);
 
     Plugin* plugin() const { return m_plugin; }
     NPObject* npObject() const { return m_npObject; }
index 90d9908..61e1f94 100644 (file)
@@ -217,7 +217,7 @@ void NPRemoteObjectMap::pluginDestroyed(Plugin* plugin)
     }
 }
 
-void NPRemoteObjectMap::didReceiveSyncMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::Encoder>& replyEncoder)
+void NPRemoteObjectMap::didReceiveSyncMessage(IPC::Connection& connection, IPC::Decoder& decoder, std::unique_ptr<IPC::Encoder>& replyEncoder)
 {
     NPObjectMessageReceiver* messageReceiver = m_registeredNPObjects.get(decoder.destinationID());
     if (!messageReceiver)
index 127e4b6..ed105a7 100644 (file)
@@ -61,7 +61,7 @@ public:
 
     void pluginDestroyed(Plugin*);
 
-    void didReceiveSyncMessage(IPC::Connection&, IPC::MessageDecoder&, std::unique_ptr<IPC::Encoder>&);
+    void didReceiveSyncMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&);
 
 private:
     explicit NPRemoteObjectMap(IPC::Connection*);
index e373daa..d2e671b 100644 (file)
@@ -28,7 +28,7 @@
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
 
-#include "ArgumentDecoder.h"
+#include "Decoder.h"
 #include "Encoder.h"
 #include "WebCoreArgumentCoders.h"
 
@@ -147,7 +147,7 @@ void NPVariantData::encode(IPC::Encoder& encoder) const
     }
 }
 
-bool NPVariantData::decode(IPC::ArgumentDecoder& decoder, NPVariantData& result)
+bool NPVariantData::decode(IPC::Decoder& decoder, NPVariantData& result)
 {
     uint32_t type;
     if (!decoder.decode(type))
index 3bc5932..2c5f2c9 100644 (file)
@@ -31,8 +31,8 @@
 #include <wtf/text/CString.h>
 
 namespace IPC {
-    class ArgumentDecoder;
-    class Encoder;
+class Decoder;
+class Encoder;
 }
 
 namespace WebKit {
@@ -99,7 +99,7 @@ public:
     }
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, NPVariantData&);
+    static bool decode(IPC::Decoder&, NPVariantData&);
 
 private:
     uint32_t m_type;
index a3cd4c3..3988e8c 100644 (file)
@@ -56,7 +56,7 @@ void PluginProcessCreationParameters::encode(IPC::Encoder& encoder) const
 #endif
 }
 
-bool PluginProcessCreationParameters::decode(IPC::ArgumentDecoder& decoder, PluginProcessCreationParameters& result)
+bool PluginProcessCreationParameters::decode(IPC::Decoder& decoder, PluginProcessCreationParameters& result)
 {
     if (!decoder.decodeEnum(result.processType))
         return false;
index a3270b7..a12a444 100644 (file)
@@ -36,7 +36,7 @@
 #endif
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
@@ -46,7 +46,7 @@ struct PluginProcessCreationParameters {
     PluginProcessCreationParameters();
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, PluginProcessCreationParameters&);
+    static bool decode(IPC::Decoder&, PluginProcessCreationParameters&);
 
     PluginProcessType processType;
     bool supportsAsynchronousPluginInitialization;
index a6b771f..21b15a3 100644 (file)
@@ -26,8 +26,7 @@
 #include "config.h"
 #include "PrintInfo.h"
 
-#include "ArgumentDecoder.h"
-#include "Arguments.h"
+#include "Decoder.h"
 #include "Encoder.h"
 
 #if PLATFORM(GTK)
@@ -56,7 +55,7 @@ void PrintInfo::encode(IPC::Encoder& encoder) const
 #endif
 }
 
-bool PrintInfo::decode(IPC::ArgumentDecoder& decoder, PrintInfo& info)
+bool PrintInfo::decode(IPC::Decoder& decoder, PrintInfo& info)
 {
     if (!decoder.decode(info.pageSetupScaleFactor))
         return false;
index b8f0422..0c86233 100644 (file)
@@ -38,8 +38,8 @@ class NSPrintInfo;
 #endif
 
 namespace IPC {
-    class ArgumentDecoder;
-    class Encoder;
+class Decoder;
+class Encoder;
 }
 
 namespace WebKit {
@@ -68,7 +68,7 @@ struct PrintInfo {
 #endif
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, PrintInfo&);
+    static bool decode(IPC::Decoder&, PrintInfo&);
 };
 
 }
index cb12531..e111551 100644 (file)
@@ -38,7 +38,7 @@ typedef struct __WKSandboxExtension* WKSandboxExtensionRef;
 
 namespace IPC {
 class Encoder;
-class ArgumentDecoder;
+class Decoder;
 }
 
 namespace WebKit {
@@ -58,7 +58,7 @@ public:
         ~Handle();
 
         void encode(IPC::Encoder&) const;
-        static bool decode(IPC::ArgumentDecoder&, Handle&);
+        static bool decode(IPC::Decoder&, Handle&);
 
     private:
         friend class SandboxExtension;
@@ -78,7 +78,7 @@ public:
         const Handle& operator[](size_t i) const;
         size_t size() const;
         void encode(IPC::Encoder&) const;
-        static bool decode(IPC::ArgumentDecoder&, HandleArray&);
+        static bool decode(IPC::Decoder&, HandleArray&);
        
     private:
 #if ENABLE(SANDBOX_EXTENSIONS)
@@ -114,7 +114,7 @@ private:
 inline SandboxExtension::Handle::Handle() { }
 inline SandboxExtension::Handle::~Handle() { }
 inline void SandboxExtension::Handle::encode(IPC::Encoder&) const { }
-inline bool SandboxExtension::Handle::decode(IPC::ArgumentDecoder&, Handle&) { return true; }
+inline bool SandboxExtension::Handle::decode(IPC::Decoder&, Handle&) { return true; }
 inline SandboxExtension::HandleArray::HandleArray() { }
 inline SandboxExtension::HandleArray::~HandleArray() { }
 inline void SandboxExtension::HandleArray::allocate(size_t) { }
@@ -122,7 +122,7 @@ inline size_t SandboxExtension::HandleArray::size() const { return 0; }
 inline const SandboxExtension::Handle& SandboxExtension::HandleArray::operator[](size_t) const { return m_emptyHandle; }
 inline SandboxExtension::Handle& SandboxExtension::HandleArray::operator[](size_t) { return m_emptyHandle; }
 inline void SandboxExtension::HandleArray::encode(IPC::Encoder&) const { }
-inline bool SandboxExtension::HandleArray::decode(IPC::ArgumentDecoder&, HandleArray&) { return true; }
+inline bool SandboxExtension::HandleArray::decode(IPC::Decoder&, HandleArray&) { return true; }
 inline RefPtr<SandboxExtension> SandboxExtension::create(const Handle&) { return nullptr; }
 inline bool SandboxExtension::createHandle(const String&, Type, Handle&) { return true; }
 inline bool SandboxExtension::createHandleForReadWriteDirectory(const String&, Handle&) { return true; }
index 8dc3f8b..bdaffab 100644 (file)
@@ -27,7 +27,6 @@
 #include "RemoteScrollingCoordinatorTransaction.h"
 
 #include "ArgumentCoders.h"
-#include "MessageDecoder.h"
 #include "WebCoreArgumentCoders.h"
 #include <WebCore/GraphicsLayer.h>
 #include <WebCore/ScrollingStateFixedNode.h>
@@ -47,32 +46,32 @@ namespace IPC {
 
 template<> struct ArgumentCoder<ScrollingStateNode> {
     static void encode(Encoder&, const ScrollingStateNode&);
-    static bool decode(ArgumentDecoder&, ScrollingStateNode&);
+    static bool decode(Decoder&, ScrollingStateNode&);
 };
 
 template<> struct ArgumentCoder<ScrollingStateScrollingNode> {
     static void encode(Encoder&, const ScrollingStateScrollingNode&);
-    static bool decode(ArgumentDecoder&, ScrollingStateScrollingNode&);
+    static bool decode(Decoder&, ScrollingStateScrollingNode&);
 };
     
 template<> struct ArgumentCoder<ScrollingStateFrameScrollingNode> {
     static void encode(Encoder&, const ScrollingStateFrameScrollingNode&);
-    static bool decode(ArgumentDecoder&, ScrollingStateFrameScrollingNode&);
+    static bool decode(Decoder&, ScrollingStateFrameScrollingNode&);
 };
     
 template<> struct ArgumentCoder<ScrollingStateOverflowScrollingNode> {
     static void encode(Encoder&, const ScrollingStateOverflowScrollingNode&);
-    static bool decode(ArgumentDecoder&, ScrollingStateOverflowScrollingNode&);
+    static bool decode(Decoder&, ScrollingStateOverflowScrollingNode&);
 };
     
 template<> struct ArgumentCoder<ScrollingStateFixedNode> {
     static void encode(Encoder&, const ScrollingStateFixedNode&);
-    static bool decode(ArgumentDecoder&, ScrollingStateFixedNode&);
+    static bool decode(Decoder&, ScrollingStateFixedNode&);
 };
 
 template<> struct ArgumentCoder<ScrollingStateStickyNode> {
     static void encode(Encoder&, const ScrollingStateStickyNode&);
-    static bool decode(ArgumentDecoder&, ScrollingStateStickyNode&);
+    static bool decode(Decoder&, ScrollingStateStickyNode&);
 };
 
 } // namespace IPC
@@ -90,7 +89,7 @@ void ArgumentCoder<ScrollingStateNode>::encode(Encoder& encoder, const Scrolling
         encoder << static_cast<GraphicsLayer::PlatformLayerID>(node.layer());
 }
 
-bool ArgumentCoder<ScrollingStateNode>::decode(ArgumentDecoder& decoder, ScrollingStateNode& node)
+bool ArgumentCoder<ScrollingStateNode>::decode(Decoder& decoder, ScrollingStateNode& node)
 {
     // nodeType, scrollingNodeID and parentNodeID have already been decoded by the caller in order to create the node.
     ScrollingStateNode::ChangedProperties changedProperties;
@@ -186,7 +185,7 @@ void ArgumentCoder<ScrollingStateOverflowScrollingNode>::encode(Encoder& encoder
         node.setter(decodedValue); \
     }
 
-bool ArgumentCoder<ScrollingStateScrollingNode>::decode(ArgumentDecoder& decoder, ScrollingStateScrollingNode& node)
+bool ArgumentCoder<ScrollingStateScrollingNode>::decode(Decoder& decoder, ScrollingStateScrollingNode& node)
 {
     if (!decoder.decode(static_cast<ScrollingStateNode&>(node)))
         return false;
@@ -219,7 +218,7 @@ bool ArgumentCoder<ScrollingStateScrollingNode>::decode(ArgumentDecoder& decoder
     return true;
 }
 
-bool ArgumentCoder<ScrollingStateFrameScrollingNode>::decode(ArgumentDecoder& decoder, ScrollingStateFrameScrollingNode& node)
+bool ArgumentCoder<ScrollingStateFrameScrollingNode>::decode(Decoder& decoder, ScrollingStateFrameScrollingNode& node)
 {
     if (!decoder.decode(static_cast<ScrollingStateScrollingNode&>(node)))
         return false;
@@ -265,7 +264,7 @@ bool ArgumentCoder<ScrollingStateFrameScrollingNode>::decode(ArgumentDecoder& de
     return true;
 }
 
-bool ArgumentCoder<ScrollingStateOverflowScrollingNode>::decode(ArgumentDecoder& decoder, ScrollingStateOverflowScrollingNode& node)
+bool ArgumentCoder<ScrollingStateOverflowScrollingNode>::decode(Decoder& decoder, ScrollingStateOverflowScrollingNode& node)
 {
     if (!decoder.decode(static_cast<ScrollingStateScrollingNode&>(node)))
         return false;
@@ -288,7 +287,7 @@ void ArgumentCoder<ScrollingStateFixedNode>::encode(Encoder& encoder, const Scro
         encoder << node.viewportConstraints();
 }
 
-bool ArgumentCoder<ScrollingStateFixedNode>::decode(ArgumentDecoder& decoder, ScrollingStateFixedNode& node)
+bool ArgumentCoder<ScrollingStateFixedNode>::decode(Decoder& decoder, ScrollingStateFixedNode& node)
 {
     if (!decoder.decode(static_cast<ScrollingStateNode&>(node)))
         return false;
@@ -311,7 +310,7 @@ void ArgumentCoder<ScrollingStateStickyNode>::encode(Encoder& encoder, const Scr
         encoder << node.viewportConstraints();
 }
 
-bool ArgumentCoder<ScrollingStateStickyNode>::decode(ArgumentDecoder& decoder, ScrollingStateStickyNode& node)
+bool ArgumentCoder<ScrollingStateStickyNode>::decode(Decoder& decoder, ScrollingStateStickyNode& node)
 {
     if (!decoder.decode(static_cast<ScrollingStateNode&>(node)))
         return false;
@@ -375,12 +374,12 @@ void RemoteScrollingCoordinatorTransaction::encode(IPC::Encoder& encoder) const
         encoder << Vector<ScrollingNodeID>();
 }
 
-bool RemoteScrollingCoordinatorTransaction::decode(IPC::ArgumentDecoder& decoder, RemoteScrollingCoordinatorTransaction& transaction)
+bool RemoteScrollingCoordinatorTransaction::decode(IPC::Decoder& decoder, RemoteScrollingCoordinatorTransaction& transaction)
 {
     return transaction.decode(decoder);
 }
 
-bool RemoteScrollingCoordinatorTransaction::decode(IPC::ArgumentDecoder& decoder)
+bool RemoteScrollingCoordinatorTransaction::decode(IPC::Decoder& decoder)
 {
     int numNodes;
     if (!decoder.decode(numNodes))
@@ -644,7 +643,7 @@ void RemoteScrollingCoordinatorTransaction::encode(IPC::Encoder&) const
 {
 }
 
-bool RemoteScrollingCoordinatorTransaction::decode(IPC::ArgumentDecoder& decoder, RemoteScrollingCoordinatorTransaction& transaction)
+bool RemoteScrollingCoordinatorTransaction::decode(IPC::Decoder& decoder, RemoteScrollingCoordinatorTransaction& transaction)
 {
     return true;
 }
index 530d1f1..8b9b0bf 100644 (file)
@@ -29,7 +29,7 @@
 #include <WebCore/ScrollingStateTree.h>
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
@@ -43,7 +43,7 @@ public:
 #endif // ENABLE(ASYNC_SCROLLING)
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, RemoteScrollingCoordinatorTransaction&);
+    static bool decode(IPC::Decoder&, RemoteScrollingCoordinatorTransaction&);
 
 #if !defined(NDEBUG) || !LOG_DISABLED
     WTF::CString description() const;
@@ -52,7 +52,7 @@ public:
 
 private:
 #if ENABLE(ASYNC_SCROLLING)
-    bool decode(IPC::ArgumentDecoder&);
+    bool decode(IPC::Decoder&);
     
     std::unique_ptr<WebCore::ScrollingStateTree> m_scrollingStateTree;
 #endif // ENABLE(ASYNC_SCROLLING)
index 83f88ce..0f048a4 100644 (file)
@@ -64,7 +64,7 @@ static bool isValidEnum(HTTPBody::Element::Type type)
     return false;
 }
 
-bool HTTPBody::Element::decode(IPC::ArgumentDecoder& decoder, Element& result)
+bool HTTPBody::Element::decode(IPC::Decoder& decoder, Element& result)
 {
     if (!decoder.decodeEnum(result.type) || !isValidEnum(result.type))
         return false;
@@ -90,7 +90,7 @@ void HTTPBody::encode(IPC::Encoder& encoder) const
     encoder << elements;
 }
 
-bool HTTPBody::decode(IPC::ArgumentDecoder& decoder, HTTPBody& result)
+bool HTTPBody::decode(IPC::Decoder& decoder, HTTPBody& result)
 {
     if (!decoder.decode(result.contentType))
         return false;
@@ -129,7 +129,7 @@ void FrameState::encode(IPC::Encoder& encoder) const
     encoder << children;
 }
 
-bool FrameState::decode(IPC::ArgumentDecoder& decoder, FrameState& result)
+bool FrameState::decode(IPC::Decoder& decoder, FrameState& result)
 {
     if (!decoder.decode(result.urlString))
         return false;
@@ -184,7 +184,7 @@ void PageState::encode(IPC::Encoder& encoder) const
     encoder.encodeEnum(shouldOpenExternalURLsPolicy);
 }
 
-bool PageState::decode(IPC::ArgumentDecoder& decoder, PageState& result)
+bool PageState::decode(IPC::Decoder& decoder, PageState& result)
 {
     if (!decoder.decode(result.title))
         return false;
@@ -202,7 +202,7 @@ void BackForwardListItemState::encode(IPC::Encoder& encoder) const
     encoder << pageState;
 }
 
-bool BackForwardListItemState::decode(IPC::ArgumentDecoder& decoder, BackForwardListItemState& result)
+bool BackForwardListItemState::decode(IPC::Decoder& decoder, BackForwardListItemState& result)
 {
     if (!decoder.decode(result.identifier))
         return false;
@@ -219,7 +219,7 @@ void BackForwardListState::encode(IPC::Encoder& encoder) const
     encoder << currentIndex;
 }
 
-bool BackForwardListState::decode(IPC::ArgumentDecoder& decoder, BackForwardListState& result)
+bool BackForwardListState::decode(IPC::Decoder& decoder, BackForwardListState& result)
 {
     if (!decoder.decode(result.items))
         return false;
index d577ee6..dee768b 100644 (file)
@@ -39,7 +39,7 @@
 #include <wtf/text/WTFString.h>
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
@@ -50,7 +50,7 @@ bool isValidEnum(WebCore::ShouldOpenExternalURLsPolicy);
 struct HTTPBody {
     struct Element {
         void encode(IPC::Encoder&) const;
-        static bool decode(IPC::ArgumentDecoder&, Element&);
+        static bool decode(IPC::Decoder&, Element&);
 
         enum class Type {
             Data,
@@ -74,7 +74,7 @@ struct HTTPBody {
     };
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, HTTPBody&);
+    static bool decode(IPC::Decoder&, HTTPBody&);
 
     String contentType;
     Vector<Element> elements;
@@ -82,7 +82,7 @@ struct HTTPBody {
 
 struct FrameState {
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, FrameState&);
+    static bool decode(IPC::Decoder&, FrameState&);
 
     String urlString;
     String originalURLString;
@@ -114,7 +114,7 @@ struct FrameState {
 
 struct PageState {
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, PageState&);
+    static bool decode(IPC::Decoder&, PageState&);
 
     String title;
     FrameState mainFrameState;
@@ -123,7 +123,7 @@ struct PageState {
 
 struct BackForwardListItemState {
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, BackForwardListItemState&);
+    static bool decode(IPC::Decoder&, BackForwardListItemState&);
 
     uint64_t identifier;
 
@@ -136,7 +136,7 @@ struct BackForwardListItemState {
 
 struct BackForwardListState {
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, BackForwardListState&);
+    static bool decode(IPC::Decoder&, BackForwardListState&);
 
     Vector<BackForwardListItemState> items;
     Optional<uint32_t> currentIndex;
index 5780f69..a43aa3b 100644 (file)
@@ -46,7 +46,7 @@ void ShareableBitmap::Handle::encode(IPC::Encoder& encoder) const
     encoder << m_flags;
 }
 
-bool ShareableBitmap::Handle::decode(IPC::ArgumentDecoder& decoder, Handle& handle)
+bool ShareableBitmap::Handle::decode(IPC::Decoder& decoder, Handle& handle)
 {
     if (!decoder.decode(handle.m_handle))
         return false;
index 7c9ceab..fa0bb47 100644 (file)
@@ -64,7 +64,7 @@ public:
         void clear();
 
         void encode(IPC::Encoder&) const;
-        static bool decode(IPC::ArgumentDecoder&, Handle&);
+        static bool decode(IPC::Decoder&, Handle&);
 
     private:
         friend class ShareableBitmap;
index c48601e..9e2eb00 100644 (file)
@@ -46,7 +46,7 @@ void ShareableResource::Handle::encode(IPC::Encoder& encoder) const
     encoder << m_size;
 }
 
-bool ShareableResource::Handle::decode(IPC::ArgumentDecoder& decoder, Handle& handle)
+bool ShareableResource::Handle::decode(IPC::Decoder& decoder, Handle& handle)
 {
     if (!decoder.decode(handle.m_handle))
         return false;
index 27e0713..ca1d3f4 100644 (file)
@@ -50,7 +50,7 @@ public:
         unsigned size() const { return m_size; }
 
         void encode(IPC::Encoder&) const;
-        static bool decode(IPC::ArgumentDecoder&, Handle&);
+        static bool decode(IPC::Decoder&, Handle&);
 
         RefPtr<WebCore::SharedBuffer> tryWrapInSharedBuffer() const;
 
index b2589ce..8af6afa 100644 (file)
@@ -38,7 +38,7 @@ void StatisticsData::encode(IPC::Encoder& encoder) const
     encoder << webCoreCacheStatistics;
 }
 
-bool StatisticsData::decode(IPC::ArgumentDecoder& decoder, StatisticsData& statisticsData)
+bool StatisticsData::decode(IPC::Decoder& decoder, StatisticsData& statisticsData)
 {
     if (!decoder.decode(statisticsData.statisticsNumbers))
         return false;
index 3370b5b..f8e24a8 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef StatisticsData_h
 #define StatisticsData_h
 
-#include "ArgumentDecoder.h"
+#include "Decoder.h"
 #include "Encoder.h"
 #include <wtf/HashMap.h>
 #include <wtf/Vector.h>
@@ -37,7 +37,7 @@ namespace WebKit {
 
 struct StatisticsData {
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, StatisticsData&);
+    static bool decode(IPC::Decoder&, StatisticsData&);
     
     HashMap<String, uint64_t> statisticsNumbers;
     HashMap<String, uint64_t> javaScriptProtectedObjectTypeCounts;
index e188631..4502ce1 100644 (file)
@@ -43,7 +43,7 @@ void UpdateInfo::encode(IPC::Encoder& encoder) const
     encoder << bitmapOffset;
 }
 
-bool UpdateInfo::decode(IPC::ArgumentDecoder& decoder, UpdateInfo& result)
+bool UpdateInfo::decode(IPC::Decoder& decoder, UpdateInfo& result)
 {
     if (!decoder.decode(result.viewSize))
         return false;
index e9b0c6f..b1d4af9 100644 (file)
@@ -32,8 +32,8 @@
 #include <wtf/Vector.h>
 
 namespace IPC {
-    class ArgumentDecoder;
-    class Encoder;
+class Decoder;
+class Encoder;
 }
 
 namespace WebKit {
@@ -45,7 +45,7 @@ public:
     UpdateInfo() { }
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, UpdateInfo&);
+    static bool decode(IPC::Decoder&, UpdateInfo&);
 
     // The size of the web view.
     WebCore::IntSize viewSize;
index 40dc1da..62e1358 100644 (file)
@@ -146,7 +146,7 @@ void UserData::encode(IPC::Encoder& encoder) const
     encode(encoder, m_object.get());
 }
 
-bool UserData::decode(IPC::ArgumentDecoder& decoder, UserData& userData)
+bool UserData::decode(IPC::Decoder& decoder, UserData& userData)
 {
     return decode(decoder, userData.m_object);
 }
@@ -327,7 +327,7 @@ void UserData::encode(IPC::Encoder& encoder, const API::Object& object)
     }
 }
 
-bool UserData::decode(IPC::ArgumentDecoder& decoder, RefPtr<API::Object>& result)
+bool UserData::decode(IPC::Decoder& decoder, RefPtr<API::Object>& result)
 {
     API::Object::Type type;
     if (!decoder.decodeEnum(type))
index d3430cb..4ee6092 100644 (file)
@@ -31,7 +31,7 @@
 
 namespace IPC {
 class Encoder;
-class ArgumentDecoder;
+class Decoder;
 }
 
 namespace WebKit {
@@ -52,10 +52,10 @@ public:
     API::Object* object() const { return m_object.get(); }
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, UserData&);
+    static bool decode(IPC::Decoder&, UserData&);
 
     static void encode(IPC::Encoder&, const API::Object*);
-    static bool decode(IPC::ArgumentDecoder&, RefPtr<API::Object>&);
+    static bool decode(IPC::Decoder&, RefPtr<API::Object>&);
 
 private:
     static void encode(IPC::Encoder&, const API::Object&);
index 3ed2324..4b5207a 100644 (file)
@@ -49,7 +49,7 @@ void VisibleContentRectUpdateInfo::encode(IPC::Encoder& encoder) const
     encoder << m_enclosedInScrollableAncestorView;
 }
 
-bool VisibleContentRectUpdateInfo::decode(IPC::ArgumentDecoder& decoder, VisibleContentRectUpdateInfo& result)
+bool VisibleContentRectUpdateInfo::decode(IPC::Decoder& decoder, VisibleContentRectUpdateInfo& result)
 {
     if (!decoder.decode(result.m_exposedContentRect))
         return false;
index 287bf3b..6ba1d68 100644 (file)
@@ -29,7 +29,7 @@
 #include <WebCore/FloatRect.h>
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
@@ -81,7 +81,7 @@ public:
     uint64_t lastLayerTreeTransactionID() const { return m_lastLayerTreeTransactionID; }
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, VisibleContentRectUpdateInfo&);
+    static bool decode(IPC::Decoder&, VisibleContentRectUpdateInfo&);
 
 private:
     WebCore::FloatRect m_exposedContentRect;
index de756e0..25d8262 100644 (file)
@@ -36,7 +36,7 @@ class Data;
 }
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
index 81a31a2..6c7d156 100644 (file)
@@ -48,7 +48,7 @@ void WebCompiledContentExtensionData::encode(IPC::Encoder& encoder) const
     encoder << domainFiltersBytecodeSize;
 }
 
-bool WebCompiledContentExtensionData::decode(IPC::ArgumentDecoder& decoder, WebCompiledContentExtensionData& compiledContentExtensionData)
+bool WebCompiledContentExtensionData::decode(IPC::Decoder& decoder, WebCompiledContentExtensionData& compiledContentExtensionData)
 {
     SharedMemory::Handle handle;
     if (!decoder.decode(handle))
index 59cd824..f62cb32 100644 (file)
@@ -33,7 +33,7 @@
 #include <wtf/RefPtr.h>
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
@@ -60,7 +60,7 @@ public:
     }
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, WebCompiledContentExtensionData&);
+    static bool decode(IPC::Decoder&, WebCompiledContentExtensionData&);
 
     RefPtr<SharedMemory> data;
     NetworkCache::Data fileData;
index 790975c..fb260b4 100644 (file)
@@ -52,7 +52,7 @@ protected:
 
     // IPC::MessageReceiver
     // Implemented in generated WebConnectionMessageReceiver.cpp
-    void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
+    void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
 
     // Mesage handling implementation functions.
     void handleMessage(const String& messageName, const UserData& messageBody);
index e0908d4..191303e 100644 (file)
@@ -110,7 +110,7 @@ void WebContextMenuItemData::encode(IPC::Encoder& encoder) const
     encoder << m_submenu;
 }
 
-bool WebContextMenuItemData::decode(IPC::ArgumentDecoder& decoder, WebContextMenuItemData& item)
+bool WebContextMenuItemData::decode(IPC::Decoder& decoder, WebContextMenuItemData& item)
 {
     WebCore::ContextMenuItemType type;
     if (!decoder.decodeEnum(type))
index ea31f5d..a361907 100644 (file)
@@ -37,7 +37,7 @@ class Object;
 }
 
 namespace IPC {
-class ArgumentDecoder;
+class Decoder;
 class Encoder;
 }
 
@@ -63,7 +63,7 @@ public:
     void setUserData(API::Object*);
     
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, WebContextMenuItemData&);
+    static bool decode(IPC::Decoder&, WebContextMenuItemData&);
 
 private:
     WebCore::ContextMenuItemType m_type;
index 924aee7..e42d0d6 100644 (file)
@@ -103,7 +103,7 @@ void ArgumentCoder<AffineTransform>::encode(Encoder& encoder, const AffineTransf
     SimpleArgumentCoder<AffineTransform>::encode(encoder, affineTransform);
 }
 
-bool ArgumentCoder<AffineTransform>::decode(ArgumentDecoder& decoder, AffineTransform& affineTransform)
+bool ArgumentCoder<AffineTransform>::decode(Decoder& decoder, AffineTransform& affineTransform)
 {
     return SimpleArgumentCoder<AffineTransform>::decode(decoder, affineTransform);
 }
@@ -114,7 +114,7 @@ void ArgumentCoder<EventTrackingRegions>::encode(Encoder& encoder, const EventTr
     encoder << eventTrackingRegions.eventSpecificSynchronousDispatchRegions;
 }
 
-bool ArgumentCoder<EventTrackingRegions>::decode(ArgumentDecoder& decoder, EventTrackingRegions& eventTrackingRegions)
+bool ArgumentCoder<EventTrackingRegions>::decode(Decoder& decoder, EventTrackingRegions& eventTrackingRegions)
 {
     Region asynchronousDispatchRegion;
     if (!decoder.decode(asynchronousDispatchRegion))
@@ -150,7 +150,7 @@ void ArgumentCoder<TransformationMatrix>::encode(Encoder& encoder, const Transfo
     encoder << transformationMatrix.m44();
 }
 
-bool ArgumentCoder<TransformationMatrix>::decode(ArgumentDecoder& decoder, TransformationMatrix& transformationMatrix)
+bool ArgumentCoder<TransformationMatrix>::decode(Decoder& decoder, TransformationMatrix& transformationMatrix)
 {
     double m11;
     if (!decoder.decode(m11))
@@ -213,7 +213,7 @@ void ArgumentCoder<LinearTimingFunction>::encode(Encoder& encoder, const LinearT
     encoder.encodeEnum(timingFunction.type());
 }
 
-bool ArgumentCoder<LinearTimingFunction>::decode(ArgumentDecoder&, LinearTimingFunction&)
+bool ArgumentCoder<LinearTimingFunction>::decode(Decoder&, LinearTimingFunction&)
 {
     // Type is decoded by the caller. Nothing else to decode.
     return true;
@@ -231,7 +231,7 @@ void ArgumentCoder<CubicBezierTimingFunction>::encode(Encoder& encoder, const Cu
     encoder.encodeEnum(timingFunction.timingFunctionPreset());
 }
 
-bool ArgumentCoder<CubicBezierTimingFunction>::decode(ArgumentDecoder& decoder, CubicBezierTimingFunction& timingFunction)
+bool ArgumentCoder<CubicBezierTimingFunction>::decode(Decoder& decoder, CubicBezierTimingFunction& timingFunction)
 {
     // Type is decoded by the caller.
     double x1;
@@ -268,7 +268,7 @@ void ArgumentCoder<StepsTimingFunction>::encode(Encoder& encoder, const StepsTim
     encoder << timingFunction.stepAtStart();
 }
 
-bool ArgumentCoder<StepsTimingFunction>::decode(ArgumentDecoder& decoder, StepsTimingFunction& timingFunction)
+bool ArgumentCoder<StepsTimingFunction>::decode(Decoder& decoder, StepsTimingFunction& timingFunction)
 {
     // Type is decoded by the caller.
     int numSteps;
@@ -295,7 +295,7 @@ void ArgumentCoder<SpringTimingFunction>::encode(Encoder& encoder, const SpringT
     encoder << timingFunction.initialVelocity();
 }
 
-bool ArgumentCoder<SpringTimingFunction>::decode(ArgumentDecoder& decoder, SpringTimingFunction& timingFunction)
+bool ArgumentCoder<SpringTimingFunction>::decode(Decoder& decoder, SpringTimingFunction& timingFunction)
 {
     // Type is decoded by the caller.
     double mass;
@@ -324,7 +324,7 @@ void ArgumentCoder<FloatPoint>::encode(Encoder& encoder, const FloatPoint& float
     SimpleArgumentCoder<FloatPoint>::encode(encoder, floatPoint);
 }
 
-bool ArgumentCoder<FloatPoint>::decode(ArgumentDecoder& decoder, FloatPoint& floatPoint)
+bool ArgumentCoder<FloatPoint>::decode(Decoder& decoder, FloatPoint& floatPoint)
 {
     return SimpleArgumentCoder<FloatPoint>::decode(decoder, floatPoint);
 }
@@ -335,7 +335,7 @@ void ArgumentCoder<FloatPoint3D>::encode(Encoder& encoder, const FloatPoint3D& f
     SimpleArgumentCoder<FloatPoint3D>::encode(encoder, floatPoint);
 }
 
-bool ArgumentCoder<FloatPoint3D>::decode(ArgumentDecoder& decoder, FloatPoint3D& floatPoint)
+bool ArgumentCoder<FloatPoint3D>::decode(Decoder& decoder, FloatPoint3D& floatPoint)
 {
     return SimpleArgumentCoder<FloatPoint3D>::decode(decoder, floatPoint);
 }
@@ -346,7 +346,7 @@ void ArgumentCoder<FloatRect>::encode(Encoder& encoder, const FloatRect& floatRe
     SimpleArgumentCoder<FloatRect>::encode(encoder, floatRect);
 }
 
-bool ArgumentCoder<FloatRect>::decode(ArgumentDecoder& decoder, FloatRect& floatRect)
+bool ArgumentCoder<FloatRect>::decode(Decoder& decoder, FloatRect& floatRect)
 {
     return SimpleArgumentCoder<FloatRect>::decode(decoder, floatRect);
 }
@@ -357,7 +357,7 @@ void ArgumentCoder<FloatSize>::encode(Encoder& encoder, const FloatSize& floatSi
     SimpleArgumentCoder<FloatSize>::encode(encoder, floatSize);
 }
 
-bool ArgumentCoder<FloatSize>::decode(ArgumentDecoder& decoder, FloatSize& floatSize)
+bool ArgumentCoder<FloatSize>::decode(Decoder& decoder, FloatSize& floatSize)
 {
     return SimpleArgumentCoder<FloatSize>::decode(decoder, floatSize);
 }
@@ -368,7 +368,7 @@ void ArgumentCoder<FloatRoundedRect>::encode(Encoder& encoder, const FloatRounde
     SimpleArgumentCoder<FloatRoundedRect>::encode(encoder, roundedRect);
 }
 
-bool ArgumentCoder<FloatRoundedRect>::decode(ArgumentDecoder& decoder, FloatRoundedRect& roundedRect)
+bool ArgumentCoder<FloatRoundedRect>::decode(Decoder& decoder, FloatRoundedRect& roundedRect)
 {
     return SimpleArgumentCoder<FloatRoundedRect>::decode(decoder, roundedRect);
 }
@@ -379,7 +379,7 @@ void ArgumentCoder<FloatQuad>::encode(Encoder& encoder, const FloatQuad& floatQu
     SimpleArgumentCoder<FloatQuad>::encode(encoder, floatQuad);
 }
 
-bool ArgumentCoder<FloatQuad>::decode(ArgumentDecoder& decoder, FloatQuad& floatQuad)
+bool ArgumentCoder<FloatQuad>::decode(Decoder& decoder, FloatQuad& floatQuad)
 {
     return SimpleArgumentCoder<FloatQuad>::decode(decoder, floatQuad);
 }
@@ -389,7 +389,7 @@ void ArgumentCoder<ViewportArguments>::encode(Encoder& encoder, const ViewportAr
     SimpleArgumentCoder<ViewportArguments>::encode(encoder, viewportArguments);
 }
 
-bool ArgumentCoder<ViewportArguments>::decode(ArgumentDecoder& decoder, ViewportArguments& viewportArguments)
+bool ArgumentCoder<ViewportArguments>::decode(Decoder& decoder, ViewportArguments& viewportArguments)
 {
     return SimpleArgumentCoder<ViewportArguments>::decode(decoder, viewportArguments);
 }
@@ -401,7 +401,7 @@ void ArgumentCoder<IntPoint>::encode(Encoder& encoder, const IntPoint& intPoint)
     SimpleArgumentCoder<IntPoint>::encode(encoder, intPoint);
 }
 
-bool ArgumentCoder<IntPoint>::decode(ArgumentDecoder& decoder, IntPoint& intPoint)
+bool ArgumentCoder<IntPoint>::decode(Decoder& decoder, IntPoint& intPoint)
 {
     return SimpleArgumentCoder<IntPoint>::decode(decoder, intPoint);
 }
@@ -412,7 +412,7 @@ void ArgumentCoder<IntRect>::encode(Encoder& encoder, const IntRect& intRect)
     SimpleArgumentCoder<IntRect>::encode(encoder, intRect);
 }
 
-bool ArgumentCoder<IntRect>::decode(ArgumentDecoder& decoder, IntRect& intRect)
+bool ArgumentCoder<IntRect>::decode(Decoder& decoder, IntRect& intRect)
 {
     return SimpleArgumentCoder<IntRect>::decode(decoder, intRect);
 }
@@ -423,7 +423,7 @@ void ArgumentCoder<IntSize>::encode(Encoder& encoder, const IntSize& intSize)
     SimpleArgumentCoder<IntSize>::encode(encoder, intSize);
 }
 
-bool ArgumentCoder<IntSize>::decode(ArgumentDecoder& decoder, IntSize& intSize)
+bool ArgumentCoder<IntSize>::decode(Decoder& decoder, IntSize& intSize)
 {
     return SimpleArgumentCoder<IntSize>::decode(decoder, intSize);
 }
@@ -467,7 +467,7 @@ void ArgumentCoder<Path>::encode(Encoder& encoder, const Path& path)
     });
 }
 
-bool ArgumentCoder<Path>::decode(ArgumentDecoder& decoder, Path& path)
+bool ArgumentCoder<Path>::decode(Decoder& decoder, Path& path)
 {
     uint64_t numPoints;
     if (!decoder.decode(numPoints))
@@ -538,7 +538,7 @@ void ArgumentCoder<RecentSearch>::encode(Encoder& encoder, const RecentSearch& r
     encoder << recentSearch.string << recentSearch.time;
 }
 
-bool ArgumentCoder<RecentSearch>::decode(ArgumentDecoder& decoder, RecentSearch& recentSearch)
+bool ArgumentCoder<RecentSearch>::decode(Decoder& decoder, RecentSearch& recentSearch)
 {
     if (!decoder.decode(recentSearch.string))
         return false;
@@ -551,7 +551,7 @@ bool ArgumentCoder<RecentSearch>::decode(ArgumentDecoder& decoder, RecentSearch&
 
 template<> struct ArgumentCoder<Region::Span> {
     static void encode(Encoder&, const Region::Span&);
-    static bool decode(ArgumentDecoder&, Region::Span&);
+    static bool decode(Decoder&, Region::Span&);
 };
 
 void ArgumentCoder<Region::Span>::encode(Encoder& encoder, const Region::Span& span)
@@ -560,7 +560,7 @@ void ArgumentCoder<Region::Span>::encode(Encoder& encoder, const Region::Span& s
     encoder << (uint64_t)span.segmentIndex;
 }
 
-bool ArgumentCoder<Region::Span>::decode(ArgumentDecoder& decoder, Region::Span& span)
+bool ArgumentCoder<Region::Span>::decode(Decoder& decoder, Region::Span& span)
 {
     if (!decoder.decode(span.y))
         return false;
@@ -579,7 +579,7 @@ void ArgumentCoder<Region>::encode(Encoder& encoder, const Region& region)
     encoder.encode(region.shapeSpans());
 }
 
-bool ArgumentCoder<Region>::decode(ArgumentDecoder& decoder, Region& region)
+bool ArgumentCoder<Region>::decode(Decoder& decoder, Region& region)
 {
     Vector<int> segments;
     if (!decoder.decode(segments))
@@ -604,7 +604,7 @@ void ArgumentCoder<Length>::encode(Encoder& encoder, const Length& length)
     SimpleArgumentCoder<Length>::encode(encoder, length);
 }
 
-bool ArgumentCoder<Length>::decode(ArgumentDecoder& decoder, Length& length)
+bool ArgumentCoder<Length>::decode(Decoder& decoder, Length& length)
 {
     return SimpleArgumentCoder<Length>::decode(decoder, length);
 }
@@ -615,7 +615,7 @@ void ArgumentCoder<ViewportAttributes>::encode(Encoder& encoder, const ViewportA
     SimpleArgumentCoder<ViewportAttributes>::encode(encoder, viewportAttributes);
 }
 
-bool ArgumentCoder<ViewportAttributes>::decode(ArgumentDecoder& decoder, ViewportAttributes& viewportAttributes)
+bool ArgumentCoder<ViewportAttributes>::decode(Decoder& decoder, ViewportAttributes& viewportAttributes)
 {
     return SimpleArgumentCoder<ViewportAttributes>::decode(decoder, viewportAttributes);
 }
@@ -626,7 +626,7 @@ void ArgumentCoder<MimeClassInfo>::encode(Encoder& encoder, const MimeClassInfo&
     encoder << mimeClassInfo.type << mimeClassInfo.desc << mimeClassInfo.extensions;
 }
 
-bool ArgumentCoder<MimeClassInfo>::decode(ArgumentDecoder& decoder, MimeClassInfo& mimeClassInfo)
+bool ArgumentCoder<MimeClassInfo>::decode(Decoder& decoder, MimeClassInfo& mimeClassInfo)
 {
     if (!decoder.decode(mimeClassInfo.type))
         return false;
@@ -653,7 +653,7 @@ void ArgumentCoder<PluginInfo>::encode(Encoder& encoder, const PluginInfo& plugi
 #endif
 }
 
-bool ArgumentCoder<PluginInfo>::decode(ArgumentDecoder& decoder, PluginInfo& pluginInfo)
+bool ArgumentCoder<PluginInfo>::decode(Decoder& decoder, PluginInfo& pluginInfo)
 {
     if (!decoder.decode(pluginInfo.name))
         return false;
@@ -682,7 +682,7 @@ void ArgumentCoder<AuthenticationChallenge>::encode(Encoder& encoder, const Auth
     encoder << challenge.protectionSpace() << challenge.proposedCredential() << challenge.previousFailureCount() << challenge.failureResponse() << challenge.error();
 }
 
-bool ArgumentCoder<AuthenticationChallenge>::decode(ArgumentDecoder& decoder, AuthenticationChallenge& challenge)
+bool ArgumentCoder<AuthenticationChallenge>::decode(Decoder& decoder, AuthenticationChallenge& challenge)
 {    
     ProtectionSpace protectionSpace;
     if (!decoder.decode(protectionSpace))
@@ -723,7 +723,7 @@ void ArgumentCoder<ProtectionSpace>::encode(Encoder& encoder, const ProtectionSp
     encoder.encodeEnum(space.serverType());
 }
 
-bool ArgumentCoder<ProtectionSpace>::decode(ArgumentDecoder& decoder, ProtectionSpace& space)
+bool ArgumentCoder<ProtectionSpace>::decode(Decoder& decoder, ProtectionSpace& space)
 {
     bool hasPlatformData;
     if (!decoder.decode(hasPlatformData))
@@ -769,7 +769,7 @@ void ArgumentCoder<Credential>::encode(Encoder& encoder, const Credential& crede
     encoder.encodeEnum(credential.persistence());
 }
 
-bool ArgumentCoder<Credential>::decode(ArgumentDecoder& decoder, Credential& credential)
+bool ArgumentCoder<Credential>::decode(Decoder& decoder, Credential& credential)
 {
     bool hasPlatformData;
     if (!decoder.decode(hasPlatformData))
@@ -805,7 +805,7 @@ static void encodeImage(Encoder& encoder, Image& image)
     encoder << handle;
 }
 
-static bool decodeImage(ArgumentDecoder& decoder, RefPtr<Image>& image)
+static bool decodeImage(Decoder& decoder, RefPtr<Image>& image)
 {
     ShareableBitmap::Handle handle;
     if (!decoder.decode(handle))
@@ -829,7 +829,7 @@ static void encodeOptionalImage(Encoder& encoder, Image* image)
         encodeImage(encoder, *image);
 }
 
-static bool decodeOptionalImage(ArgumentDecoder& decoder, RefPtr<Image>& image)
+static bool decodeOptionalImage(Decoder& decoder, RefPtr<Image>& image)
 {
     image = nullptr;
 
@@ -864,7 +864,7 @@ void ArgumentCoder<Cursor>::encode(Encoder& encoder, const Cursor& cursor)
 #endif
 }
 
-bool ArgumentCoder<Cursor>::decode(ArgumentDecoder& decoder, Cursor& cursor)
+bool ArgumentCoder<Cursor>::decode(Decoder& decoder, Cursor& cursor)
 {
     Cursor::Type type;
     if (!decoder.decodeEnum(type))
@@ -933,7 +933,7 @@ void ArgumentCoder<ResourceRequest>::encode(Encoder& encoder, const ResourceRequ
     resourceRequest.encodeWithoutPlatformData(encoder);
 }
 
-bool ArgumentCoder<ResourceRequest>::decode(ArgumentDecoder& decoder, ResourceRequest& resourceRequest)
+bool ArgumentCoder<ResourceRequest>::decode(Decoder& decoder, ResourceRequest& resourceRequest)
 {
 #if ENABLE(CACHE_PARTITIONING)
     String cachePartition;
@@ -961,7 +961,7 @@ void ArgumentCoder<ResourceError>::encode(Encoder& encoder, const ResourceError&
     encodePlatformData(encoder, resourceError);
 }
 
-bool ArgumentCoder<ResourceError>::decode(ArgumentDecoder& decoder, ResourceError& resourceError)
+bool ArgumentCoder<ResourceError>::decode(Decoder& decoder, ResourceError& resourceError)
 {
     return decodePlatformData(decoder, resourceError);
 }
@@ -984,7 +984,7 @@ void ArgumentCoder<SelectionRect>::encode(Encoder& encoder, const SelectionRect&
     encoder << selectionRect.isHorizontal();
 }
 
-bool ArgumentCoder<SelectionRect>::decode(ArgumentDecoder& decoder, SelectionRect& selectionRect)
+bool ArgumentCoder<SelectionRect>::decode(Decoder& decoder, SelectionRect& selectionRect)
 {
     IntRect rect;
     if (!decoder.decode(rect))
@@ -1059,7 +1059,7 @@ void ArgumentCoder<WindowFeatures>::encode(Encoder& encoder, const WindowFeature
     encoder << windowFeatures.dialog;
 }
 
-bool ArgumentCoder<WindowFeatures>::decode(ArgumentDecoder& decoder, WindowFeatures& windowFeatures)
+bool ArgumentCoder<WindowFeatures>::decode(Decoder& decoder, WindowFeatures& windowFeatures)
 {
     if (!decoder.decode(windowFeatures.x))
         return false;
@@ -1100,7 +1100,7 @@ void ArgumentCoder<Color>::encode(Encoder& encoder, const Color& color)
     encoder << color.rgb();
 }
 
-bool ArgumentCoder<Color>::decode(ArgumentDecoder& decoder, Color& color)
+bool ArgumentCoder<Color>::decode(Decoder& decoder, Color& color)
 {
     bool isValid;
     if (!decoder.decode(isValid))
@@ -1128,7 +1128,7 @@ void ArgumentCoder<CompositionUnderline>::encode(Encoder& encoder, const Composi
     encoder << underline.color;
 }
 
-bool ArgumentCoder<CompositionUnderline>::decode(ArgumentDecoder& decoder, CompositionUnderline& underline)
+bool ArgumentCoder<CompositionUnderline>::decode(Decoder& decoder, CompositionUnderline& underline)
 {
     if (!decoder.decode(underline.startOffset))
         return false;
@@ -1155,7 +1155,7 @@ void ArgumentCoder<Cookie>::encode(Encoder& encoder, const Cookie& cookie)
     encoder << cookie.session;
 }
 
-bool ArgumentCoder<Cookie>::decode(ArgumentDecoder& decoder, Cookie& cookie)
+bool ArgumentCoder<Cookie>::decode(Decoder& decoder, Cookie& cookie)
 {
     if (!decoder.decode(cookie.name))
         return false;
@@ -1187,7 +1187,7 @@ void ArgumentCoder<DatabaseDetails>::encode(Encoder& encoder, const DatabaseDeta
     encoder << details.modificationTime();
 }
     
-bool ArgumentCoder<DatabaseDetails>::decode(ArgumentDecoder& decoder, DatabaseDetails& details)
+bool ArgumentCoder<DatabaseDetails>::decode(Decoder& decoder, DatabaseDetails& details)
 {
     String name;
     if (!decoder.decode(name))
@@ -1231,7 +1231,7 @@ void ArgumentCoder<Highlight>::encode(Encoder& encoder, const Highlight& highlig
     encoder << highlight.quads;
 }
 
-bool ArgumentCoder<Highlight>::decode(ArgumentDecoder& decoder, Highlight& highlight)
+bool ArgumentCoder<Highlight>::decode(Decoder& decoder, Highlight& highlight)
 {
     uint32_t type;
     if (!decoder.decode(type))
@@ -1267,7 +1267,7 @@ static void encodeSharedBuffer(Encoder& encoder, SharedBuffer* buffer)
     }
 }
 
-static bool decodeSharedBuffer(ArgumentDecoder& decoder, RefPtr<SharedBuffer>& buffer)
+static bool decodeSharedBuffer(Decoder& decoder, RefPtr<SharedBuffer>& buffer)
 {
     uint64_t bufferSize = 0;
     if (!decoder.decode(bufferSize))
@@ -1300,7 +1300,7 @@ void ArgumentCoder<PasteboardWebContent>::encode(Encoder& encoder, const Pastebo
         encodeSharedBuffer(encoder, content.clientData[i].get());
 }
 
-bool ArgumentCoder<PasteboardWebContent>::decode(ArgumentDecoder& decoder, PasteboardWebContent& content)
+bool ArgumentCoder<PasteboardWebContent>::decode(Decoder& decoder, PasteboardWebContent& content)
 {
     if (!decoder.decode(content.canSmartCopyOrDelete))
         return false;
@@ -1334,7 +1334,7 @@ void ArgumentCoder<PasteboardImage>::encode(Encoder& encoder, const PasteboardIm
         encodeSharedBuffer(encoder, pasteboardImage.resourceData.get());
 }
 
-bool ArgumentCoder<PasteboardImage>::decode(ArgumentDecoder& decoder, PasteboardImage& pasteboardImage)
+bool ArgumentCoder<PasteboardImage>::decode(Decoder& decoder, PasteboardImage& pasteboardImage)
 {
     if (!decodeOptionalImage(decoder, pasteboardImage.image))
         return false;
@@ -1358,7 +1358,7 @@ void ArgumentCoder<DictationAlternative>::encode(Encoder& encoder, const Dictati
     encoder << dictationAlternative.dictationContext;
 }
 
-bool ArgumentCoder<DictationAlternative>::decode(ArgumentDecoder& decoder, DictationAlternative& dictationAlternative)
+bool ArgumentCoder<DictationAlternative>::decode(Decoder& decoder, DictationAlternative& dictationAlternative)
 {
     if (!decoder.decode(dictationAlternative.rangeStart))
         return false;
@@ -1380,7 +1380,7 @@ void ArgumentCoder<FileChooserSettings>::encode(Encoder& encoder, const FileChoo
 #endif
 }
 
-bool ArgumentCoder<FileChooserSettings>::decode(ArgumentDecoder& decoder, FileChooserSettings& settings)
+bool ArgumentCoder<FileChooserSettings>::decode(Decoder& decoder, FileChooserSettings& settings)
 {
     if (!decoder.decode(settings.allowsMultipleFiles))
         return false;
@@ -1405,7 +1405,7 @@ void ArgumentCoder<GrammarDetail>::encode(Encoder& encoder, const GrammarDetail&
     encoder << detail.userDescription;
 }
 
-bool ArgumentCoder<GrammarDetail>::decode(ArgumentDecoder& decoder, GrammarDetail& detail)
+bool ArgumentCoder<GrammarDetail>::decode(Decoder& decoder, GrammarDetail& detail)
 {
     if (!decoder.decode(detail.location))
         return false;
@@ -1427,7 +1427,7 @@ void ArgumentCoder<TextCheckingRequestData>::encode(Encoder& encoder, const Text
     encoder.encodeEnum(request.processType());
 }
 
-bool ArgumentCoder<TextCheckingRequestData>::decode(ArgumentDecoder& decoder, TextCheckingRequestData& request)
+bool ArgumentCoder<TextCheckingRequestData>::decode(Decoder& decoder, TextCheckingRequestData& request)
 {
     int sequence;
     if (!decoder.decode(sequence))
@@ -1458,7 +1458,7 @@ void ArgumentCoder<TextCheckingResult>::encode(Encoder& encoder, const TextCheck
     encoder << result.replacement;
 }
 
-bool ArgumentCoder<TextCheckingResult>::decode(ArgumentDecoder& decoder, TextCheckingResult& result)
+bool ArgumentCoder<TextCheckingResult>::decode(Decoder& decoder, TextCheckingResult& result)
 {
     if (!decoder.decodeEnum(result.type))
         return false;
@@ -1478,7 +1478,7 @@ void ArgumentCoder<URL>::encode(Encoder& encoder, const URL& result)
     encoder << result.string();
 }
     
-bool ArgumentCoder<URL>::decode(ArgumentDecoder& decoder, URL& result)
+bool ArgumentCoder<URL>::decode(Decoder& decoder, URL& result)
 {
     String urlAsString;
     if (!decoder.decode(urlAsString))
@@ -1497,7 +1497,7 @@ void ArgumentCoder<UserStyleSheet>::encode(Encoder& encoder, const UserStyleShee
     encoder.encodeEnum(userStyleSheet.level());
 }
 
-bool ArgumentCoder<UserStyleSheet>::decode(ArgumentDecoder& decoder, UserStyleSheet& userStyleSheet)
+bool ArgumentCoder<UserStyleSheet>::decode(Decoder& decoder, UserStyleSheet& userStyleSheet)
 {
     String source;
     if (!decoder.decode(source))
@@ -1536,7 +1536,7 @@ void ArgumentCoder<MediaSessionMetadata>::encode(Encoder& encoder, const MediaSe
     encoder << result.artworkURL();
 }
 
-bool ArgumentCoder<MediaSessionMetadata>::decode(ArgumentDecoder& decoder, MediaSessionMetadata& result)
+bool ArgumentCoder<MediaSessionMetadata>::decode(Decoder& decoder, MediaSessionMetadata& result)
 {
     String artist, album, title;
     URL artworkURL;
@@ -1563,7 +1563,7 @@ void ArgumentCoder<UserScript>::encode(Encoder& encoder, const UserScript& userS
     encoder.encodeEnum(userScript.injectedFrames());
 }
 
-bool ArgumentCoder<UserScript>::decode(ArgumentDecoder& decoder, UserScript& userScript)
+bool ArgumentCoder<UserScript>::decode(Decoder& decoder, UserScript& userScript)
 {
     String source;
     if (!decoder.decode(source))
@@ -1605,7 +1605,7 @@ void ArgumentCoder<ScrollableAreaParameters>::encode(Encoder& encoder, const Scr
     encoder << parameters.hasEnabledVerticalScrollbar;
 }
 
-bool ArgumentCoder<ScrollableAreaParameters>::decode(ArgumentDecoder& decoder, ScrollableAreaParameters& params)
+bool ArgumentCoder<ScrollableAreaParameters>::decode(Decoder& decoder, ScrollableAreaParameters& params)
 {
     if (!decoder.decodeEnum(params.horizontalScrollElasticity))
         return false;
@@ -1634,7 +1634,7 @@ void ArgumentCoder<FixedPositionViewportConstraints>::encode(Encoder& encoder, c
     encoder << viewportConstraints.layerPositionAtLastLayout();
 }
 
-bool ArgumentCoder<FixedPositionViewportConstraints>::decode(ArgumentDecoder& decoder, FixedPositionViewportConstraints& viewportConstraints)
+bool ArgumentCoder<FixedPositionViewportConstraints>::decode(Decoder& decoder, FixedPositionViewportConstraints& viewportConstraints)
 {
     FloatSize alignmentOffset;
     if (!decoder.decode(alignmentOffset))
@@ -1680,7 +1680,7 @@ void ArgumentCoder<StickyPositionViewportConstraints>::encode(Encoder& encoder,
     encoder << viewportConstraints.layerPositionAtLastLayout();
 }
 
-bool ArgumentCoder<StickyPositionViewportConstraints>::decode(ArgumentDecoder& decoder, StickyPositionViewportConstraints& viewportConstraints)
+bool ArgumentCoder<StickyPositionViewportConstraints>::decode(Decoder& decoder, StickyPositionViewportConstraints& viewportConstraints)
 {
     FloatSize alignmentOffset;
     if (!decoder.decode(alignmentOffset))
@@ -1785,7 +1785,7 @@ void ArgumentCoder<FilterOperation>::encode(Encoder& encoder, const FilterOperat
     }
 }
 
-bool decodeFilterOperation(ArgumentDecoder& decoder, RefPtr<FilterOperation>& filter)
+bool decodeFilterOperation(Decoder& decoder, RefPtr<FilterOperation>& filter)
 {
     FilterOperation::OperationType type;
     if (!decoder.decodeEnum(type))
@@ -1861,7 +1861,7 @@ void ArgumentCoder<FilterOperations>::encode(Encoder& encoder, const FilterOpera
         encoder << *filter;
 }
 
-bool ArgumentCoder<FilterOperations>::decode(ArgumentDecoder& decoder, FilterOperations& filters)
+bool ArgumentCoder<FilterOperations>::decode(Decoder& decoder, FilterOperations& filters)
 {
     uint64_t filterCount;
     if (!decoder.decode(filterCount))
@@ -1883,7 +1883,7 @@ void ArgumentCoder<SessionID>::encode(Encoder& encoder, const SessionID& session
     encoder << sessionID.sessionID();
 }
 
-bool ArgumentCoder<SessionID>::decode(ArgumentDecoder& decoder, SessionID& sessionID)
+bool ArgumentCoder<SessionID>::decode(Decoder& decoder, SessionID& sessionID)
 {
     uint64_t session;
     if (!decoder.decode(session))
@@ -1907,7 +1907,7 @@ void ArgumentCoder<BlobPart>::encode(Encoder& encoder, const BlobPart& blobPart)
     }
 }
 
-bool ArgumentCoder<BlobPart>::decode(ArgumentDecoder& decoder, BlobPart& blobPart)
+bool ArgumentCoder<BlobPart>::decode(Decoder& decoder, BlobPart& blobPart)
 {
     uint32_t type;
     if (!decoder.decode(type))
@@ -1948,7 +1948,7 @@ void ArgumentCoder<TextIndicatorData>::encode(Encoder& encoder, const TextIndica
     encodeOptionalImage(encoder, textIndicatorData.contentImageWithHighlight.get());
 }
 
-bool ArgumentCoder<TextIndicatorData>::decode(ArgumentDecoder& decoder, TextIndicatorData& textIndicatorData)
+bool ArgumentCoder<TextIndicatorData>::decode(Decoder& decoder, TextIndicatorData& textIndicatorData)
 {
     if (!decoder.decode(textIndicatorData.selectionRectInRootViewCoordinates))
         return false;
@@ -1998,7 +1998,7 @@ void ArgumentCoder<MediaPlaybackTargetContext>::encode(Encoder& encoder, const M
     encoder << static_cast<int32_t>(target.mockState());
 }
 
-bool ArgumentCoder<MediaPlaybackTargetContext>::decode(ArgumentDecoder& decoder, MediaPlaybackTargetContext& target)
+bool ArgumentCoder<MediaPlaybackTargetContext>::decode(Decoder& decoder, MediaPlaybackTargetContext& target)
 {
     bool hasPlatformData;
     if (!decoder.decode(hasPlatformData))
@@ -2044,7 +2044,7 @@ void ArgumentCoder<DictionaryPopupInfo>::encode(IPC::Encoder& encoder, const Dic
 #endif
 }
 
-bool ArgumentCoder<DictionaryPopupInfo>::decode(IPC::ArgumentDecoder& decoder, DictionaryPopupInfo& result)
+bool ArgumentCoder<DictionaryPopupInfo>::decode(IPC::Decoder& decoder, DictionaryPopupInfo& result)
 {
     if (!decoder.decode(result.origin))
         return false;
@@ -2082,7 +2082,7 @@ void ArgumentCoder<ExceptionDetails>::encode(IPC::Encoder& encoder, const Except
     encoder << info.sourceURL;
 }
 
-bool ArgumentCoder<ExceptionDetails>::decode(IPC::ArgumentDecoder& decoder, ExceptionDetails& result)
+bool ArgumentCoder<ExceptionDetails>::decode(IPC::Decoder& decoder, ExceptionDetails& result)
 {
     if (!decoder.decode(result.message))
         return false;
@@ -2137,7 +2137,7 @@ void ArgumentCoder<ResourceLoadStatistics>::encode(Encoder& encoder, const WebCo
     encoder << statistics.isPrevalentResource;
 }
 
-bool ArgumentCoder<ResourceLoadStatistics>::decode(ArgumentDecoder& decoder, WebCore::ResourceLoadStatistics& statistics)
+bool ArgumentCoder<ResourceLoadStatistics>::decode(Decoder& decoder, WebCore::ResourceLoadStatistics& statistics)
 {
     if (!decoder.decode(statistics.highLevelDomain))
         return false;
index 7226dbf..3dc0e3e 100644 (file)
@@ -131,399 +131,399 @@ namespace IPC {
 
 template<> struct ArgumentCoder<WebCore::AffineTransform> {
     static void encode(Encoder&, const WebCore::AffineTransform&);
-    static bool decode(ArgumentDecoder&, WebCore::AffineTransform&);
+    static bool decode(Decoder&, WebCore::AffineTransform&);
 };
 
 template<> struct ArgumentCoder<WebCore::EventTrackingRegions> {
     static void encode(Encoder&, const WebCore::EventTrackingRegions&);
-    static bool decode(ArgumentDecoder&, WebCore::EventTrackingRegions&);
+    static bool decode(Decoder&, WebCore::EventTrackingRegions&);
 };
 
 template<> struct ArgumentCoder<WebCore::TransformationMatrix> {
     static void encode(Encoder&, const WebCore::TransformationMatrix&);
-    static bool decode(ArgumentDecoder&, WebCore::TransformationMatrix&);
+    static bool decode(Decoder&, WebCore::TransformationMatrix&);
 };
 
 template<> struct ArgumentCoder<WebCore::LinearTimingFunction> {
     static void encode(Encoder&, const WebCore::LinearTimingFunction&);
-    static bool decode(ArgumentDecoder&, WebCore::LinearTimingFunction&);
+    static bool decode(Decoder&, WebCore::LinearTimingFunction&);
 };
 
 template<> struct ArgumentCoder<WebCore::CubicBezierTimingFunction> {
     static void encode(Encoder&, const WebCore::CubicBezierTimingFunction&);
-    static bool decode(ArgumentDecoder&, WebCore::CubicBezierTimingFunction&);
+    static bool decode(Decoder&, WebCore::CubicBezierTimingFunction&);
 };
 
 template<> struct ArgumentCoder<WebCore::StepsTimingFunction> {
     static void encode(Encoder&, const WebCore::StepsTimingFunction&);
-    static bool decode(ArgumentDecoder&, WebCore::StepsTimingFunction&);
+    static bool decode(Decoder&, WebCore::StepsTimingFunction&);
 };
 
 template<> struct ArgumentCoder<WebCore::SpringTimingFunction> {
     static void encode(Encoder&, const WebCore::SpringTimingFunction&);
-    static bool decode(ArgumentDecoder&, WebCore::SpringTimingFunction&);
+    static bool decode(Decoder&, WebCore::SpringTimingFunction&);
 };
 
 template<> struct ArgumentCoder<WebCore::CertificateInfo> {
     static void encode(Encoder&, const WebCore::CertificateInfo&);
-    static bool decode(ArgumentDecoder&, WebCore::CertificateInfo&);
+    static bool decode(Decoder&, WebCore::CertificateInfo&);
 };
 
 template<> struct ArgumentCoder<WebCore::FloatPoint> {
     static void encode(Encoder&, const WebCore::FloatPoint&);
-    static bool decode(ArgumentDecoder&, WebCore::FloatPoint&);
+    static bool decode(Decoder&, WebCore::FloatPoint&);
 };
 
 template<> struct ArgumentCoder<WebCore::FloatPoint3D> {
     static void encode(Encoder&, const WebCore::FloatPoint3D&);
-    static bool decode(ArgumentDecoder&, WebCore::FloatPoint3D&);
+    static bool decode(Decoder&, WebCore::FloatPoint3D&);
 };
 
 template<> struct ArgumentCoder<WebCore::FloatRect> {
     static void encode(Encoder&, const WebCore::FloatRect&);
-    static bool decode(ArgumentDecoder&, WebCore::FloatRect&);
+    static bool decode(Decoder&, WebCore::FloatRect&);
 };
 
 template<> struct ArgumentCoder<WebCore::FloatSize> {
     static void encode(Encoder&, const WebCore::FloatSize&);
-    static bool decode(ArgumentDecoder&, WebCore::FloatSize&);
+    static bool decode(Decoder&, WebCore::FloatSize&);
 };
 
 template<> struct ArgumentCoder<WebCore::FloatRoundedRect> {
     static void encode(Encoder&, const WebCore::FloatRoundedRect&);
-    static bool decode(ArgumentDecoder&, WebCore::FloatRoundedRect&);
+    static bool decode(Decoder&, WebCore::FloatRoundedRect&);
 };
 
 #if PLATFORM(IOS)
 template<> struct ArgumentCoder<WebCore::FloatQuad> {
     static void encode(Encoder&, const WebCore::FloatQuad&);
-    static bool decode(ArgumentDecoder&, WebCore::FloatQuad&);
+    static bool decode(Decoder&, WebCore::FloatQuad&);
 };
 
 template<> struct ArgumentCoder<WebCore::ViewportArguments> {
     static void encode(Encoder&, const WebCore::ViewportArguments&);
-    static bool decode(ArgumentDecoder&, WebCore::ViewportArguments&);
+    static bool decode(Decoder&, WebCore::ViewportArguments&);
 };
 #endif // PLATFORM(IOS)
 
 template<> struct ArgumentCoder<WebCore::IntPoint> {
     static void encode(Encoder&, const WebCore::IntPoint&);
-    static bool decode(ArgumentDecoder&, WebCore::IntPoint&);
+    static bool decode(Decoder&, WebCore::IntPoint&);
 };
 
 template<> struct ArgumentCoder<WebCore::IntRect> {
     static void encode(Encoder&, const WebCore::IntRect&);
-    static bool decode(ArgumentDecoder&, WebCore::IntRect&);
+    static bool decode(Decoder&, WebCore::IntRect&);
 };
 
 template<> struct ArgumentCoder<WebCore::IntSize> {
     static void encode(Encoder&, const WebCore::IntSize&);
-    static bool decode(ArgumentDecoder&, WebCore::IntSize&);
+    static bool decode(Decoder&, WebCore::IntSize&);
 };
 
 template<> struct ArgumentCoder<WebCore::Path> {
     static void encode(Encoder&, const WebCore::Path&);
-    static bool decode(ArgumentDecoder&, WebCore::Path&);
+    static bool decode(Decoder&, WebCore::Path&);
 };
 
 template<> struct ArgumentCoder<WebCore::Region> {
     static void encode(Encoder&, const WebCore::Region&);
-    static bool decode(ArgumentDecoder&, WebCore::Region&);
+    static bool decode(Decoder&, WebCore::Region&);
 };
 
 template<> struct ArgumentCoder<WebCore::Length> {
     static void encode(Encoder&, const WebCore::Length&);
-    static bool decode(ArgumentDecoder&, WebCore::Length&);
+    static bool decode(Decoder&, WebCore::Length&);
 };
 
 template<> struct ArgumentCoder<WebCore::ViewportAttributes> {
     static void encode(Encoder&, const WebCore::ViewportAttributes&);
-    static bool decode(ArgumentDecoder&, WebCore::ViewportAttributes&);
+    static bool decode(Decoder&, WebCore::ViewportAttributes&);
 };
 
 template<> struct ArgumentCoder<WebCore::MimeClassInfo> {
     static void encode(Encoder&, const WebCore::MimeClassInfo&);
-    static bool decode(ArgumentDecoder&, WebCore::MimeClassInfo&);
+    static bool decode(Decoder&, WebCore::MimeClassInfo&);
 };
 
 template<> struct ArgumentCoder<WebCore::PluginInfo> {
     static void encode(Encoder&, const WebCore::PluginInfo&);
-    static bool decode(ArgumentDecoder&, WebCore::PluginInfo&);
+    static bool decode(Decoder&, WebCore::PluginInfo&);
 };
 
 template<> struct ArgumentCoder<WebCore::AuthenticationChallenge> {
     static void encode(Encoder&, const WebCore::AuthenticationChallenge&);
-    static bool decode(ArgumentDecoder&, WebCore::AuthenticationChallenge&);
+    static bool decode(Decoder&, WebCore::AuthenticationChallenge&);
 };
 
 template<> struct ArgumentCoder<WebCore::ProtectionSpace> {
     static void encode(Encoder&, const WebCore::ProtectionSpace&);
-    static bool decode(ArgumentDecoder&, WebCore::ProtectionSpace&);
+    static bool decode(Decoder&, WebCore::ProtectionSpace&);
     static void encodePlatformData(Encoder&, const WebCore::ProtectionSpace&);
-    static bool decodePlatformData(ArgumentDecoder&, WebCore::ProtectionSpace&);
+    static bool decodePlatformData(Decoder&, WebCore::ProtectionSpace&);
 };
 
 template<> struct ArgumentCoder<WebCore::Credential> {
     static void encode(Encoder&, const WebCore::Credential&);
-    static bool decode(ArgumentDecoder&, WebCore::Credential&);
+    static bool decode(Decoder&, WebCore::Credential&);
     static void encodePlatformData(Encoder&, const WebCore::Credential&);
-    static bool decodePlatformData(ArgumentDecoder&, WebCore::Credential&);
+    static bool decodePlatformData(Decoder&, WebCore::Credential&);
 };
 
 template<> struct ArgumentCoder<WebCore::Cursor> {
     static void encode(Encoder&, const WebCore::Cursor&);
-    static bool decode(ArgumentDecoder&, WebCore::Cursor&);
+    static bool decode(Decoder&, WebCore::Cursor&);
 };
 
 template<> struct ArgumentCoder<WebCore::ResourceRequest> {
     static void encode(Encoder&, const WebCore::ResourceRequest&);
-    static bool decode(ArgumentDecoder&, WebCore::ResourceRequest&);
+    static bool decode(Decoder&, WebCore::ResourceRequest&);
     static void encodePlatformData(Encoder&, const WebCore::ResourceRequest&);
-    static bool decodePlatformData(ArgumentDecoder&, WebCore::ResourceRequest&);
+    static bool decodePlatformData(Decoder&, WebCore::ResourceRequest&);
 };
 
 template<> struct ArgumentCoder<WebCore::ResourceError> {
     static void encode(Encoder&, const WebCore::ResourceError&);
-    static bool decode(ArgumentDecoder&, WebCore::ResourceError&);
+    static bool decode(Decoder&, WebCore::ResourceError&);
     static void encodePlatformData(Encoder&, const WebCore::ResourceError&);
-    static bool decodePlatformData(ArgumentDecoder&, WebCore::ResourceError&);
+    static bool decodePlatformData(Decoder&, WebCore::ResourceError&);
 };
 
 template<> struct ArgumentCoder<WebCore::WindowFeatures> {
     static void encode(Encoder&, const WebCore::WindowFeatures&);
-    static bool decode(ArgumentDecoder&, WebCore::WindowFeatures&);
+    static bool decode(Decoder&, WebCore::WindowFeatures&);
 };
 
 template<> struct ArgumentCoder<WebCore::Color> {
     static void encode(Encoder&, const WebCore::Color&);
-    static bool decode(ArgumentDecoder&, WebCore::Color&);
+    static bool decode(Decoder&, WebCore::Color&);
 };
 
 #if PLATFORM(COCOA)
 template<> struct ArgumentCoder<WebCore::MachSendRight> {
     static void encode(Encoder&, const WebCore::MachSendRight&);
     static void encode(Encoder&, WebCore::MachSendRight&&);
-    static bool decode(ArgumentDecoder&, WebCore::MachSendRight&);
+    static bool decode(Decoder&, WebCore::MachSendRight&);
 };
 
 template<> struct ArgumentCoder<WebCore::KeypressCommand> {
     static void encode(Encoder&, const WebCore::KeypressCommand&);
-    static bool decode(ArgumentDecoder&, WebCore::KeypressCommand&);
+    static bool decode(Decoder&, WebCore::KeypressCommand&);
 };
 #endif
 
 #if PLATFORM(IOS)
 template<> struct ArgumentCoder<WebCore::SelectionRect> {
     static void encode(Encoder&, const WebCore::SelectionRect&);
-    static bool decode(ArgumentDecoder&, WebCore::SelectionRect&);
+    static bool decode(Decoder&, WebCore::SelectionRect&);
 };
 
 template<> struct ArgumentCoder<WebCore::Highlight> {
     static void encode(Encoder&, const WebCore::Highlight&);
-    static bool decode(ArgumentDecoder&, WebCore::Highlight&);
+    static bool decode(Decoder&, WebCore::Highlight&);
 };
 
 template<> struct ArgumentCoder<WebCore::PasteboardWebContent> {
     static void encode(Encoder&, const WebCore::PasteboardWebContent&);
-    static bool decode(ArgumentDecoder&, WebCore::PasteboardWebContent&);
+    static bool decode(Decoder&, WebCore::PasteboardWebContent&);
 };
 
 template<> struct ArgumentCoder<WebCore::PasteboardImage> {
     static void encode(Encoder&, const WebCore::PasteboardImage&);
-    static bool decode(ArgumentDecoder&, WebCore::PasteboardImage&);
+    static bool decode(Decoder&, WebCore::PasteboardImage&);
 };
 #endif
 
 template<> struct ArgumentCoder<WebCore::CompositionUnderline> {
     static void encode(Encoder&, const WebCore::CompositionUnderline&);
-    static bool decode(ArgumentDecoder&, WebCore::CompositionUnderline&);
+    static bool decode(Decoder&, WebCore::CompositionUnderline&);
 };
 
 template<> struct ArgumentCoder<WebCore::Cookie> {
     static void encode(Encoder&, const WebCore::Cookie&);
-    static bool decode(ArgumentDecoder&, WebCore::Cookie&);
+    static bool decode(Decoder&, WebCore::Cookie&);
 };
 
 template<> struct ArgumentCoder<WebCore::DatabaseDetails> {
     static void encode(Encoder&, const WebCore::DatabaseDetails&);
-    static bool decode(ArgumentDecoder&, WebCore::DatabaseDetails&);
+    static bool decode(Decoder&, WebCore::DatabaseDetails&);
 };
 
 template<> struct ArgumentCoder<WebCore::DictationAlternative> {
     static void encode(Encoder&, const WebCore::DictationAlternative&);
-    static bool decode(ArgumentDecoder&, WebCore::DictationAlternative&);
+    static bool decode(Decoder&, WebCore::DictationAlternative&);
 };
 
 template<> struct ArgumentCoder<WebCore::FileChooserSettings> {
     static void encode(Encoder&, const WebCore::FileChooserSettings&);
-    static bool decode(ArgumentDecoder&, WebCore::FileChooserSettings&);
+    static bool decode(Decoder&, WebCore::FileChooserSettings&);
 };
 
 template<> struct ArgumentCoder<WebCore::GrammarDetail> {
     static void encode(Encoder&, const WebCore::GrammarDetail&);
-    static bool decode(ArgumentDecoder&, WebCore::GrammarDetail&);
+    static bool decode(Decoder&, WebCore::GrammarDetail&);
 };
 
 template<> struct ArgumentCoder<WebCore::TextCheckingRequestData> {
     static void encode(Encoder&, const WebCore::TextCheckingRequestData&);
-    static bool decode(ArgumentDecoder&, WebCore::TextCheckingRequestData&);
+    static bool decode(Decoder&, WebCore::TextCheckingRequestData&);
 };
 
 template<> struct ArgumentCoder<WebCore::TextCheckingResult> {
     static void encode(Encoder&, const WebCore::TextCheckingResult&);
-    static bool decode(ArgumentDecoder&, WebCore::TextCheckingResult&);
+    static bool decode(Decoder&, WebCore::TextCheckingResult&);
 };
     
 template<> struct ArgumentCoder<WebCore::URL> {
     static void encode(Encoder&, const WebCore::URL&);
-    static bool decode(ArgumentDecoder&, WebCore::URL&);
+    static bool decode(Decoder&, WebCore::URL&);
 };
 
 template<> struct ArgumentCoder<WebCore::UserStyleSheet> {
     static void encode(Encoder&, const WebCore::UserStyleSheet&);
-    static bool decode(ArgumentDecoder&, WebCore::UserStyleSheet&);
+    static bool decode(Decoder&, WebCore::UserStyleSheet&);
 };
 
 template<> struct ArgumentCoder<WebCore::UserScript> {
     static void encode(Encoder&, const WebCore::UserScript&);
-    static bool decode(ArgumentDecoder&, WebCore::UserScript&);
+    static bool decode(Decoder&, WebCore::UserScript&);
 };
 
 template<> struct ArgumentCoder<WebCore::ScrollableAreaParameters> {
     static void encode(Encoder&, const WebCore::ScrollableAreaParameters&);
-    static bool decode(ArgumentDecoder&, WebCore::ScrollableAreaParameters&);
+    static bool decode(Decoder&, WebCore::ScrollableAreaParameters&);
 };
 
 template<> struct ArgumentCoder<WebCore::FixedPositionViewportConstraints> {
     static void encode(Encoder&, const WebCore::FixedPositionViewportConstraints&);
-    static bool decode(ArgumentDecoder&, WebCore::FixedPositionViewportConstraints&);
+    static bool decode(Decoder&, WebCore::FixedPositionViewportConstraints&);
 };
 
 template<> struct ArgumentCoder<WebCore::StickyPositionViewportConstraints> {
     static void encode(Encoder&, const WebCore::StickyPositionViewportConstraints&);
-    static bool decode(ArgumentDecoder&, WebCore::StickyPositionViewportConstraints&);
+    static bool decode(Decoder&, WebCore::StickyPositionViewportConstraints&);
 };
 
 #if !USE(COORDINATED_GRAPHICS)
 template<> struct ArgumentCoder<WebCore::FilterOperations> {
     static void encode(Encoder&, const WebCore::FilterOperations&);
-    static bool decode(ArgumentDecoder&, WebCore::FilterOperations&);
+    static bool decode(Decoder&, WebCore::FilterOperations&);
 };
     
 template<> struct ArgumentCoder<WebCore::FilterOperation> {
     static void encode(Encoder&, const WebCore::FilterOperation&);
 };
-bool decodeFilterOperation(ArgumentDecoder&, RefPtr<WebCore::FilterOperation>&);
+bool decodeFilterOperation(Decoder&, RefPtr<WebCore::FilterOperation>&);
 #endif
 
 template<> struct ArgumentCoder<WebCore::SessionID> {
     static void encode(Encoder&, const WebCore::SessionID&);
-    static bool decode(ArgumentDecoder&, WebCore::SessionID&);
+    static bool decode(Decoder&, WebCore::SessionID&);
 };
 
 template<> struct ArgumentCoder<WebCore::BlobPart> {
     static void encode(Encoder&, const WebCore::BlobPart&);
-    static bool decode(ArgumentDecoder&, WebCore::BlobPart&);
+    static bool decode(Decoder&, WebCore::BlobPart&);
 };
 
 #if ENABLE(CONTENT_FILTERING)
 template<> struct ArgumentCoder<WebCore::ContentFilterUnblockHandler> {
     static void encode(Encoder&, const WebCore::ContentFilterUnblockHandler&);
-    static bool decode(ArgumentDecoder&, WebCore::ContentFilterUnblockHandler&);
+    static bool decode(Decoder&, WebCore::ContentFilterUnblockHandler&);
 };
 #endif
 
 #if ENABLE(MEDIA_SESSION)
 template<> struct ArgumentCoder<WebCore::MediaSessionMetadata> {
     static void encode(Encoder&, const WebCore::MediaSessionMetadata&);
-    static bool decode(ArgumentDecoder&, WebCore::MediaSessionMetadata&);
+    static bool decode(Decoder&, WebCore::MediaSessionMetadata&);
 };
 #endif
 
 template<> struct ArgumentCoder<WebCore::TextIndicatorData> {
     static void encode(Encoder&, const WebCore::TextIndicatorData&);
-    static bool decode(ArgumentDecoder&, WebCore::TextIndicatorData&);
+    static bool decode(Decoder&, WebCore::TextIndicatorData&);
 };
 
 template<> struct ArgumentCoder<WebCore::DictionaryPopupInfo> {
     static void encode(Encoder&, const WebCore::DictionaryPopupInfo&);
-    static bool decode(ArgumentDecoder&, WebCore::DictionaryPopupInfo&);
+    static bool decode(Decoder&, WebCore::DictionaryPopupInfo&);
 };
 
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
 template<> struct ArgumentCoder<WebCore::MediaPlaybackTargetContext> {
     static void encode(Encoder&, const WebCore::MediaPlaybackTargetContext&);
-    static bool decode(ArgumentDecoder&, WebCore::MediaPlaybackTargetContext&);
+    static bool decode(Decoder&, WebCore::MediaPlaybackTargetContext&);
     static void encodePlatformData(Encoder&, const WebCore::MediaPlaybackTargetContext&);
-    static bool decodePlatformData(ArgumentDecoder&, WebCore::MediaPlaybackTargetContext&);
+    static bool decodePlatformData(Decoder&, WebCore::MediaPlaybackTargetContext&);
 };
 #endif
 
 template<> struct ArgumentCoder<WebCore::RecentSearch> {
     static void encode(Encoder&, const WebCore::RecentSearch&);
-    static bool decode(ArgumentDecoder&, WebCore::RecentSearch&);
+    static bool decode(Decoder&, WebCore::RecentSearch&);
 };
 
 template<> struct ArgumentCoder<WebCore::ExceptionDetails> {
     static void encode(Encoder&, const WebCore::ExceptionDetails&);
-    static bool decode(ArgumentDecoder&, WebCore::ExceptionDetails&);
+    static bool decode(Decoder&, WebCore::ExceptionDetails&);
 };
 
 template<> struct ArgumentCoder<WebCore::ResourceLoadStatistics> {
     static void encode(Encoder&, const WebCore::ResourceLoadStatistics&);
-    static bool decode(ArgumentDecoder&, WebCore::ResourceLoadStatistics&);
+    static bool decode(Decoder&, WebCore::ResourceLoadStatistics&);
 };
 
 #if ENABLE(APPLE_PAY)
 
 template<> struct ArgumentCoder<WebCore::Payment> {
     static void encode(Encoder&, const WebCore::Payment&);
-    static bool decode(ArgumentDecoder&, WebCore::Payment&);
+    static bool decode(Decoder&, WebCore::Payment&);
 };
 
 template<> struct ArgumentCoder<WebCore::PaymentContact> {
     static void encode(Encoder&, const WebCore::PaymentContact&);
-    static bool decode(ArgumentDecoder&, WebCore::PaymentContact&);
+    static bool decode(Decoder&, WebCore::PaymentContact&);
 };
 
 template<> struct ArgumentCoder<WebCore::PaymentMerchantSession> {
     static void encode(Encoder&, const WebCore::PaymentMerchantSession&);
-    static bool decode(ArgumentDecoder&, WebCore::PaymentMerchantSession&);
+    static bool decode(Decoder&, WebCore::PaymentMerchantSession&);
 };
 
 template<> struct ArgumentCoder<WebCore::PaymentMethod> {
     static void encode(Encoder&, const WebCore::PaymentMethod&);
-    static bool decode(ArgumentDecoder&, WebCore::PaymentMethod&);
+    static bool decode(Decoder&, WebCore::PaymentMethod&);
 };
 
 template<> struct ArgumentCoder<WebCore::PaymentRequest> {
     static void encode(Encoder&, const WebCore::PaymentRequest&);
-    static bool decode(ArgumentDecoder&, WebCore::PaymentRequest&);
+    static bool decode(Decoder&, WebCore::PaymentRequest&);
 };
 
 template<> struct ArgumentCoder<WebCore::PaymentRequest::ContactFields> {
     static void encode(Encoder&, const WebCore::PaymentRequest::ContactFields&);
-    static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::ContactFields&);
+    static bool decode(Decoder&, WebCore::PaymentRequest::ContactFields&);
 };
 
 template<> struct ArgumentCoder<WebCore::PaymentRequest::LineItem> {
     static void encode(Encoder&, const WebCore::PaymentRequest::LineItem&);
-    static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::LineItem&);
+    static bool decode(Decoder&, WebCore::PaymentRequest::LineItem&);
 };
 
 template<> struct ArgumentCoder<WebCore::PaymentRequest::MerchantCapabilities> {
     static void encode(Encoder&, const WebCore::PaymentRequest::MerchantCapabilities&);
-    static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::MerchantCapabilities&);
+    static bool decode(Decoder&, WebCore::PaymentRequest::MerchantCapabilities&);
 };
 
 template<> struct ArgumentCoder<WebCore::PaymentRequest::ShippingMethod> {
     static void encode(Encoder&, const WebCore::PaymentRequest::ShippingMethod&);
-    static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::ShippingMethod&);
+    static bool decode(Decoder&, WebCore::PaymentRequest::ShippingMethod&);
 };
 
 template<> struct ArgumentCoder<WebCore::PaymentRequest::TotalAndLineItems> {
     static void encode(Encoder&, const WebCore::PaymentRequest::TotalAndLineItems&);
-    static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::TotalAndLineItems&);
+    static bool decode(Decoder&, WebCore::PaymentRequest::TotalAndLineItems&);
 };
 
 #endif
index 7b44ffd..507bc16 100644 (file)
@@ -26,8 +26,7 @@
 #include "config.h"
 #include "WebEvent.h"
 
-#include "ArgumentDecoder.h"
-#include "Arguments.h"
+#include "Decoder.h"
 #include "Encoder.h"
 
 namespace WebKit {
@@ -53,7 +52,7 @@ void WebEvent::encode(IPC::Encoder& encoder) const
     encoder << m_timestamp;
 }
 
-bool WebEvent::decode(IPC::ArgumentDecoder& decoder, WebEvent& result)
+bool WebEvent::decode(IPC::Decoder& decoder, WebEvent& result)
 {
     if (!decoder.decode(result.m_type))
         return false;
index c60ec4c..98df671 100644 (file)
@@ -37,8 +37,8 @@
 #include <wtf/text/WTFString.h>
 
 namespace IPC {
-    class ArgumentDecoder;
-    class Encoder;
+class Decoder;
+class Encoder;
 }
 
 #if USE(APPKIT)
@@ -112,7 +112,7 @@ protected:
     WebEvent(Type, Modifiers, double timestamp);
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, WebEvent&);
+    static bool decode(IPC::Decoder&, WebEvent&);
 
 private:
     uint32_t m_type; // Type
@@ -155,7 +155,7 @@ public:
     SyntheticClickType syntheticClickType() const { return static_cast<SyntheticClickType>(m_syntheticClickType); }
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, WebMouseEvent&);
+    static bool decode(IPC::Decoder&, WebMouseEvent&);
 
 private:
     static bool isMouseEventType(Type);
@@ -217,7 +217,7 @@ public:
 #endif
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, WebWheelEvent&);
+    static bool decode(IPC::Decoder&, WebWheelEvent&);
 
 private:
     static bool isWheelEventType(Type);
@@ -270,7 +270,7 @@ public:
     bool isSystemKey() const { return m_isSystemKey; }
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, WebKeyboardEvent&);
+    static bool decode(IPC::Decoder&, WebKeyboardEvent&);
 
     static bool isKeyboardEventType(Type);
 
@@ -325,7 +325,7 @@ public:
 #endif
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, WebPlatformTouchPoint&);
+    static bool decode(IPC::Decoder&, WebPlatformTouchPoint&);
 
 private:
     unsigned m_identifier;
@@ -368,7 +368,7 @@ public:
     bool allTouchPointsAreReleased() const;
 
     void encode(IPC::Encoder&) const;
-    static bool decode(IPC::ArgumentDecoder&, WebTouchEvent&);
+    static bool decode(IPC::Decoder&, WebTouchEvent&);
     
 private:
     Vector<WebPlatformTouchPoint> m_touchPoints;