Move code over to the IPC namespace.
Rubber-stamped by Andreas Kling.
* DatabaseProcess/DatabaseProcess.cpp:
(WebKit::DatabaseProcess::initializeConnection):
(WebKit::DatabaseProcess::didClose):
(WebKit::DatabaseProcess::didReceiveInvalidMessage):
(WebKit::DatabaseProcess::createDatabaseToWebProcessConnection):
* DatabaseProcess/DatabaseProcess.h:
* DatabaseProcess/DatabaseToWebProcessConnection.cpp:
(WebKit::DatabaseToWebProcessConnection::create):
(WebKit::DatabaseToWebProcessConnection::DatabaseToWebProcessConnection):
(WebKit::DatabaseToWebProcessConnection::didReceiveMessage):
(WebKit::DatabaseToWebProcessConnection::didClose):
(WebKit::DatabaseToWebProcessConnection::didReceiveInvalidMessage):
* DatabaseProcess/DatabaseToWebProcessConnection.h:
(WebKit::DatabaseToWebProcessConnection::connection):
* DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp:
(WebKit::DatabaseProcessIDBConnection::messageSenderConnection):
* DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h:
* NetworkProcess/AsynchronousNetworkLoaderClient.cpp:
(WebKit::AsynchronousNetworkLoaderClient::willSendRequest):
(WebKit::AsynchronousNetworkLoaderClient::canAuthenticateAgainstProtectionSpace):
(WebKit::AsynchronousNetworkLoaderClient::didReceiveBuffer):
* NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::NetworkConnectionToWebProcess::create):
(WebKit::NetworkConnectionToWebProcess::NetworkConnectionToWebProcess):
(WebKit::NetworkConnectionToWebProcess::didReceiveMessage):
(WebKit::NetworkConnectionToWebProcess::didReceiveSyncMessage):
(WebKit::NetworkConnectionToWebProcess::didClose):
(WebKit::NetworkConnectionToWebProcess::didReceiveInvalidMessage):
* NetworkProcess/NetworkConnectionToWebProcess.h:
(WebKit::NetworkConnectionToWebProcess::connection):
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::didReceiveMessage):
(WebKit::NetworkProcess::didReceiveSyncMessage):
(WebKit::NetworkProcess::didClose):
(WebKit::NetworkProcess::didReceiveInvalidMessage):
(WebKit::NetworkProcess::downloadProxyConnection):
(WebKit::NetworkProcess::initializeConnection):
(WebKit::NetworkProcess::createNetworkConnectionToWebProcess):
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::messageSenderConnection):
* NetworkProcess/NetworkResourceLoader.h:
* NetworkProcess/mac/DiskCacheMonitor.h:
* NetworkProcess/mac/DiskCacheMonitor.mm:
(WebKit::DiskCacheMonitor::messageSenderConnection):
* Platform/IPC/ArgumentCoder.h:
* Platform/IPC/ArgumentCoders.cpp:
* Platform/IPC/ArgumentCoders.h:
* Platform/IPC/ArgumentDecoder.cpp:
* Platform/IPC/ArgumentDecoder.h:
* Platform/IPC/ArgumentEncoder.cpp:
* Platform/IPC/ArgumentEncoder.h:
* Platform/IPC/Arguments.h:
* Platform/IPC/Attachment.cpp:
* Platform/IPC/Attachment.h:
* Platform/IPC/Connection.cpp:
(IPC::Connection::Connection):
* Platform/IPC/Connection.h:
* Platform/IPC/HandleMessage.h:
* Platform/IPC/MessageDecoder.cpp:
* Platform/IPC/MessageDecoder.h:
* Platform/IPC/MessageEncoder.cpp:
* Platform/IPC/MessageEncoder.h:
* Platform/IPC/MessageFlags.h:
* Platform/IPC/MessageReceiver.h:
* Platform/IPC/MessageReceiverMap.cpp:
* Platform/IPC/MessageReceiverMap.h:
* Platform/IPC/mac/ConnectionMac.cpp:
* Platform/IPC/mac/ImportanceAssertion.h:
* Platform/IPC/mac/MachPort.h:
* Platform/SharedMemory.h:
* Platform/mac/SharedMemoryMac.cpp:
(WebKit::SharedMemory::Handle::encode):
(WebKit::SharedMemory::Handle::decode):
* PluginProcess/PluginControllerProxy.cpp:
(WebKit::PluginControllerProxy::streamDidReceiveData):
(WebKit::PluginControllerProxy::manualStreamDidReceiveData):
* PluginProcess/PluginControllerProxy.h:
* PluginProcess/PluginControllerProxy.messages.in:
* PluginProcess/PluginCreationParameters.cpp:
(WebKit::PluginCreationParameters::encode):
(WebKit::PluginCreationParameters::decode):
* PluginProcess/PluginCreationParameters.h:
* PluginProcess/PluginProcess.cpp:
(WebKit::PluginProcess::didReceiveMessage):
(WebKit::PluginProcess::didClose):
(WebKit::PluginProcess::didReceiveInvalidMessage):
(WebKit::PluginProcess::createWebProcessConnection):
* PluginProcess/PluginProcess.h:
* PluginProcess/WebProcessConnection.cpp:
(WebKit::WebProcessConnection::create):
(WebKit::WebProcessConnection::WebProcessConnection):
(WebKit::WebProcessConnection::setGlobalException):
(WebKit::WebProcessConnection::didReceiveMessage):
(WebKit::WebProcessConnection::didReceiveSyncMessage):
(WebKit::WebProcessConnection::didClose):
(WebKit::WebProcessConnection::didReceiveInvalidMessage):
* PluginProcess/WebProcessConnection.h:
(WebKit::WebProcessConnection::connection):
* PluginProcess/mac/PluginControllerProxyMac.mm:
(WebKit::PluginControllerProxy::setComplexTextInputState):
* Scripts/webkit2/messages.py:
(arguments_type_old):
(message_to_struct_declaration):
(forward_declarations_and_headers):
(generate_messages_header):
(async_message_statement):
(sync_message_statement):
(headers_for_type):
(generate_message_handler):
* Scripts/webkit2/messages_unittest.py:
(IPC):
(std):
* Shared/API/Cocoa/RemoteObjectRegistry.h:
* Shared/APIGeometry.cpp:
(API::Point::encode):
(API::Point::decode):
(API::Size::encode):
(API::Size::decode):
(API::Rect::encode):
(API::Rect::decode):
* Shared/APIGeometry.h:
* Shared/APINumber.h:
(API::Number::encode):
(API::Number::decode):
* Shared/Authentication/AuthenticationManager.h:
* Shared/ChildProcess.cpp:
(WebKit::didCloseOnConnectionWorkQueue):
(WebKit::ChildProcess::initialize):
(WebKit::ChildProcess::initializeConnection):
(WebKit::ChildProcess::addMessageReceiver):
(WebKit::ChildProcess::removeMessageReceiver):
(WebKit::ChildProcess::messageSenderConnection):
* Shared/ChildProcess.h:
(WebKit::ChildProcess::parentProcessConnection):
(WebKit::ChildProcess::messageReceiverMap):
* Shared/ChildProcessProxy.cpp:
(WebKit::ChildProcessProxy::fromConnection):
(WebKit::ChildProcessProxy::sendMessage):
(WebKit::ChildProcessProxy::addMessageReceiver):
(WebKit::ChildProcessProxy::removeMessageReceiver):
(WebKit::ChildProcessProxy::dispatchMessage):
(WebKit::ChildProcessProxy::dispatchSyncMessage):
(WebKit::ChildProcessProxy::didFinishLaunching):
(WebKit::ChildProcessProxy::connectionWillOpen):
(WebKit::ChildProcessProxy::connectionWillClose):
* Shared/ChildProcessProxy.h:
(WebKit::ChildProcessProxy::connection):
(WebKit::ChildProcessProxy::send):
* Shared/ChildProcessSupplement.h:
(WebKit::ChildProcessSupplement::initializeConnection):
* Shared/ConnectionStack.h:
(WebKit::ConnectionStack::current):
(WebKit::ConnectionStack::CurrentConnectionPusher::CurrentConnectionPusher):
* Shared/CoreIPCSupport/WebContextMessageKinds.h:
(WebContextLegacyMessages::messageReceiverName):
(WebContextLegacyMessages::postMessageMessageName):
(WebContextLegacyMessages::postSynchronousMessageMessageName):
* Shared/Databases/DatabaseProcessCreationParameters.cpp:
(WebKit::DatabaseProcessCreationParameters::encode):
(WebKit::DatabaseProcessCreationParameters::decode):
* Shared/Databases/DatabaseProcessCreationParameters.h:
* Shared/DictionaryPopupInfo.cpp:
(WebKit::DictionaryPopupInfo::encode):
(WebKit::DictionaryPopupInfo::decode):
* Shared/DictionaryPopupInfo.h:
* Shared/Downloads/Download.cpp:
(WebKit::Download::didFail):
(WebKit::Download::didCancel):
(WebKit::Download::messageSenderConnection):
* Shared/Downloads/Download.h:
* Shared/Downloads/DownloadManager.cpp:
(WebKit::DownloadManager::downloadProxyConnection):
* Shared/Downloads/DownloadManager.h:
* Shared/Downloads/mac/DownloadMac.mm:
(WebKit::Download::cancel):
(-[WKDownloadAsDelegate download:didFailWithError:]):
* Shared/EditorState.cpp:
(WebKit::EditorState::encode):
(WebKit::EditorState::decode):
* Shared/EditorState.h:
* Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessEntryPoint.h:
* Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessEntryPoint.mm:
(WebKit::ChildProcessMainDelegate::getConnectionIdentifier):
* Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h:
* Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm:
(WebKit::XPCServiceInitializerDelegate::getConnectionIdentifier):
* Shared/FileAPI/BlobRegistrationData.cpp:
(WebKit::BlobRegistrationData::encode):
(WebKit::BlobRegistrationData::decode):
* Shared/FileAPI/BlobRegistrationData.h:
* Shared/FontInfo.cpp:
(WebKit::FontInfo::encode):
(WebKit::FontInfo::decode):
* Shared/FontInfo.h:
* Shared/LayerTreeContext.h:
* Shared/Network/CustomProtocols/CustomProtocolManager.h:
* Shared/Network/CustomProtocols/CustomProtocolManager.messages.in:
* Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm:
(WebKit::CustomProtocolManager::initializeConnection):
(WebKit::CustomProtocolManager::didLoadData):
* Shared/Network/NetworkProcessCreationParameters.cpp:
(WebKit::NetworkProcessCreationParameters::encode):
(WebKit::NetworkProcessCreationParameters::decode):
* Shared/Network/NetworkProcessCreationParameters.h:
* Shared/Network/NetworkResourceLoadParameters.cpp:
(WebKit::NetworkResourceLoadParameters::encode):
(WebKit::NetworkResourceLoadParameters::decode):
* Shared/Network/NetworkResourceLoadParameters.h:
* Shared/OriginAndDatabases.cpp:
(WebKit::OriginAndDatabases::encode):
(WebKit::OriginAndDatabases::decode):
* Shared/OriginAndDatabases.h:
* Shared/PlatformPopupMenuData.cpp:
(WebKit::PlatformPopupMenuData::encode):
(WebKit::PlatformPopupMenuData::decode):
* Shared/PlatformPopupMenuData.h:
* Shared/Plugins/NPIdentifierData.cpp:
(WebKit::NPIdentifierData::encode):
(WebKit::NPIdentifierData::decode):
* Shared/Plugins/NPIdentifierData.h:
* Shared/Plugins/NPObjectMessageReceiver.h:
* Shared/Plugins/NPRemoteObjectMap.cpp:
(WebKit::NPRemoteObjectMap::create):
(WebKit::NPRemoteObjectMap::NPRemoteObjectMap):
(WebKit::NPRemoteObjectMap::didReceiveSyncMessage):
* Shared/Plugins/NPRemoteObjectMap.h:
(WebKit::NPRemoteObjectMap::connection):
* Shared/Plugins/NPVariantData.cpp:
(WebKit::NPVariantData::encode):
(WebKit::NPVariantData::decode):
* Shared/Plugins/NPVariantData.h:
* Shared/Plugins/PluginProcessCreationParameters.cpp:
(WebKit::PluginProcessCreationParameters::encode):
(WebKit::PluginProcessCreationParameters::decode):
* Shared/Plugins/PluginProcessCreationParameters.h:
* Shared/PrintInfo.cpp:
(WebKit::PrintInfo::encode):
(WebKit::PrintInfo::decode):
* Shared/PrintInfo.h:
* Shared/SandboxExtension.h:
(WebKit::SandboxExtension::Handle::encode):
(WebKit::SandboxExtension::Handle::decode):
(WebKit::SandboxExtension::HandleArray::encode):
(WebKit::SandboxExtension::HandleArray::decode):
* Shared/SecurityOriginData.cpp:
(WebKit::SecurityOriginData::encode):
(WebKit::SecurityOriginData::decode):
* Shared/SecurityOriginData.h:
* Shared/SessionState.cpp:
(WebKit::SessionState::encode):
(WebKit::SessionState::decode):
* Shared/SessionState.h:
* Shared/ShareableBitmap.cpp:
(WebKit::ShareableBitmap::Handle::encode):
(WebKit::ShareableBitmap::Handle::decode):
* Shared/ShareableBitmap.h:
* Shared/ShareableResource.cpp:
(WebKit::ShareableResource::Handle::encode):
(WebKit::ShareableResource::Handle::decode):
* Shared/ShareableResource.h:
* Shared/StatisticsData.cpp:
(WebKit::StatisticsData::encode):
(WebKit::StatisticsData::decode):
* Shared/StatisticsData.h:
* Shared/TextCheckerState.h:
* Shared/UpdateInfo.cpp:
(WebKit::UpdateInfo::encode):
(WebKit::UpdateInfo::decode):
* Shared/UpdateInfo.h:
* Shared/UserData.cpp:
(WebKit::UserData::encode):
(WebKit::UserData::decode):
* Shared/UserData.h:
* Shared/UserMessageCoders.h:
(WebKit::UserMessageEncoder::baseEncode):
(WebKit::UserMessageDecoder::baseDecode):
* Shared/WebBackForwardListItem.cpp:
(WebKit::WebBackForwardListItem::encode):
(WebKit::WebBackForwardListItem::decode):
* Shared/WebBackForwardListItem.h:
* Shared/WebConnection.cpp:
(WebKit::WebConnection::postMessage):
(WebKit::WebConnection::didReceiveMessage):
(WebKit::WebConnection::handleMessage):
* Shared/WebConnection.h:
* Shared/WebContextMenuItemData.cpp:
(WebKit::WebContextMenuItemData::encode):
(WebKit::WebContextMenuItemData::decode):
* Shared/WebContextMenuItemData.h:
* Shared/WebCoreArgumentCoders.cpp:
* Shared/WebCoreArgumentCoders.h:
* Shared/WebEvent.cpp:
(WebKit::WebEvent::encode):
(WebKit::WebEvent::decode):
* Shared/WebEvent.h:
* Shared/WebGeolocationPosition.cpp:
(WebKit::WebGeolocationPosition::Data::encode):
(WebKit::WebGeolocationPosition::Data::decode):
* Shared/WebGeolocationPosition.h:
* Shared/WebHitTestResult.cpp:
(WebKit::WebHitTestResult::Data::encode):
(WebKit::WebHitTestResult::Data::decode):
* Shared/WebHitTestResult.h:
* Shared/WebKeyboardEvent.cpp:
(WebKit::WebKeyboardEvent::encode):
(WebKit::WebKeyboardEvent::decode):
* Shared/WebMouseEvent.cpp:
(WebKit::WebMouseEvent::encode):
(WebKit::WebMouseEvent::decode):
* Shared/WebNavigationDataStore.h:
(WebKit::WebNavigationDataStore::encode):
(WebKit::WebNavigationDataStore::decode):
* Shared/WebPageCreationParameters.cpp:
(WebKit::WebPageCreationParameters::encode):
(WebKit::WebPageCreationParameters::decode):
* Shared/WebPageCreationParameters.h:
* Shared/WebPageGroupData.cpp:
(WebKit::WebPageGroupData::encode):
(WebKit::WebPageGroupData::decode):
* Shared/WebPageGroupData.h:
* Shared/WebPlatformTouchPoint.cpp:
(WebKit::WebPlatformTouchPoint::encode):
(WebKit::WebPlatformTouchPoint::decode):
* Shared/WebPopupItem.cpp:
(WebKit::WebPopupItem::encode):
(WebKit::WebPopupItem::decode):
* Shared/WebPopupItem.h:
* Shared/WebPreferencesStore.cpp:
(WebKit::WebPreferencesStore::encode):
(WebKit::WebPreferencesStore::decode):
* Shared/WebPreferencesStore.h:
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
* Shared/WebSerializedScriptValue.h:
(WebKit::WebSerializedScriptValue::dataReference):
* Shared/WebTouchEvent.cpp:
(WebKit::WebTouchEvent::encode):
(WebKit::WebTouchEvent::decode):
* Shared/WebWheelEvent.cpp:
(WebKit::WebWheelEvent::encode):
(WebKit::WebWheelEvent::decode):
* Shared/cf/ArgumentCodersCF.cpp:
(IPC::encode):
(IPC::decode):
* Shared/cf/ArgumentCodersCF.h:
* Shared/mac/ArgumentCodersMac.h:
* Shared/mac/ArgumentCodersMac.mm:
(IPC::encode):
(IPC::decode):
* Shared/mac/AttributedString.h:
* Shared/mac/AttributedString.mm:
(WebKit::AttributedString::encode):
(WebKit::AttributedString::decode):
* Shared/mac/ColorSpaceData.h:
* Shared/mac/ColorSpaceData.mm:
(WebKit::ColorSpaceData::encode):
(WebKit::ColorSpaceData::decode):
* Shared/mac/LayerTreeContextMac.mm:
(WebKit::LayerTreeContext::encode):
(WebKit::LayerTreeContext::decode):
* Shared/mac/ObjCObjectGraphCoders.h:
* Shared/mac/ObjCObjectGraphCoders.mm:
(WebKit::ObjCObjectGraphEncoder::baseEncode):
(WebKit::ObjCObjectGraphDecoder::baseDecode):
(WebKit::WebContextObjCObjectGraphEncoderImpl::encode):
(WebKit::WebContextObjCObjectGraphDecoderImpl::decode):
(WebKit::InjectedBundleObjCObjectGraphEncoderImpl::encode):
(WebKit::InjectedBundleObjCObjectGraphDecoderImpl::decode):
(WebKit::WebContextObjCObjectGraphEncoder::encode):
(WebKit::WebContextObjCObjectGraphDecoder::decode):
(WebKit::InjectedBundleObjCObjectGraphEncoder::encode):
(WebKit::InjectedBundleObjCObjectGraphDecoder::decode):
* Shared/mac/RemoteLayerBackingStore.h:
* Shared/mac/RemoteLayerBackingStore.mm:
(RemoteLayerBackingStore::encode):
(RemoteLayerBackingStore::decode):
* Shared/mac/RemoteLayerTreeTransaction.h:
* Shared/mac/RemoteLayerTreeTransaction.mm:
(WebKit::RemoteLayerTreeTransaction::LayerCreationProperties::encode):
(WebKit::RemoteLayerTreeTransaction::LayerCreationProperties::decode):
(WebKit::RemoteLayerTreeTransaction::LayerProperties::encode):
(WebKit::RemoteLayerTreeTransaction::LayerProperties::decode):
(WebKit::RemoteLayerTreeTransaction::encode):
(WebKit::RemoteLayerTreeTransaction::decode):
* Shared/mac/SandboxExtensionMac.mm:
(WebKit::SandboxExtension::Handle::encode):
(WebKit::SandboxExtension::Handle::decode):
(WebKit::SandboxExtension::HandleArray::encode):
(WebKit::SandboxExtension::HandleArray::decode):
* Shared/mac/SecItemRequestData.cpp:
(WebKit::SecItemRequestData::encode):
(WebKit::SecItemRequestData::decode):
* Shared/mac/SecItemRequestData.h:
* Shared/mac/SecItemResponseData.cpp:
(WebKit::SecItemResponseData::encode):
(WebKit::SecItemResponseData::decode):
* Shared/mac/SecItemResponseData.h:
* Shared/mac/SecItemShim.cpp:
(WebKit::SecItemShim::initializeConnection):
* Shared/mac/SecItemShim.h:
* Shared/mac/WebCoreArgumentCodersMac.mm:
(IPC::ArgumentCoder<ResourceRequest>::encodePlatformData):
(IPC::ArgumentCoder<ResourceRequest>::decodePlatformData):
(IPC::ArgumentCoder<ResourceResponse>::encodePlatformData):
(IPC::ArgumentCoder<ResourceResponse>::decodePlatformData):
(IPC::ArgumentCoder<CertificateInfo>::encode):
(IPC::ArgumentCoder<CertificateInfo>::decode):
(IPC::ArgumentCoder<ResourceError>::encodePlatformData):
(IPC::ArgumentCoder<ResourceError>::decodePlatformData):
* UIProcess/API/mac/PageClientImpl.h:
* UIProcess/API/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::accessibilityWebProcessTokenReceived):
* UIProcess/API/mac/WKView.mm:
(-[WKView _accessibilityRegisterUIProcessTokens]):
* UIProcess/API/mac/WKViewInternal.h:
* UIProcess/Authentication/AuthenticationChallengeProxy.cpp:
(WebKit::AuthenticationChallengeProxy::AuthenticationChallengeProxy):
* UIProcess/Authentication/AuthenticationChallengeProxy.h:
(WebKit::AuthenticationChallengeProxy::create):
* UIProcess/Databases/DatabaseProcessProxy.cpp:
(WebKit::DatabaseProcessProxy::connectionWillOpen):
(WebKit::DatabaseProcessProxy::connectionWillClose):
(WebKit::DatabaseProcessProxy::getDatabaseProcessConnection):
(WebKit::DatabaseProcessProxy::didClose):
(WebKit::DatabaseProcessProxy::didReceiveInvalidMessage):
(WebKit::DatabaseProcessProxy::didCreateDatabaseToWebProcessConnection):
(WebKit::DatabaseProcessProxy::didFinishLaunching):
* UIProcess/Databases/DatabaseProcessProxy.h:
* UIProcess/Databases/DatabaseProcessProxy.messages.in:
* UIProcess/Downloads/DownloadProxy.cpp:
(WebKit::createData):
(WebKit::DownloadProxy::didFail):
(WebKit::DownloadProxy::didCancel):
* UIProcess/Downloads/DownloadProxy.h:
* UIProcess/Downloads/DownloadProxy.messages.in:
* UIProcess/DrawingAreaProxy.h:
* UIProcess/Launcher/ProcessLauncher.cpp:
(WebKit::ProcessLauncher::didFinishLaunchingProcess):
* UIProcess/Launcher/ProcessLauncher.h:
* UIProcess/Launcher/mac/ProcessLauncherMac.mm:
(WebKit::connectToService):
(WebKit::tryPreexistingProcess):
(WebKit::createProcess):
* UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h:
* UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm:
(-[WKCustomProtocolLoader connection:didReceiveData:]):
* UIProcess/Network/NetworkProcessProxy.cpp:
(WebKit::NetworkProcessProxy::connectionWillOpen):
(WebKit::NetworkProcessProxy::connectionWillClose):
(WebKit::NetworkProcessProxy::getNetworkProcessConnection):
(WebKit::NetworkProcessProxy::networkProcessCrashedOrFailedToLaunch):
(WebKit::NetworkProcessProxy::didReceiveMessage):
(WebKit::NetworkProcessProxy::didReceiveSyncMessage):
(WebKit::NetworkProcessProxy::didClose):
(WebKit::NetworkProcessProxy::didReceiveInvalidMessage):
(WebKit::NetworkProcessProxy::didCreateNetworkConnectionToWebProcess):
(WebKit::NetworkProcessProxy::didFinishLaunching):
* UIProcess/Network/NetworkProcessProxy.h:
* UIProcess/Network/NetworkProcessProxy.messages.in:
* UIProcess/Notifications/WebNotification.h:
* UIProcess/PageClient.h:
* UIProcess/Plugins/PluginProcessManager.h:
* UIProcess/Plugins/PluginProcessProxy.cpp:
(WebKit::PluginProcessProxy::getPluginProcessConnection):
(WebKit::PluginProcessProxy::pluginProcessCrashedOrFailedToLaunch):
(WebKit::PluginProcessProxy::didClose):
(WebKit::PluginProcessProxy::didReceiveInvalidMessage):
(WebKit::PluginProcessProxy::didFinishLaunching):
(WebKit::PluginProcessProxy::didCreateWebProcessConnection):
* UIProcess/Plugins/PluginProcessProxy.h:
* UIProcess/Plugins/PluginProcessProxy.messages.in:
* UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
(WebKit::PluginProcessProxy::platformInitializePluginProcess):
* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::StorageArea::addListener):
(WebKit::StorageManager::StorageArea::removeListener):
(WebKit::StorageManager::StorageArea::setItem):
(WebKit::StorageManager::StorageArea::removeItem):
(WebKit::StorageManager::StorageArea::clear):
(WebKit::StorageManager::StorageArea::dispatchEvents):
(WebKit::StorageManager::SessionStorageNamespace::allowedConnection):
(WebKit::StorageManager::SessionStorageNamespace::create):
(WebKit::StorageManager::SessionStorageNamespace::SessionStorageNamespace):
(WebKit::StorageManager::SessionStorageNamespace::setAllowedConnection):
(WebKit::StorageManager::createSessionStorageNamespace):
(WebKit::StorageManager::setAllowedSessionStorageNamespaceConnection):
(WebKit::StorageManager::processWillCloseConnection):
(WebKit::StorageManager::createLocalStorageMap):
(WebKit::StorageManager::createSessionStorageMap):
(WebKit::StorageManager::destroyStorageMap):
(WebKit::StorageManager::getValues):
(WebKit::StorageManager::setItem):
(WebKit::StorageManager::removeItem):
(WebKit::StorageManager::clear):
(WebKit::StorageManager::createSessionStorageNamespaceInternal):
(WebKit::StorageManager::setAllowedSessionStorageNamespaceConnectionInternal):
(WebKit::StorageManager::invalidateConnectionInternal):
(WebKit::StorageManager::findStorageArea):
* UIProcess/Storage/StorageManager.h:
* UIProcess/WebApplicationCacheManagerProxy.h:
* UIProcess/WebConnectionToWebProcess.cpp:
(WebKit::WebConnectionToWebProcess::encodeMessageBody):
(WebKit::WebConnectionToWebProcess::decodeMessageBody):
(WebKit::WebConnectionToWebProcess::messageSenderConnection):
* UIProcess/WebConnectionToWebProcess.h:
* UIProcess/WebContext.cpp:
(WebKit::WebContext::networkingProcessConnection):
(WebKit::WebContext::didReceiveInvalidMessage):
(WebKit::WebContext::createNewWebProcess):
(WebKit::WebContext::postMessageToInjectedBundle):
(WebKit::WebContext::addMessageReceiver):
(WebKit::WebContext::removeMessageReceiver):
(WebKit::WebContext::dispatchMessage):
(WebKit::WebContext::dispatchSyncMessage):
(WebKit::WebContext::didReceiveMessage):
(WebKit::WebContext::didReceiveSyncMessage):
* UIProcess/WebContext.h:
* UIProcess/WebContextUserMessageCoders.h:
(WebKit::WebContextUserMessageEncoder::encode):
(WebKit::WebContextUserMessageDecoder::decode):
* UIProcess/WebCookieManagerProxy.h:
* UIProcess/WebDatabaseManagerProxy.h:
* UIProcess/WebEditCommandProxy.cpp:
(WebKit::WebEditCommandProxy::unapply):
(WebKit::WebEditCommandProxy::reapply):
* UIProcess/WebFrameProxy.h:
* UIProcess/WebFullScreenManagerProxy.h:
* UIProcess/WebGeolocationManagerProxy.cpp:
(WebKit::WebGeolocationManagerProxy::startUpdating):
(WebKit::WebGeolocationManagerProxy::stopUpdating):
(WebKit::WebGeolocationManagerProxy::removeRequester):
(WebKit::WebGeolocationManagerProxy::setEnableHighAccuracy):
* UIProcess/WebGeolocationManagerProxy.h:
* UIProcess/WebIconDatabase.cpp:
(WebKit::WebIconDatabase::setIconDataForIconURL):
(WebKit::WebIconDatabase::synchronousIconDataForPageURL):
* UIProcess/WebIconDatabase.h:
* UIProcess/WebIconDatabase.messages.in:
* UIProcess/WebInspectorProxy.h:
* UIProcess/WebMediaCacheManagerProxy.h:
* UIProcess/WebOriginDataManagerProxy.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::willGoToBackForwardListItem):
(WebKit::WebPageProxy::preferencesDidChange):
(WebKit::WebPageProxy::didStartProvisionalLoadForFrame):
(WebKit::WebPageProxy::didReceiveServerRedirectForProvisionalLoadForFrame):
(WebKit::WebPageProxy::didFailProvisionalLoadForFrame):
(WebKit::WebPageProxy::didCommitLoadForFrame):
(WebKit::WebPageProxy::didFinishDocumentLoadForFrame):
(WebKit::WebPageProxy::didFinishLoadForFrame):
(WebKit::WebPageProxy::didFailLoadForFrame):
(WebKit::WebPageProxy::didSameDocumentNavigationForFrame):
(WebKit::WebPageProxy::didReceiveTitleForFrame):
(WebKit::WebPageProxy::didFirstLayoutForFrame):
(WebKit::WebPageProxy::didFirstVisuallyNonEmptyLayoutForFrame):
(WebKit::WebPageProxy::didLayout):
(WebKit::WebPageProxy::didRemoveFrameFromHierarchy):
(WebKit::WebPageProxy::didDisplayInsecureContentForFrame):
(WebKit::WebPageProxy::didRunInsecureContentForFrame):
(WebKit::WebPageProxy::didDetectXSSForFrame):
(WebKit::WebPageProxy::decidePolicyForNavigationAction):
(WebKit::WebPageProxy::decidePolicyForNewWindowAction):
(WebKit::WebPageProxy::decidePolicyForResponse):
(WebKit::WebPageProxy::decidePolicyForResponseSync):
(WebKit::WebPageProxy::unableToImplementPolicy):
(WebKit::WebPageProxy::willSubmitForm):
(WebKit::WebPageProxy::mouseDidMoveOverElement):
(WebKit::WebPageProxy::connectionWillOpen):
(WebKit::WebPageProxy::connectionWillClose):
(WebKit::WebPageProxy::sendMessage):
(WebKit::WebPageProxy::messageSenderConnection):
(WebKit::WebPageProxy::showContextMenu):
(WebKit::WebPageProxy::internalShowContextMenu):
(WebKit::WebPageProxy::dataCallback):
(WebKit::WebPageProxy::scriptValueCallback):
(WebKit::WebPageProxy::beginPrinting):
(WebKit::WebPageProxy::endPrinting):
(WebKit::WebPageProxy::computePagesForPrinting):
(WebKit::WebPageProxy::drawRectToImage):
(WebKit::WebPageProxy::drawPagesToPDF):
(WebKit::WebPageProxy::drawPagesForPrinting):
(WebKit::WebPageProxy::savePDFToFileInDownloadsFolder):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::connectionWillOpen):
(WebKit::WebProcessProxy::connectionWillClose):
(WebKit::WebProcessProxy::addBackForwardItem):
(WebKit::WebProcessProxy::didReceiveMessage):
(WebKit::WebProcessProxy::didReceiveSyncMessage):
(WebKit::WebProcessProxy::didClose):
(WebKit::WebProcessProxy::didReceiveInvalidMessage):
(WebKit::WebProcessProxy::didFinishLaunching):
* UIProcess/WebProcessProxy.h:
(WebKit::WebProcessProxy::fromConnection):
* UIProcess/WebProcessProxy.messages.in:
* UIProcess/WebResourceCacheManagerProxy.h:
* UIProcess/cf/WebBackForwardListCF.cpp:
(WebKit::WebBackForwardList::createCFDictionaryRepresentation):
* UIProcess/mac/RemoteLayerTreeHost.h:
* UIProcess/mac/SecItemShimProxy.cpp:
(WebKit::SecItemShimProxy::initializeConnection):
(WebKit::SecItemShimProxy::secItemRequest):
* UIProcess/mac/SecItemShimProxy.h:
* UIProcess/mac/ViewGestureController.h:
* UIProcess/mac/WebContextMac.mm:
(WebKit::WebContext::platformInitializeWebProcess):
* UIProcess/mac/WebPageProxyMac.mm:
(WebKit::WebPageProxy::registerWebProcessAccessibilityToken):
(WebKit::WebPageProxy::registerUIProcessAccessibilityTokens):
(WebKit::WebPageProxy::savePDFToTemporaryFolderAndOpenWithNativeApplication):
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/ApplicationCache/WebApplicationCacheManager.h:
* WebProcess/Cookies/WebCookieManager.h:
* WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
(WebKit::WebIDBServerConnection::messageSenderConnection):
* WebProcess/Databases/IndexedDB/WebIDBServerConnection.h:
* WebProcess/Databases/WebToDatabaseProcessConnection.cpp:
(WebKit::WebToDatabaseProcessConnection::WebToDatabaseProcessConnection):
(WebKit::WebToDatabaseProcessConnection::didReceiveMessage):
(WebKit::WebToDatabaseProcessConnection::didClose):
(WebKit::WebToDatabaseProcessConnection::didReceiveInvalidMessage):
* WebProcess/Databases/WebToDatabaseProcessConnection.h:
(WebKit::WebToDatabaseProcessConnection::create):
(WebKit::WebToDatabaseProcessConnection::connection):
* WebProcess/EntryPoint/mac/LegacyProcess/WebContentProcessMain.mm:
(WebKit::WebContentProcessMainDelegate::getConnectionIdentifier):
* WebProcess/FullScreen/WebFullScreenManager.cpp:
(WebKit::WebFullScreenManager::didReceiveMessage):
* WebProcess/FullScreen/WebFullScreenManager.h:
* WebProcess/Geolocation/WebGeolocationManager.h:
* WebProcess/IconDatabase/WebIconDatabaseProxy.cpp:
(WebKit::WebIconDatabaseProxy::synchronousIconForPageURL):
(WebKit::WebIconDatabaseProxy::setIconDataForIconURL):
* WebProcess/IconDatabase/WebIconDatabaseProxy.h:
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::postMessage):
(WebKit::InjectedBundle::postSynchronousMessage):
* WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h:
(WebKit::InjectedBundleUserMessageEncoder::encode):
(WebKit::InjectedBundleUserMessageDecoder::decode):
* WebProcess/MediaCache/WebMediaCacheManager.h:
* WebProcess/Network/NetworkProcessConnection.cpp:
(WebKit::NetworkProcessConnection::NetworkProcessConnection):
(WebKit::NetworkProcessConnection::didReceiveMessage):
(WebKit::NetworkProcessConnection::didReceiveSyncMessage):
(WebKit::NetworkProcessConnection::didClose):
(WebKit::NetworkProcessConnection::didReceiveInvalidMessage):
* WebProcess/Network/NetworkProcessConnection.h:
(WebKit::NetworkProcessConnection::create):
(WebKit::NetworkProcessConnection::connection):
* WebProcess/Network/WebResourceLoader.cpp:
(WebKit::WebResourceLoader::messageSenderConnection):
(WebKit::WebResourceLoader::didReceiveData):
* WebProcess/Network/WebResourceLoader.h:
* WebProcess/Network/WebResourceLoader.messages.in:
* WebProcess/Notifications/WebNotificationManager.h:
* WebProcess/OriginData/WebOriginDataManager.h:
* WebProcess/Plugins/PDF/PDFPlugin.h:
* WebProcess/Plugins/Plugin.cpp:
(WebKit::Plugin::Parameters::encode):
(WebKit::Plugin::Parameters::decode):
* WebProcess/Plugins/Plugin.h:
* WebProcess/Plugins/PluginProcessConnection.cpp:
(WebKit::PluginProcessConnection::PluginProcessConnection):
(WebKit::PluginProcessConnection::didReceiveMessage):
(WebKit::PluginProcessConnection::didReceiveSyncMessage):
(WebKit::PluginProcessConnection::didClose):
(WebKit::PluginProcessConnection::didReceiveInvalidMessage):
* WebProcess/Plugins/PluginProcessConnection.h:
(WebKit::PluginProcessConnection::create):
(WebKit::PluginProcessConnection::connection):
* WebProcess/Plugins/PluginProcessConnectionManager.cpp:
(WebKit::PluginProcessConnectionManager::initializeConnection):
(WebKit::PluginProcessConnectionManager::getPluginProcessConnection):
(WebKit::PluginProcessConnectionManager::pluginProcessCrashed):
* WebProcess/Plugins/PluginProcessConnectionManager.h:
* WebProcess/Plugins/PluginProxy.cpp:
(WebKit::PluginProxy::geometryDidChange):
(WebKit::PluginProxy::streamDidReceiveData):
(WebKit::PluginProxy::manualStreamDidReceiveData):
* WebProcess/Plugins/PluginProxy.h:
* WebProcess/ResourceCache/WebResourceCacheManager.h:
* WebProcess/Storage/StorageAreaMap.h:
* WebProcess/WebConnectionToUIProcess.cpp:
(WebKit::WebConnectionToUIProcess::encodeMessageBody):
(WebKit::WebConnectionToUIProcess::decodeMessageBody):
(WebKit::WebConnectionToUIProcess::messageSenderConnection):
* WebProcess/WebConnectionToUIProcess.h:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::runJavaScriptAlert):
(WebKit::WebChromeClient::runJavaScriptConfirm):
(WebKit::WebChromeClient::runJavaScriptPrompt):
* WebProcess/WebCoreSupport/WebDatabaseManager.h:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse):
* WebProcess/WebPage/DecoderAdapter.cpp:
(WebKit::DecoderAdapter::decodeBytes):
(WebKit::DecoderAdapter::decodeString):
* WebProcess/WebPage/DecoderAdapter.h:
* WebProcess/WebPage/DrawingArea.h:
* WebProcess/WebPage/EncoderAdapter.cpp:
(WebKit::EncoderAdapter::dataReference):
(WebKit::EncoderAdapter::encodeBytes):
(WebKit::EncoderAdapter::encodeString):
* WebProcess/WebPage/EncoderAdapter.h:
* WebProcess/WebPage/EventDispatcher.cpp:
(WebKit::EventDispatcher::initializeConnection):
* WebProcess/WebPage/EventDispatcher.h:
* WebProcess/WebPage/LayerTreeHost.h:
* WebProcess/WebPage/ViewGestureGeometryCollector.h:
* WebProcess/WebPage/WebInspector.cpp:
(WebKit::WebInspector::createInspectorPage):
* WebProcess/WebPage/WebInspector.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::messageSenderConnection):
(WebKit::WebPage::loadURL):
(WebKit::WebPage::loadURLRequest):
(WebKit::WebPage::loadDataImpl):
(WebKit::WebPage::loadString):
(WebKit::WebPage::loadData):
(WebKit::WebPage::loadHTMLString):
(WebKit::WebPage::loadAlternateHTMLString):
(WebKit::WebPage::loadPlainTextString):
(WebKit::WebPage::loadWebArchiveData):
(WebKit::WebPage::postInjectedBundleMessage):
(WebKit::WebPage::runJavaScriptInMainFrame):
(WebKit::WebPage::getContentsAsMHTMLData):
(WebKit::WebPage::getSelectionAsWebArchiveData):
(WebKit::WebPage::getMainResourceDataOfFrame):
(WebKit::WebPage::getResourceDataFromFrame):
(WebKit::WebPage::getWebArchiveOfFrame):
(WebKit::WebPage::didReceiveMessage):
(WebKit::WebPage::didReceiveSyncMessage):
(WebKit::WebPage::drawPagesToPDF):
(WebKit::WebPage::savePDFToFileInDownloadsFolder):
(WebKit::WebPage::savePDFToTemporaryFolderAndOpenWithNativeApplication):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
* WebProcess/WebPage/WebPageGroupProxy.h:
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::platformInitialize):
(WebKit::WebPage::registerUIProcessAccessibilityTokens):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeConnection):
(WebKit::WebProcess::downloadProxyConnection):
(WebKit::WebProcess::initializeWebProcess):
(WebKit::WebProcess::ensureNetworkProcessConnection):
(WebKit::WebProcess::didReceiveSyncMessage):
(WebKit::WebProcess::didReceiveMessage):
(WebKit::WebProcess::didClose):
(WebKit::WebProcess::didReceiveInvalidMessage):
(WebKit::WebProcess::postInjectedBundleMessage):
(WebKit::WebProcess::ensureWebToDatabaseProcessConnection):
* WebProcess/WebProcess.h:
* WebProcess/WebProcess.messages.in:
* WebProcess/mac/WebProcessMac.mm:
(WebKit::WebProcess::platformInitializeWebProcess):
* config.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@161148 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 7a6ff23..ef3e9c1 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,774 @@
2013-12-30 Anders Carlsson <andersca@apple.com>
+ Move code over to the IPC namespace.
+
+ Rubber-stamped by Andreas Kling.
+
+ * DatabaseProcess/DatabaseProcess.cpp:
+ (WebKit::DatabaseProcess::initializeConnection):
+ (WebKit::DatabaseProcess::didClose):
+ (WebKit::DatabaseProcess::didReceiveInvalidMessage):
+ (WebKit::DatabaseProcess::createDatabaseToWebProcessConnection):
+ * DatabaseProcess/DatabaseProcess.h:
+ * DatabaseProcess/DatabaseToWebProcessConnection.cpp:
+ (WebKit::DatabaseToWebProcessConnection::create):
+ (WebKit::DatabaseToWebProcessConnection::DatabaseToWebProcessConnection):
+ (WebKit::DatabaseToWebProcessConnection::didReceiveMessage):
+ (WebKit::DatabaseToWebProcessConnection::didClose):
+ (WebKit::DatabaseToWebProcessConnection::didReceiveInvalidMessage):
+ * DatabaseProcess/DatabaseToWebProcessConnection.h:
+ (WebKit::DatabaseToWebProcessConnection::connection):
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp:
+ (WebKit::DatabaseProcessIDBConnection::messageSenderConnection):
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h:
+ * NetworkProcess/AsynchronousNetworkLoaderClient.cpp:
+ (WebKit::AsynchronousNetworkLoaderClient::willSendRequest):
+ (WebKit::AsynchronousNetworkLoaderClient::canAuthenticateAgainstProtectionSpace):
+ (WebKit::AsynchronousNetworkLoaderClient::didReceiveBuffer):
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::create):
+ (WebKit::NetworkConnectionToWebProcess::NetworkConnectionToWebProcess):
+ (WebKit::NetworkConnectionToWebProcess::didReceiveMessage):
+ (WebKit::NetworkConnectionToWebProcess::didReceiveSyncMessage):
+ (WebKit::NetworkConnectionToWebProcess::didClose):
+ (WebKit::NetworkConnectionToWebProcess::didReceiveInvalidMessage):
+ * NetworkProcess/NetworkConnectionToWebProcess.h:
+ (WebKit::NetworkConnectionToWebProcess::connection):
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::didReceiveMessage):
+ (WebKit::NetworkProcess::didReceiveSyncMessage):
+ (WebKit::NetworkProcess::didClose):
+ (WebKit::NetworkProcess::didReceiveInvalidMessage):
+ (WebKit::NetworkProcess::downloadProxyConnection):
+ (WebKit::NetworkProcess::initializeConnection):
+ (WebKit::NetworkProcess::createNetworkConnectionToWebProcess):
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::messageSenderConnection):
+ * NetworkProcess/NetworkResourceLoader.h:
+ * NetworkProcess/mac/DiskCacheMonitor.h:
+ * NetworkProcess/mac/DiskCacheMonitor.mm:
+ (WebKit::DiskCacheMonitor::messageSenderConnection):
+ * Platform/IPC/ArgumentCoder.h:
+ * Platform/IPC/ArgumentCoders.cpp:
+ * Platform/IPC/ArgumentCoders.h:
+ * Platform/IPC/ArgumentDecoder.cpp:
+ * Platform/IPC/ArgumentDecoder.h:
+ * Platform/IPC/ArgumentEncoder.cpp:
+ * Platform/IPC/ArgumentEncoder.h:
+ * Platform/IPC/Arguments.h:
+ * Platform/IPC/Attachment.cpp:
+ * Platform/IPC/Attachment.h:
+ * Platform/IPC/Connection.cpp:
+ (IPC::Connection::Connection):
+ * Platform/IPC/Connection.h:
+ * Platform/IPC/HandleMessage.h:
+ * Platform/IPC/MessageDecoder.cpp:
+ * Platform/IPC/MessageDecoder.h:
+ * Platform/IPC/MessageEncoder.cpp:
+ * Platform/IPC/MessageEncoder.h:
+ * Platform/IPC/MessageFlags.h:
+ * Platform/IPC/MessageReceiver.h:
+ * Platform/IPC/MessageReceiverMap.cpp:
+ * Platform/IPC/MessageReceiverMap.h:
+ * Platform/IPC/mac/ConnectionMac.cpp:
+ * Platform/IPC/mac/ImportanceAssertion.h:
+ * Platform/IPC/mac/MachPort.h:
+ * Platform/SharedMemory.h:
+ * Platform/mac/SharedMemoryMac.cpp:
+ (WebKit::SharedMemory::Handle::encode):
+ (WebKit::SharedMemory::Handle::decode):
+ * PluginProcess/PluginControllerProxy.cpp:
+ (WebKit::PluginControllerProxy::streamDidReceiveData):
+ (WebKit::PluginControllerProxy::manualStreamDidReceiveData):
+ * PluginProcess/PluginControllerProxy.h:
+ * PluginProcess/PluginControllerProxy.messages.in:
+ * PluginProcess/PluginCreationParameters.cpp:
+ (WebKit::PluginCreationParameters::encode):
+ (WebKit::PluginCreationParameters::decode):
+ * PluginProcess/PluginCreationParameters.h:
+ * PluginProcess/PluginProcess.cpp:
+ (WebKit::PluginProcess::didReceiveMessage):
+ (WebKit::PluginProcess::didClose):
+ (WebKit::PluginProcess::didReceiveInvalidMessage):
+ (WebKit::PluginProcess::createWebProcessConnection):
+ * PluginProcess/PluginProcess.h:
+ * PluginProcess/WebProcessConnection.cpp:
+ (WebKit::WebProcessConnection::create):
+ (WebKit::WebProcessConnection::WebProcessConnection):
+ (WebKit::WebProcessConnection::setGlobalException):
+ (WebKit::WebProcessConnection::didReceiveMessage):
+ (WebKit::WebProcessConnection::didReceiveSyncMessage):
+ (WebKit::WebProcessConnection::didClose):
+ (WebKit::WebProcessConnection::didReceiveInvalidMessage):
+ * PluginProcess/WebProcessConnection.h:
+ (WebKit::WebProcessConnection::connection):
+ * PluginProcess/mac/PluginControllerProxyMac.mm:
+ (WebKit::PluginControllerProxy::setComplexTextInputState):
+ * Scripts/webkit2/messages.py:
+ (arguments_type_old):
+ (message_to_struct_declaration):
+ (forward_declarations_and_headers):
+ (generate_messages_header):
+ (async_message_statement):
+ (sync_message_statement):
+ (headers_for_type):
+ (generate_message_handler):
+ * Scripts/webkit2/messages_unittest.py:
+ (IPC):
+ (std):
+ * Shared/API/Cocoa/RemoteObjectRegistry.h:
+ * Shared/APIGeometry.cpp:
+ (API::Point::encode):
+ (API::Point::decode):
+ (API::Size::encode):
+ (API::Size::decode):
+ (API::Rect::encode):
+ (API::Rect::decode):
+ * Shared/APIGeometry.h:
+ * Shared/APINumber.h:
+ (API::Number::encode):
+ (API::Number::decode):
+ * Shared/Authentication/AuthenticationManager.h:
+ * Shared/ChildProcess.cpp:
+ (WebKit::didCloseOnConnectionWorkQueue):
+ (WebKit::ChildProcess::initialize):
+ (WebKit::ChildProcess::initializeConnection):
+ (WebKit::ChildProcess::addMessageReceiver):
+ (WebKit::ChildProcess::removeMessageReceiver):
+ (WebKit::ChildProcess::messageSenderConnection):
+ * Shared/ChildProcess.h:
+ (WebKit::ChildProcess::parentProcessConnection):
+ (WebKit::ChildProcess::messageReceiverMap):
+ * Shared/ChildProcessProxy.cpp:
+ (WebKit::ChildProcessProxy::fromConnection):
+ (WebKit::ChildProcessProxy::sendMessage):
+ (WebKit::ChildProcessProxy::addMessageReceiver):
+ (WebKit::ChildProcessProxy::removeMessageReceiver):
+ (WebKit::ChildProcessProxy::dispatchMessage):
+ (WebKit::ChildProcessProxy::dispatchSyncMessage):
+ (WebKit::ChildProcessProxy::didFinishLaunching):
+ (WebKit::ChildProcessProxy::connectionWillOpen):
+ (WebKit::ChildProcessProxy::connectionWillClose):
+ * Shared/ChildProcessProxy.h:
+ (WebKit::ChildProcessProxy::connection):
+ (WebKit::ChildProcessProxy::send):
+ * Shared/ChildProcessSupplement.h:
+ (WebKit::ChildProcessSupplement::initializeConnection):
+ * Shared/ConnectionStack.h:
+ (WebKit::ConnectionStack::current):
+ (WebKit::ConnectionStack::CurrentConnectionPusher::CurrentConnectionPusher):
+ * Shared/CoreIPCSupport/WebContextMessageKinds.h:
+ (WebContextLegacyMessages::messageReceiverName):
+ (WebContextLegacyMessages::postMessageMessageName):
+ (WebContextLegacyMessages::postSynchronousMessageMessageName):
+ * Shared/Databases/DatabaseProcessCreationParameters.cpp:
+ (WebKit::DatabaseProcessCreationParameters::encode):
+ (WebKit::DatabaseProcessCreationParameters::decode):
+ * Shared/Databases/DatabaseProcessCreationParameters.h:
+ * Shared/DictionaryPopupInfo.cpp:
+ (WebKit::DictionaryPopupInfo::encode):
+ (WebKit::DictionaryPopupInfo::decode):
+ * Shared/DictionaryPopupInfo.h:
+ * Shared/Downloads/Download.cpp:
+ (WebKit::Download::didFail):
+ (WebKit::Download::didCancel):
+ (WebKit::Download::messageSenderConnection):
+ * Shared/Downloads/Download.h:
+ * Shared/Downloads/DownloadManager.cpp:
+ (WebKit::DownloadManager::downloadProxyConnection):
+ * Shared/Downloads/DownloadManager.h:
+ * Shared/Downloads/mac/DownloadMac.mm:
+ (WebKit::Download::cancel):
+ (-[WKDownloadAsDelegate download:didFailWithError:]):
+ * Shared/EditorState.cpp:
+ (WebKit::EditorState::encode):
+ (WebKit::EditorState::decode):
+ * Shared/EditorState.h:
+ * Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessEntryPoint.h:
+ * Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessEntryPoint.mm:
+ (WebKit::ChildProcessMainDelegate::getConnectionIdentifier):
+ * Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h:
+ * Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm:
+ (WebKit::XPCServiceInitializerDelegate::getConnectionIdentifier):
+ * Shared/FileAPI/BlobRegistrationData.cpp:
+ (WebKit::BlobRegistrationData::encode):
+ (WebKit::BlobRegistrationData::decode):
+ * Shared/FileAPI/BlobRegistrationData.h:
+ * Shared/FontInfo.cpp:
+ (WebKit::FontInfo::encode):
+ (WebKit::FontInfo::decode):
+ * Shared/FontInfo.h:
+ * Shared/LayerTreeContext.h:
+ * Shared/Network/CustomProtocols/CustomProtocolManager.h:
+ * Shared/Network/CustomProtocols/CustomProtocolManager.messages.in:
+ * Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm:
+ (WebKit::CustomProtocolManager::initializeConnection):
+ (WebKit::CustomProtocolManager::didLoadData):
+ * Shared/Network/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode):
+ (WebKit::NetworkProcessCreationParameters::decode):
+ * Shared/Network/NetworkProcessCreationParameters.h:
+ * Shared/Network/NetworkResourceLoadParameters.cpp:
+ (WebKit::NetworkResourceLoadParameters::encode):
+ (WebKit::NetworkResourceLoadParameters::decode):
+ * Shared/Network/NetworkResourceLoadParameters.h:
+ * Shared/OriginAndDatabases.cpp:
+ (WebKit::OriginAndDatabases::encode):
+ (WebKit::OriginAndDatabases::decode):
+ * Shared/OriginAndDatabases.h:
+ * Shared/PlatformPopupMenuData.cpp:
+ (WebKit::PlatformPopupMenuData::encode):
+ (WebKit::PlatformPopupMenuData::decode):
+ * Shared/PlatformPopupMenuData.h:
+ * Shared/Plugins/NPIdentifierData.cpp:
+ (WebKit::NPIdentifierData::encode):
+ (WebKit::NPIdentifierData::decode):
+ * Shared/Plugins/NPIdentifierData.h:
+ * Shared/Plugins/NPObjectMessageReceiver.h:
+ * Shared/Plugins/NPRemoteObjectMap.cpp:
+ (WebKit::NPRemoteObjectMap::create):
+ (WebKit::NPRemoteObjectMap::NPRemoteObjectMap):
+ (WebKit::NPRemoteObjectMap::didReceiveSyncMessage):
+ * Shared/Plugins/NPRemoteObjectMap.h:
+ (WebKit::NPRemoteObjectMap::connection):
+ * Shared/Plugins/NPVariantData.cpp:
+ (WebKit::NPVariantData::encode):
+ (WebKit::NPVariantData::decode):
+ * Shared/Plugins/NPVariantData.h:
+ * Shared/Plugins/PluginProcessCreationParameters.cpp:
+ (WebKit::PluginProcessCreationParameters::encode):
+ (WebKit::PluginProcessCreationParameters::decode):
+ * Shared/Plugins/PluginProcessCreationParameters.h:
+ * Shared/PrintInfo.cpp:
+ (WebKit::PrintInfo::encode):
+ (WebKit::PrintInfo::decode):
+ * Shared/PrintInfo.h:
+ * Shared/SandboxExtension.h:
+ (WebKit::SandboxExtension::Handle::encode):
+ (WebKit::SandboxExtension::Handle::decode):
+ (WebKit::SandboxExtension::HandleArray::encode):
+ (WebKit::SandboxExtension::HandleArray::decode):
+ * Shared/SecurityOriginData.cpp:
+ (WebKit::SecurityOriginData::encode):
+ (WebKit::SecurityOriginData::decode):
+ * Shared/SecurityOriginData.h:
+ * Shared/SessionState.cpp:
+ (WebKit::SessionState::encode):
+ (WebKit::SessionState::decode):
+ * Shared/SessionState.h:
+ * Shared/ShareableBitmap.cpp:
+ (WebKit::ShareableBitmap::Handle::encode):
+ (WebKit::ShareableBitmap::Handle::decode):
+ * Shared/ShareableBitmap.h:
+ * Shared/ShareableResource.cpp:
+ (WebKit::ShareableResource::Handle::encode):
+ (WebKit::ShareableResource::Handle::decode):
+ * Shared/ShareableResource.h:
+ * Shared/StatisticsData.cpp:
+ (WebKit::StatisticsData::encode):
+ (WebKit::StatisticsData::decode):
+ * Shared/StatisticsData.h:
+ * Shared/TextCheckerState.h:
+ * Shared/UpdateInfo.cpp:
+ (WebKit::UpdateInfo::encode):
+ (WebKit::UpdateInfo::decode):
+ * Shared/UpdateInfo.h:
+ * Shared/UserData.cpp:
+ (WebKit::UserData::encode):
+ (WebKit::UserData::decode):
+ * Shared/UserData.h:
+ * Shared/UserMessageCoders.h:
+ (WebKit::UserMessageEncoder::baseEncode):
+ (WebKit::UserMessageDecoder::baseDecode):
+ * Shared/WebBackForwardListItem.cpp:
+ (WebKit::WebBackForwardListItem::encode):
+ (WebKit::WebBackForwardListItem::decode):
+ * Shared/WebBackForwardListItem.h:
+ * Shared/WebConnection.cpp:
+ (WebKit::WebConnection::postMessage):
+ (WebKit::WebConnection::didReceiveMessage):
+ (WebKit::WebConnection::handleMessage):
+ * Shared/WebConnection.h:
+ * Shared/WebContextMenuItemData.cpp:
+ (WebKit::WebContextMenuItemData::encode):
+ (WebKit::WebContextMenuItemData::decode):
+ * Shared/WebContextMenuItemData.h:
+ * Shared/WebCoreArgumentCoders.cpp:
+ * Shared/WebCoreArgumentCoders.h:
+ * Shared/WebEvent.cpp:
+ (WebKit::WebEvent::encode):
+ (WebKit::WebEvent::decode):
+ * Shared/WebEvent.h:
+ * Shared/WebGeolocationPosition.cpp:
+ (WebKit::WebGeolocationPosition::Data::encode):
+ (WebKit::WebGeolocationPosition::Data::decode):
+ * Shared/WebGeolocationPosition.h:
+ * Shared/WebHitTestResult.cpp:
+ (WebKit::WebHitTestResult::Data::encode):
+ (WebKit::WebHitTestResult::Data::decode):
+ * Shared/WebHitTestResult.h:
+ * Shared/WebKeyboardEvent.cpp:
+ (WebKit::WebKeyboardEvent::encode):
+ (WebKit::WebKeyboardEvent::decode):
+ * Shared/WebMouseEvent.cpp:
+ (WebKit::WebMouseEvent::encode):
+ (WebKit::WebMouseEvent::decode):
+ * Shared/WebNavigationDataStore.h:
+ (WebKit::WebNavigationDataStore::encode):
+ (WebKit::WebNavigationDataStore::decode):
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h:
+ * Shared/WebPageGroupData.cpp:
+ (WebKit::WebPageGroupData::encode):
+ (WebKit::WebPageGroupData::decode):
+ * Shared/WebPageGroupData.h:
+ * Shared/WebPlatformTouchPoint.cpp:
+ (WebKit::WebPlatformTouchPoint::encode):
+ (WebKit::WebPlatformTouchPoint::decode):
+ * Shared/WebPopupItem.cpp:
+ (WebKit::WebPopupItem::encode):
+ (WebKit::WebPopupItem::decode):
+ * Shared/WebPopupItem.h:
+ * Shared/WebPreferencesStore.cpp:
+ (WebKit::WebPreferencesStore::encode):
+ (WebKit::WebPreferencesStore::decode):
+ * Shared/WebPreferencesStore.h:
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::encode):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ * Shared/WebSerializedScriptValue.h:
+ (WebKit::WebSerializedScriptValue::dataReference):
+ * Shared/WebTouchEvent.cpp:
+ (WebKit::WebTouchEvent::encode):
+ (WebKit::WebTouchEvent::decode):
+ * Shared/WebWheelEvent.cpp:
+ (WebKit::WebWheelEvent::encode):
+ (WebKit::WebWheelEvent::decode):
+ * Shared/cf/ArgumentCodersCF.cpp:
+ (IPC::encode):
+ (IPC::decode):
+ * Shared/cf/ArgumentCodersCF.h:
+ * Shared/mac/ArgumentCodersMac.h:
+ * Shared/mac/ArgumentCodersMac.mm:
+ (IPC::encode):
+ (IPC::decode):
+ * Shared/mac/AttributedString.h:
+ * Shared/mac/AttributedString.mm:
+ (WebKit::AttributedString::encode):
+ (WebKit::AttributedString::decode):
+ * Shared/mac/ColorSpaceData.h:
+ * Shared/mac/ColorSpaceData.mm:
+ (WebKit::ColorSpaceData::encode):
+ (WebKit::ColorSpaceData::decode):
+ * Shared/mac/LayerTreeContextMac.mm:
+ (WebKit::LayerTreeContext::encode):
+ (WebKit::LayerTreeContext::decode):
+ * Shared/mac/ObjCObjectGraphCoders.h:
+ * Shared/mac/ObjCObjectGraphCoders.mm:
+ (WebKit::ObjCObjectGraphEncoder::baseEncode):
+ (WebKit::ObjCObjectGraphDecoder::baseDecode):
+ (WebKit::WebContextObjCObjectGraphEncoderImpl::encode):
+ (WebKit::WebContextObjCObjectGraphDecoderImpl::decode):
+ (WebKit::InjectedBundleObjCObjectGraphEncoderImpl::encode):
+ (WebKit::InjectedBundleObjCObjectGraphDecoderImpl::decode):
+ (WebKit::WebContextObjCObjectGraphEncoder::encode):
+ (WebKit::WebContextObjCObjectGraphDecoder::decode):
+ (WebKit::InjectedBundleObjCObjectGraphEncoder::encode):
+ (WebKit::InjectedBundleObjCObjectGraphDecoder::decode):
+ * Shared/mac/RemoteLayerBackingStore.h:
+ * Shared/mac/RemoteLayerBackingStore.mm:
+ (RemoteLayerBackingStore::encode):
+ (RemoteLayerBackingStore::decode):
+ * Shared/mac/RemoteLayerTreeTransaction.h:
+ * Shared/mac/RemoteLayerTreeTransaction.mm:
+ (WebKit::RemoteLayerTreeTransaction::LayerCreationProperties::encode):
+ (WebKit::RemoteLayerTreeTransaction::LayerCreationProperties::decode):
+ (WebKit::RemoteLayerTreeTransaction::LayerProperties::encode):
+ (WebKit::RemoteLayerTreeTransaction::LayerProperties::decode):
+ (WebKit::RemoteLayerTreeTransaction::encode):
+ (WebKit::RemoteLayerTreeTransaction::decode):
+ * Shared/mac/SandboxExtensionMac.mm:
+ (WebKit::SandboxExtension::Handle::encode):
+ (WebKit::SandboxExtension::Handle::decode):
+ (WebKit::SandboxExtension::HandleArray::encode):
+ (WebKit::SandboxExtension::HandleArray::decode):
+ * Shared/mac/SecItemRequestData.cpp:
+ (WebKit::SecItemRequestData::encode):
+ (WebKit::SecItemRequestData::decode):
+ * Shared/mac/SecItemRequestData.h:
+ * Shared/mac/SecItemResponseData.cpp:
+ (WebKit::SecItemResponseData::encode):
+ (WebKit::SecItemResponseData::decode):
+ * Shared/mac/SecItemResponseData.h:
+ * Shared/mac/SecItemShim.cpp:
+ (WebKit::SecItemShim::initializeConnection):
+ * Shared/mac/SecItemShim.h:
+ * Shared/mac/WebCoreArgumentCodersMac.mm:
+ (IPC::ArgumentCoder<ResourceRequest>::encodePlatformData):
+ (IPC::ArgumentCoder<ResourceRequest>::decodePlatformData):
+ (IPC::ArgumentCoder<ResourceResponse>::encodePlatformData):
+ (IPC::ArgumentCoder<ResourceResponse>::decodePlatformData):
+ (IPC::ArgumentCoder<CertificateInfo>::encode):
+ (IPC::ArgumentCoder<CertificateInfo>::decode):
+ (IPC::ArgumentCoder<ResourceError>::encodePlatformData):
+ (IPC::ArgumentCoder<ResourceError>::decodePlatformData):
+ * UIProcess/API/mac/PageClientImpl.h:
+ * UIProcess/API/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::accessibilityWebProcessTokenReceived):
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _accessibilityRegisterUIProcessTokens]):
+ * UIProcess/API/mac/WKViewInternal.h:
+ * UIProcess/Authentication/AuthenticationChallengeProxy.cpp:
+ (WebKit::AuthenticationChallengeProxy::AuthenticationChallengeProxy):
+ * UIProcess/Authentication/AuthenticationChallengeProxy.h:
+ (WebKit::AuthenticationChallengeProxy::create):
+ * UIProcess/Databases/DatabaseProcessProxy.cpp:
+ (WebKit::DatabaseProcessProxy::connectionWillOpen):
+ (WebKit::DatabaseProcessProxy::connectionWillClose):
+ (WebKit::DatabaseProcessProxy::getDatabaseProcessConnection):
+ (WebKit::DatabaseProcessProxy::didClose):
+ (WebKit::DatabaseProcessProxy::didReceiveInvalidMessage):
+ (WebKit::DatabaseProcessProxy::didCreateDatabaseToWebProcessConnection):
+ (WebKit::DatabaseProcessProxy::didFinishLaunching):
+ * UIProcess/Databases/DatabaseProcessProxy.h:
+ * UIProcess/Databases/DatabaseProcessProxy.messages.in:
+ * UIProcess/Downloads/DownloadProxy.cpp:
+ (WebKit::createData):
+ (WebKit::DownloadProxy::didFail):
+ (WebKit::DownloadProxy::didCancel):
+ * UIProcess/Downloads/DownloadProxy.h:
+ * UIProcess/Downloads/DownloadProxy.messages.in:
+ * UIProcess/DrawingAreaProxy.h:
+ * UIProcess/Launcher/ProcessLauncher.cpp:
+ (WebKit::ProcessLauncher::didFinishLaunchingProcess):
+ * UIProcess/Launcher/ProcessLauncher.h:
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ (WebKit::connectToService):
+ (WebKit::tryPreexistingProcess):
+ (WebKit::createProcess):
+ * UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h:
+ * UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm:
+ (-[WKCustomProtocolLoader connection:didReceiveData:]):
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::connectionWillOpen):
+ (WebKit::NetworkProcessProxy::connectionWillClose):
+ (WebKit::NetworkProcessProxy::getNetworkProcessConnection):
+ (WebKit::NetworkProcessProxy::networkProcessCrashedOrFailedToLaunch):
+ (WebKit::NetworkProcessProxy::didReceiveMessage):
+ (WebKit::NetworkProcessProxy::didReceiveSyncMessage):
+ (WebKit::NetworkProcessProxy::didClose):
+ (WebKit::NetworkProcessProxy::didReceiveInvalidMessage):
+ (WebKit::NetworkProcessProxy::didCreateNetworkConnectionToWebProcess):
+ (WebKit::NetworkProcessProxy::didFinishLaunching):
+ * UIProcess/Network/NetworkProcessProxy.h:
+ * UIProcess/Network/NetworkProcessProxy.messages.in:
+ * UIProcess/Notifications/WebNotification.h:
+ * UIProcess/PageClient.h:
+ * UIProcess/Plugins/PluginProcessManager.h:
+ * UIProcess/Plugins/PluginProcessProxy.cpp:
+ (WebKit::PluginProcessProxy::getPluginProcessConnection):
+ (WebKit::PluginProcessProxy::pluginProcessCrashedOrFailedToLaunch):
+ (WebKit::PluginProcessProxy::didClose):
+ (WebKit::PluginProcessProxy::didReceiveInvalidMessage):
+ (WebKit::PluginProcessProxy::didFinishLaunching):
+ (WebKit::PluginProcessProxy::didCreateWebProcessConnection):
+ * UIProcess/Plugins/PluginProcessProxy.h:
+ * UIProcess/Plugins/PluginProcessProxy.messages.in:
+ * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+ (WebKit::PluginProcessProxy::platformInitializePluginProcess):
+ * UIProcess/Storage/StorageManager.cpp:
+ (WebKit::StorageManager::StorageArea::addListener):
+ (WebKit::StorageManager::StorageArea::removeListener):
+ (WebKit::StorageManager::StorageArea::setItem):
+ (WebKit::StorageManager::StorageArea::removeItem):
+ (WebKit::StorageManager::StorageArea::clear):
+ (WebKit::StorageManager::StorageArea::dispatchEvents):
+ (WebKit::StorageManager::SessionStorageNamespace::allowedConnection):
+ (WebKit::StorageManager::SessionStorageNamespace::create):
+ (WebKit::StorageManager::SessionStorageNamespace::SessionStorageNamespace):
+ (WebKit::StorageManager::SessionStorageNamespace::setAllowedConnection):
+ (WebKit::StorageManager::createSessionStorageNamespace):
+ (WebKit::StorageManager::setAllowedSessionStorageNamespaceConnection):
+ (WebKit::StorageManager::processWillCloseConnection):
+ (WebKit::StorageManager::createLocalStorageMap):
+ (WebKit::StorageManager::createSessionStorageMap):
+ (WebKit::StorageManager::destroyStorageMap):
+ (WebKit::StorageManager::getValues):
+ (WebKit::StorageManager::setItem):
+ (WebKit::StorageManager::removeItem):
+ (WebKit::StorageManager::clear):
+ (WebKit::StorageManager::createSessionStorageNamespaceInternal):
+ (WebKit::StorageManager::setAllowedSessionStorageNamespaceConnectionInternal):
+ (WebKit::StorageManager::invalidateConnectionInternal):
+ (WebKit::StorageManager::findStorageArea):
+ * UIProcess/Storage/StorageManager.h:
+ * UIProcess/WebApplicationCacheManagerProxy.h:
+ * UIProcess/WebConnectionToWebProcess.cpp:
+ (WebKit::WebConnectionToWebProcess::encodeMessageBody):
+ (WebKit::WebConnectionToWebProcess::decodeMessageBody):
+ (WebKit::WebConnectionToWebProcess::messageSenderConnection):
+ * UIProcess/WebConnectionToWebProcess.h:
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::networkingProcessConnection):
+ (WebKit::WebContext::didReceiveInvalidMessage):
+ (WebKit::WebContext::createNewWebProcess):
+ (WebKit::WebContext::postMessageToInjectedBundle):
+ (WebKit::WebContext::addMessageReceiver):
+ (WebKit::WebContext::removeMessageReceiver):
+ (WebKit::WebContext::dispatchMessage):
+ (WebKit::WebContext::dispatchSyncMessage):
+ (WebKit::WebContext::didReceiveMessage):
+ (WebKit::WebContext::didReceiveSyncMessage):
+ * UIProcess/WebContext.h:
+ * UIProcess/WebContextUserMessageCoders.h:
+ (WebKit::WebContextUserMessageEncoder::encode):
+ (WebKit::WebContextUserMessageDecoder::decode):
+ * UIProcess/WebCookieManagerProxy.h:
+ * UIProcess/WebDatabaseManagerProxy.h:
+ * UIProcess/WebEditCommandProxy.cpp:
+ (WebKit::WebEditCommandProxy::unapply):
+ (WebKit::WebEditCommandProxy::reapply):
+ * UIProcess/WebFrameProxy.h:
+ * UIProcess/WebFullScreenManagerProxy.h:
+ * UIProcess/WebGeolocationManagerProxy.cpp:
+ (WebKit::WebGeolocationManagerProxy::startUpdating):
+ (WebKit::WebGeolocationManagerProxy::stopUpdating):
+ (WebKit::WebGeolocationManagerProxy::removeRequester):
+ (WebKit::WebGeolocationManagerProxy::setEnableHighAccuracy):
+ * UIProcess/WebGeolocationManagerProxy.h:
+ * UIProcess/WebIconDatabase.cpp:
+ (WebKit::WebIconDatabase::setIconDataForIconURL):
+ (WebKit::WebIconDatabase::synchronousIconDataForPageURL):
+ * UIProcess/WebIconDatabase.h:
+ * UIProcess/WebIconDatabase.messages.in:
+ * UIProcess/WebInspectorProxy.h:
+ * UIProcess/WebMediaCacheManagerProxy.h:
+ * UIProcess/WebOriginDataManagerProxy.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::willGoToBackForwardListItem):
+ (WebKit::WebPageProxy::preferencesDidChange):
+ (WebKit::WebPageProxy::didStartProvisionalLoadForFrame):
+ (WebKit::WebPageProxy::didReceiveServerRedirectForProvisionalLoadForFrame):
+ (WebKit::WebPageProxy::didFailProvisionalLoadForFrame):
+ (WebKit::WebPageProxy::didCommitLoadForFrame):
+ (WebKit::WebPageProxy::didFinishDocumentLoadForFrame):
+ (WebKit::WebPageProxy::didFinishLoadForFrame):
+ (WebKit::WebPageProxy::didFailLoadForFrame):
+ (WebKit::WebPageProxy::didSameDocumentNavigationForFrame):
+ (WebKit::WebPageProxy::didReceiveTitleForFrame):
+ (WebKit::WebPageProxy::didFirstLayoutForFrame):
+ (WebKit::WebPageProxy::didFirstVisuallyNonEmptyLayoutForFrame):
+ (WebKit::WebPageProxy::didLayout):
+ (WebKit::WebPageProxy::didRemoveFrameFromHierarchy):
+ (WebKit::WebPageProxy::didDisplayInsecureContentForFrame):
+ (WebKit::WebPageProxy::didRunInsecureContentForFrame):
+ (WebKit::WebPageProxy::didDetectXSSForFrame):
+ (WebKit::WebPageProxy::decidePolicyForNavigationAction):
+ (WebKit::WebPageProxy::decidePolicyForNewWindowAction):
+ (WebKit::WebPageProxy::decidePolicyForResponse):
+ (WebKit::WebPageProxy::decidePolicyForResponseSync):
+ (WebKit::WebPageProxy::unableToImplementPolicy):
+ (WebKit::WebPageProxy::willSubmitForm):
+ (WebKit::WebPageProxy::mouseDidMoveOverElement):
+ (WebKit::WebPageProxy::connectionWillOpen):
+ (WebKit::WebPageProxy::connectionWillClose):
+ (WebKit::WebPageProxy::sendMessage):
+ (WebKit::WebPageProxy::messageSenderConnection):
+ (WebKit::WebPageProxy::showContextMenu):
+ (WebKit::WebPageProxy::internalShowContextMenu):
+ (WebKit::WebPageProxy::dataCallback):
+ (WebKit::WebPageProxy::scriptValueCallback):
+ (WebKit::WebPageProxy::beginPrinting):
+ (WebKit::WebPageProxy::endPrinting):
+ (WebKit::WebPageProxy::computePagesForPrinting):
+ (WebKit::WebPageProxy::drawRectToImage):
+ (WebKit::WebPageProxy::drawPagesToPDF):
+ (WebKit::WebPageProxy::drawPagesForPrinting):
+ (WebKit::WebPageProxy::savePDFToFileInDownloadsFolder):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::connectionWillOpen):
+ (WebKit::WebProcessProxy::connectionWillClose):
+ (WebKit::WebProcessProxy::addBackForwardItem):
+ (WebKit::WebProcessProxy::didReceiveMessage):
+ (WebKit::WebProcessProxy::didReceiveSyncMessage):
+ (WebKit::WebProcessProxy::didClose):
+ (WebKit::WebProcessProxy::didReceiveInvalidMessage):
+ (WebKit::WebProcessProxy::didFinishLaunching):
+ * UIProcess/WebProcessProxy.h:
+ (WebKit::WebProcessProxy::fromConnection):
+ * UIProcess/WebProcessProxy.messages.in:
+ * UIProcess/WebResourceCacheManagerProxy.h:
+ * UIProcess/cf/WebBackForwardListCF.cpp:
+ (WebKit::WebBackForwardList::createCFDictionaryRepresentation):
+ * UIProcess/mac/RemoteLayerTreeHost.h:
+ * UIProcess/mac/SecItemShimProxy.cpp:
+ (WebKit::SecItemShimProxy::initializeConnection):
+ (WebKit::SecItemShimProxy::secItemRequest):
+ * UIProcess/mac/SecItemShimProxy.h:
+ * UIProcess/mac/ViewGestureController.h:
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::platformInitializeWebProcess):
+ * UIProcess/mac/WebPageProxyMac.mm:
+ (WebKit::WebPageProxy::registerWebProcessAccessibilityToken):
+ (WebKit::WebPageProxy::registerUIProcessAccessibilityTokens):
+ (WebKit::WebPageProxy::savePDFToTemporaryFolderAndOpenWithNativeApplication):
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/ApplicationCache/WebApplicationCacheManager.h:
+ * WebProcess/Cookies/WebCookieManager.h:
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
+ (WebKit::WebIDBServerConnection::messageSenderConnection):
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.h:
+ * WebProcess/Databases/WebToDatabaseProcessConnection.cpp:
+ (WebKit::WebToDatabaseProcessConnection::WebToDatabaseProcessConnection):
+ (WebKit::WebToDatabaseProcessConnection::didReceiveMessage):
+ (WebKit::WebToDatabaseProcessConnection::didClose):
+ (WebKit::WebToDatabaseProcessConnection::didReceiveInvalidMessage):
+ * WebProcess/Databases/WebToDatabaseProcessConnection.h:
+ (WebKit::WebToDatabaseProcessConnection::create):
+ (WebKit::WebToDatabaseProcessConnection::connection):
+ * WebProcess/EntryPoint/mac/LegacyProcess/WebContentProcessMain.mm:
+ (WebKit::WebContentProcessMainDelegate::getConnectionIdentifier):
+ * WebProcess/FullScreen/WebFullScreenManager.cpp:
+ (WebKit::WebFullScreenManager::didReceiveMessage):
+ * WebProcess/FullScreen/WebFullScreenManager.h:
+ * WebProcess/Geolocation/WebGeolocationManager.h:
+ * WebProcess/IconDatabase/WebIconDatabaseProxy.cpp:
+ (WebKit::WebIconDatabaseProxy::synchronousIconForPageURL):
+ (WebKit::WebIconDatabaseProxy::setIconDataForIconURL):
+ * WebProcess/IconDatabase/WebIconDatabaseProxy.h:
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::postMessage):
+ (WebKit::InjectedBundle::postSynchronousMessage):
+ * WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h:
+ (WebKit::InjectedBundleUserMessageEncoder::encode):
+ (WebKit::InjectedBundleUserMessageDecoder::decode):
+ * WebProcess/MediaCache/WebMediaCacheManager.h:
+ * WebProcess/Network/NetworkProcessConnection.cpp:
+ (WebKit::NetworkProcessConnection::NetworkProcessConnection):
+ (WebKit::NetworkProcessConnection::didReceiveMessage):
+ (WebKit::NetworkProcessConnection::didReceiveSyncMessage):
+ (WebKit::NetworkProcessConnection::didClose):
+ (WebKit::NetworkProcessConnection::didReceiveInvalidMessage):
+ * WebProcess/Network/NetworkProcessConnection.h:
+ (WebKit::NetworkProcessConnection::create):
+ (WebKit::NetworkProcessConnection::connection):
+ * WebProcess/Network/WebResourceLoader.cpp:
+ (WebKit::WebResourceLoader::messageSenderConnection):
+ (WebKit::WebResourceLoader::didReceiveData):
+ * WebProcess/Network/WebResourceLoader.h:
+ * WebProcess/Network/WebResourceLoader.messages.in:
+ * WebProcess/Notifications/WebNotificationManager.h:
+ * WebProcess/OriginData/WebOriginDataManager.h:
+ * WebProcess/Plugins/PDF/PDFPlugin.h:
+ * WebProcess/Plugins/Plugin.cpp:
+ (WebKit::Plugin::Parameters::encode):
+ (WebKit::Plugin::Parameters::decode):
+ * WebProcess/Plugins/Plugin.h:
+ * WebProcess/Plugins/PluginProcessConnection.cpp:
+ (WebKit::PluginProcessConnection::PluginProcessConnection):
+ (WebKit::PluginProcessConnection::didReceiveMessage):
+ (WebKit::PluginProcessConnection::didReceiveSyncMessage):
+ (WebKit::PluginProcessConnection::didClose):
+ (WebKit::PluginProcessConnection::didReceiveInvalidMessage):
+ * WebProcess/Plugins/PluginProcessConnection.h:
+ (WebKit::PluginProcessConnection::create):
+ (WebKit::PluginProcessConnection::connection):
+ * WebProcess/Plugins/PluginProcessConnectionManager.cpp:
+ (WebKit::PluginProcessConnectionManager::initializeConnection):
+ (WebKit::PluginProcessConnectionManager::getPluginProcessConnection):
+ (WebKit::PluginProcessConnectionManager::pluginProcessCrashed):
+ * WebProcess/Plugins/PluginProcessConnectionManager.h:
+ * WebProcess/Plugins/PluginProxy.cpp:
+ (WebKit::PluginProxy::geometryDidChange):
+ (WebKit::PluginProxy::streamDidReceiveData):
+ (WebKit::PluginProxy::manualStreamDidReceiveData):
+ * WebProcess/Plugins/PluginProxy.h:
+ * WebProcess/ResourceCache/WebResourceCacheManager.h:
+ * WebProcess/Storage/StorageAreaMap.h:
+ * WebProcess/WebConnectionToUIProcess.cpp:
+ (WebKit::WebConnectionToUIProcess::encodeMessageBody):
+ (WebKit::WebConnectionToUIProcess::decodeMessageBody):
+ (WebKit::WebConnectionToUIProcess::messageSenderConnection):
+ * WebProcess/WebConnectionToUIProcess.h:
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::runJavaScriptAlert):
+ (WebKit::WebChromeClient::runJavaScriptConfirm):
+ (WebKit::WebChromeClient::runJavaScriptPrompt):
+ * WebProcess/WebCoreSupport/WebDatabaseManager.h:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse):
+ * WebProcess/WebPage/DecoderAdapter.cpp:
+ (WebKit::DecoderAdapter::decodeBytes):
+ (WebKit::DecoderAdapter::decodeString):
+ * WebProcess/WebPage/DecoderAdapter.h:
+ * WebProcess/WebPage/DrawingArea.h:
+ * WebProcess/WebPage/EncoderAdapter.cpp:
+ (WebKit::EncoderAdapter::dataReference):
+ (WebKit::EncoderAdapter::encodeBytes):
+ (WebKit::EncoderAdapter::encodeString):
+ * WebProcess/WebPage/EncoderAdapter.h:
+ * WebProcess/WebPage/EventDispatcher.cpp:
+ (WebKit::EventDispatcher::initializeConnection):
+ * WebProcess/WebPage/EventDispatcher.h:
+ * WebProcess/WebPage/LayerTreeHost.h:
+ * WebProcess/WebPage/ViewGestureGeometryCollector.h:
+ * WebProcess/WebPage/WebInspector.cpp:
+ (WebKit::WebInspector::createInspectorPage):
+ * WebProcess/WebPage/WebInspector.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::messageSenderConnection):
+ (WebKit::WebPage::loadURL):
+ (WebKit::WebPage::loadURLRequest):
+ (WebKit::WebPage::loadDataImpl):
+ (WebKit::WebPage::loadString):
+ (WebKit::WebPage::loadData):
+ (WebKit::WebPage::loadHTMLString):
+ (WebKit::WebPage::loadAlternateHTMLString):
+ (WebKit::WebPage::loadPlainTextString):
+ (WebKit::WebPage::loadWebArchiveData):
+ (WebKit::WebPage::postInjectedBundleMessage):
+ (WebKit::WebPage::runJavaScriptInMainFrame):
+ (WebKit::WebPage::getContentsAsMHTMLData):
+ (WebKit::WebPage::getSelectionAsWebArchiveData):
+ (WebKit::WebPage::getMainResourceDataOfFrame):
+ (WebKit::WebPage::getResourceDataFromFrame):
+ (WebKit::WebPage::getWebArchiveOfFrame):
+ (WebKit::WebPage::didReceiveMessage):
+ (WebKit::WebPage::didReceiveSyncMessage):
+ (WebKit::WebPage::drawPagesToPDF):
+ (WebKit::WebPage::savePDFToFileInDownloadsFolder):
+ (WebKit::WebPage::savePDFToTemporaryFolderAndOpenWithNativeApplication):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+ * WebProcess/WebPage/WebPageGroupProxy.h:
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::platformInitialize):
+ (WebKit::WebPage::registerUIProcessAccessibilityTokens):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeConnection):
+ (WebKit::WebProcess::downloadProxyConnection):
+ (WebKit::WebProcess::initializeWebProcess):
+ (WebKit::WebProcess::ensureNetworkProcessConnection):
+ (WebKit::WebProcess::didReceiveSyncMessage):
+ (WebKit::WebProcess::didReceiveMessage):
+ (WebKit::WebProcess::didClose):
+ (WebKit::WebProcess::didReceiveInvalidMessage):
+ (WebKit::WebProcess::postInjectedBundleMessage):
+ (WebKit::WebProcess::ensureWebToDatabaseProcessConnection):
+ * WebProcess/WebProcess.h:
+ * WebProcess/WebProcess.messages.in:
+ * WebProcess/mac/WebProcessMac.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+ * config.h:
+
+2013-12-30 Anders Carlsson <andersca@apple.com>
+
Move remaining IPC related files to Platform/IPC.
Rubber-stamped by Andreas Kling.
diff --git a/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp b/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp
index eb57245..90457fd 100644
--- a/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp
+++ b/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp
@@ -55,7 +55,7 @@
{
}
-void DatabaseProcess::initializeConnection(CoreIPC::Connection* connection)
+void DatabaseProcess::initializeConnection(IPC::Connection* connection)
{
ChildProcess::initializeConnection(connection);
}
@@ -65,12 +65,12 @@
return true;
}
-void DatabaseProcess::didClose(CoreIPC::Connection*)
+void DatabaseProcess::didClose(IPC::Connection*)
{
RunLoop::current()->stop();
}
-void DatabaseProcess::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)
+void DatabaseProcess::didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference, IPC::StringReference)
{
RunLoop::current()->stop();
}
@@ -155,10 +155,10 @@
mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &listeningPort);
// Create a listening connection.
- RefPtr<DatabaseToWebProcessConnection> connection = DatabaseToWebProcessConnection::create(CoreIPC::Connection::Identifier(listeningPort));
+ RefPtr<DatabaseToWebProcessConnection> connection = DatabaseToWebProcessConnection::create(IPC::Connection::Identifier(listeningPort));
m_databaseToWebProcessConnections.append(connection.release());
- CoreIPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);
+ IPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);
parentProcessConnection()->send(Messages::DatabaseProcessProxy::DidCreateDatabaseToWebProcessConnection(clientPort), 0);
#else
notImplemented();
diff --git a/Source/WebKit2/DatabaseProcess/DatabaseProcess.h b/Source/WebKit2/DatabaseProcess/DatabaseProcess.h
index 5d5d841..24b1ef0 100644
--- a/Source/WebKit2/DatabaseProcess/DatabaseProcess.h
+++ b/Source/WebKit2/DatabaseProcess/DatabaseProcess.h
@@ -67,13 +67,13 @@
virtual void initializeProcess(const ChildProcessInitializationParameters&) OVERRIDE;
virtual void initializeProcessName(const ChildProcessInitializationParameters&) OVERRIDE;
virtual void initializeSandbox(const ChildProcessInitializationParameters&, SandboxInitializationParameters&) OVERRIDE;
- virtual void initializeConnection(CoreIPC::Connection*) OVERRIDE;
+ virtual void initializeConnection(IPC::Connection*) OVERRIDE;
virtual bool shouldTerminate() OVERRIDE;
- // CoreIPC::Connection::Client
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
- virtual void didClose(CoreIPC::Connection*) OVERRIDE;
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
+ // IPC::Connection::Client
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
+ virtual void didClose(IPC::Connection*) OVERRIDE;
+ virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName) OVERRIDE;
// Message Handlers
void initializeDatabaseProcess(const DatabaseProcessCreationParameters&);
diff --git a/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp b/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp
index 28773fc..7f90c43 100644
--- a/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp
+++ b/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp
@@ -35,14 +35,14 @@
namespace WebKit {
-PassRefPtr<DatabaseToWebProcessConnection> DatabaseToWebProcessConnection::create(CoreIPC::Connection::Identifier connectionIdentifier)
+PassRefPtr<DatabaseToWebProcessConnection> DatabaseToWebProcessConnection::create(IPC::Connection::Identifier connectionIdentifier)
{
return adoptRef(new DatabaseToWebProcessConnection(connectionIdentifier));
}
-DatabaseToWebProcessConnection::DatabaseToWebProcessConnection(CoreIPC::Connection::Identifier connectionIdentifier)
+DatabaseToWebProcessConnection::DatabaseToWebProcessConnection(IPC::Connection::Identifier connectionIdentifier)
{
- m_connection = CoreIPC::Connection::createServerConnection(connectionIdentifier, this, RunLoop::main());
+ m_connection = IPC::Connection::createServerConnection(connectionIdentifier, this, RunLoop::main());
m_connection->setOnlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage(true);
m_connection->open();
}
@@ -52,7 +52,7 @@
}
-void DatabaseToWebProcessConnection::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
+void DatabaseToWebProcessConnection::didReceiveMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder)
{
if (decoder.messageReceiverName() == Messages::DatabaseToWebProcessConnection::messageReceiverName()) {
didReceiveDatabaseToWebProcessConnectionMessage(connection, decoder);
@@ -69,12 +69,12 @@
ASSERT_NOT_REACHED();
}
-void DatabaseToWebProcessConnection::didClose(CoreIPC::Connection*)
+void DatabaseToWebProcessConnection::didClose(IPC::Connection*)
{
}
-void DatabaseToWebProcessConnection::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName)
+void DatabaseToWebProcessConnection::didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
{
}
diff --git a/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h b/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h
index 96ec0b5..78d885c 100644
--- a/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h
+++ b/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h
@@ -36,24 +36,24 @@
namespace WebKit {
-class DatabaseToWebProcessConnection : public RefCounted<DatabaseToWebProcessConnection>, public CoreIPC::Connection::Client, public CoreIPC::MessageSender {
+class DatabaseToWebProcessConnection : public RefCounted<DatabaseToWebProcessConnection>, public IPC::Connection::Client, public IPC::MessageSender {
public:
- static PassRefPtr<DatabaseToWebProcessConnection> create(CoreIPC::Connection::Identifier);
+ static PassRefPtr<DatabaseToWebProcessConnection> create(IPC::Connection::Identifier);
~DatabaseToWebProcessConnection();
- CoreIPC::Connection* connection() const { return m_connection.get(); }
+ IPC::Connection* connection() const { return m_connection.get(); }
private:
- DatabaseToWebProcessConnection(CoreIPC::Connection::Identifier);
+ DatabaseToWebProcessConnection(IPC::Connection::Identifier);
- // CoreIPC::Connection::Client
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
- virtual void didClose(CoreIPC::Connection*) OVERRIDE;
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
- void didReceiveDatabaseToWebProcessConnectionMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
+ // IPC::Connection::Client
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
+ virtual void didClose(IPC::Connection*) OVERRIDE;
+ virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName) OVERRIDE;
+ void didReceiveDatabaseToWebProcessConnectionMessage(IPC::Connection*, IPC::MessageDecoder&);
- // CoreIPC::MessageSender
- virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE { return m_connection.get(); }
+ // IPC::MessageSender
+ virtual IPC::Connection* messageSenderConnection() OVERRIDE { return m_connection.get(); }
virtual uint64_t messageSenderDestinationID() OVERRIDE { return 0; }
#if ENABLE(INDEXED_DATABASE)
@@ -65,7 +65,7 @@
IDBConnectionMap m_idbConnections;
#endif // ENABLE(INDEXED_DATABASE)
- RefPtr<CoreIPC::Connection> m_connection;
+ RefPtr<IPC::Connection> m_connection;
};
} // namespace WebKit
diff --git a/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp b/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp
index 887d6d3..dbd9e00 100644
--- a/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp
+++ b/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp
@@ -155,7 +155,7 @@
});
}
-CoreIPC::Connection* DatabaseProcessIDBConnection::messageSenderConnection()
+IPC::Connection* DatabaseProcessIDBConnection::messageSenderConnection()
{
return m_connection->connection();
}
diff --git a/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h b/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h
index ad62eb7..64754ec 100644
--- a/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h
+++ b/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h
@@ -39,7 +39,7 @@
class DatabaseToWebProcessConnection;
class UniqueIDBDatabase;
-class DatabaseProcessIDBConnection : public RefCounted<DatabaseProcessIDBConnection>, public CoreIPC::MessageSender {
+class DatabaseProcessIDBConnection : public RefCounted<DatabaseProcessIDBConnection>, public IPC::MessageSender {
public:
static RefPtr<DatabaseProcessIDBConnection> create(DatabaseToWebProcessConnection& connection, uint64_t serverConnectionIdentifier)
{
@@ -49,15 +49,15 @@
virtual ~DatabaseProcessIDBConnection();
// Message handlers.
- void didReceiveDatabaseProcessIDBConnectionMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
+ void didReceiveDatabaseProcessIDBConnectionMessage(IPC::Connection*, IPC::MessageDecoder&);
void disconnectedFromWebProcess();
private:
DatabaseProcessIDBConnection(DatabaseToWebProcessConnection&, uint64_t idbConnectionIdentifier);
- // CoreIPC::MessageSender
- virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
+ // IPC::MessageSender
+ virtual IPC::Connection* messageSenderConnection() OVERRIDE;
virtual uint64_t messageSenderDestinationID() OVERRIDE { return m_serverConnectionIdentifier; }
// Message handlers.
diff --git a/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp b/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp
index d1c93d4..3cb5cb4 100644
--- a/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp
+++ b/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp
@@ -49,7 +49,7 @@
{
// This message is DispatchMessageEvenWhenWaitingForSyncReply to avoid a situation where the NetworkProcess is deadlocked
// waiting for 6 connections to complete while the WebProcess is waiting for a 7th (Synchronous XHR) to complete.
- loader->sendAbortingOnFailure(Messages::WebResourceLoader::WillSendRequest(request, redirectResponse), CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply);
+ loader->sendAbortingOnFailure(Messages::WebResourceLoader::WillSendRequest(request, redirectResponse), IPC::DispatchMessageEvenWhenWaitingForSyncReply);
}
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
@@ -57,7 +57,7 @@
{
// This message is DispatchMessageEvenWhenWaitingForSyncReply to avoid a situation where the NetworkProcess is deadlocked
// waiting for 6 connections to complete while the WebProcess is waiting for a 7th (Synchronous XHR) to complete.
- loader->sendAbortingOnFailure(Messages::WebResourceLoader::CanAuthenticateAgainstProtectionSpace(protectionSpace), CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply);
+ loader->sendAbortingOnFailure(Messages::WebResourceLoader::CanAuthenticateAgainstProtectionSpace(protectionSpace), IPC::DispatchMessageEvenWhenWaitingForSyncReply);
}
#endif
@@ -79,7 +79,7 @@
}
#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
- CoreIPC::DataReference dataReference(reinterpret_cast<const uint8_t*>(buffer->data()), buffer->size());
+ IPC::DataReference dataReference(reinterpret_cast<const uint8_t*>(buffer->data()), buffer->size());
loader->sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveData(dataReference, encodedDataLength));
}
diff --git a/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp
index 93ccdb3..f599446 100644
--- a/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp
+++ b/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp
@@ -47,15 +47,15 @@
namespace WebKit {
-PassRefPtr<NetworkConnectionToWebProcess> NetworkConnectionToWebProcess::create(CoreIPC::Connection::Identifier connectionIdentifier)
+PassRefPtr<NetworkConnectionToWebProcess> NetworkConnectionToWebProcess::create(IPC::Connection::Identifier connectionIdentifier)
{
return adoptRef(new NetworkConnectionToWebProcess(connectionIdentifier));
}
-NetworkConnectionToWebProcess::NetworkConnectionToWebProcess(CoreIPC::Connection::Identifier connectionIdentifier)
+NetworkConnectionToWebProcess::NetworkConnectionToWebProcess(IPC::Connection::Identifier connectionIdentifier)
: m_serialLoadingEnabled(false)
{
- m_connection = CoreIPC::Connection::createServerConnection(connectionIdentifier, this, RunLoop::main());
+ m_connection = IPC::Connection::createServerConnection(connectionIdentifier, this, RunLoop::main());
m_connection->setOnlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage(true);
m_connection->open();
}
@@ -64,7 +64,7 @@
{
}
-void NetworkConnectionToWebProcess::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
+void NetworkConnectionToWebProcess::didReceiveMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder)
{
if (decoder.messageReceiverName() == Messages::NetworkConnectionToWebProcess::messageReceiverName()) {
didReceiveNetworkConnectionToWebProcessMessage(connection, decoder);
@@ -81,7 +81,7 @@
ASSERT_NOT_REACHED();
}
-void NetworkConnectionToWebProcess::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, std::unique_ptr<CoreIPC::MessageEncoder>& reply)
+void NetworkConnectionToWebProcess::didReceiveSyncMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& reply)
{
if (decoder.messageReceiverName() == Messages::NetworkConnectionToWebProcess::messageReceiverName()) {
didReceiveSyncNetworkConnectionToWebProcessMessage(connection, decoder, reply);
@@ -90,7 +90,7 @@
ASSERT_NOT_REACHED();
}
-void NetworkConnectionToWebProcess::didClose(CoreIPC::Connection*)
+void NetworkConnectionToWebProcess::didClose(IPC::Connection*)
{
// Protect ourself as we might be otherwise be deleted during this function.
Ref<NetworkConnectionToWebProcess> protector(*this);
@@ -106,7 +106,7 @@
NetworkProcess::shared().removeNetworkConnectionToWebProcess(this);
}
-void NetworkConnectionToWebProcess::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)
+void NetworkConnectionToWebProcess::didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference, IPC::StringReference)
{
}
diff --git a/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h
index d22dd53..9457375 100644
--- a/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h
+++ b/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h
@@ -47,27 +47,27 @@
class SyncNetworkResourceLoader;
typedef uint64_t ResourceLoadIdentifier;
-class NetworkConnectionToWebProcess : public RefCounted<NetworkConnectionToWebProcess>, CoreIPC::Connection::Client {
+class NetworkConnectionToWebProcess : public RefCounted<NetworkConnectionToWebProcess>, IPC::Connection::Client {
public:
- static PassRefPtr<NetworkConnectionToWebProcess> create(CoreIPC::Connection::Identifier);
+ static PassRefPtr<NetworkConnectionToWebProcess> create(IPC::Connection::Identifier);
virtual ~NetworkConnectionToWebProcess();
- CoreIPC::Connection* connection() const { return m_connection.get(); }
+ IPC::Connection* connection() const { return m_connection.get(); }
bool isSerialLoadingEnabled() const { return m_serialLoadingEnabled; }
private:
- NetworkConnectionToWebProcess(CoreIPC::Connection::Identifier);
+ NetworkConnectionToWebProcess(IPC::Connection::Identifier);
- // CoreIPC::Connection::Client
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
- virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&);
- virtual void didClose(CoreIPC::Connection*);
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName);
+ // IPC::Connection::Client
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&);
+ virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
+ virtual void didClose(IPC::Connection*);
+ virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName);
// Message handlers.
- void didReceiveNetworkConnectionToWebProcessMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
- void didReceiveSyncNetworkConnectionToWebProcessMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&);
+ void didReceiveNetworkConnectionToWebProcessMessage(IPC::Connection*, IPC::MessageDecoder&);
+ void didReceiveSyncNetworkConnectionToWebProcessMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
void scheduleResourceLoad(const NetworkResourceLoadParameters&);
void performSynchronousLoad(const NetworkResourceLoadParameters&, PassRefPtr<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply>);
@@ -90,7 +90,7 @@
void registerBlobURLFromURL(const WebCore::URL&, const WebCore::URL& srcURL);
void unregisterBlobURL(const WebCore::URL&);
- RefPtr<CoreIPC::Connection> m_connection;
+ RefPtr<IPC::Connection> m_connection;
HashMap<ResourceLoadIdentifier, RefPtr<NetworkResourceLoader>> m_networkResourceLoaders;
diff --git a/Source/WebKit2/NetworkProcess/NetworkProcess.cpp b/Source/WebKit2/NetworkProcess/NetworkProcess.cpp
index c599670..e5000f5 100644
--- a/Source/WebKit2/NetworkProcess/NetworkProcess.cpp
+++ b/Source/WebKit2/NetworkProcess/NetworkProcess.cpp
@@ -106,7 +106,7 @@
return false;
}
-void NetworkProcess::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
+void NetworkProcess::didReceiveMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder)
{
if (messageReceiverMap().dispatchMessage(connection, decoder))
return;
@@ -114,18 +114,18 @@
didReceiveNetworkProcessMessage(connection, decoder);
}
-void NetworkProcess::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, std::unique_ptr<CoreIPC::MessageEncoder>& replyEncoder)
+void NetworkProcess::didReceiveSyncMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)
{
messageReceiverMap().dispatchSyncMessage(connection, decoder, replyEncoder);
}
-void NetworkProcess::didClose(CoreIPC::Connection*)
+void NetworkProcess::didClose(IPC::Connection*)
{
// The UIProcess just exited.
RunLoop::current()->stop();
}
-void NetworkProcess::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)
+void NetworkProcess::didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference, IPC::StringReference)
{
RunLoop::current()->stop();
}
@@ -140,7 +140,7 @@
enableTermination();
}
-CoreIPC::Connection* NetworkProcess::downloadProxyConnection()
+IPC::Connection* NetworkProcess::downloadProxyConnection()
{
return parentProcessConnection();
}
@@ -172,7 +172,7 @@
it->value->initialize(parameters);
}
-void NetworkProcess::initializeConnection(CoreIPC::Connection* connection)
+void NetworkProcess::initializeConnection(IPC::Connection* connection)
{
ChildProcess::initializeConnection(connection);
@@ -194,18 +194,18 @@
mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &listeningPort);
// Create a listening connection.
- RefPtr<NetworkConnectionToWebProcess> connection = NetworkConnectionToWebProcess::create(CoreIPC::Connection::Identifier(listeningPort));
+ RefPtr<NetworkConnectionToWebProcess> connection = NetworkConnectionToWebProcess::create(IPC::Connection::Identifier(listeningPort));
m_webProcessConnections.append(connection.release());
- CoreIPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);
+ IPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);
parentProcessConnection()->send(Messages::NetworkProcessProxy::DidCreateNetworkConnectionToWebProcess(clientPort), 0);
#elif USE(UNIX_DOMAIN_SOCKETS)
- CoreIPC::Connection::SocketPair socketPair = CoreIPC::Connection::createPlatformConnection();
+ IPC::Connection::SocketPair socketPair = IPC::Connection::createPlatformConnection();
RefPtr<NetworkConnectionToWebProcess> connection = NetworkConnectionToWebProcess::create(socketPair.server);
m_webProcessConnections.append(connection.release());
- CoreIPC::Attachment clientSocket(socketPair.client);
+ IPC::Attachment clientSocket(socketPair.client);
parentProcessConnection()->send(Messages::NetworkProcessProxy::DidCreateNetworkConnectionToWebProcess(clientSocket), 0);
#else
notImplemented();
diff --git a/Source/WebKit2/NetworkProcess/NetworkProcess.h b/Source/WebKit2/NetworkProcess/NetworkProcess.h
index 5b224fd..7daad31 100644
--- a/Source/WebKit2/NetworkProcess/NetworkProcess.h
+++ b/Source/WebKit2/NetworkProcess/NetworkProcess.h
@@ -85,23 +85,23 @@
virtual void initializeProcess(const ChildProcessInitializationParameters&) OVERRIDE;
virtual void initializeProcessName(const ChildProcessInitializationParameters&) OVERRIDE;
virtual void initializeSandbox(const ChildProcessInitializationParameters&, SandboxInitializationParameters&) OVERRIDE;
- virtual void initializeConnection(CoreIPC::Connection*) OVERRIDE;
+ virtual void initializeConnection(IPC::Connection*) OVERRIDE;
virtual bool shouldTerminate() OVERRIDE;
- // CoreIPC::Connection::Client
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
- virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&);
- virtual void didClose(CoreIPC::Connection*) OVERRIDE;
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
+ // IPC::Connection::Client
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
+ virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
+ virtual void didClose(IPC::Connection*) OVERRIDE;
+ virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName) OVERRIDE;
// DownloadManager::Client
virtual void didCreateDownload() OVERRIDE;
virtual void didDestroyDownload() OVERRIDE;
- virtual CoreIPC::Connection* downloadProxyConnection() OVERRIDE;
+ virtual IPC::Connection* downloadProxyConnection() OVERRIDE;
virtual AuthenticationManager& downloadsAuthenticationManager() OVERRIDE;
// Message Handlers
- void didReceiveNetworkProcessMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
+ void didReceiveNetworkProcessMessage(IPC::Connection*, IPC::MessageDecoder&);
void initializeNetworkProcess(const NetworkProcessCreationParameters&);
void createNetworkConnectionToWebProcess();
void ensurePrivateBrowsingSession();
diff --git a/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp b/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
index 96379b9..0738929 100644
--- a/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
+++ b/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
@@ -336,7 +336,7 @@
notImplemented();
}
-CoreIPC::Connection* NetworkResourceLoader::messageSenderConnection()
+IPC::Connection* NetworkResourceLoader::messageSenderConnection()
{
return connectionToWebProcess()->connection();
}
diff --git a/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h b/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h
index 189698d..9d23032 100644
--- a/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h
+++ b/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h
@@ -54,7 +54,7 @@
class RemoteNetworkingContext;
class SandboxExtension;
-class NetworkResourceLoader : public RefCounted<NetworkResourceLoader>, public WebCore::ResourceHandleClient, public CoreIPC::MessageSender {
+class NetworkResourceLoader : public RefCounted<NetworkResourceLoader>, public WebCore::ResourceHandleClient, public IPC::MessageSender {
public:
static RefPtr<NetworkResourceLoader> create(const NetworkResourceLoadParameters& parameters, NetworkConnectionToWebProcess* connection)
{
@@ -112,7 +112,7 @@
#endif // PLATFORM(MAC)
// Message handlers.
- void didReceiveNetworkResourceLoaderMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
+ void didReceiveNetworkResourceLoaderMessage(IPC::Connection*, IPC::MessageDecoder&);
#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
static void tryGetShareableHandleFromCFURLCachedResponse(ShareableResource::Handle&, CFCachedURLResponseRef);
@@ -146,8 +146,8 @@
private:
NetworkResourceLoader(const NetworkResourceLoadParameters&, NetworkConnectionToWebProcess*, PassRefPtr<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply>);
- // CoreIPC::MessageSender
- virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
+ // IPC::MessageSender
+ virtual IPC::Connection* messageSenderConnection() OVERRIDE;
virtual uint64_t messageSenderDestinationID() OVERRIDE { return m_identifier; }
void continueDidReceiveResponse();
diff --git a/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.h b/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.h
index 49d0c0f..bfa31e2 100644
--- a/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.h
+++ b/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.h
@@ -37,7 +37,7 @@
class NetworkConnectionToWebProcess;
class NetworkResourceLoader;
-class DiskCacheMonitor : public CoreIPC::MessageSender {
+class DiskCacheMonitor : public IPC::MessageSender {
public:
static void monitorFileBackingStoreCreation(CFCachedURLResponseRef, NetworkResourceLoader*);
@@ -46,8 +46,8 @@
private:
DiskCacheMonitor(CFCachedURLResponseRef, NetworkResourceLoader*);
- // CoreIPC::MessageSender
- virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
+ // IPC::MessageSender
+ virtual IPC::Connection* messageSenderConnection() OVERRIDE;
virtual uint64_t messageSenderDestinationID() OVERRIDE;
RefPtr<NetworkConnectionToWebProcess> m_connectionToWebProcess;
diff --git a/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm b/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm
index 67b277c..fb1eaa0 100644
--- a/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm
+++ b/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm
@@ -94,7 +94,7 @@
_CFCachedURLResponseSetBecameFileBackedCallBackBlock(cachedResponse, block, dispatch_get_main_queue());
}
-CoreIPC::Connection* DiskCacheMonitor::messageSenderConnection()
+IPC::Connection* DiskCacheMonitor::messageSenderConnection()
{
return m_connectionToWebProcess->connection();
}
diff --git a/Source/WebKit2/Platform/IPC/ArgumentCoder.h b/Source/WebKit2/Platform/IPC/ArgumentCoder.h
index 4b0d692..2af313c 100644
--- a/Source/WebKit2/Platform/IPC/ArgumentCoder.h
+++ b/Source/WebKit2/Platform/IPC/ArgumentCoder.h
@@ -26,7 +26,7 @@
#ifndef ArgumentCoder_h
#define ArgumentCoder_h
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
diff --git a/Source/WebKit2/Platform/IPC/ArgumentCoders.cpp b/Source/WebKit2/Platform/IPC/ArgumentCoders.cpp
index bd79604..5ca0641 100644
--- a/Source/WebKit2/Platform/IPC/ArgumentCoders.cpp
+++ b/Source/WebKit2/Platform/IPC/ArgumentCoders.cpp
@@ -30,7 +30,7 @@
#include <wtf/text/CString.h>
#include <wtf/text/WTFString.h>
-namespace CoreIPC {
+namespace IPC {
void ArgumentCoder<AtomicString>::encode(ArgumentEncoder& encoder, const AtomicString& atomicString)
{
@@ -147,4 +147,4 @@
return decodeStringText<UChar>(decoder, length, result);
}
-} // namespace CoreIPC
+} // namespace IPC
diff --git a/Source/WebKit2/Platform/IPC/ArgumentCoders.h b/Source/WebKit2/Platform/IPC/ArgumentCoders.h
index 804f2dc..c04b7a9 100644
--- a/Source/WebKit2/Platform/IPC/ArgumentCoders.h
+++ b/Source/WebKit2/Platform/IPC/ArgumentCoders.h
@@ -33,7 +33,7 @@
#include <wtf/HashMap.h>
#include <wtf/Vector.h>
-namespace CoreIPC {
+namespace IPC {
// An argument coder works on POD types
template<typename T> struct SimpleArgumentCoder {
@@ -208,6 +208,6 @@
static bool decode(ArgumentDecoder&, String&);
};
-} // namespace CoreIPC
+} // namespace IPC
#endif // ArgumentCoders_h
diff --git a/Source/WebKit2/Platform/IPC/ArgumentDecoder.cpp b/Source/WebKit2/Platform/IPC/ArgumentDecoder.cpp
index b80d5e5..6d396be 100644
--- a/Source/WebKit2/Platform/IPC/ArgumentDecoder.cpp
+++ b/Source/WebKit2/Platform/IPC/ArgumentDecoder.cpp
@@ -29,7 +29,7 @@
#include "DataReference.h"
#include <stdio.h>
-namespace CoreIPC {
+namespace IPC {
ArgumentDecoder::ArgumentDecoder(const uint8_t* buffer, size_t bufferSize)
{
@@ -224,4 +224,4 @@
return true;
}
-} // namespace CoreIPC
+} // namespace IPC
diff --git a/Source/WebKit2/Platform/IPC/ArgumentDecoder.h b/Source/WebKit2/Platform/IPC/ArgumentDecoder.h
index c7c8854..b35ce3f 100644
--- a/Source/WebKit2/Platform/IPC/ArgumentDecoder.h
+++ b/Source/WebKit2/Platform/IPC/ArgumentDecoder.h
@@ -30,7 +30,7 @@
#include "Attachment.h"
#include <wtf/Vector.h>
-namespace CoreIPC {
+namespace IPC {
class DataReference;
@@ -106,6 +106,6 @@
Vector<Attachment> m_attachments;
};
-} // namespace CoreIPC
+} // namespace IPC
#endif // ArgumentDecoder_h
diff --git a/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp b/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp
index b636508..ee85630 100644
--- a/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp
+++ b/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp
@@ -34,7 +34,7 @@
#include <sys/mman.h>
#endif
-namespace CoreIPC {
+namespace IPC {
static inline void* allocBuffer(size_t size)
{
@@ -195,4 +195,4 @@
return newList;
}
-} // namespace CoreIPC
+} // namespace IPC
diff --git a/Source/WebKit2/Platform/IPC/ArgumentEncoder.h b/Source/WebKit2/Platform/IPC/ArgumentEncoder.h
index 047c35d..4242915 100644
--- a/Source/WebKit2/Platform/IPC/ArgumentEncoder.h
+++ b/Source/WebKit2/Platform/IPC/ArgumentEncoder.h
@@ -30,7 +30,7 @@
#include "Attachment.h"
#include <wtf/Vector.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentEncoder;
class DataReference;
@@ -91,6 +91,6 @@
Vector<Attachment> m_attachments;
};
-} // namespace CoreIPC
+} // namespace IPC
#endif // ArgumentEncoder_h
diff --git a/Source/WebKit2/Platform/IPC/Arguments.h b/Source/WebKit2/Platform/IPC/Arguments.h
index ac0f071..7921e1a 100644
--- a/Source/WebKit2/Platform/IPC/Arguments.h
+++ b/Source/WebKit2/Platform/IPC/Arguments.h
@@ -29,7 +29,7 @@
#include "ArgumentDecoder.h"
#include "ArgumentEncoder.h"
-namespace CoreIPC {
+namespace IPC {
template<size_t index, typename... Elements>
struct TupleCoder {
@@ -386,6 +386,6 @@
T10 argument10;
};
-} // namespace CoreIPC
+} // namespace IPC
#endif // Arguments_h
diff --git a/Source/WebKit2/Platform/IPC/Attachment.cpp b/Source/WebKit2/Platform/IPC/Attachment.cpp
index 0e367a7..9367b1a 100644
--- a/Source/WebKit2/Platform/IPC/Attachment.cpp
+++ b/Source/WebKit2/Platform/IPC/Attachment.cpp
@@ -29,7 +29,7 @@
#include "ArgumentDecoder.h"
#include "ArgumentEncoder.h"
-namespace CoreIPC {
+namespace IPC {
Attachment::Attachment()
: m_type(Uninitialized)
@@ -62,4 +62,4 @@
return true;
}
-} // namespace CoreIPC
+} // namespace IPC
diff --git a/Source/WebKit2/Platform/IPC/Attachment.h b/Source/WebKit2/Platform/IPC/Attachment.h
index 7115f0b..b0f1dce 100644
--- a/Source/WebKit2/Platform/IPC/Attachment.h
+++ b/Source/WebKit2/Platform/IPC/Attachment.h
@@ -31,7 +31,7 @@
#include <mach/mach_traps.h>
#endif
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
@@ -90,6 +90,6 @@
#endif
};
-} // namespace CoreIPC
+} // namespace IPC
#endif // Attachment_h
diff --git a/Source/WebKit2/Platform/IPC/Connection.cpp b/Source/WebKit2/Platform/IPC/Connection.cpp
index 821182d..6cbecbb 100644
--- a/Source/WebKit2/Platform/IPC/Connection.cpp
+++ b/Source/WebKit2/Platform/IPC/Connection.cpp
@@ -33,7 +33,7 @@
#include <wtf/text/WTFString.h>
#include <wtf/threads/BinarySemaphore.h>
-namespace CoreIPC {
+namespace IPC {
class Connection::SyncMessageState : public ThreadSafeRefCounted<Connection::SyncMessageState> {
public:
@@ -218,7 +218,7 @@
, m_shouldExitOnSyncMessageSendFailure(false)
, m_didCloseOnConnectionWorkQueueCallback(0)
, m_isConnected(false)
- , m_connectionQueue(WorkQueue::create("com.apple.CoreIPC.ReceiveQueue"))
+ , m_connectionQueue(WorkQueue::create("com.apple.IPC.ReceiveQueue"))
, m_clientRunLoop(clientRunLoop)
, m_inSendSyncCount(0)
, m_inDispatchMessageCount(0)
@@ -837,4 +837,4 @@
m_clientRunLoop->wakeUp();
}
-} // namespace CoreIPC
+} // namespace IPC
diff --git a/Source/WebKit2/Platform/IPC/Connection.h b/Source/WebKit2/Platform/IPC/Connection.h
index cb9be54..1b71650 100644
--- a/Source/WebKit2/Platform/IPC/Connection.h
+++ b/Source/WebKit2/Platform/IPC/Connection.h
@@ -54,7 +54,7 @@
class RunLoop;
}
-namespace CoreIPC {
+namespace IPC {
enum MessageSendFlags {
// Whether this message should be dispatched when waiting for a sync reply.
@@ -351,6 +351,6 @@
return true;
}
-} // namespace CoreIPC
+} // namespace IPC
#endif // Connection_h
diff --git a/Source/WebKit2/Platform/IPC/HandleMessage.h b/Source/WebKit2/Platform/IPC/HandleMessage.h
index f0c5c18..88468b1 100644
--- a/Source/WebKit2/Platform/IPC/HandleMessage.h
+++ b/Source/WebKit2/Platform/IPC/HandleMessage.h
@@ -5,7 +5,7 @@
#include "MessageDecoder.h"
#include "MessageEncoder.h"
-namespace CoreIPC {
+namespace IPC {
// Dispatch functions with no reply arguments.
template<typename C, typename MF>
@@ -445,6 +445,6 @@
callMemberFunction(std::move(arguments), delayedReply.release(), object, function);
}
-} // namespace CoreIPC
+} // namespace IPC
#endif // HandleMessage_h
diff --git a/Source/WebKit2/Platform/IPC/MessageDecoder.cpp b/Source/WebKit2/Platform/IPC/MessageDecoder.cpp
index 0dfe237..5dfda21 100644
--- a/Source/WebKit2/Platform/IPC/MessageDecoder.cpp
+++ b/Source/WebKit2/Platform/IPC/MessageDecoder.cpp
@@ -35,7 +35,7 @@
#include "ImportanceAssertion.h"
#endif
-namespace CoreIPC {
+namespace IPC {
MessageDecoder::~MessageDecoder()
{
@@ -73,4 +73,4 @@
}
#endif
-} // namespace CoreIPC
+} // namespace IPC
diff --git a/Source/WebKit2/Platform/IPC/MessageDecoder.h b/Source/WebKit2/Platform/IPC/MessageDecoder.h
index e3d42f3..0b09baa 100644
--- a/Source/WebKit2/Platform/IPC/MessageDecoder.h
+++ b/Source/WebKit2/Platform/IPC/MessageDecoder.h
@@ -29,7 +29,7 @@
#include "ArgumentDecoder.h"
#include "StringReference.h"
-namespace CoreIPC {
+namespace IPC {
class DataReference;
class ImportanceAssertion;
@@ -62,6 +62,6 @@
#endif
};
-} // namespace CoreIPC
+} // namespace IPC
#endif // MessageDecoder_h
diff --git a/Source/WebKit2/Platform/IPC/MessageEncoder.cpp b/Source/WebKit2/Platform/IPC/MessageEncoder.cpp
index 11d7f6e..d2e4efe 100644
--- a/Source/WebKit2/Platform/IPC/MessageEncoder.cpp
+++ b/Source/WebKit2/Platform/IPC/MessageEncoder.cpp
@@ -30,7 +30,7 @@
#include "MessageFlags.h"
#include "StringReference.h"
-namespace CoreIPC {
+namespace IPC {
static uint8_t defaultMessageFlags = 0;
@@ -64,4 +64,4 @@
*buffer() &= ~DispatchMessageWhenWaitingForSyncReply;
}
-} // namespace CoreIPC
+} // namespace IPC
diff --git a/Source/WebKit2/Platform/IPC/MessageEncoder.h b/Source/WebKit2/Platform/IPC/MessageEncoder.h
index 5753df4..524e5e1 100644
--- a/Source/WebKit2/Platform/IPC/MessageEncoder.h
+++ b/Source/WebKit2/Platform/IPC/MessageEncoder.h
@@ -29,7 +29,7 @@
#include "ArgumentEncoder.h"
#include <wtf/Forward.h>
-namespace CoreIPC {
+namespace IPC {
class StringReference;
@@ -42,6 +42,6 @@
void setShouldDispatchMessageWhenWaitingForSyncReply(bool);
};
-} // namespace CoreIPC
+} // namespace IPC
#endif // MessageEncoder_h
diff --git a/Source/WebKit2/Platform/IPC/MessageFlags.h b/Source/WebKit2/Platform/IPC/MessageFlags.h
index e3e980f..187ca98 100644
--- a/Source/WebKit2/Platform/IPC/MessageFlags.h
+++ b/Source/WebKit2/Platform/IPC/MessageFlags.h
@@ -26,13 +26,13 @@
#ifndef MessageFlags_h
#define MessageFlags_h
-namespace CoreIPC {
+namespace IPC {
enum MessageFlags {
SyncMessage = 1 << 0,
DispatchMessageWhenWaitingForSyncReply = 1 << 1,
};
-} // namespace CoreIPC
+} // namespace IPC
#endif // MessageFlags_h
diff --git a/Source/WebKit2/Platform/IPC/MessageReceiver.h b/Source/WebKit2/Platform/IPC/MessageReceiver.h
index b8d29b0..331b7c3 100644
--- a/Source/WebKit2/Platform/IPC/MessageReceiver.h
+++ b/Source/WebKit2/Platform/IPC/MessageReceiver.h
@@ -29,7 +29,7 @@
#include <wtf/Assertions.h>
#include <wtf/OwnPtr.h>
-namespace CoreIPC {
+namespace IPC {
class MessageDecoder;
class MessageEncoder;
@@ -46,6 +46,6 @@
}
};
-} // namespace CoreIPC
+} // namespace IPC
#endif // MessageReceiver_h
diff --git a/Source/WebKit2/Platform/IPC/MessageReceiverMap.cpp b/Source/WebKit2/Platform/IPC/MessageReceiverMap.cpp
index 0f03e22..da6d7c5 100644
--- a/Source/WebKit2/Platform/IPC/MessageReceiverMap.cpp
+++ b/Source/WebKit2/Platform/IPC/MessageReceiverMap.cpp
@@ -29,7 +29,7 @@
#include "MessageDecoder.h"
#include "MessageReceiver.h"
-namespace CoreIPC {
+namespace IPC {
MessageReceiverMap::MessageReceiverMap()
{
@@ -108,4 +108,4 @@
return false;
}
-} // namespace CoreIPC
+} // namespace IPC
diff --git a/Source/WebKit2/Platform/IPC/MessageReceiverMap.h b/Source/WebKit2/Platform/IPC/MessageReceiverMap.h
index 4e62181..b00d3646 100644
--- a/Source/WebKit2/Platform/IPC/MessageReceiverMap.h
+++ b/Source/WebKit2/Platform/IPC/MessageReceiverMap.h
@@ -30,7 +30,7 @@
#include <wtf/HashMap.h>
#include <wtf/text/CString.h>
-namespace CoreIPC {
+namespace IPC {
class Connection;
class MessageDecoder;
diff --git a/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp b/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp
index d33ac41..392e0f8 100644
--- a/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp
+++ b/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp
@@ -35,7 +35,7 @@
#include <wtf/RunLoop.h>
#include <xpc/xpc.h>
-namespace CoreIPC {
+namespace IPC {
static const size_t inlineMessageMaxSize = 4096;
@@ -491,4 +491,4 @@
ASSERT_NOT_REACHED();
}
-} // namespace CoreIPC
+} // namespace IPC
diff --git a/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h b/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h
index f373232..cbe3ad5 100644
--- a/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h
+++ b/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h
@@ -35,7 +35,7 @@
extern "C" int proc_importance_assertion_begin_with_msg(mach_msg_header_t*, mach_msg_trailer_t*, uint64_t*);
extern "C" int proc_importance_assertion_complete(uint64_t assertion_handle);
-namespace CoreIPC {
+namespace IPC {
class ImportanceAssertion {
WTF_MAKE_NONCOPYABLE(ImportanceAssertion);
diff --git a/Source/WebKit2/Platform/IPC/mac/MachPort.h b/Source/WebKit2/Platform/IPC/mac/MachPort.h
index 47aceb7..663ffcc 100644
--- a/Source/WebKit2/Platform/IPC/mac/MachPort.h
+++ b/Source/WebKit2/Platform/IPC/mac/MachPort.h
@@ -30,7 +30,7 @@
#include "ArgumentEncoder.h"
#include "Attachment.h"
-namespace CoreIPC {
+namespace IPC {
class MachPort {
public:
@@ -70,6 +70,6 @@
mach_msg_type_name_t m_disposition;
};
-} // namespace CoreIPC
+} // namespace IPC
#endif // MachPort_h
diff --git a/Source/WebKit2/Platform/SharedMemory.h b/Source/WebKit2/Platform/SharedMemory.h
index 3f430dd7..efa5f00 100644
--- a/Source/WebKit2/Platform/SharedMemory.h
+++ b/Source/WebKit2/Platform/SharedMemory.h
@@ -35,7 +35,7 @@
#include <wtf/text/WTFString.h>
#endif
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -57,11 +57,11 @@
bool isNull() const;
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, Handle&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, Handle&);
#if USE(UNIX_DOMAIN_SOCKETS)
- CoreIPC::Attachment releaseToAttachment() const;
+ IPC::Attachment releaseToAttachment() const;
void adoptFromAttachment(int fileDescriptor, size_t);
#endif
private:
diff --git a/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp b/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp
index c7b52d9..46a43f3 100644
--- a/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp
+++ b/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp
@@ -55,14 +55,14 @@
return !m_port;
}
-void SharedMemory::Handle::encode(CoreIPC::ArgumentEncoder& encoder) const
+void SharedMemory::Handle::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << static_cast<uint64_t>(m_size);
- encoder << CoreIPC::MachPort(m_port, MACH_MSG_TYPE_MOVE_SEND);
+ encoder << IPC::MachPort(m_port, MACH_MSG_TYPE_MOVE_SEND);
m_port = MACH_PORT_NULL;
}
-bool SharedMemory::Handle::decode(CoreIPC::ArgumentDecoder& decoder, Handle& handle)
+bool SharedMemory::Handle::decode(IPC::ArgumentDecoder& decoder, Handle& handle)
{
ASSERT(!handle.m_port);
ASSERT(!handle.m_size);
@@ -71,7 +71,7 @@
if (!decoder.decode(size))
return false;
- CoreIPC::MachPort machPort;
+ IPC::MachPort machPort;
if (!decoder.decode(machPort))
return false;
diff --git a/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp b/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp
index d7346f7..277b089 100644
--- a/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp
+++ b/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp
@@ -437,7 +437,7 @@
m_plugin->streamDidReceiveResponse(streamID, URL(ParsedURLString, responseURLString), streamLength, lastModifiedTime, mimeType, headers, String());
}
-void PluginControllerProxy::streamDidReceiveData(uint64_t streamID, const CoreIPC::DataReference& data)
+void PluginControllerProxy::streamDidReceiveData(uint64_t streamID, const IPC::DataReference& data)
{
m_plugin->streamDidReceiveData(streamID, reinterpret_cast<const char*>(data.data()), data.size());
}
@@ -460,7 +460,7 @@
m_plugin->manualStreamDidReceiveResponse(URL(ParsedURLString, responseURLString), streamLength, lastModifiedTime, mimeType, headers, String());
}
-void PluginControllerProxy::manualStreamDidReceiveData(const CoreIPC::DataReference& data)
+void PluginControllerProxy::manualStreamDidReceiveData(const IPC::DataReference& data)
{
if (m_pluginCanceledManualStreamLoad)
return;
diff --git a/Source/WebKit2/PluginProcess/PluginControllerProxy.h b/Source/WebKit2/PluginProcess/PluginControllerProxy.h
index e87c7a7..d769971 100644
--- a/Source/WebKit2/PluginProcess/PluginControllerProxy.h
+++ b/Source/WebKit2/PluginProcess/PluginControllerProxy.h
@@ -38,7 +38,7 @@
#include <wtf/Noncopyable.h>
#include <wtf/RunLoop.h>
-namespace CoreIPC {
+namespace IPC {
class DataReference;
}
@@ -61,8 +61,8 @@
bool initialize(const PluginCreationParameters&);
void destroy();
- void didReceivePluginControllerProxyMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
- void didReceiveSyncPluginControllerProxyMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&);
+ void didReceivePluginControllerProxyMessage(IPC::Connection*, IPC::MessageDecoder&);
+ void didReceiveSyncPluginControllerProxyMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
bool wantsWheelEvents() const;
@@ -124,11 +124,11 @@
void geometryDidChange(const WebCore::IntSize& pluginSize, const WebCore::IntRect& clipRect, const WebCore::AffineTransform& pluginToRootViewTransform, float contentsScaleFactor, const ShareableBitmap::Handle& backingStoreHandle);
void didEvaluateJavaScript(uint64_t requestID, const String& result);
void streamDidReceiveResponse(uint64_t streamID, const String& responseURLString, uint32_t streamLength, uint32_t lastModifiedTime, const String& mimeType, const String& headers);
- void streamDidReceiveData(uint64_t streamID, const CoreIPC::DataReference& data);
+ void streamDidReceiveData(uint64_t streamID, const IPC::DataReference& data);
void streamDidFinishLoading(uint64_t streamID);
void streamDidFail(uint64_t streamID, bool wasCancelled);
void manualStreamDidReceiveResponse(const String& responseURLString, uint32_t streamLength, uint32_t lastModifiedTime, const String& mimeType, const String& headers);
- void manualStreamDidReceiveData(const CoreIPC::DataReference& data);
+ void manualStreamDidReceiveData(const IPC::DataReference& data);
void manualStreamDidFinishLoading();
void manualStreamDidFail(bool wasCancelled);
void handleMouseEvent(const WebMouseEvent&, PassRefPtr<Messages::PluginControllerProxy::HandleMouseEvent::DelayedReply>);
diff --git a/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in b/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in
index dd763e0..6fa85f6 100644
--- a/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in
+++ b/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in
@@ -39,7 +39,7 @@
StreamDidReceiveResponse(uint64_t streamID, String responseURLString, uint32_t streamLength, uint32_t lastModifiedTime, String mimeType, String headers)
# Sent when the plug-in receives data for a stream.
- StreamDidReceiveData(uint64_t streamID, CoreIPC::DataReference data)
+ StreamDidReceiveData(uint64_t streamID, IPC::DataReference data)
# Sent when a plug-in stream has finishes loading.
StreamDidFinishLoading(uint64_t streamID)
@@ -51,7 +51,7 @@
ManualStreamDidReceiveResponse(String responseURLString, uint32_t streamLength, uint32_t lastModifiedTime, String mimeType, String headers)
# Sent when the plug-in receives data for the manual stream.
- ManualStreamDidReceiveData(CoreIPC::DataReference data)
+ ManualStreamDidReceiveData(IPC::DataReference data)
# Sent when the plug-in manual stream has finishes loading.
ManualStreamDidFinishLoading()
diff --git a/Source/WebKit2/PluginProcess/PluginCreationParameters.cpp b/Source/WebKit2/PluginProcess/PluginCreationParameters.cpp
index 105fff0..3d2492f 100644
--- a/Source/WebKit2/PluginProcess/PluginCreationParameters.cpp
+++ b/Source/WebKit2/PluginProcess/PluginCreationParameters.cpp
@@ -45,7 +45,7 @@
{
}
-void PluginCreationParameters::encode(CoreIPC::ArgumentEncoder& encoder) const
+void PluginCreationParameters::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << pluginInstanceID;
encoder << windowNPObjectID;
@@ -61,7 +61,7 @@
#endif
}
-bool PluginCreationParameters::decode(CoreIPC::ArgumentDecoder& decoder, PluginCreationParameters& result)
+bool PluginCreationParameters::decode(IPC::ArgumentDecoder& decoder, PluginCreationParameters& result)
{
if (!decoder.decode(result.pluginInstanceID) || !result.pluginInstanceID)
return false;
diff --git a/Source/WebKit2/PluginProcess/PluginCreationParameters.h b/Source/WebKit2/PluginProcess/PluginCreationParameters.h
index 301ea48..389f755 100644
--- a/Source/WebKit2/PluginProcess/PluginCreationParameters.h
+++ b/Source/WebKit2/PluginProcess/PluginCreationParameters.h
@@ -30,7 +30,7 @@
#include "Plugin.h"
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -40,8 +40,8 @@
struct PluginCreationParameters {
PluginCreationParameters();
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, PluginCreationParameters&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, PluginCreationParameters&);
// The unique ID of this plug-in instance.
uint64_t pluginInstanceID;
diff --git a/Source/WebKit2/PluginProcess/PluginProcess.cpp b/Source/WebKit2/PluginProcess/PluginProcess.cpp
index aafcdaa..37bcd78 100644
--- a/Source/WebKit2/PluginProcess/PluginProcess.cpp
+++ b/Source/WebKit2/PluginProcess/PluginProcess.cpp
@@ -121,19 +121,19 @@
return m_webProcessConnections.isEmpty();
}
-void PluginProcess::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
+void PluginProcess::didReceiveMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder)
{
didReceivePluginProcessMessage(connection, decoder);
}
-void PluginProcess::didClose(CoreIPC::Connection*)
+void PluginProcess::didClose(IPC::Connection*)
{
// The UI process has crashed, just go ahead and quit.
// FIXME: If the plug-in is spinning in the main loop, we'll never get this message.
stopRunLoop();
}
-void PluginProcess::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)
+void PluginProcess::didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference, IPC::StringReference)
{
}
@@ -158,18 +158,18 @@
mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &listeningPort);
// Create a listening connection.
- RefPtr<WebProcessConnection> connection = WebProcessConnection::create(CoreIPC::Connection::Identifier(listeningPort));
+ RefPtr<WebProcessConnection> connection = WebProcessConnection::create(IPC::Connection::Identifier(listeningPort));
m_webProcessConnections.append(connection.release());
- CoreIPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);
+ IPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);
parentProcessConnection()->send(Messages::PluginProcessProxy::DidCreateWebProcessConnection(clientPort, m_supportsAsynchronousPluginInitialization), 0);
#elif USE(UNIX_DOMAIN_SOCKETS)
- CoreIPC::Connection::SocketPair socketPair = CoreIPC::Connection::createPlatformConnection();
+ IPC::Connection::SocketPair socketPair = IPC::Connection::createPlatformConnection();
RefPtr<WebProcessConnection> connection = WebProcessConnection::create(socketPair.server);
m_webProcessConnections.append(connection.release());
- CoreIPC::Attachment clientSocket(socketPair.client);
+ IPC::Attachment clientSocket(socketPair.client);
parentProcessConnection()->send(Messages::PluginProcessProxy::DidCreateWebProcessConnection(clientSocket, m_supportsAsynchronousPluginInitialization), 0);
#else
notImplemented();
diff --git a/Source/WebKit2/PluginProcess/PluginProcess.h b/Source/WebKit2/PluginProcess/PluginProcess.h
index 4bfa2b9..dadd3f4 100644
--- a/Source/WebKit2/PluginProcess/PluginProcess.h
+++ b/Source/WebKit2/PluginProcess/PluginProcess.h
@@ -80,13 +80,13 @@
virtual void stopRunLoop() OVERRIDE;
#endif
- // CoreIPC::Connection::Client
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
- virtual void didClose(CoreIPC::Connection*) OVERRIDE;
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
+ // IPC::Connection::Client
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
+ virtual void didClose(IPC::Connection*) OVERRIDE;
+ virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName) OVERRIDE;
// Message handlers.
- void didReceivePluginProcessMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
+ void didReceivePluginProcessMessage(IPC::Connection*, IPC::MessageDecoder&);
void initializePluginProcess(const PluginProcessCreationParameters&);
void createWebProcessConnection();
void getSitesWithData(uint64_t callbackID);
diff --git a/Source/WebKit2/PluginProcess/WebProcessConnection.cpp b/Source/WebKit2/PluginProcess/WebProcessConnection.cpp
index 3a4d15a..5011089 100644
--- a/Source/WebKit2/PluginProcess/WebProcessConnection.cpp
+++ b/Source/WebKit2/PluginProcess/WebProcessConnection.cpp
@@ -46,7 +46,7 @@
namespace WebKit {
-PassRefPtr<WebProcessConnection> WebProcessConnection::create(CoreIPC::Connection::Identifier connectionIdentifier)
+PassRefPtr<WebProcessConnection> WebProcessConnection::create(IPC::Connection::Identifier connectionIdentifier)
{
return adoptRef(new WebProcessConnection(connectionIdentifier));
}
@@ -58,9 +58,9 @@
ASSERT(!m_connection);
}
-WebProcessConnection::WebProcessConnection(CoreIPC::Connection::Identifier connectionIdentifier)
+WebProcessConnection::WebProcessConnection(IPC::Connection::Identifier connectionIdentifier)
{
- m_connection = CoreIPC::Connection::createServerConnection(connectionIdentifier, this, RunLoop::main());
+ m_connection = IPC::Connection::createServerConnection(connectionIdentifier, this, RunLoop::main());
m_npRemoteObjectMap = NPRemoteObjectMap::create(m_connection.get());
m_connection->setOnlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage(true);
@@ -110,14 +110,14 @@
void WebProcessConnection::setGlobalException(const String& exceptionString)
{
- CoreIPC::Connection* connection = ConnectionStack::shared().current();
+ IPC::Connection* connection = ConnectionStack::shared().current();
if (!connection)
return;
connection->sendSync(Messages::PluginProcessConnection::SetException(exceptionString), Messages::PluginProcessConnection::SetException::Reply(), 0);
}
-void WebProcessConnection::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
+void WebProcessConnection::didReceiveMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder)
{
ConnectionStack::CurrentConnectionPusher currentConnection(ConnectionStack::shared(), connection);
@@ -139,7 +139,7 @@
pluginControllerProxy->didReceivePluginControllerProxyMessage(connection, decoder);
}
-void WebProcessConnection::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, std::unique_ptr<CoreIPC::MessageEncoder>& replyEncoder)
+void WebProcessConnection::didReceiveSyncMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)
{
// Force all timers to run at full speed when processing a synchronous message
ActivityAssertion activityAssertion(PluginProcess::shared());
@@ -166,7 +166,7 @@
pluginControllerProxy->didReceiveSyncPluginControllerProxyMessage(connection, decoder, replyEncoder);
}
-void WebProcessConnection::didClose(CoreIPC::Connection*)
+void WebProcessConnection::didClose(IPC::Connection*)
{
// The web process crashed. Destroy all the plug-in controllers. Destroying the last plug-in controller
// will cause the web process connection itself to be destroyed.
@@ -198,7 +198,7 @@
destroyPluginControllerProxy(pluginControllerProxy);
}
-void WebProcessConnection::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)
+void WebProcessConnection::didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference, IPC::StringReference)
{
// FIXME: Implement.
}
diff --git a/Source/WebKit2/PluginProcess/WebProcessConnection.h b/Source/WebKit2/PluginProcess/WebProcessConnection.h
index 4d1c47c2..79269e6 100644
--- a/Source/WebKit2/PluginProcess/WebProcessConnection.h
+++ b/Source/WebKit2/PluginProcess/WebProcessConnection.h
@@ -42,12 +42,12 @@
// A connection from a plug-in process to a web process.
-class WebProcessConnection : public RefCounted<WebProcessConnection>, CoreIPC::Connection::Client {
+class WebProcessConnection : public RefCounted<WebProcessConnection>, IPC::Connection::Client {
public:
- static PassRefPtr<WebProcessConnection> create(CoreIPC::Connection::Identifier);
+ static PassRefPtr<WebProcessConnection> create(IPC::Connection::Identifier);
virtual ~WebProcessConnection();
- CoreIPC::Connection* connection() const { return m_connection.get(); }
+ IPC::Connection* connection() const { return m_connection.get(); }
NPRemoteObjectMap* npRemoteObjectMap() const { return m_npRemoteObjectMap.get(); }
void removePluginControllerProxy(PluginControllerProxy*, Plugin*);
@@ -55,28 +55,28 @@
static void setGlobalException(const String&);
private:
- WebProcessConnection(CoreIPC::Connection::Identifier);
+ WebProcessConnection(IPC::Connection::Identifier);
void addPluginControllerProxy(std::unique_ptr<PluginControllerProxy>);
void destroyPluginControllerProxy(PluginControllerProxy*);
- // CoreIPC::Connection::Client
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
- virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&) OVERRIDE;
- virtual void didClose(CoreIPC::Connection*);
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName);
+ // IPC::Connection::Client
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
+ virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) OVERRIDE;
+ virtual void didClose(IPC::Connection*);
+ virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName);
// Message handlers.
- void didReceiveWebProcessConnectionMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
- void didReceiveSyncWebProcessConnectionMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&);
+ void didReceiveWebProcessConnectionMessage(IPC::Connection*, IPC::MessageDecoder&);
+ void didReceiveSyncWebProcessConnectionMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
void createPlugin(const PluginCreationParameters&, PassRefPtr<Messages::WebProcessConnection::CreatePlugin::DelayedReply>);
void createPluginAsynchronously(const PluginCreationParameters&);
void destroyPlugin(uint64_t pluginInstanceID, bool asynchronousCreationIncomplete);
void createPluginInternal(const PluginCreationParameters&, bool& result, bool& wantsWheelEvents, uint32_t& remoteLayerClientID);
- RefPtr<CoreIPC::Connection> m_connection;
+ RefPtr<IPC::Connection> m_connection;
HashMap<uint64_t, std::unique_ptr<PluginControllerProxy>> m_pluginControllers;
RefPtr<NPRemoteObjectMap> m_npRemoteObjectMap;
diff --git a/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm b/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm
index fabf86e..bbe1195 100644
--- a/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm
+++ b/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm
@@ -47,7 +47,7 @@
void PluginControllerProxy::setComplexTextInputState(PluginComplexTextInputState pluginComplexTextInputState)
{
- m_connection->connection()->send(Messages::PluginProxy::SetComplexTextInputState(pluginComplexTextInputState), m_pluginInstanceID, CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply);
+ m_connection->connection()->send(Messages::PluginProxy::SetComplexTextInputState(pluginComplexTextInputState), m_pluginInstanceID, IPC::DispatchMessageEvenWhenWaitingForSyncReply);
}
mach_port_t PluginControllerProxy::compositingRenderServerPort()
diff --git a/Source/WebKit2/Scripts/webkit2/messages.py b/Source/WebKit2/Scripts/webkit2/messages.py
index 64f19ac..84e9b7f 100644
--- a/Source/WebKit2/Scripts/webkit2/messages.py
+++ b/Source/WebKit2/Scripts/webkit2/messages.py
@@ -94,7 +94,7 @@
def arguments_type_old(parameters, parameter_type_function):
- arguments_type = 'CoreIPC::Arguments%d' % len(parameters)
+ arguments_type = 'IPC::Arguments%d' % len(parameters)
if len(parameters):
arguments_type = '%s<%s>' % (arguments_type, ', '.join(parameter_type_function(parameter.type) for parameter in parameters))
return arguments_type
@@ -130,22 +130,22 @@
result.append('public:\n')
result.append(' typedef %s DecodeType;\n' % decode_type(message))
result.append('\n')
- result.append(' static CoreIPC::StringReference receiverName() { return messageReceiverName(); }\n')
- result.append(' static CoreIPC::StringReference name() { return CoreIPC::StringReference("%s"); }\n' % message.name)
+ result.append(' static IPC::StringReference receiverName() { return messageReceiverName(); }\n')
+ result.append(' static IPC::StringReference name() { return IPC::StringReference("%s"); }\n' % message.name)
result.append(' static const bool isSync = %s;\n' % ('false', 'true')[message.reply_parameters != None])
result.append('\n')
if message.reply_parameters != None:
if message.has_attribute(DELAYED_ATTRIBUTE):
send_parameters = [(function_parameter_type(x.type), x.name) for x in message.reply_parameters]
result.append(' struct DelayedReply : public ThreadSafeRefCounted<DelayedReply> {\n')
- result.append(' DelayedReply(PassRefPtr<CoreIPC::Connection>, std::unique_ptr<CoreIPC::MessageEncoder>);\n')
+ result.append(' DelayedReply(PassRefPtr<IPC::Connection>, std::unique_ptr<IPC::MessageEncoder>);\n')
result.append(' ~DelayedReply();\n')
result.append('\n')
result.append(' bool send(%s);\n' % ', '.join([' '.join(x) for x in send_parameters]))
result.append('\n')
result.append(' private:\n')
- result.append(' RefPtr<CoreIPC::Connection> m_connection;\n')
- result.append(' std::unique_ptr<CoreIPC::MessageEncoder> m_encoder;\n')
+ result.append(' RefPtr<IPC::Connection> m_connection;\n')
+ result.append(' std::unique_ptr<IPC::MessageEncoder> m_encoder;\n')
result.append(' };\n\n')
result.append(' typedef %s Reply;\n' % reply_type(message))
@@ -251,7 +251,7 @@
for message in receiver.messages:
if message.reply_parameters != None and message.has_attribute(DELAYED_ATTRIBUTE):
headers.add('<wtf/ThreadSafeRefCounted.h>')
- types_by_namespace['CoreIPC'].update(['Connection'])
+ types_by_namespace['IPC'].update(['Connection'])
for parameter in receiver.iterparameters():
type = parameter.type
@@ -305,9 +305,9 @@
result.append('namespace Messages {\nnamespace %s {\n' % receiver.name)
result.append('\n')
- result.append('static inline CoreIPC::StringReference messageReceiverName()\n')
+ result.append('static inline IPC::StringReference messageReceiverName()\n')
result.append('{\n')
- result.append(' return CoreIPC::StringReference("%s");\n' % receiver.name)
+ result.append(' return IPC::StringReference("%s");\n' % receiver.name)
result.append('}\n')
result.append('\n')
result.append('\n'.join([message_to_struct_declaration(x) for x in receiver.messages]))
@@ -340,7 +340,7 @@
result = []
result.append(' if (decoder.messageName() == Messages::%s::%s::name()) {\n' % (receiver.name, message.name))
- result.append(' CoreIPC::%s<Messages::%s::%s>(%s);\n' % (dispatch_function, receiver.name, message.name, ', '.join(dispatch_function_args)))
+ result.append(' IPC::%s<Messages::%s::%s>(%s);\n' % (dispatch_function, receiver.name, message.name, ', '.join(dispatch_function_args)))
result.append(' return;\n')
result.append(' }\n')
return surround_in_condition(''.join(result), message.condition)
@@ -357,7 +357,7 @@
result = []
result.append(' if (decoder.messageName() == Messages::%s::%s::name()) {\n' % (receiver.name, message.name))
- result.append(' CoreIPC::%s<Messages::%s::%s>(%sdecoder, %sreplyEncoder, this, &%s);\n' % (dispatch_function, receiver.name, message.name, 'connection, ' if wants_connection else '', '' if message.has_attribute(DELAYED_ATTRIBUTE) else '*', handler_function(receiver, message)))
+ result.append(' IPC::%s<Messages::%s::%s>(%sdecoder, %sreplyEncoder, this, &%s);\n' % (dispatch_function, receiver.name, message.name, 'connection, ' if wants_connection else '', '' if message.has_attribute(DELAYED_ATTRIBUTE) else '*', handler_function(receiver, message)))
result.append(' return;\n')
result.append(' }\n')
return surround_in_condition(''.join(result), message.condition)
@@ -460,7 +460,7 @@
if len(split) < 2:
continue
- if split[0] == 'WebKit' or split[0] == 'CoreIPC':
+ if split[0] == 'WebKit' or split[0] == 'IPC':
headers.append('"%s.h"' % split[1])
else:
headers.append('<%s/%s.h>' % tuple(split))
@@ -551,7 +551,7 @@
if message.condition:
result.append('#if %s\n\n' % message.condition)
- result.append('%s::DelayedReply::DelayedReply(PassRefPtr<CoreIPC::Connection> connection, std::unique_ptr<CoreIPC::MessageEncoder> encoder)\n' % message.name)
+ result.append('%s::DelayedReply::DelayedReply(PassRefPtr<IPC::Connection> connection, std::unique_ptr<IPC::MessageEncoder> encoder)\n' % message.name)
result.append(' : m_connection(connection)\n')
result.append(' , m_encoder(std::move(encoder))\n')
result.append('{\n')
@@ -589,9 +589,9 @@
if async_messages:
if receiver.has_attribute(LEGACY_RECEIVER_ATTRIBUTE):
- result.append('void %s::didReceive%sMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder& decoder)\n' % (receiver.name, receiver.name))
+ result.append('void %s::didReceive%sMessage(IPC::Connection*, IPC::MessageDecoder& decoder)\n' % (receiver.name, receiver.name))
else:
- result.append('void %s::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)\n' % (receiver.name))
+ result.append('void %s::didReceiveMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder)\n' % (receiver.name))
result.append('{\n')
result += [async_message_statement(receiver, message) for message in async_messages]
@@ -603,9 +603,9 @@
if sync_messages:
result.append('\n')
if receiver.has_attribute(LEGACY_RECEIVER_ATTRIBUTE):
- result.append('void %s::didReceiveSync%sMessage(CoreIPC::Connection*%s, CoreIPC::MessageDecoder& decoder, std::unique_ptr<CoreIPC::MessageEncoder>& replyEncoder)\n' % (receiver.name, receiver.name, ' connection' if sync_delayed_messages else ''))
+ result.append('void %s::didReceiveSync%sMessage(IPC::Connection*%s, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)\n' % (receiver.name, receiver.name, ' connection' if sync_delayed_messages else ''))
else:
- result.append('void %s::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, std::unique_ptr<CoreIPC::MessageEncoder>& replyEncoder)\n' % (receiver.name))
+ result.append('void %s::didReceiveSyncMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)\n' % (receiver.name))
result.append('{\n')
result += [sync_message_statement(receiver, message) for message in sync_messages]
if not receiver.has_attribute(LEGACY_RECEIVER_ATTRIBUTE):
diff --git a/Source/WebKit2/Scripts/webkit2/messages_unittest.py b/Source/WebKit2/Scripts/webkit2/messages_unittest.py
index ed58633..97f7e3e 100644
--- a/Source/WebKit2/Scripts/webkit2/messages_unittest.py
+++ b/Source/WebKit2/Scripts/webkit2/messages_unittest.py
@@ -73,7 +73,7 @@
CreatePlugin(uint64_t pluginInstanceID, WebKit::Plugin::Parameters parameters) -> (bool result)
RunJavaScriptAlert(uint64_t frameID, String message) -> ()
GetPlugins(bool refresh) -> (Vector<WebCore::PluginInfo> plugins)
- GetPluginProcessConnection(String pluginPath) -> (CoreIPC::Connection::Handle connectionHandle) Delayed
+ GetPluginProcessConnection(String pluginPath) -> (IPC::Connection::Handle connectionHandle) Delayed
TestMultipleAttributes() -> () WantsConnection Delayed
@@ -82,7 +82,7 @@
TemplateTest(HashMap<String, std::pair<String, uint64_t>> a)
#if PLATFORM(MAC)
- DidCreateWebProcessConnection(CoreIPC::MachPort connectionIdentifier)
+ DidCreateWebProcessConnection(IPC::MachPort connectionIdentifier)
#endif
#if PLATFORM(MAC)
@@ -91,11 +91,11 @@
#endif
#if ENABLE(DEPRECATED_FEATURE)
- DeprecatedOperation(CoreIPC::DummyType dummy)
+ DeprecatedOperation(IPC::DummyType dummy)
#endif
#if ENABLE(EXPERIMENTAL_FEATURE)
- ExperimentalOperation(CoreIPC::DummyType dummy)
+ ExperimentalOperation(IPC::DummyType dummy)
#endif
}
@@ -215,7 +215,7 @@
('String', 'pluginPath'),
),
'reply_parameters': (
- ('CoreIPC::Connection::Handle', 'connectionHandle'),
+ ('IPC::Connection::Handle', 'connectionHandle'),
),
'conditions': (None),
},
@@ -246,7 +246,7 @@
{
'name': 'DidCreateWebProcessConnection',
'parameters': (
- ('CoreIPC::MachPort', 'connectionIdentifier'),
+ ('IPC::MachPort', 'connectionIdentifier'),
),
'conditions': ('PLATFORM(MAC)'),
},
@@ -263,14 +263,14 @@
{
'name': 'DeprecatedOperation',
'parameters': (
- ('CoreIPC::DummyType', 'dummy'),
+ ('IPC::DummyType', 'dummy'),
),
'conditions': ('ENABLE(DEPRECATED_FEATURE)'),
},
{
'name': 'ExperimentalOperation',
'parameters': (
- ('CoreIPC::DummyType', 'dummy'),
+ ('IPC::DummyType', 'dummy'),
),
'conditions': ('ENABLE(EXPERIMENTAL_FEATURE)'),
}
@@ -355,7 +355,7 @@
#include <wtf/Vector.h>
#include <wtf/text/WTFString.h>
-namespace CoreIPC {
+namespace IPC {
class Connection;
class DummyType;
class MachPort;
@@ -373,17 +373,17 @@
namespace Messages {
namespace WebPage {
-static inline CoreIPC::StringReference messageReceiverName()
+static inline IPC::StringReference messageReceiverName()
{
- return CoreIPC::StringReference("WebPage");
+ return IPC::StringReference("WebPage");
}
class LoadURL {
public:
typedef std::tuple<String> DecodeType;
- static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
- static CoreIPC::StringReference name() { return CoreIPC::StringReference("LoadURL"); }
+ static IPC::StringReference receiverName() { return messageReceiverName(); }
+ static IPC::StringReference name() { return IPC::StringReference("LoadURL"); }
static const bool isSync = false;
explicit LoadURL(const String& url)
@@ -405,8 +405,8 @@
public:
typedef std::tuple<String> DecodeType;
- static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
- static CoreIPC::StringReference name() { return CoreIPC::StringReference("LoadSomething"); }
+ static IPC::StringReference receiverName() { return messageReceiverName(); }
+ static IPC::StringReference name() { return IPC::StringReference("LoadSomething"); }
static const bool isSync = false;
explicit LoadSomething(const String& url)
@@ -429,8 +429,8 @@
public:
typedef std::tuple<WebKit::WebTouchEvent> DecodeType;
- static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
- static CoreIPC::StringReference name() { return CoreIPC::StringReference("TouchEvent"); }
+ static IPC::StringReference receiverName() { return messageReceiverName(); }
+ static IPC::StringReference name() { return IPC::StringReference("TouchEvent"); }
static const bool isSync = false;
explicit TouchEvent(const WebKit::WebTouchEvent& event)
@@ -453,8 +453,8 @@
public:
typedef std::tuple<WebKit::WebTouchEvent> DecodeType;
- static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
- static CoreIPC::StringReference name() { return CoreIPC::StringReference("AddEvent"); }
+ static IPC::StringReference receiverName() { return messageReceiverName(); }
+ static IPC::StringReference name() { return IPC::StringReference("AddEvent"); }
static const bool isSync = false;
explicit AddEvent(const WebKit::WebTouchEvent& event)
@@ -477,8 +477,8 @@
public:
typedef std::tuple<String> DecodeType;
- static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
- static CoreIPC::StringReference name() { return CoreIPC::StringReference("LoadSomethingElse"); }
+ static IPC::StringReference receiverName() { return messageReceiverName(); }
+ static IPC::StringReference name() { return IPC::StringReference("LoadSomethingElse"); }
static const bool isSync = false;
explicit LoadSomethingElse(const String& url)
@@ -500,8 +500,8 @@
public:
typedef std::tuple<uint64_t, uint64_t, uint32_t> DecodeType;
- static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
- static CoreIPC::StringReference name() { return CoreIPC::StringReference("DidReceivePolicyDecision"); }
+ static IPC::StringReference receiverName() { return messageReceiverName(); }
+ static IPC::StringReference name() { return IPC::StringReference("DidReceivePolicyDecision"); }
static const bool isSync = false;
DidReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, uint32_t policyAction)
@@ -522,8 +522,8 @@
public:
typedef std::tuple<> DecodeType;
- static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
- static CoreIPC::StringReference name() { return CoreIPC::StringReference("Close"); }
+ static IPC::StringReference receiverName() { return messageReceiverName(); }
+ static IPC::StringReference name() { return IPC::StringReference("Close"); }
static const bool isSync = false;
const std::tuple<> arguments() const
@@ -539,8 +539,8 @@
public:
typedef std::tuple<WebKit::WebPreferencesStore> DecodeType;
- static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
- static CoreIPC::StringReference name() { return CoreIPC::StringReference("PreferencesDidChange"); }
+ static IPC::StringReference receiverName() { return messageReceiverName(); }
+ static IPC::StringReference name() { return IPC::StringReference("PreferencesDidChange"); }
static const bool isSync = false;
explicit PreferencesDidChange(const WebKit::WebPreferencesStore& store)
@@ -561,8 +561,8 @@
public:
typedef std::tuple<double, float> DecodeType;
- static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
- static CoreIPC::StringReference name() { return CoreIPC::StringReference("SendDoubleAndFloat"); }
+ static IPC::StringReference receiverName() { return messageReceiverName(); }
+ static IPC::StringReference name() { return IPC::StringReference("SendDoubleAndFloat"); }
static const bool isSync = false;
SendDoubleAndFloat(double d, float f)
@@ -583,8 +583,8 @@
public:
typedef std::tuple<Vector<uint64_t>, Vector<Vector<uint64_t>>> DecodeType;
- static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
- static CoreIPC::StringReference name() { return CoreIPC::StringReference("SendInts"); }
+ static IPC::StringReference receiverName() { return messageReceiverName(); }
+ static IPC::StringReference name() { return IPC::StringReference("SendInts"); }
static const bool isSync = false;
SendInts(const Vector<uint64_t>& ints, const Vector<Vector<uint64_t>>& intVectors)
@@ -605,11 +605,11 @@
public:
typedef std::tuple<uint64_t, WebKit::Plugin::Parameters> DecodeType;
- static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
- static CoreIPC::StringReference name() { return CoreIPC::StringReference("CreatePlugin"); }
+ static IPC::StringReference receiverName() { return messageReceiverName(); }
+ static IPC::StringReference name() { return IPC::StringReference("CreatePlugin"); }
static const bool isSync = true;
- typedef CoreIPC::Arguments1<bool&> Reply;
+ typedef IPC::Arguments1<bool&> Reply;
CreatePlugin(uint64_t pluginInstanceID, const WebKit::Plugin::Parameters& parameters)
: m_arguments(pluginInstanceID, parameters)
{
@@ -628,11 +628,11 @@
public:
typedef std::tuple<uint64_t, String> DecodeType;
- static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
- static CoreIPC::StringReference name() { return CoreIPC::StringReference("RunJavaScriptAlert"); }
+ static IPC::StringReference receiverName() { return messageReceiverName(); }
+ static IPC::StringReference name() { return IPC::StringReference("RunJavaScriptAlert"); }
static const bool isSync = true;
- typedef CoreIPC::Arguments0 Reply;
+ typedef IPC::Arguments0 Reply;
RunJavaScriptAlert(uint64_t frameID, const String& message)
: m_arguments(frameID, message)
{
@@ -651,11 +651,11 @@
public:
typedef std::tuple<bool> DecodeType;
- static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
- static CoreIPC::StringReference name() { return CoreIPC::StringReference("GetPlugins"); }
+ static IPC::StringReference receiverName() { return messageReceiverName(); }
+ static IPC::StringReference name() { return IPC::StringReference("GetPlugins"); }
static const bool isSync = true;
- typedef CoreIPC::Arguments1<Vector<WebCore::PluginInfo>&> Reply;
+ typedef IPC::Arguments1<Vector<WebCore::PluginInfo>&> Reply;
explicit GetPlugins(bool refresh)
: m_arguments(refresh)
{
@@ -674,22 +674,22 @@
public:
typedef std::tuple<String> DecodeType;
- static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
- static CoreIPC::StringReference name() { return CoreIPC::StringReference("GetPluginProcessConnection"); }
+ static IPC::StringReference receiverName() { return messageReceiverName(); }
+ static IPC::StringReference name() { return IPC::StringReference("GetPluginProcessConnection"); }
static const bool isSync = true;
struct DelayedReply : public ThreadSafeRefCounted<DelayedReply> {
- DelayedReply(PassRefPtr<CoreIPC::Connection>, std::unique_ptr<CoreIPC::MessageEncoder>);
+ DelayedReply(PassRefPtr<IPC::Connection>, std::unique_ptr<IPC::MessageEncoder>);
~DelayedReply();
- bool send(const CoreIPC::Connection::Handle& connectionHandle);
+ bool send(const IPC::Connection::Handle& connectionHandle);
private:
- RefPtr<CoreIPC::Connection> m_connection;
- std::unique_ptr<CoreIPC::MessageEncoder> m_encoder;
+ RefPtr<IPC::Connection> m_connection;
+ std::unique_ptr<IPC::MessageEncoder> m_encoder;
};
- typedef CoreIPC::Arguments1<CoreIPC::Connection::Handle&> Reply;
+ typedef IPC::Arguments1<IPC::Connection::Handle&> Reply;
explicit GetPluginProcessConnection(const String& pluginPath)
: m_arguments(pluginPath)
{
@@ -708,22 +708,22 @@
public:
typedef std::tuple<> DecodeType;
- static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
- static CoreIPC::StringReference name() { return CoreIPC::StringReference("TestMultipleAttributes"); }
+ static IPC::StringReference receiverName() { return messageReceiverName(); }
+ static IPC::StringReference name() { return IPC::StringReference("TestMultipleAttributes"); }
static const bool isSync = true;
struct DelayedReply : public ThreadSafeRefCounted<DelayedReply> {
- DelayedReply(PassRefPtr<CoreIPC::Connection>, std::unique_ptr<CoreIPC::MessageEncoder>);
+ DelayedReply(PassRefPtr<IPC::Connection>, std::unique_ptr<IPC::MessageEncoder>);
~DelayedReply();
bool send();
private:
- RefPtr<CoreIPC::Connection> m_connection;
- std::unique_ptr<CoreIPC::MessageEncoder> m_encoder;
+ RefPtr<IPC::Connection> m_connection;
+ std::unique_ptr<IPC::MessageEncoder> m_encoder;
};
- typedef CoreIPC::Arguments0 Reply;
+ typedef IPC::Arguments0 Reply;
const std::tuple<> arguments() const
{
return m_arguments;
@@ -737,8 +737,8 @@
public:
typedef std::tuple<uint64_t, double, double> DecodeType;
- static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
- static CoreIPC::StringReference name() { return CoreIPC::StringReference("TestParameterAttributes"); }
+ static IPC::StringReference receiverName() { return messageReceiverName(); }
+ static IPC::StringReference name() { return IPC::StringReference("TestParameterAttributes"); }
static const bool isSync = false;
TestParameterAttributes(uint64_t foo, double bar, double baz)
@@ -759,8 +759,8 @@
public:
typedef std::tuple<HashMap<String, std::pair<String, uint64_t>>> DecodeType;
- static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
- static CoreIPC::StringReference name() { return CoreIPC::StringReference("TemplateTest"); }
+ static IPC::StringReference receiverName() { return messageReceiverName(); }
+ static IPC::StringReference name() { return IPC::StringReference("TemplateTest"); }
static const bool isSync = false;
explicit TemplateTest(const HashMap<String, std::pair<String, uint64_t>>& a)
@@ -780,24 +780,24 @@
#if PLATFORM(MAC)
class DidCreateWebProcessConnection {
public:
- typedef std::tuple<CoreIPC::MachPort> DecodeType;
+ typedef std::tuple<IPC::MachPort> DecodeType;
- static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
- static CoreIPC::StringReference name() { return CoreIPC::StringReference("DidCreateWebProcessConnection"); }
+ static IPC::StringReference receiverName() { return messageReceiverName(); }
+ static IPC::StringReference name() { return IPC::StringReference("DidCreateWebProcessConnection"); }
static const bool isSync = false;
- explicit DidCreateWebProcessConnection(const CoreIPC::MachPort& connectionIdentifier)
+ explicit DidCreateWebProcessConnection(const IPC::MachPort& connectionIdentifier)
: m_arguments(connectionIdentifier)
{
}
- const std::tuple<const CoreIPC::MachPort&> arguments() const
+ const std::tuple<const IPC::MachPort&> arguments() const
{
return m_arguments;
}
private:
- std::tuple<const CoreIPC::MachPort&> m_arguments;
+ std::tuple<const IPC::MachPort&> m_arguments;
};
#endif
@@ -806,11 +806,11 @@
public:
typedef std::tuple<uint32_t> DecodeType;
- static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
- static CoreIPC::StringReference name() { return CoreIPC::StringReference("InterpretKeyEvent"); }
+ static IPC::StringReference receiverName() { return messageReceiverName(); }
+ static IPC::StringReference name() { return IPC::StringReference("InterpretKeyEvent"); }
static const bool isSync = true;
- typedef CoreIPC::Arguments1<Vector<WebCore::KeypressCommand>&> Reply;
+ typedef IPC::Arguments1<Vector<WebCore::KeypressCommand>&> Reply;
explicit InterpretKeyEvent(uint32_t type)
: m_arguments(type)
{
@@ -829,48 +829,48 @@
#if ENABLE(DEPRECATED_FEATURE)
class DeprecatedOperation {
public:
- typedef std::tuple<CoreIPC::DummyType> DecodeType;
+ typedef std::tuple<IPC::DummyType> DecodeType;
- static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
- static CoreIPC::StringReference name() { return CoreIPC::StringReference("DeprecatedOperation"); }
+ static IPC::StringReference receiverName() { return messageReceiverName(); }
+ static IPC::StringReference name() { return IPC::StringReference("DeprecatedOperation"); }
static const bool isSync = false;
- explicit DeprecatedOperation(const CoreIPC::DummyType& dummy)
+ explicit DeprecatedOperation(const IPC::DummyType& dummy)
: m_arguments(dummy)
{
}
- const std::tuple<const CoreIPC::DummyType&> arguments() const
+ const std::tuple<const IPC::DummyType&> arguments() const
{
return m_arguments;
}
private:
- std::tuple<const CoreIPC::DummyType&> m_arguments;
+ std::tuple<const IPC::DummyType&> m_arguments;
};
#endif
#if ENABLE(EXPERIMENTAL_FEATURE)
class ExperimentalOperation {
public:
- typedef std::tuple<CoreIPC::DummyType> DecodeType;
+ typedef std::tuple<IPC::DummyType> DecodeType;
- static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
- static CoreIPC::StringReference name() { return CoreIPC::StringReference("ExperimentalOperation"); }
+ static IPC::StringReference receiverName() { return messageReceiverName(); }
+ static IPC::StringReference name() { return IPC::StringReference("ExperimentalOperation"); }
static const bool isSync = false;
- explicit ExperimentalOperation(const CoreIPC::DummyType& dummy)
+ explicit ExperimentalOperation(const IPC::DummyType& dummy)
: m_arguments(dummy)
{
}
- const std::tuple<const CoreIPC::DummyType&> arguments() const
+ const std::tuple<const IPC::DummyType&> arguments() const
{
return m_arguments;
}
private:
- std::tuple<const CoreIPC::DummyType&> m_arguments;
+ std::tuple<const IPC::DummyType&> m_arguments;
};
#endif
@@ -942,7 +942,7 @@
namespace WebPage {
-GetPluginProcessConnection::DelayedReply::DelayedReply(PassRefPtr<CoreIPC::Connection> connection, std::unique_ptr<CoreIPC::MessageEncoder> encoder)
+GetPluginProcessConnection::DelayedReply::DelayedReply(PassRefPtr<IPC::Connection> connection, std::unique_ptr<IPC::MessageEncoder> encoder)
: m_connection(connection)
, m_encoder(std::move(encoder))
{
@@ -953,7 +953,7 @@
ASSERT(!m_connection);
}
-bool GetPluginProcessConnection::DelayedReply::send(const CoreIPC::Connection::Handle& connectionHandle)
+bool GetPluginProcessConnection::DelayedReply::send(const IPC::Connection::Handle& connectionHandle)
{
ASSERT(m_encoder);
*m_encoder << connectionHandle;
@@ -962,7 +962,7 @@
return result;
}
-TestMultipleAttributes::DelayedReply::DelayedReply(PassRefPtr<CoreIPC::Connection> connection, std::unique_ptr<CoreIPC::MessageEncoder> encoder)
+TestMultipleAttributes::DelayedReply::DelayedReply(PassRefPtr<IPC::Connection> connection, std::unique_ptr<IPC::MessageEncoder> encoder)
: m_connection(connection)
, m_encoder(std::move(encoder))
{
@@ -987,110 +987,110 @@
namespace WebKit {
-void WebPage::didReceiveWebPageMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder& decoder)
+void WebPage::didReceiveWebPageMessage(IPC::Connection*, IPC::MessageDecoder& decoder)
{
if (decoder.messageName() == Messages::WebPage::LoadURL::name()) {
- CoreIPC::handleMessage<Messages::WebPage::LoadURL>(decoder, this, &WebPage::loadURL);
+ IPC::handleMessage<Messages::WebPage::LoadURL>(decoder, this, &WebPage::loadURL);
return;
}
#if ENABLE(TOUCH_EVENTS)
if (decoder.messageName() == Messages::WebPage::LoadSomething::name()) {
- CoreIPC::handleMessage<Messages::WebPage::LoadSomething>(decoder, this, &WebPage::loadSomething);
+ IPC::handleMessage<Messages::WebPage::LoadSomething>(decoder, this, &WebPage::loadSomething);
return;
}
#endif
#if (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION || SOME_OTHER_MESSAGE_CONDITION))
if (decoder.messageName() == Messages::WebPage::TouchEvent::name()) {
- CoreIPC::handleMessage<Messages::WebPage::TouchEvent>(decoder, this, &WebPage::touchEvent);
+ IPC::handleMessage<Messages::WebPage::TouchEvent>(decoder, this, &WebPage::touchEvent);
return;
}
#endif
#if (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION && SOME_OTHER_MESSAGE_CONDITION))
if (decoder.messageName() == Messages::WebPage::AddEvent::name()) {
- CoreIPC::handleMessage<Messages::WebPage::AddEvent>(decoder, this, &WebPage::addEvent);
+ IPC::handleMessage<Messages::WebPage::AddEvent>(decoder, this, &WebPage::addEvent);
return;
}
#endif
#if ENABLE(TOUCH_EVENTS)
if (decoder.messageName() == Messages::WebPage::LoadSomethingElse::name()) {
- CoreIPC::handleMessage<Messages::WebPage::LoadSomethingElse>(decoder, this, &WebPage::loadSomethingElse);
+ IPC::handleMessage<Messages::WebPage::LoadSomethingElse>(decoder, this, &WebPage::loadSomethingElse);
return;
}
#endif
if (decoder.messageName() == Messages::WebPage::DidReceivePolicyDecision::name()) {
- CoreIPC::handleMessage<Messages::WebPage::DidReceivePolicyDecision>(decoder, this, &WebPage::didReceivePolicyDecision);
+ IPC::handleMessage<Messages::WebPage::DidReceivePolicyDecision>(decoder, this, &WebPage::didReceivePolicyDecision);
return;
}
if (decoder.messageName() == Messages::WebPage::Close::name()) {
- CoreIPC::handleMessage<Messages::WebPage::Close>(decoder, this, &WebPage::close);
+ IPC::handleMessage<Messages::WebPage::Close>(decoder, this, &WebPage::close);
return;
}
if (decoder.messageName() == Messages::WebPage::PreferencesDidChange::name()) {
- CoreIPC::handleMessage<Messages::WebPage::PreferencesDidChange>(decoder, this, &WebPage::preferencesDidChange);
+ IPC::handleMessage<Messages::WebPage::PreferencesDidChange>(decoder, this, &WebPage::preferencesDidChange);
return;
}
if (decoder.messageName() == Messages::WebPage::SendDoubleAndFloat::name()) {
- CoreIPC::handleMessage<Messages::WebPage::SendDoubleAndFloat>(decoder, this, &WebPage::sendDoubleAndFloat);
+ IPC::handleMessage<Messages::WebPage::SendDoubleAndFloat>(decoder, this, &WebPage::sendDoubleAndFloat);
return;
}
if (decoder.messageName() == Messages::WebPage::SendInts::name()) {
- CoreIPC::handleMessage<Messages::WebPage::SendInts>(decoder, this, &WebPage::sendInts);
+ IPC::handleMessage<Messages::WebPage::SendInts>(decoder, this, &WebPage::sendInts);
return;
}
if (decoder.messageName() == Messages::WebPage::TestParameterAttributes::name()) {
- CoreIPC::handleMessage<Messages::WebPage::TestParameterAttributes>(decoder, this, &WebPage::testParameterAttributes);
+ IPC::handleMessage<Messages::WebPage::TestParameterAttributes>(decoder, this, &WebPage::testParameterAttributes);
return;
}
if (decoder.messageName() == Messages::WebPage::TemplateTest::name()) {
- CoreIPC::handleMessage<Messages::WebPage::TemplateTest>(decoder, this, &WebPage::templateTest);
+ IPC::handleMessage<Messages::WebPage::TemplateTest>(decoder, this, &WebPage::templateTest);
return;
}
#if PLATFORM(MAC)
if (decoder.messageName() == Messages::WebPage::DidCreateWebProcessConnection::name()) {
- CoreIPC::handleMessage<Messages::WebPage::DidCreateWebProcessConnection>(decoder, this, &WebPage::didCreateWebProcessConnection);
+ IPC::handleMessage<Messages::WebPage::DidCreateWebProcessConnection>(decoder, this, &WebPage::didCreateWebProcessConnection);
return;
}
#endif
#if ENABLE(DEPRECATED_FEATURE)
if (decoder.messageName() == Messages::WebPage::DeprecatedOperation::name()) {
- CoreIPC::handleMessage<Messages::WebPage::DeprecatedOperation>(decoder, this, &WebPage::deprecatedOperation);
+ IPC::handleMessage<Messages::WebPage::DeprecatedOperation>(decoder, this, &WebPage::deprecatedOperation);
return;
}
#endif
#if ENABLE(EXPERIMENTAL_FEATURE)
if (decoder.messageName() == Messages::WebPage::ExperimentalOperation::name()) {
- CoreIPC::handleMessage<Messages::WebPage::ExperimentalOperation>(decoder, this, &WebPage::experimentalOperation);
+ IPC::handleMessage<Messages::WebPage::ExperimentalOperation>(decoder, this, &WebPage::experimentalOperation);
return;
}
#endif
ASSERT_NOT_REACHED();
}
-void WebPage::didReceiveSyncWebPageMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, std::unique_ptr<CoreIPC::MessageEncoder>& replyEncoder)
+void WebPage::didReceiveSyncWebPageMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)
{
if (decoder.messageName() == Messages::WebPage::CreatePlugin::name()) {
- CoreIPC::handleMessage<Messages::WebPage::CreatePlugin>(decoder, *replyEncoder, this, &WebPage::createPlugin);
+ IPC::handleMessage<Messages::WebPage::CreatePlugin>(decoder, *replyEncoder, this, &WebPage::createPlugin);
return;
}
if (decoder.messageName() == Messages::WebPage::RunJavaScriptAlert::name()) {
- CoreIPC::handleMessage<Messages::WebPage::RunJavaScriptAlert>(decoder, *replyEncoder, this, &WebPage::runJavaScriptAlert);
+ IPC::handleMessage<Messages::WebPage::RunJavaScriptAlert>(decoder, *replyEncoder, this, &WebPage::runJavaScriptAlert);
return;
}
if (decoder.messageName() == Messages::WebPage::GetPlugins::name()) {
- CoreIPC::handleMessage<Messages::WebPage::GetPlugins>(decoder, *replyEncoder, this, &WebPage::getPlugins);
+ IPC::handleMessage<Messages::WebPage::GetPlugins>(decoder, *replyEncoder, this, &WebPage::getPlugins);
return;
}
if (decoder.messageName() == Messages::WebPage::GetPluginProcessConnection::name()) {
- CoreIPC::handleMessageDelayed<Messages::WebPage::GetPluginProcessConnection>(connection, decoder, replyEncoder, this, &WebPage::getPluginProcessConnection);
+ IPC::handleMessageDelayed<Messages::WebPage::GetPluginProcessConnection>(connection, decoder, replyEncoder, this, &WebPage::getPluginProcessConnection);
return;
}
if (decoder.messageName() == Messages::WebPage::TestMultipleAttributes::name()) {
- CoreIPC::handleMessageDelayed<Messages::WebPage::TestMultipleAttributes>(connection, decoder, replyEncoder, this, &WebPage::testMultipleAttributes);
+ IPC::handleMessageDelayed<Messages::WebPage::TestMultipleAttributes>(connection, decoder, replyEncoder, this, &WebPage::testMultipleAttributes);
return;
}
#if PLATFORM(MAC)
if (decoder.messageName() == Messages::WebPage::InterpretKeyEvent::name()) {
- CoreIPC::handleMessage<Messages::WebPage::InterpretKeyEvent>(decoder, *replyEncoder, this, &WebPage::interpretKeyEvent);
+ IPC::handleMessage<Messages::WebPage::InterpretKeyEvent>(decoder, *replyEncoder, this, &WebPage::interpretKeyEvent);
return;
}
#endif
diff --git a/Source/WebKit2/Shared/API/Cocoa/RemoteObjectRegistry.h b/Source/WebKit2/Shared/API/Cocoa/RemoteObjectRegistry.h
index 10d8f6f..09c2f05 100644
--- a/Source/WebKit2/Shared/API/Cocoa/RemoteObjectRegistry.h
+++ b/Source/WebKit2/Shared/API/Cocoa/RemoteObjectRegistry.h
@@ -38,7 +38,7 @@
class UserData;
-class RemoteObjectRegistry FINAL : public CoreIPC::MessageReceiver {
+class RemoteObjectRegistry FINAL : public IPC::MessageReceiver {
public:
RemoteObjectRegistry(WKRemoteObjectRegistry *, IPC::MessageSender&);
~RemoteObjectRegistry();
@@ -46,8 +46,8 @@
void sendInvocation(const UserData&);
private:
- // CoreIPC::MessageReceiver
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::MessageReceiver
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
// Message handlers
void invokeMethod(const UserData&);
diff --git a/Source/WebKit2/Shared/APIGeometry.cpp b/Source/WebKit2/Shared/APIGeometry.cpp
index 610b978..c59827b 100644
--- a/Source/WebKit2/Shared/APIGeometry.cpp
+++ b/Source/WebKit2/Shared/APIGeometry.cpp
@@ -31,13 +31,13 @@
namespace API {
-void Point::encode(CoreIPC::ArgumentEncoder& encoder) const
+void Point::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << m_point.x;
encoder << m_point.y;
}
-bool Point::decode(CoreIPC::ArgumentDecoder& decoder, RefPtr<API::Object>& result)
+bool Point::decode(IPC::ArgumentDecoder& decoder, RefPtr<API::Object>& result)
{
WKPoint point;
if (!decoder.decode(point.x))
@@ -50,13 +50,13 @@
}
-void Size::encode(CoreIPC::ArgumentEncoder& encoder) const
+void Size::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << m_size.width;
encoder << m_size.height;
}
-bool Size::decode(CoreIPC::ArgumentDecoder& decoder, RefPtr<API::Object>& result)
+bool Size::decode(IPC::ArgumentDecoder& decoder, RefPtr<API::Object>& result)
{
WKSize size;
if (!decoder.decode(size.width))
@@ -69,7 +69,7 @@
}
-void Rect::encode(CoreIPC::ArgumentEncoder& encoder) const
+void Rect::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << m_rect.origin.x;
encoder << m_rect.origin.y;
@@ -77,7 +77,7 @@
encoder << m_rect.size.height;
}
-bool Rect::decode(CoreIPC::ArgumentDecoder& decoder, RefPtr<API::Object>& result)
+bool Rect::decode(IPC::ArgumentDecoder& decoder, RefPtr<API::Object>& result)
{
WKRect rect;
if (!decoder.decode(rect.origin.x))
diff --git a/Source/WebKit2/Shared/APIGeometry.h b/Source/WebKit2/Shared/APIGeometry.h
index 907d704..2efcb47 100644
--- a/Source/WebKit2/Shared/APIGeometry.h
+++ b/Source/WebKit2/Shared/APIGeometry.h
@@ -31,7 +31,7 @@
#include <WebCore/FloatRect.h>
#include <wtf/PassRefPtr.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -47,8 +47,8 @@
const WKSize& size() const { return m_size; }
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, RefPtr<API::Object>&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, RefPtr<API::Object>&);
private:
explicit Size(const WKSize& size)
@@ -68,8 +68,8 @@
const WKPoint& point() const { return m_point; }
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, RefPtr<API::Object>&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, RefPtr<API::Object>&);
private:
explicit Point(const WKPoint& point)
@@ -88,8 +88,8 @@
const WKRect& rect() const { return m_rect; }
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, RefPtr<API::Object>&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, RefPtr<API::Object>&);
private:
explicit Rect(const WKRect& rect)
diff --git a/Source/WebKit2/Shared/APINumber.h b/Source/WebKit2/Shared/APINumber.h
index 5c10100..02a4da9 100644
--- a/Source/WebKit2/Shared/APINumber.h
+++ b/Source/WebKit2/Shared/APINumber.h
@@ -43,12 +43,12 @@
NumberType value() const { return m_value; }
- void encode(CoreIPC::ArgumentEncoder& encoder) const
+ void encode(IPC::ArgumentEncoder& encoder) const
{
encoder << m_value;
}
- static bool decode(CoreIPC::ArgumentDecoder& decoder, RefPtr<Object>& result)
+ static bool decode(IPC::ArgumentDecoder& decoder, RefPtr<Object>& result)
{
NumberType value;
if (!decoder.decode(value))
diff --git a/Source/WebKit2/Shared/Authentication/AuthenticationManager.h b/Source/WebKit2/Shared/Authentication/AuthenticationManager.h
index 4975986..e68e3fa 100644
--- a/Source/WebKit2/Shared/Authentication/AuthenticationManager.h
+++ b/Source/WebKit2/Shared/Authentication/AuthenticationManager.h
@@ -45,7 +45,7 @@
class Download;
class WebFrame;
-class AuthenticationManager : public WebProcessSupplement, public NetworkProcessSupplement, public CoreIPC::MessageReceiver {
+class AuthenticationManager : public WebProcessSupplement, public NetworkProcessSupplement, public IPC::MessageReceiver {
WTF_MAKE_NONCOPYABLE(AuthenticationManager);
public:
explicit AuthenticationManager(ChildProcess*);
@@ -66,8 +66,8 @@
uint64_t outstandingAuthenticationChallengeCount() const { return m_challenges.size(); }
private:
- // CoreIPC::MessageReceiver
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::MessageReceiver
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
bool tryUseCertificateInfoForChallenge(const WebCore::AuthenticationChallenge&, const WebCore::CertificateInfo&);
diff --git a/Source/WebKit2/Shared/ChildProcess.cpp b/Source/WebKit2/Shared/ChildProcess.cpp
index 2c9f164..cafe471 100644
--- a/Source/WebKit2/Shared/ChildProcess.cpp
+++ b/Source/WebKit2/Shared/ChildProcess.cpp
@@ -55,7 +55,7 @@
_exit(EXIT_FAILURE);
}
-static void didCloseOnConnectionWorkQueue(CoreIPC::Connection*)
+static void didCloseOnConnectionWorkQueue(IPC::Connection*)
{
// If the connection has been closed and we haven't responded in the main thread for 10 seconds
// the process will exit forcibly.
@@ -74,7 +74,7 @@
SandboxInitializationParameters sandboxParameters;
initializeSandbox(parameters, sandboxParameters);
- m_connection = CoreIPC::Connection::createClientConnection(parameters.connectionIdentifier, this, RunLoop::main());
+ m_connection = IPC::Connection::createClientConnection(parameters.connectionIdentifier, this, RunLoop::main());
m_connection->setDidCloseOnConnectionWorkQueueCallback(didCloseOnConnectionWorkQueue);
initializeConnection(m_connection.get());
m_connection->open();
@@ -88,21 +88,21 @@
{
}
-void ChildProcess::initializeConnection(CoreIPC::Connection*)
+void ChildProcess::initializeConnection(IPC::Connection*)
{
}
-void ChildProcess::addMessageReceiver(CoreIPC::StringReference messageReceiverName, CoreIPC::MessageReceiver& messageReceiver)
+void ChildProcess::addMessageReceiver(IPC::StringReference messageReceiverName, IPC::MessageReceiver& messageReceiver)
{
m_messageReceiverMap.addMessageReceiver(messageReceiverName, messageReceiver);
}
-void ChildProcess::addMessageReceiver(CoreIPC::StringReference messageReceiverName, uint64_t destinationID, CoreIPC::MessageReceiver& messageReceiver)
+void ChildProcess::addMessageReceiver(IPC::StringReference messageReceiverName, uint64_t destinationID, IPC::MessageReceiver& messageReceiver)
{
m_messageReceiverMap.addMessageReceiver(messageReceiverName, destinationID, messageReceiver);
}
-void ChildProcess::removeMessageReceiver(CoreIPC::StringReference messageReceiverName, uint64_t destinationID)
+void ChildProcess::removeMessageReceiver(IPC::StringReference messageReceiverName, uint64_t destinationID)
{
m_messageReceiverMap.removeMessageReceiver(messageReceiverName, destinationID);
}
@@ -129,7 +129,7 @@
m_terminationTimer.startOneShot(m_terminationTimeout);
}
-CoreIPC::Connection* ChildProcess::messageSenderConnection()
+IPC::Connection* ChildProcess::messageSenderConnection()
{
return m_connection.get();
}
diff --git a/Source/WebKit2/Shared/ChildProcess.h b/Source/WebKit2/Shared/ChildProcess.h
index 29850e1..7fc0f76 100644
--- a/Source/WebKit2/Shared/ChildProcess.h
+++ b/Source/WebKit2/Shared/ChildProcess.h
@@ -42,11 +42,11 @@
struct ChildProcessInitializationParameters {
String uiProcessName;
String clientIdentifier;
- CoreIPC::Connection::Identifier connectionIdentifier;
+ IPC::Connection::Identifier connectionIdentifier;
HashMap<String, String> extraInitializationData;
};
-class ChildProcess : protected CoreIPC::Connection::Client, public CoreIPC::MessageSender {
+class ChildProcess : protected IPC::Connection::Client, public IPC::MessageSender {
WTF_MAKE_NONCOPYABLE(ChildProcess);
public:
@@ -57,9 +57,9 @@
void disableTermination();
void enableTermination();
- void addMessageReceiver(CoreIPC::StringReference messageReceiverName, CoreIPC::MessageReceiver&);
- void addMessageReceiver(CoreIPC::StringReference messageReceiverName, uint64_t destinationID, CoreIPC::MessageReceiver&);
- void removeMessageReceiver(CoreIPC::StringReference messageReceiverName, uint64_t destinationID);
+ void addMessageReceiver(IPC::StringReference messageReceiverName, IPC::MessageReceiver&);
+ void addMessageReceiver(IPC::StringReference messageReceiverName, uint64_t destinationID, IPC::MessageReceiver&);
+ void removeMessageReceiver(IPC::StringReference messageReceiverName, uint64_t destinationID);
#if PLATFORM(MAC)
void setProcessSuppressionEnabled(bool);
@@ -73,9 +73,9 @@
void decrementActiveTaskCount() { }
#endif
- CoreIPC::Connection* parentProcessConnection() const { return m_connection.get(); }
+ IPC::Connection* parentProcessConnection() const { return m_connection.get(); }
- CoreIPC::MessageReceiverMap& messageReceiverMap() { return m_messageReceiverMap; }
+ IPC::MessageReceiverMap& messageReceiverMap() { return m_messageReceiverMap; }
protected:
explicit ChildProcess();
@@ -86,7 +86,7 @@
virtual void initializeProcess(const ChildProcessInitializationParameters&);
virtual void initializeProcessName(const ChildProcessInitializationParameters&);
virtual void initializeSandbox(const ChildProcessInitializationParameters&, SandboxInitializationParameters&);
- virtual void initializeConnection(CoreIPC::Connection*);
+ virtual void initializeConnection(IPC::Connection*);
virtual bool shouldTerminate() = 0;
virtual void terminate();
@@ -98,8 +98,8 @@
#endif
private:
- // CoreIPC::MessageSender
- virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
+ // IPC::MessageSender
+ virtual IPC::Connection* messageSenderConnection() OVERRIDE;
virtual uint64_t messageSenderDestinationID() OVERRIDE;
void terminationTimerFired();
@@ -116,8 +116,8 @@
RunLoop::Timer<ChildProcess> m_terminationTimer;
- RefPtr<CoreIPC::Connection> m_connection;
- CoreIPC::MessageReceiverMap m_messageReceiverMap;
+ RefPtr<IPC::Connection> m_connection;
+ IPC::MessageReceiverMap m_messageReceiverMap;
#if PLATFORM(MAC)
void suspensionHysteresisTimerFired();
diff --git a/Source/WebKit2/Shared/ChildProcessProxy.cpp b/Source/WebKit2/Shared/ChildProcessProxy.cpp
index 3be1e18..264d10b 100644
--- a/Source/WebKit2/Shared/ChildProcessProxy.cpp
+++ b/Source/WebKit2/Shared/ChildProcessProxy.cpp
@@ -45,7 +45,7 @@
}
}
-ChildProcessProxy* ChildProcessProxy::fromConnection(CoreIPC::Connection* connection)
+ChildProcessProxy* ChildProcessProxy::fromConnection(IPC::Connection* connection)
{
ASSERT(connection);
@@ -69,10 +69,9 @@
m_processLauncher->terminateProcess();
}
-bool ChildProcessProxy::sendMessage(std::unique_ptr<CoreIPC::MessageEncoder> encoder, unsigned messageSendFlags)
+bool ChildProcessProxy::sendMessage(std::unique_ptr<IPC::MessageEncoder> encoder, unsigned messageSendFlags)
{
- // If we're waiting for the web process to launch, we need to stash away the messages so we can send them once we have
- // a CoreIPC connection.
+ // If we're waiting for the child process to launch, we need to stash away the messages so we can send them once we have a connection.
if (isLaunching()) {
m_pendingMessages.append(std::make_pair(std::move(encoder), messageSendFlags));
return true;
@@ -85,27 +84,27 @@
return connection()->sendMessage(std::move(encoder), messageSendFlags);
}
-void ChildProcessProxy::addMessageReceiver(CoreIPC::StringReference messageReceiverName, CoreIPC::MessageReceiver& messageReceiver)
+void ChildProcessProxy::addMessageReceiver(IPC::StringReference messageReceiverName, IPC::MessageReceiver& messageReceiver)
{
m_messageReceiverMap.addMessageReceiver(messageReceiverName, messageReceiver);
}
-void ChildProcessProxy::addMessageReceiver(CoreIPC::StringReference messageReceiverName, uint64_t destinationID, CoreIPC::MessageReceiver& messageReceiver)
+void ChildProcessProxy::addMessageReceiver(IPC::StringReference messageReceiverName, uint64_t destinationID, IPC::MessageReceiver& messageReceiver)
{
m_messageReceiverMap.addMessageReceiver(messageReceiverName, destinationID, messageReceiver);
}
-void ChildProcessProxy::removeMessageReceiver(CoreIPC::StringReference messageReceiverName, uint64_t destinationID)
+void ChildProcessProxy::removeMessageReceiver(IPC::StringReference messageReceiverName, uint64_t destinationID)
{
m_messageReceiverMap.removeMessageReceiver(messageReceiverName, destinationID);
}
-bool ChildProcessProxy::dispatchMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
+bool ChildProcessProxy::dispatchMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder)
{
return m_messageReceiverMap.dispatchMessage(connection, decoder);
}
-bool ChildProcessProxy::dispatchSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, std::unique_ptr<CoreIPC::MessageEncoder>& replyEncoder)
+bool ChildProcessProxy::dispatchSyncMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)
{
return m_messageReceiverMap.dispatchSyncMessage(connection, decoder, replyEncoder);
}
@@ -118,11 +117,11 @@
return false;
}
-void ChildProcessProxy::didFinishLaunching(ProcessLauncher*, CoreIPC::Connection::Identifier connectionIdentifier)
+void ChildProcessProxy::didFinishLaunching(ProcessLauncher*, IPC::Connection::Identifier connectionIdentifier)
{
ASSERT(!m_connection);
- m_connection = CoreIPC::Connection::createServerConnection(connectionIdentifier, this, RunLoop::main());
+ m_connection = IPC::Connection::createServerConnection(connectionIdentifier, this, RunLoop::main());
#if OS(DARWIN)
m_connection->setShouldCloseConnectionOnMachExceptions();
#endif
@@ -131,7 +130,7 @@
m_connection->open();
for (size_t i = 0; i < m_pendingMessages.size(); ++i) {
- std::unique_ptr<CoreIPC::MessageEncoder> message = std::move(m_pendingMessages[i].first);
+ std::unique_ptr<IPC::MessageEncoder> message = std::move(m_pendingMessages[i].first);
unsigned messageSendFlags = m_pendingMessages[i].second;
m_connection->sendMessage(std::move(message), messageSendFlags);
}
@@ -159,11 +158,11 @@
m_connection = nullptr;
}
-void ChildProcessProxy::connectionWillOpen(CoreIPC::Connection*)
+void ChildProcessProxy::connectionWillOpen(IPC::Connection*)
{
}
-void ChildProcessProxy::connectionWillClose(CoreIPC::Connection*)
+void ChildProcessProxy::connectionWillClose(IPC::Connection*)
{
}
diff --git a/Source/WebKit2/Shared/ChildProcessProxy.h b/Source/WebKit2/Shared/ChildProcessProxy.h
index f66c03a..aefe0d9 100644
--- a/Source/WebKit2/Shared/ChildProcessProxy.h
+++ b/Source/WebKit2/Shared/ChildProcessProxy.h
@@ -34,7 +34,7 @@
namespace WebKit {
-class ChildProcessProxy : ProcessLauncher::Client, public CoreIPC::Connection::Client, public ThreadSafeRefCounted<ChildProcessProxy> {
+class ChildProcessProxy : ProcessLauncher::Client, public IPC::Connection::Client, public ThreadSafeRefCounted<ChildProcessProxy> {
WTF_MAKE_NONCOPYABLE(ChildProcessProxy);
public:
@@ -42,7 +42,7 @@
virtual ~ChildProcessProxy();
// FIXME: This function does an unchecked upcast, and it is only used in a deprecated code path. Would like to get rid of it.
- static ChildProcessProxy* fromConnection(CoreIPC::Connection*);
+ static ChildProcessProxy* fromConnection(IPC::Connection*);
void connect();
void terminate();
@@ -50,15 +50,15 @@
template<typename T> bool send(T&& message, uint64_t destinationID, unsigned messageSendFlags = 0);
template<typename T> bool sendSync(T&& message, typename T::Reply&&, uint64_t destinationID, double timeout = 1);
- CoreIPC::Connection* connection() const
+ IPC::Connection* connection() const
{
ASSERT(m_connection);
return m_connection.get();
}
- void addMessageReceiver(CoreIPC::StringReference messageReceiverName, CoreIPC::MessageReceiver&);
- void addMessageReceiver(CoreIPC::StringReference messageReceiverName, uint64_t destinationID, CoreIPC::MessageReceiver&);
- void removeMessageReceiver(CoreIPC::StringReference messageReceiverName, uint64_t destinationID);
+ void addMessageReceiver(IPC::StringReference messageReceiverName, IPC::MessageReceiver&);
+ void addMessageReceiver(IPC::StringReference messageReceiverName, uint64_t destinationID, IPC::MessageReceiver&);
+ void removeMessageReceiver(IPC::StringReference messageReceiverName, uint64_t destinationID);
bool isValid() const { return m_connection; }
bool isLaunching() const;
@@ -66,27 +66,27 @@
PlatformProcessIdentifier processIdentifier() const { return m_processLauncher->processIdentifier(); }
- bool sendMessage(std::unique_ptr<CoreIPC::MessageEncoder>, unsigned messageSendFlags);
+ bool sendMessage(std::unique_ptr<IPC::MessageEncoder>, unsigned messageSendFlags);
protected:
void clearConnection();
void abortProcessLaunchIfNeeded();
// ProcessLauncher::Client
- virtual void didFinishLaunching(ProcessLauncher*, CoreIPC::Connection::Identifier) OVERRIDE;
+ virtual void didFinishLaunching(ProcessLauncher*, IPC::Connection::Identifier) OVERRIDE;
- bool dispatchMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
- bool dispatchSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&);
+ bool dispatchMessage(IPC::Connection*, IPC::MessageDecoder&);
+ bool dispatchSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
private:
virtual void getLaunchOptions(ProcessLauncher::LaunchOptions&) = 0;
- virtual void connectionWillOpen(CoreIPC::Connection*);
- virtual void connectionWillClose(CoreIPC::Connection*);
+ virtual void connectionWillOpen(IPC::Connection*);
+ virtual void connectionWillClose(IPC::Connection*);
- Vector<std::pair<std::unique_ptr<CoreIPC::MessageEncoder>, unsigned>> m_pendingMessages;
+ Vector<std::pair<std::unique_ptr<IPC::MessageEncoder>, unsigned>> m_pendingMessages;
RefPtr<ProcessLauncher> m_processLauncher;
- RefPtr<CoreIPC::Connection> m_connection;
- CoreIPC::MessageReceiverMap m_messageReceiverMap;
+ RefPtr<IPC::Connection> m_connection;
+ IPC::MessageReceiverMap m_messageReceiverMap;
};
template<typename T>
@@ -94,7 +94,7 @@
{
COMPILE_ASSERT(!T::isSync, AsyncMessageExpected);
- auto encoder = std::make_unique<CoreIPC::MessageEncoder>(T::receiverName(), T::name(), destinationID);
+ auto encoder = std::make_unique<IPC::MessageEncoder>(T::receiverName(), T::name(), destinationID);
encoder->encode(message.arguments());
return sendMessage(std::move(encoder), messageSendFlags);
diff --git a/Source/WebKit2/Shared/ChildProcessSupplement.h b/Source/WebKit2/Shared/ChildProcessSupplement.h
index 9a83405..dfbefba 100644
--- a/Source/WebKit2/Shared/ChildProcessSupplement.h
+++ b/Source/WebKit2/Shared/ChildProcessSupplement.h
@@ -26,9 +26,9 @@
#ifndef ChildProcessSupplement_h
#define ChildProcessSupplement_h
-namespace CoreIPC {
+namespace IPC {
class Connection;
-} // namespace CoreIPC
+} // namespace IPC
namespace WebKit {
@@ -38,7 +38,7 @@
{
}
- virtual void initializeConnection(CoreIPC::Connection*)
+ virtual void initializeConnection(IPC::Connection*)
{
}
};
diff --git a/Source/WebKit2/Shared/ConnectionStack.h b/Source/WebKit2/Shared/ConnectionStack.h
index 6eea5ba..bd753a0 100644
--- a/Source/WebKit2/Shared/ConnectionStack.h
+++ b/Source/WebKit2/Shared/ConnectionStack.h
@@ -28,7 +28,7 @@
#include <wtf/Vector.h>
-namespace CoreIPC {
+namespace IPC {
class Connection;
}
@@ -38,14 +38,14 @@
public:
static ConnectionStack& shared();
- CoreIPC::Connection* current()
+ IPC::Connection* current()
{
return m_connectionStack.last();
}
class CurrentConnectionPusher {
public:
- CurrentConnectionPusher(ConnectionStack& connectionStack, CoreIPC::Connection* connection)
+ CurrentConnectionPusher(ConnectionStack& connectionStack, IPC::Connection* connection)
: m_connectionStack(connectionStack)
#if !ASSERT_DISABLED
, m_connection(connection)
@@ -63,7 +63,7 @@
private:
ConnectionStack& m_connectionStack;
#if !ASSERT_DISABLED
- CoreIPC::Connection* m_connection;
+ IPC::Connection* m_connection;
#endif
};
@@ -71,7 +71,7 @@
// It's OK for these to be weak pointers because we only push object on the stack
// from within didReceiveMessage and didReceiveSyncMessage and the Connection objects are
// already ref'd for the duration of those functions.
- Vector<CoreIPC::Connection*, 4> m_connectionStack;
+ Vector<IPC::Connection*, 4> m_connectionStack;
};
} // namespace WebKit
diff --git a/Source/WebKit2/Shared/CoreIPCSupport/WebContextMessageKinds.h b/Source/WebKit2/Shared/CoreIPCSupport/WebContextMessageKinds.h
index a2dfba2..4895810 100644
--- a/Source/WebKit2/Shared/CoreIPCSupport/WebContextMessageKinds.h
+++ b/Source/WebKit2/Shared/CoreIPCSupport/WebContextMessageKinds.h
@@ -32,19 +32,19 @@
namespace WebContextLegacyMessages {
-inline CoreIPC::StringReference messageReceiverName()
+inline IPC::StringReference messageReceiverName()
{
- return CoreIPC::StringReference("WebContextLegacyMessage");
+ return IPC::StringReference("WebContextLegacyMessage");
}
-inline CoreIPC::StringReference postMessageMessageName()
+inline IPC::StringReference postMessageMessageName()
{
- return CoreIPC::StringReference("PostMessage");
+ return IPC::StringReference("PostMessage");
}
-inline CoreIPC::StringReference postSynchronousMessageMessageName()
+inline IPC::StringReference postSynchronousMessageMessageName()
{
- return CoreIPC::StringReference("PostSynchronousMessage");
+ return IPC::StringReference("PostSynchronousMessage");
}
} // namespace WebContextLegacyMessages
diff --git a/Source/WebKit2/Shared/Databases/DatabaseProcessCreationParameters.cpp b/Source/WebKit2/Shared/Databases/DatabaseProcessCreationParameters.cpp
index c94adda..49f2cef 100644
--- a/Source/WebKit2/Shared/Databases/DatabaseProcessCreationParameters.cpp
+++ b/Source/WebKit2/Shared/Databases/DatabaseProcessCreationParameters.cpp
@@ -36,12 +36,12 @@
{
}
-void DatabaseProcessCreationParameters::encode(CoreIPC::ArgumentEncoder& encoder) const
+void DatabaseProcessCreationParameters::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << indexedDatabaseDirectory;
}
-bool DatabaseProcessCreationParameters::decode(CoreIPC::ArgumentDecoder& decoder, DatabaseProcessCreationParameters& result)
+bool DatabaseProcessCreationParameters::decode(IPC::ArgumentDecoder& decoder, DatabaseProcessCreationParameters& result)
{
if (!decoder.decode(result.indexedDatabaseDirectory))
return false;
diff --git a/Source/WebKit2/Shared/Databases/DatabaseProcessCreationParameters.h b/Source/WebKit2/Shared/Databases/DatabaseProcessCreationParameters.h
index eedc618..c3b637c 100644
--- a/Source/WebKit2/Shared/Databases/DatabaseProcessCreationParameters.h
+++ b/Source/WebKit2/Shared/Databases/DatabaseProcessCreationParameters.h
@@ -31,7 +31,7 @@
#if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -41,8 +41,8 @@
struct DatabaseProcessCreationParameters {
DatabaseProcessCreationParameters();
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, DatabaseProcessCreationParameters&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, DatabaseProcessCreationParameters&);
String indexedDatabaseDirectory;
};
diff --git a/Source/WebKit2/Shared/DictionaryPopupInfo.cpp b/Source/WebKit2/Shared/DictionaryPopupInfo.cpp
index 13f0e85..e15dae6 100644
--- a/Source/WebKit2/Shared/DictionaryPopupInfo.cpp
+++ b/Source/WebKit2/Shared/DictionaryPopupInfo.cpp
@@ -34,7 +34,7 @@
namespace WebKit {
-void DictionaryPopupInfo::encode(CoreIPC::ArgumentEncoder& encoder) const
+void DictionaryPopupInfo::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << origin;
@@ -42,11 +42,11 @@
bool hadOptions = options;
encoder << hadOptions;
if (hadOptions)
- CoreIPC::encode(encoder, options.get());
+ IPC::encode(encoder, options.get());
#endif
}
-bool DictionaryPopupInfo::decode(CoreIPC::ArgumentDecoder& decoder, DictionaryPopupInfo& result)
+bool DictionaryPopupInfo::decode(IPC::ArgumentDecoder& decoder, DictionaryPopupInfo& result)
{
if (!decoder.decode(result.origin))
return false;
@@ -55,7 +55,7 @@
if (!decoder.decode(hadOptions))
return false;
if (hadOptions) {
- if (!CoreIPC::decode(decoder, result.options))
+ if (!IPC::decode(decoder, result.options))
return false;
}
#endif
diff --git a/Source/WebKit2/Shared/DictionaryPopupInfo.h b/Source/WebKit2/Shared/DictionaryPopupInfo.h
index 11c4514..7a0aa95 100644
--- a/Source/WebKit2/Shared/DictionaryPopupInfo.h
+++ b/Source/WebKit2/Shared/DictionaryPopupInfo.h
@@ -32,7 +32,7 @@
#include <wtf/RetainPtr.h>
#endif
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -40,8 +40,8 @@
namespace WebKit {
struct DictionaryPopupInfo {
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, DictionaryPopupInfo&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, DictionaryPopupInfo&);
WebCore::FloatPoint origin;
#if PLATFORM(MAC)
diff --git a/Source/WebKit2/Shared/Downloads/Download.cpp b/Source/WebKit2/Shared/Downloads/Download.cpp
index 6f17e60..77229d7 100644
--- a/Source/WebKit2/Shared/Downloads/Download.cpp
+++ b/Source/WebKit2/Shared/Downloads/Download.cpp
@@ -130,7 +130,7 @@
m_downloadManager.downloadFinished(this);
}
-void Download::didFail(const ResourceError& error, const CoreIPC::DataReference& resumeData)
+void Download::didFail(const ResourceError& error, const IPC::DataReference& resumeData)
{
send(Messages::DownloadProxy::DidFail(error, resumeData));
@@ -141,7 +141,7 @@
m_downloadManager.downloadFinished(this);
}
-void Download::didCancel(const CoreIPC::DataReference& resumeData)
+void Download::didCancel(const IPC::DataReference& resumeData)
{
send(Messages::DownloadProxy::DidCancel(resumeData));
@@ -152,7 +152,7 @@
m_downloadManager.downloadFinished(this);
}
-CoreIPC::Connection* Download::messageSenderConnection()
+IPC::Connection* Download::messageSenderConnection()
{
return m_downloadManager.downloadProxyConnection();
}
diff --git a/Source/WebKit2/Shared/Downloads/Download.h b/Source/WebKit2/Shared/Downloads/Download.h
index f67a7b5..6f38b90 100644
--- a/Source/WebKit2/Shared/Downloads/Download.h
+++ b/Source/WebKit2/Shared/Downloads/Download.h
@@ -46,7 +46,7 @@
#include <CFNetwork/CFURLDownloadPriv.h>
#endif
-namespace CoreIPC {
+namespace IPC {
class DataReference;
}
@@ -65,7 +65,7 @@
class SandboxExtension;
class WebPage;
-class Download : public CoreIPC::MessageSender {
+class Download : public IPC::MessageSender {
WTF_MAKE_NONCOPYABLE(Download);
public:
Download(DownloadManager&, uint64_t downloadID, const WebCore::ResourceRequest&);
@@ -86,8 +86,8 @@
void didCreateDestination(const String& path);
void didFinish();
void platformDidFinish();
- void didFail(const WebCore::ResourceError&, const CoreIPC::DataReference& resumeData);
- void didCancel(const CoreIPC::DataReference& resumeData);
+ void didFail(const WebCore::ResourceError&, const IPC::DataReference& resumeData);
+ void didCancel(const IPC::DataReference& resumeData);
void didDecideDestination(const String&, bool allowOverwrite);
#if USE(CFNETWORK)
@@ -105,8 +105,8 @@
void cancelAuthenticationChallenge(const WebCore::AuthenticationChallenge&);
private:
- // CoreIPC::MessageSender
- virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
+ // IPC::MessageSender
+ virtual IPC::Connection* messageSenderConnection() OVERRIDE;
virtual uint64_t messageSenderDestinationID() OVERRIDE;
void platformInvalidate();
diff --git a/Source/WebKit2/Shared/Downloads/DownloadManager.cpp b/Source/WebKit2/Shared/Downloads/DownloadManager.cpp
index df353d8..a1d6506 100644
--- a/Source/WebKit2/Shared/Downloads/DownloadManager.cpp
+++ b/Source/WebKit2/Shared/Downloads/DownloadManager.cpp
@@ -81,7 +81,7 @@
m_client->didDestroyDownload();
}
-CoreIPC::Connection* DownloadManager::downloadProxyConnection()
+IPC::Connection* DownloadManager::downloadProxyConnection()
{
return m_client->downloadProxyConnection();
}
diff --git a/Source/WebKit2/Shared/Downloads/DownloadManager.h b/Source/WebKit2/Shared/Downloads/DownloadManager.h
index e5ffffa..2a1694e 100644
--- a/Source/WebKit2/Shared/Downloads/DownloadManager.h
+++ b/Source/WebKit2/Shared/Downloads/DownloadManager.h
@@ -36,7 +36,7 @@
class ResourceResponse;
}
-namespace CoreIPC {
+namespace IPC {
class Connection;
}
@@ -56,7 +56,7 @@
virtual void didCreateDownload() = 0;
virtual void didDestroyDownload() = 0;
- virtual CoreIPC::Connection* downloadProxyConnection() = 0;
+ virtual IPC::Connection* downloadProxyConnection() = 0;
virtual AuthenticationManager& downloadsAuthenticationManager() = 0;
};
@@ -74,7 +74,7 @@
void didCreateDownload();
void didDestroyDownload();
- CoreIPC::Connection* downloadProxyConnection();
+ IPC::Connection* downloadProxyConnection();
AuthenticationManager& downloadsAuthenticationManager();
private:
diff --git a/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm b/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm
index 9c1de83d..d2e804d 100644
--- a/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm
+++ b/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm
@@ -87,7 +87,7 @@
[m_nsURLDownload.get() cancel];
RetainPtr<NSData> resumeData = [m_nsURLDownload.get() resumeData];
- didCancel(CoreIPC::DataReference(reinterpret_cast<const uint8_t*>([resumeData.get() bytes]), [resumeData.get() length]));
+ didCancel(IPC::DataReference(reinterpret_cast<const uint8_t*>([resumeData.get() bytes]), [resumeData.get() length]));
}
void Download::platformInvalidate()
@@ -263,7 +263,7 @@
return;
RetainPtr<NSData> resumeData = [download resumeData];
- CoreIPC::DataReference dataReference(reinterpret_cast<const uint8_t*>([resumeData.get() bytes]), [resumeData.get() length]);
+ IPC::DataReference dataReference(reinterpret_cast<const uint8_t*>([resumeData.get() bytes]), [resumeData.get() length]);
_download->didFail(error, dataReference);
});
diff --git a/Source/WebKit2/Shared/EditorState.cpp b/Source/WebKit2/Shared/EditorState.cpp
index 30ee206..3593d7b 100644
--- a/Source/WebKit2/Shared/EditorState.cpp
+++ b/Source/WebKit2/Shared/EditorState.cpp
@@ -35,7 +35,7 @@
namespace WebKit {
-void EditorState::encode(CoreIPC::ArgumentEncoder& encoder) const
+void EditorState::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << shouldIgnoreCompositionSelectionChange;
encoder << selectionIsNone;
@@ -62,7 +62,7 @@
#endif
}
-bool EditorState::decode(CoreIPC::ArgumentDecoder& decoder, EditorState& result)
+bool EditorState::decode(IPC::ArgumentDecoder& decoder, EditorState& result)
{
if (!decoder.decode(result.shouldIgnoreCompositionSelectionChange))
return false;
diff --git a/Source/WebKit2/Shared/EditorState.h b/Source/WebKit2/Shared/EditorState.h
index 444ca44..61b5014 100644
--- a/Source/WebKit2/Shared/EditorState.h
+++ b/Source/WebKit2/Shared/EditorState.h
@@ -77,8 +77,8 @@
WebCore::IntRect cursorRect;
#endif
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, EditorState&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, EditorState&);
};
}
diff --git a/Source/WebKit2/Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessEntryPoint.h b/Source/WebKit2/Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessEntryPoint.h
index 91e2976..dbf0a1f 100644
--- a/Source/WebKit2/Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessEntryPoint.h
+++ b/Source/WebKit2/Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessEntryPoint.h
@@ -47,7 +47,7 @@
virtual void installSignalHandlers();
virtual void doPreInitializationWork();
- virtual bool getConnectionIdentifier(CoreIPC::Connection::Identifier& identifier);
+ virtual bool getConnectionIdentifier(IPC::Connection::Identifier& identifier);
virtual bool getClientIdentifier(String& clientIdentifier);
virtual bool getClientProcessName(String& clientProcessName);
virtual bool getExtraInitializationData(HashMap<String, String>& extraInitializationData);
diff --git a/Source/WebKit2/Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessEntryPoint.mm b/Source/WebKit2/Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessEntryPoint.mm
index 5f8ff4e..13f306e 100644
--- a/Source/WebKit2/Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessEntryPoint.mm
+++ b/Source/WebKit2/Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessEntryPoint.mm
@@ -55,7 +55,7 @@
{
}
-bool ChildProcessMainDelegate::getConnectionIdentifier(CoreIPC::Connection::Identifier& identifier)
+bool ChildProcessMainDelegate::getConnectionIdentifier(IPC::Connection::Identifier& identifier)
{
String serviceName = m_commandLine["servicename"];
if (serviceName.isEmpty())
diff --git a/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h b/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h
index a9e8183..7633161 100644
--- a/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h
+++ b/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h
@@ -42,7 +42,7 @@
virtual ~XPCServiceInitializerDelegate();
- virtual bool getConnectionIdentifier(CoreIPC::Connection::Identifier& identifier);
+ virtual bool getConnectionIdentifier(IPC::Connection::Identifier& identifier);
virtual bool getClientIdentifier(String& clientIdentifier);
virtual bool getClientProcessName(String& clientProcessName);
virtual bool getExtraInitializationData(HashMap<String, String>& extraInitializationData);
diff --git a/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm b/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm
index 63dd785..6dd5dbe 100644
--- a/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm
+++ b/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm
@@ -35,9 +35,9 @@
{
}
-bool XPCServiceInitializerDelegate::getConnectionIdentifier(CoreIPC::Connection::Identifier& identifier)
+bool XPCServiceInitializerDelegate::getConnectionIdentifier(IPC::Connection::Identifier& identifier)
{
- identifier = CoreIPC::Connection::Identifier(xpc_dictionary_copy_mach_send(m_initializerMessage, "server-port"), m_connection);
+ identifier = IPC::Connection::Identifier(xpc_dictionary_copy_mach_send(m_initializerMessage, "server-port"), m_connection);
return true;
}
diff --git a/Source/WebKit2/Shared/FileAPI/BlobRegistrationData.cpp b/Source/WebKit2/Shared/FileAPI/BlobRegistrationData.cpp
index 47dea9f..24939a9 100644
--- a/Source/WebKit2/Shared/FileAPI/BlobRegistrationData.cpp
+++ b/Source/WebKit2/Shared/FileAPI/BlobRegistrationData.cpp
@@ -70,7 +70,7 @@
return std::move(m_data);
}
-void BlobRegistrationData::encode(CoreIPC::ArgumentEncoder& encoder) const
+void BlobRegistrationData::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << m_data->contentType();
encoder << m_data->contentDisposition();
@@ -85,7 +85,7 @@
// There is no way to create a partial data item.
ASSERT(!item.offset);
ASSERT(item.length == BlobDataItem::toEndOfFile);
- encoder << CoreIPC::DataReference(reinterpret_cast<const uint8_t*>(item.data->data()), item.data->length());
+ encoder << IPC::DataReference(reinterpret_cast<const uint8_t*>(item.data->data()), item.data->length());
break;
case BlobDataItem::File:
encoder << static_cast<int64_t>(item.offset);
@@ -104,7 +104,7 @@
encoder << m_sandboxExtensions;
}
-bool BlobRegistrationData::decode(CoreIPC::ArgumentDecoder& decoder, BlobRegistrationData& result)
+bool BlobRegistrationData::decode(IPC::ArgumentDecoder& decoder, BlobRegistrationData& result)
{
ASSERT(!result.m_data);
result.m_data = std::make_unique<BlobData>();
@@ -129,7 +129,7 @@
return false;
switch (type) {
case BlobDataItem::Data: {
- CoreIPC::DataReference data;
+ IPC::DataReference data;
if (!decoder.decode(data))
return false;
RefPtr<RawData> rawData = RawData::create();
diff --git a/Source/WebKit2/Shared/FileAPI/BlobRegistrationData.h b/Source/WebKit2/Shared/FileAPI/BlobRegistrationData.h
index b485131..71f9c09 100644
--- a/Source/WebKit2/Shared/FileAPI/BlobRegistrationData.h
+++ b/Source/WebKit2/Shared/FileAPI/BlobRegistrationData.h
@@ -43,8 +43,8 @@
BlobRegistrationData(std::unique_ptr<WebCore::BlobData>);
~BlobRegistrationData();
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, BlobRegistrationData&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, BlobRegistrationData&);
std::unique_ptr<WebCore::BlobData> releaseData() const;
const SandboxExtension::HandleArray& sandboxExtensions() const { return m_sandboxExtensions; }
diff --git a/Source/WebKit2/Shared/FontInfo.cpp b/Source/WebKit2/Shared/FontInfo.cpp
index ab64598..7743d72 100644
--- a/Source/WebKit2/Shared/FontInfo.cpp
+++ b/Source/WebKit2/Shared/FontInfo.cpp
@@ -34,18 +34,18 @@
namespace WebKit {
-void FontInfo::encode(CoreIPC::ArgumentEncoder& encoder) const
+void FontInfo::encode(IPC::ArgumentEncoder& encoder) const
{
#if PLATFORM(MAC)
encoder << static_cast<bool>(fontAttributeDictionary);
if (fontAttributeDictionary)
- CoreIPC::encode(encoder, fontAttributeDictionary.get());
+ IPC::encode(encoder, fontAttributeDictionary.get());
#else
UNUSED_PARAM(encoder);
#endif
}
-bool FontInfo::decode(CoreIPC::ArgumentDecoder& decoder, FontInfo& fontInfo)
+bool FontInfo::decode(IPC::ArgumentDecoder& decoder, FontInfo& fontInfo)
{
#if PLATFORM(MAC)
bool hasFontAttributeDictionary;
@@ -55,7 +55,7 @@
if (!hasFontAttributeDictionary)
return true;
- if (!CoreIPC::decode(decoder, fontInfo.fontAttributeDictionary))
+ if (!IPC::decode(decoder, fontInfo.fontAttributeDictionary))
return false;
#else
UNUSED_PARAM(decoder);
diff --git a/Source/WebKit2/Shared/FontInfo.h b/Source/WebKit2/Shared/FontInfo.h
index e124f25..8f15635 100644
--- a/Source/WebKit2/Shared/FontInfo.h
+++ b/Source/WebKit2/Shared/FontInfo.h
@@ -30,7 +30,7 @@
#include <wtf/RetainPtr.h>
#endif
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -38,8 +38,8 @@
namespace WebKit {
struct FontInfo {
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, FontInfo&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, FontInfo&);
#if PLATFORM(MAC)
RetainPtr<CFDictionaryRef> fontAttributeDictionary;
diff --git a/Source/WebKit2/Shared/LayerTreeContext.h b/Source/WebKit2/Shared/LayerTreeContext.h
index 03b1d68..94296fb 100644
--- a/Source/WebKit2/Shared/LayerTreeContext.h
+++ b/Source/WebKit2/Shared/LayerTreeContext.h
@@ -28,7 +28,7 @@
#include <stdint.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -47,8 +47,8 @@
LayerTreeContext();
~LayerTreeContext();
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, LayerTreeContext&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, LayerTreeContext&);
bool isEmpty() const;
diff --git a/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h b/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h
index d34ffbf..505107e 100644
--- a/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h
+++ b/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h
@@ -43,9 +43,9 @@
#endif
-namespace CoreIPC {
+namespace IPC {
class DataReference;
-} // namespace CoreIPC
+} // namespace IPC
namespace WebCore {
class ResourceError;
@@ -57,7 +57,7 @@
class ChildProcess;
struct NetworkProcessCreationParameters;
-class CustomProtocolManager : public WebProcessSupplement, public NetworkProcessSupplement, public CoreIPC::Connection::WorkQueueMessageReceiver {
+class CustomProtocolManager : public WebProcessSupplement, public NetworkProcessSupplement, public IPC::Connection::WorkQueueMessageReceiver {
WTF_MAKE_NONCOPYABLE(CustomProtocolManager);
public:
explicit CustomProtocolManager(ChildProcess*);
@@ -77,7 +77,7 @@
private:
// ChildProcessSupplement
- void initializeConnection(CoreIPC::Connection*) OVERRIDE;
+ void initializeConnection(IPC::Connection*) OVERRIDE;
// WebProcessSupplement
void initialize(const WebProcessCreationParameters&) OVERRIDE;
@@ -87,11 +87,11 @@
void initialize(const NetworkProcessCreationParameters&) OVERRIDE;
#endif
- // CoreIPC::MessageReceiver
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::MessageReceiver
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
void didFailWithError(uint64_t customProtocolID, const WebCore::ResourceError&);
- void didLoadData(uint64_t customProtocolID, const CoreIPC::DataReference&);
+ void didLoadData(uint64_t customProtocolID, const IPC::DataReference&);
void didReceiveResponse(uint64_t customProtocolID, const WebCore::ResourceResponse&, uint32_t cacheStoragePolicy);
void didFinishLoading(uint64_t customProtocolID);
diff --git a/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.messages.in b/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.messages.in
index ca51560..2376d92 100644
--- a/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.messages.in
+++ b/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.messages.in
@@ -24,7 +24,7 @@
messages -> CustomProtocolManager {
DidFailWithError(uint64_t customProtocolID, WebCore::ResourceError error)
- DidLoadData(uint64_t customProtocolID, CoreIPC::DataReference data)
+ DidLoadData(uint64_t customProtocolID, IPC::DataReference data)
DidReceiveResponse(uint64_t customProtocolID, WebCore::ResourceResponse response, uint32_t cacheStoragePolicy)
DidFinishLoading(uint64_t customProtocolID)
diff --git a/Source/WebKit2/Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm b/Source/WebKit2/Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm
index 7983a77..1fec7d5 100644
--- a/Source/WebKit2/Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm
+++ b/Source/WebKit2/Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm
@@ -132,7 +132,7 @@
sharedCustomProtocolManager = this;
}
-void CustomProtocolManager::initializeConnection(CoreIPC::Connection* connection)
+void CustomProtocolManager::initializeConnection(IPC::Connection* connection)
{
connection->addWorkQueueMessageReceiver(Messages::CustomProtocolManager::messageReceiverName(), m_messageQueue.get(), this);
}
@@ -222,7 +222,7 @@
removeCustomProtocol(protocol.get());
}
-void CustomProtocolManager::didLoadData(uint64_t customProtocolID, const CoreIPC::DataReference& data)
+void CustomProtocolManager::didLoadData(uint64_t customProtocolID, const IPC::DataReference& data)
{
RetainPtr<WKCustomProtocol> protocol = protocolForID(customProtocolID);
if (!protocol)
diff --git a/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp b/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp
index d1ebfc7..f267c66 100644
--- a/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp
+++ b/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp
@@ -36,7 +36,7 @@
{
}
-void NetworkProcessCreationParameters::encode(CoreIPC::ArgumentEncoder& encoder) const
+void NetworkProcessCreationParameters::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << privateBrowsingEnabled;
encoder.encodeEnum(cacheModel);
@@ -62,7 +62,7 @@
#endif
}
-bool NetworkProcessCreationParameters::decode(CoreIPC::ArgumentDecoder& decoder, NetworkProcessCreationParameters& result)
+bool NetworkProcessCreationParameters::decode(IPC::ArgumentDecoder& decoder, NetworkProcessCreationParameters& result)
{
if (!decoder.decode(result.privateBrowsingEnabled))
return false;
diff --git a/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h b/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h
index 6429052..e89889b 100644
--- a/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h
+++ b/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h
@@ -37,7 +37,7 @@
#include "HTTPCookieAcceptPolicy.h"
#endif
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -47,8 +47,8 @@
struct NetworkProcessCreationParameters {
NetworkProcessCreationParameters();
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, NetworkProcessCreationParameters&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, NetworkProcessCreationParameters&);
bool privateBrowsingEnabled;
CacheModel cacheModel;
diff --git a/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp b/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp
index 99d1d46..57a0571 100644
--- a/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp
+++ b/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp
@@ -51,7 +51,7 @@
{
}
-void NetworkResourceLoadParameters::encode(CoreIPC::ArgumentEncoder& encoder) const
+void NetworkResourceLoadParameters::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << identifier;
encoder << webPageID;
@@ -99,7 +99,7 @@
encoder << isMainResource;
}
-bool NetworkResourceLoadParameters::decode(CoreIPC::ArgumentDecoder& decoder, NetworkResourceLoadParameters& result)
+bool NetworkResourceLoadParameters::decode(IPC::ArgumentDecoder& decoder, NetworkResourceLoadParameters& result)
{
if (!decoder.decode(result.identifier))
return false;
@@ -118,7 +118,7 @@
return false;
if (hasHTTPBody) {
- CoreIPC::DataReference formData;
+ IPC::DataReference formData;
if (!decoder.decode(formData))
return false;
DecoderAdapter httpBodyDecoderAdapter(formData.data(), formData.size());
diff --git a/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h b/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h
index f26bb1d..ace0634 100644
--- a/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h
+++ b/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h
@@ -33,7 +33,7 @@
#if ENABLE(NETWORK_PROCESS)
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -46,8 +46,8 @@
public:
NetworkResourceLoadParameters();
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, NetworkResourceLoadParameters&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, NetworkResourceLoadParameters&);
ResourceLoadIdentifier identifier;
uint64_t webPageID;
diff --git a/Source/WebKit2/Shared/OriginAndDatabases.cpp b/Source/WebKit2/Shared/OriginAndDatabases.cpp
index 4745b9c..94f49b8 100644
--- a/Source/WebKit2/Shared/OriginAndDatabases.cpp
+++ b/Source/WebKit2/Shared/OriginAndDatabases.cpp
@@ -34,7 +34,7 @@
namespace WebKit {
-void OriginAndDatabases::encode(CoreIPC::ArgumentEncoder& encoder) const
+void OriginAndDatabases::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << originIdentifier;
encoder << originQuota;
@@ -42,7 +42,7 @@
encoder << databases;
}
-bool OriginAndDatabases::decode(CoreIPC::ArgumentDecoder& decoder, OriginAndDatabases& originAndDatabases)
+bool OriginAndDatabases::decode(IPC::ArgumentDecoder& decoder, OriginAndDatabases& originAndDatabases)
{
if (!decoder.decode(originAndDatabases.originIdentifier))
return false;
diff --git a/Source/WebKit2/Shared/OriginAndDatabases.h b/Source/WebKit2/Shared/OriginAndDatabases.h
index b7b389a..487338f 100644
--- a/Source/WebKit2/Shared/OriginAndDatabases.h
+++ b/Source/WebKit2/Shared/OriginAndDatabases.h
@@ -32,7 +32,7 @@
#include <wtf/Vector.h>
#include <wtf/text/WTFString.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -40,8 +40,8 @@
namespace WebKit {
struct OriginAndDatabases {
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, OriginAndDatabases&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, OriginAndDatabases&);
String originIdentifier;
uint64_t originQuota;
diff --git a/Source/WebKit2/Shared/PlatformPopupMenuData.cpp b/Source/WebKit2/Shared/PlatformPopupMenuData.cpp
index e857b64..49da130 100644
--- a/Source/WebKit2/Shared/PlatformPopupMenuData.cpp
+++ b/Source/WebKit2/Shared/PlatformPopupMenuData.cpp
@@ -34,7 +34,7 @@
{
}
-void PlatformPopupMenuData::encode(CoreIPC::ArgumentEncoder& encoder) const
+void PlatformPopupMenuData::encode(IPC::ArgumentEncoder& encoder) const
{
#if PLATFORM(MAC)
encoder << fontInfo;
@@ -44,7 +44,7 @@
#endif
}
-bool PlatformPopupMenuData::decode(CoreIPC::ArgumentDecoder& decoder, PlatformPopupMenuData& data)
+bool PlatformPopupMenuData::decode(IPC::ArgumentDecoder& decoder, PlatformPopupMenuData& data)
{
#if PLATFORM(MAC)
if (!decoder.decode(data.fontInfo))
diff --git a/Source/WebKit2/Shared/PlatformPopupMenuData.h b/Source/WebKit2/Shared/PlatformPopupMenuData.h
index 0d42e68..10207fe 100644
--- a/Source/WebKit2/Shared/PlatformPopupMenuData.h
+++ b/Source/WebKit2/Shared/PlatformPopupMenuData.h
@@ -30,7 +30,7 @@
#include "ShareableBitmap.h"
#include <wtf/text/WTFString.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -40,8 +40,8 @@
struct PlatformPopupMenuData {
PlatformPopupMenuData();
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, PlatformPopupMenuData&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, PlatformPopupMenuData&);
#if PLATFORM(MAC)
FontInfo fontInfo;
diff --git a/Source/WebKit2/Shared/Plugins/NPIdentifierData.cpp b/Source/WebKit2/Shared/Plugins/NPIdentifierData.cpp
index fd059d4..029e6ab 100644
--- a/Source/WebKit2/Shared/Plugins/NPIdentifierData.cpp
+++ b/Source/WebKit2/Shared/Plugins/NPIdentifierData.cpp
@@ -67,7 +67,7 @@
return static_cast<NPIdentifier>(IdentifierRep::get(m_number));
}
-void NPIdentifierData::encode(CoreIPC::ArgumentEncoder& encoder) const
+void NPIdentifierData::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << m_isString;
if (m_isString)
@@ -76,7 +76,7 @@
encoder << m_number;
}
-bool NPIdentifierData::decode(CoreIPC::ArgumentDecoder& decoder, NPIdentifierData& result)
+bool NPIdentifierData::decode(IPC::ArgumentDecoder& decoder, NPIdentifierData& result)
{
if (!decoder.decode(result.m_isString))
return false;
diff --git a/Source/WebKit2/Shared/Plugins/NPIdentifierData.h b/Source/WebKit2/Shared/Plugins/NPIdentifierData.h
index 0c42adf..5b51793 100644
--- a/Source/WebKit2/Shared/Plugins/NPIdentifierData.h
+++ b/Source/WebKit2/Shared/Plugins/NPIdentifierData.h
@@ -31,15 +31,13 @@
#include <WebCore/npruntime_internal.h>
#include <wtf/text/CString.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
namespace WebKit {
-// The CoreIPC representation of an NPIdentifier.
-
class NPIdentifierData {
public:
NPIdentifierData();
@@ -47,8 +45,8 @@
static NPIdentifierData fromNPIdentifier(NPIdentifier);
NPIdentifier createNPIdentifier() const;
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, NPIdentifierData&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, NPIdentifierData&);
private:
bool m_isString;
diff --git a/Source/WebKit2/Shared/Plugins/NPObjectMessageReceiver.h b/Source/WebKit2/Shared/Plugins/NPObjectMessageReceiver.h
index 6c8cc92..ee14d6d 100644
--- a/Source/WebKit2/Shared/Plugins/NPObjectMessageReceiver.h
+++ b/Source/WebKit2/Shared/Plugins/NPObjectMessageReceiver.h
@@ -46,7 +46,7 @@
NPObjectMessageReceiver(NPRemoteObjectMap*, Plugin*, uint64_t npObjectID, NPObject*);
~NPObjectMessageReceiver();
- void didReceiveSyncNPObjectMessageReceiverMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&);
+ void didReceiveSyncNPObjectMessageReceiverMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
Plugin* plugin() const { return m_plugin; }
NPObject* npObject() const { return m_npObject; }
diff --git a/Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.cpp b/Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.cpp
index 20b5ba0..8138c2f 100644
--- a/Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.cpp
+++ b/Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.cpp
@@ -42,12 +42,12 @@
return ++generateNPObjectID;
}
-PassRefPtr<NPRemoteObjectMap> NPRemoteObjectMap::create(CoreIPC::Connection* connection)
+PassRefPtr<NPRemoteObjectMap> NPRemoteObjectMap::create(IPC::Connection* connection)
{
return adoptRef(new NPRemoteObjectMap(connection));
}
-NPRemoteObjectMap::NPRemoteObjectMap(CoreIPC::Connection* connection)
+NPRemoteObjectMap::NPRemoteObjectMap(IPC::Connection* connection)
: m_connection(connection)
{
}
@@ -227,7 +227,7 @@
}
}
-void NPRemoteObjectMap::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, std::unique_ptr<CoreIPC::MessageEncoder>& replyEncoder)
+void NPRemoteObjectMap::didReceiveSyncMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)
{
NPObjectMessageReceiver* messageReceiver = m_registeredNPObjects.get(decoder.destinationID());
if (!messageReceiver)
diff --git a/Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.h b/Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.h
index 5c8a473..cd075f8 100644
--- a/Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.h
+++ b/Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.h
@@ -43,7 +43,7 @@
class NPRemoteObjectMap : public RefCounted<NPRemoteObjectMap> {
public:
- static PassRefPtr<NPRemoteObjectMap> create(CoreIPC::Connection*);
+ static PassRefPtr<NPRemoteObjectMap> create(IPC::Connection*);
~NPRemoteObjectMap();
// Creates an NPObjectProxy wrapper for the remote object with the given remote object ID.
@@ -54,21 +54,18 @@
uint64_t registerNPObject(NPObject*, Plugin*);
void unregisterNPObject(uint64_t);
- // Given an NPVariant, creates an NPVariantData object (a CoreIPC representation of an NPVariant).
NPVariantData npVariantToNPVariantData(const NPVariant&, Plugin*);
-
- // Given an NPVariantData, creates an NPVariant object.
NPVariant npVariantDataToNPVariant(const NPVariantData&, Plugin*);
- CoreIPC::Connection* connection() const { return m_connection; }
+ IPC::Connection* connection() const { return m_connection; }
void pluginDestroyed(Plugin*);
- void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&);
+ void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
private:
- explicit NPRemoteObjectMap(CoreIPC::Connection*);
- CoreIPC::Connection* m_connection;
+ explicit NPRemoteObjectMap(IPC::Connection*);
+ IPC::Connection* m_connection;
// A map of NPObjectMessageReceiver classes, wrapping objects that we export to the
// other end of the connection.
diff --git a/Source/WebKit2/Shared/Plugins/NPVariantData.cpp b/Source/WebKit2/Shared/Plugins/NPVariantData.cpp
index 029a6d0..b460d09 100644
--- a/Source/WebKit2/Shared/Plugins/NPVariantData.cpp
+++ b/Source/WebKit2/Shared/Plugins/NPVariantData.cpp
@@ -118,7 +118,7 @@
return npVariantData;
}
-void NPVariantData::encode(CoreIPC::ArgumentEncoder& encoder) const
+void NPVariantData::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << m_type;
@@ -147,7 +147,7 @@
}
}
-bool NPVariantData::decode(CoreIPC::ArgumentDecoder& decoder, NPVariantData& result)
+bool NPVariantData::decode(IPC::ArgumentDecoder& decoder, NPVariantData& result)
{
uint32_t type;
if (!decoder.decode(type))
diff --git a/Source/WebKit2/Shared/Plugins/NPVariantData.h b/Source/WebKit2/Shared/Plugins/NPVariantData.h
index 66be03a..da056a9 100644
--- a/Source/WebKit2/Shared/Plugins/NPVariantData.h
+++ b/Source/WebKit2/Shared/Plugins/NPVariantData.h
@@ -30,15 +30,13 @@
#include <wtf/text/CString.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
namespace WebKit {
-// The CoreIPC representation of an NPVariant.
-
class NPVariantData {
public:
enum Type {
@@ -100,8 +98,8 @@
return m_remoteNPObjectIDValue;
}
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, NPVariantData&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, NPVariantData&);
private:
uint32_t m_type;
diff --git a/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp b/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp
index 89ea7d1..a53fdef 100644
--- a/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp
+++ b/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp
@@ -37,7 +37,7 @@
{
}
-void PluginProcessCreationParameters::encode(CoreIPC::ArgumentEncoder& encoder) const
+void PluginProcessCreationParameters::encode(IPC::ArgumentEncoder& encoder) const
{
encoder.encodeEnum(processType);
encoder << supportsAsynchronousPluginInitialization;
@@ -48,7 +48,7 @@
#endif
}
-bool PluginProcessCreationParameters::decode(CoreIPC::ArgumentDecoder& decoder, PluginProcessCreationParameters& result)
+bool PluginProcessCreationParameters::decode(IPC::ArgumentDecoder& decoder, PluginProcessCreationParameters& result)
{
if (!decoder.decodeEnum(result.processType))
return false;
diff --git a/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h b/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h
index b94c66b1..e0f9d6b 100644
--- a/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h
+++ b/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h
@@ -34,7 +34,7 @@
#include "MachPort.h"
#endif
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -44,8 +44,8 @@
struct PluginProcessCreationParameters {
PluginProcessCreationParameters();
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, PluginProcessCreationParameters&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, PluginProcessCreationParameters&);
PluginProcessType processType;
bool supportsAsynchronousPluginInitialization;
@@ -54,7 +54,7 @@
double terminationTimeout;
#if PLATFORM(MAC)
- CoreIPC::MachPort acceleratedCompositingPort;
+ IPC::MachPort acceleratedCompositingPort;
#endif
};
diff --git a/Source/WebKit2/Shared/PrintInfo.cpp b/Source/WebKit2/Shared/PrintInfo.cpp
index e57ff72..bbdcba7 100644
--- a/Source/WebKit2/Shared/PrintInfo.cpp
+++ b/Source/WebKit2/Shared/PrintInfo.cpp
@@ -43,20 +43,20 @@
{
}
-void PrintInfo::encode(CoreIPC::ArgumentEncoder& encoder) const
+void PrintInfo::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << pageSetupScaleFactor;
encoder << availablePaperWidth;
encoder << availablePaperHeight;
#if PLATFORM(GTK)
- CoreIPC::encode(encoder, printSettings.get());
- CoreIPC::encode(encoder, pageSetup.get());
+ IPC::encode(encoder, printSettings.get());
+ IPC::encode(encoder, pageSetup.get());
encoder.encodeEnum(printMode);
#endif
}
-bool PrintInfo::decode(CoreIPC::ArgumentDecoder& decoder, PrintInfo& info)
+bool PrintInfo::decode(IPC::ArgumentDecoder& decoder, PrintInfo& info)
{
if (!decoder.decode(info.pageSetupScaleFactor))
return false;
@@ -66,9 +66,9 @@
return false;
#if PLATFORM(GTK)
- if (!CoreIPC::decode(decoder, info.printSettings))
+ if (!IPC::decode(decoder, info.printSettings))
return false;
- if (!CoreIPC::decode(decoder, info.pageSetup))
+ if (!IPC::decode(decoder, info.pageSetup))
return false;
if (!decoder.decodeEnum(info.printMode))
return false;
diff --git a/Source/WebKit2/Shared/PrintInfo.h b/Source/WebKit2/Shared/PrintInfo.h
index 9d290eb..c037ccf 100644
--- a/Source/WebKit2/Shared/PrintInfo.h
+++ b/Source/WebKit2/Shared/PrintInfo.h
@@ -37,7 +37,7 @@
class NSPrintInfo;
#endif
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -67,8 +67,8 @@
PrintMode printMode;
#endif
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, PrintInfo&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, PrintInfo&);
};
}
diff --git a/Source/WebKit2/Shared/SandboxExtension.h b/Source/WebKit2/Shared/SandboxExtension.h
index 2d96c27..06c6873 100644
--- a/Source/WebKit2/Shared/SandboxExtension.h
+++ b/Source/WebKit2/Shared/SandboxExtension.h
@@ -36,7 +36,7 @@
typedef struct __WKSandboxExtension* WKSandboxExtensionRef;
#endif
-namespace CoreIPC {
+namespace IPC {
class ArgumentEncoder;
class ArgumentDecoder;
}
@@ -57,8 +57,8 @@
Handle();
~Handle();
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, Handle&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, Handle&);
private:
friend class SandboxExtension;
@@ -77,8 +77,8 @@
Handle& operator[](size_t i);
const Handle& operator[](size_t i) const;
size_t size() const;
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, HandleArray&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, HandleArray&);
private:
#if ENABLE(WEB_PROCESS_SANDBOX)
@@ -113,16 +113,16 @@
#if !ENABLE(WEB_PROCESS_SANDBOX)
inline SandboxExtension::Handle::Handle() { }
inline SandboxExtension::Handle::~Handle() { }
-inline void SandboxExtension::Handle::encode(CoreIPC::ArgumentEncoder&) const { }
-inline bool SandboxExtension::Handle::decode(CoreIPC::ArgumentDecoder&, Handle&) { return true; }
+inline void SandboxExtension::Handle::encode(IPC::ArgumentEncoder&) const { }
+inline bool SandboxExtension::Handle::decode(IPC::ArgumentDecoder&, Handle&) { return true; }
inline SandboxExtension::HandleArray::HandleArray() { }
inline SandboxExtension::HandleArray::~HandleArray() { }
inline void SandboxExtension::HandleArray::allocate(size_t) { }
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(CoreIPC::ArgumentEncoder&) const { }
-inline bool SandboxExtension::HandleArray::decode(CoreIPC::ArgumentDecoder&, HandleArray&) { return true; }
+inline void SandboxExtension::HandleArray::encode(IPC::ArgumentEncoder&) const { }
+inline bool SandboxExtension::HandleArray::decode(IPC::ArgumentDecoder&, HandleArray&) { return true; }
inline PassRefPtr<SandboxExtension> SandboxExtension::create(const Handle&) { return 0; }
inline void SandboxExtension::createHandle(const String&, Type, Handle&) { }
inline void SandboxExtension::createHandleForReadWriteDirectory(const String&, Handle&) { }
diff --git a/Source/WebKit2/Shared/SecurityOriginData.cpp b/Source/WebKit2/Shared/SecurityOriginData.cpp
index dbf32fa..b6b4a9a 100644
--- a/Source/WebKit2/Shared/SecurityOriginData.cpp
+++ b/Source/WebKit2/Shared/SecurityOriginData.cpp
@@ -51,14 +51,14 @@
return SecurityOrigin::create(protocol, host, port);
}
-void SecurityOriginData::encode(CoreIPC::ArgumentEncoder& encoder) const
+void SecurityOriginData::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << protocol;
encoder << host;
encoder << port;
}
-bool SecurityOriginData::decode(CoreIPC::ArgumentDecoder& decoder, SecurityOriginData& securityOriginData)
+bool SecurityOriginData::decode(IPC::ArgumentDecoder& decoder, SecurityOriginData& securityOriginData)
{
if (!decoder.decode(securityOriginData.protocol))
return false;
diff --git a/Source/WebKit2/Shared/SecurityOriginData.h b/Source/WebKit2/Shared/SecurityOriginData.h
index 2d4169c..96404e5 100644
--- a/Source/WebKit2/Shared/SecurityOriginData.h
+++ b/Source/WebKit2/Shared/SecurityOriginData.h
@@ -30,7 +30,7 @@
#include "GenericCallback.h"
#include <wtf/text/WTFString.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -43,8 +43,8 @@
static SecurityOriginData fromSecurityOrigin(const WebCore::SecurityOrigin*);
PassRefPtr<WebCore::SecurityOrigin> securityOrigin() const;
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, SecurityOriginData&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, SecurityOriginData&);
// FIXME <rdar://9018386>: We should be sending more state across the wire than just the protocol,
// host, and port.
diff --git a/Source/WebKit2/Shared/SessionState.cpp b/Source/WebKit2/Shared/SessionState.cpp
index 9b36761..7ccbdc5 100644
--- a/Source/WebKit2/Shared/SessionState.cpp
+++ b/Source/WebKit2/Shared/SessionState.cpp
@@ -27,7 +27,7 @@
#include "SessionState.h"
#include "WebCoreArgumentCoders.h"
-namespace CoreIPC {
+namespace IPC {
// This assumes that when we encode a RefPtr we want to encode the object it points to and it is never null.
template<typename T> struct ArgumentCoder<RefPtr<T>> {
@@ -43,7 +43,7 @@
}
};
-} // namespace CoreIPC
+} // namespace IPC
namespace WebKit {
@@ -65,13 +65,13 @@
return m_list.isEmpty();
}
-void SessionState::encode(CoreIPC::ArgumentEncoder& encoder) const
+void SessionState::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << m_list;
encoder << m_currentIndex;
}
-bool SessionState::decode(CoreIPC::ArgumentDecoder& decoder, SessionState& state)
+bool SessionState::decode(IPC::ArgumentDecoder& decoder, SessionState& state)
{
if (!decoder.decode(state.m_list))
return false;
diff --git a/Source/WebKit2/Shared/SessionState.h b/Source/WebKit2/Shared/SessionState.h
index 54b7186..ef82755 100644
--- a/Source/WebKit2/Shared/SessionState.h
+++ b/Source/WebKit2/Shared/SessionState.h
@@ -28,7 +28,7 @@
#include "WebBackForwardListItem.h"
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -45,8 +45,8 @@
bool isEmpty() const;
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, SessionState&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, SessionState&);
private:
BackForwardListItemVector m_list;
diff --git a/Source/WebKit2/Shared/ShareableBitmap.cpp b/Source/WebKit2/Shared/ShareableBitmap.cpp
index 0f06c86..1971100 100644
--- a/Source/WebKit2/Shared/ShareableBitmap.cpp
+++ b/Source/WebKit2/Shared/ShareableBitmap.cpp
@@ -39,14 +39,14 @@
{
}
-void ShareableBitmap::Handle::encode(CoreIPC::ArgumentEncoder& encoder) const
+void ShareableBitmap::Handle::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << m_handle;
encoder << m_size;
encoder << m_flags;
}
-bool ShareableBitmap::Handle::decode(CoreIPC::ArgumentDecoder& decoder, Handle& handle)
+bool ShareableBitmap::Handle::decode(IPC::ArgumentDecoder& decoder, Handle& handle)
{
if (!decoder.decode(handle.m_handle))
return false;
diff --git a/Source/WebKit2/Shared/ShareableBitmap.h b/Source/WebKit2/Shared/ShareableBitmap.h
index 3a5d3bd..47161f0 100644
--- a/Source/WebKit2/Shared/ShareableBitmap.h
+++ b/Source/WebKit2/Shared/ShareableBitmap.h
@@ -63,8 +63,8 @@
bool isNull() const { return m_handle.isNull(); }
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, Handle&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, Handle&);
private:
friend class ShareableBitmap;
diff --git a/Source/WebKit2/Shared/ShareableResource.cpp b/Source/WebKit2/Shared/ShareableResource.cpp
index 1c6208f..1658fcb 100644
--- a/Source/WebKit2/Shared/ShareableResource.cpp
+++ b/Source/WebKit2/Shared/ShareableResource.cpp
@@ -39,14 +39,14 @@
{
}
-void ShareableResource::Handle::encode(CoreIPC::ArgumentEncoder& encoder) const
+void ShareableResource::Handle::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << m_handle;
encoder << m_offset;
encoder << m_size;
}
-bool ShareableResource::Handle::decode(CoreIPC::ArgumentDecoder& decoder, Handle& handle)
+bool ShareableResource::Handle::decode(IPC::ArgumentDecoder& decoder, Handle& handle)
{
if (!decoder.decode(handle.m_handle))
return false;
diff --git a/Source/WebKit2/Shared/ShareableResource.h b/Source/WebKit2/Shared/ShareableResource.h
index 6f681dd..8f4993f 100644
--- a/Source/WebKit2/Shared/ShareableResource.h
+++ b/Source/WebKit2/Shared/ShareableResource.h
@@ -51,8 +51,8 @@
bool isNull() const { return m_handle.isNull(); }
unsigned size() const { return m_size; }
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, Handle&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, Handle&);
PassRefPtr<WebCore::SharedBuffer> tryWrapInSharedBuffer() const;
diff --git a/Source/WebKit2/Shared/StatisticsData.cpp b/Source/WebKit2/Shared/StatisticsData.cpp
index 24a85d3..6199e8c 100644
--- a/Source/WebKit2/Shared/StatisticsData.cpp
+++ b/Source/WebKit2/Shared/StatisticsData.cpp
@@ -30,7 +30,7 @@
namespace WebKit {
-void StatisticsData::encode(CoreIPC::ArgumentEncoder& encoder) const
+void StatisticsData::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << statisticsNumbers;
encoder << javaScriptProtectedObjectTypeCounts;
@@ -38,7 +38,7 @@
encoder << webCoreCacheStatistics;
}
-bool StatisticsData::decode(CoreIPC::ArgumentDecoder& decoder, StatisticsData& statisticsData)
+bool StatisticsData::decode(IPC::ArgumentDecoder& decoder, StatisticsData& statisticsData)
{
if (!decoder.decode(statisticsData.statisticsNumbers))
return false;
diff --git a/Source/WebKit2/Shared/StatisticsData.h b/Source/WebKit2/Shared/StatisticsData.h
index 1dbfe2a..1494b2a 100644
--- a/Source/WebKit2/Shared/StatisticsData.h
+++ b/Source/WebKit2/Shared/StatisticsData.h
@@ -36,8 +36,8 @@
namespace WebKit {
struct StatisticsData {
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, StatisticsData&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, StatisticsData&);
HashMap<String, uint64_t> statisticsNumbers;
HashMap<String, uint64_t> javaScriptProtectedObjectTypeCounts;
diff --git a/Source/WebKit2/Shared/TextCheckerState.h b/Source/WebKit2/Shared/TextCheckerState.h
index 3bb5332..0473032 100644
--- a/Source/WebKit2/Shared/TextCheckerState.h
+++ b/Source/WebKit2/Shared/TextCheckerState.h
@@ -45,7 +45,7 @@
} // namespace WebKit
-namespace CoreIPC {
+namespace IPC {
template<> struct ArgumentCoder<WebKit::TextCheckerState> : SimpleArgumentCoder<WebKit::TextCheckerState> { };
};
diff --git a/Source/WebKit2/Shared/UpdateInfo.cpp b/Source/WebKit2/Shared/UpdateInfo.cpp
index daf14e2..8a79857 100644
--- a/Source/WebKit2/Shared/UpdateInfo.cpp
+++ b/Source/WebKit2/Shared/UpdateInfo.cpp
@@ -30,7 +30,7 @@
namespace WebKit {
-void UpdateInfo::encode(CoreIPC::ArgumentEncoder& encoder) const
+void UpdateInfo::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << viewSize;
encoder << deviceScaleFactor;
@@ -43,7 +43,7 @@
encoder << bitmapOffset;
}
-bool UpdateInfo::decode(CoreIPC::ArgumentDecoder& decoder, UpdateInfo& result)
+bool UpdateInfo::decode(IPC::ArgumentDecoder& decoder, UpdateInfo& result)
{
if (!decoder.decode(result.viewSize))
return false;
diff --git a/Source/WebKit2/Shared/UpdateInfo.h b/Source/WebKit2/Shared/UpdateInfo.h
index b3b9285..d4c110d 100644
--- a/Source/WebKit2/Shared/UpdateInfo.h
+++ b/Source/WebKit2/Shared/UpdateInfo.h
@@ -30,7 +30,7 @@
#include <WebCore/IntRect.h>
#include <wtf/Noncopyable.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -43,8 +43,8 @@
public:
UpdateInfo() { }
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, UpdateInfo&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, UpdateInfo&);
// The size of the web view.
WebCore::IntSize viewSize;
diff --git a/Source/WebKit2/Shared/UserData.cpp b/Source/WebKit2/Shared/UserData.cpp
index ca1d1df..1cb366f 100644
--- a/Source/WebKit2/Shared/UserData.cpp
+++ b/Source/WebKit2/Shared/UserData.cpp
@@ -84,17 +84,17 @@
return object;
}
-void UserData::encode(CoreIPC::ArgumentEncoder& encoder) const
+void UserData::encode(IPC::ArgumentEncoder& encoder) const
{
encode(encoder, m_object.get());
}
-bool UserData::decode(CoreIPC::ArgumentDecoder& decoder, UserData& userData)
+bool UserData::decode(IPC::ArgumentDecoder& decoder, UserData& userData)
{
return decode(decoder, userData.m_object);
}
-void UserData::encode(CoreIPC::ArgumentEncoder& encoder, const API::Object* object) const
+void UserData::encode(IPC::ArgumentEncoder& encoder, const API::Object* object) const
{
if (!object) {
encoder.encodeEnum(API::Object::Type::Null);
@@ -104,7 +104,7 @@
encode(encoder, *object);
}
-void UserData::encode(CoreIPC::ArgumentEncoder& encoder, const API::Object& object) const
+void UserData::encode(IPC::ArgumentEncoder& encoder, const API::Object& object) const
{
API::Object::Type type = object.type();
encoder.encodeEnum(type);
@@ -192,7 +192,7 @@
}
}
-bool UserData::decode(CoreIPC::ArgumentDecoder& decoder, RefPtr<API::Object>& result)
+bool UserData::decode(IPC::ArgumentDecoder& decoder, RefPtr<API::Object>& result)
{
API::Object::Type type;
if (!decoder.decodeEnum(type))
@@ -284,7 +284,7 @@
break;
case API::Object::Type::SerializedScriptValue: {
- CoreIPC::DataReference dataReference;
+ IPC::DataReference dataReference;
if (!decoder.decode(dataReference))
return false;
diff --git a/Source/WebKit2/Shared/UserData.h b/Source/WebKit2/Shared/UserData.h
index 1fca17a..df69b5a 100644
--- a/Source/WebKit2/Shared/UserData.h
+++ b/Source/WebKit2/Shared/UserData.h
@@ -33,7 +33,7 @@
class Object;
}
-namespace CoreIPC {
+namespace IPC {
class ArgumentEncoder;
class ArgumentDecoder;
}
@@ -49,14 +49,14 @@
API::Object* object() const { return m_object.get(); }
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, UserData&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, UserData&);
private:
- void encode(CoreIPC::ArgumentEncoder&, const API::Object*) const;
- void encode(CoreIPC::ArgumentEncoder&, const API::Object&) const;
+ void encode(IPC::ArgumentEncoder&, const API::Object*) const;
+ void encode(IPC::ArgumentEncoder&, const API::Object&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, RefPtr<API::Object>&);
+ static bool decode(IPC::ArgumentDecoder&, RefPtr<API::Object>&);
RefPtr<API::Object> m_object;
};
diff --git a/Source/WebKit2/Shared/UserMessageCoders.h b/Source/WebKit2/Shared/UserMessageCoders.h
index c275067..8f4f576 100644
--- a/Source/WebKit2/Shared/UserMessageCoders.h
+++ b/Source/WebKit2/Shared/UserMessageCoders.h
@@ -71,7 +71,7 @@
template<typename Owner>
class UserMessageEncoder {
public:
- bool baseEncode(CoreIPC::ArgumentEncoder& encoder, const Owner& coder, API::Object::Type& type) const
+ bool baseEncode(IPC::ArgumentEncoder& encoder, const Owner& coder, API::Object::Type& type) const
{
if (!m_root) {
encoder << static_cast<uint32_t>(API::Object::Type::Null);
@@ -260,7 +260,7 @@
template<typename Owner>
class UserMessageDecoder {
public:
- static bool baseDecode(CoreIPC::ArgumentDecoder& decoder, Owner& coder, API::Object::Type& type)
+ static bool baseDecode(IPC::ArgumentDecoder& decoder, Owner& coder, API::Object::Type& type)
{
uint32_t typeAsUInt32;
if (!decoder.decode(typeAsUInt32))
@@ -318,7 +318,7 @@
break;
}
case API::Object::Type::SerializedScriptValue: {
- CoreIPC::DataReference dataReference;
+ IPC::DataReference dataReference;
if (!decoder.decode(dataReference))
return false;
@@ -497,7 +497,7 @@
return true;
}
case API::Object::Type::Data: {
- CoreIPC::DataReference dataReference;
+ IPC::DataReference dataReference;
if (!decoder.decode(dataReference))
return false;
coder.m_root = API::Data::create(dataReference.data(), dataReference.size());
diff --git a/Source/WebKit2/Shared/WebBackForwardListItem.cpp b/Source/WebKit2/Shared/WebBackForwardListItem.cpp
index e5ae67a..58e54ce 100644
--- a/Source/WebKit2/Shared/WebBackForwardListItem.cpp
+++ b/Source/WebKit2/Shared/WebBackForwardListItem.cpp
@@ -61,16 +61,16 @@
m_backForwardData.append(data, size);
}
-void WebBackForwardListItem::encode(CoreIPC::ArgumentEncoder& encoder) const
+void WebBackForwardListItem::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << m_originalURL;
encoder << m_url;
encoder << m_title;
encoder << m_itemID;
- encoder << CoreIPC::DataReference(m_backForwardData);
+ encoder << IPC::DataReference(m_backForwardData);
}
-PassRefPtr<WebBackForwardListItem> WebBackForwardListItem::decode(CoreIPC::ArgumentDecoder& decoder)
+PassRefPtr<WebBackForwardListItem> WebBackForwardListItem::decode(IPC::ArgumentDecoder& decoder)
{
String originalURL;
if (!decoder.decode(originalURL))
@@ -88,7 +88,7 @@
if (!decoder.decode(itemID))
return 0;
- CoreIPC::DataReference data;
+ IPC::DataReference data;
if (!decoder.decode(data))
return 0;
diff --git a/Source/WebKit2/Shared/WebBackForwardListItem.h b/Source/WebKit2/Shared/WebBackForwardListItem.h
index 8187bb7..b139fa07 100644
--- a/Source/WebKit2/Shared/WebBackForwardListItem.h
+++ b/Source/WebKit2/Shared/WebBackForwardListItem.h
@@ -30,7 +30,7 @@
#include <wtf/PassRefPtr.h>
#include <wtf/text/WTFString.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -60,8 +60,8 @@
void setBackForwardData(const uint8_t* buffer, size_t size);
const Vector<uint8_t>& backForwardData() const { return m_backForwardData; }
- void encode(CoreIPC::ArgumentEncoder&) const;
- static PassRefPtr<WebBackForwardListItem> decode(CoreIPC::ArgumentDecoder&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static PassRefPtr<WebBackForwardListItem> decode(IPC::ArgumentDecoder&);
static uint64_t highedUsedItemID();
diff --git a/Source/WebKit2/Shared/WebConnection.cpp b/Source/WebKit2/Shared/WebConnection.cpp
index c3971c7..7180fc6 100644
--- a/Source/WebKit2/Shared/WebConnection.cpp
+++ b/Source/WebKit2/Shared/WebConnection.cpp
@@ -51,7 +51,7 @@
if (!hasValidConnection())
return;
- auto encoder = std::make_unique<CoreIPC::MessageEncoder>(Messages::WebConnection::HandleMessage::receiverName(), Messages::WebConnection::HandleMessage::name(), 0);
+ auto encoder = std::make_unique<IPC::MessageEncoder>(Messages::WebConnection::HandleMessage::receiverName(), Messages::WebConnection::HandleMessage::name(), 0);
encoder->encode(messageName);
encodeMessageBody(*encoder, messageBody);
@@ -63,12 +63,12 @@
m_client.didClose(this);
}
-void WebConnection::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
+void WebConnection::didReceiveMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder)
{
didReceiveWebConnectionMessage(connection, decoder);
}
-void WebConnection::handleMessage(CoreIPC::MessageDecoder& decoder)
+void WebConnection::handleMessage(IPC::MessageDecoder& decoder)
{
String messageName;
if (!decoder.decode(messageName))
diff --git a/Source/WebKit2/Shared/WebConnection.h b/Source/WebKit2/Shared/WebConnection.h
index 1792f91..f9bf091 100644
--- a/Source/WebKit2/Shared/WebConnection.h
+++ b/Source/WebKit2/Shared/WebConnection.h
@@ -34,7 +34,7 @@
namespace WebKit {
-class WebConnection : public API::ObjectImpl<API::Object::Type::Connection>, public CoreIPC::MessageReceiver, public CoreIPC::MessageSender {
+class WebConnection : public API::ObjectImpl<API::Object::Type::Connection>, public IPC::MessageReceiver, public IPC::MessageSender {
public:
virtual ~WebConnection();
@@ -45,17 +45,17 @@
protected:
explicit WebConnection();
- virtual void encodeMessageBody(CoreIPC::ArgumentEncoder&, API::Object*) = 0;
- virtual bool decodeMessageBody(CoreIPC::ArgumentDecoder&, RefPtr<API::Object>&) = 0;
+ virtual void encodeMessageBody(IPC::ArgumentEncoder&, API::Object*) = 0;
+ virtual bool decodeMessageBody(IPC::ArgumentDecoder&, RefPtr<API::Object>&) = 0;
- // CoreIPC::MessageReceiver
- void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::MessageReceiver
+ void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
// Implemented in generated WebConnectionMessageReceiver.cpp
- void didReceiveWebConnectionMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
+ void didReceiveWebConnectionMessage(IPC::Connection*, IPC::MessageDecoder&);
// Mesage handling implementation functions.
- void handleMessage(CoreIPC::MessageDecoder&);
+ void handleMessage(IPC::MessageDecoder&);
virtual bool hasValidConnection() const = 0;
diff --git a/Source/WebKit2/Shared/WebContextMenuItemData.cpp b/Source/WebKit2/Shared/WebContextMenuItemData.cpp
index 6d3a86f..d659e9c 100644
--- a/Source/WebKit2/Shared/WebContextMenuItemData.cpp
+++ b/Source/WebKit2/Shared/WebContextMenuItemData.cpp
@@ -104,7 +104,7 @@
m_userData = userData;
}
-void WebContextMenuItemData::encode(CoreIPC::ArgumentEncoder& encoder) const
+void WebContextMenuItemData::encode(IPC::ArgumentEncoder& encoder) const
{
encoder.encodeEnum(m_type);
encoder.encodeEnum(m_action);
@@ -114,7 +114,7 @@
encoder << m_submenu;
}
-bool WebContextMenuItemData::decode(CoreIPC::ArgumentDecoder& decoder, WebContextMenuItemData& item)
+bool WebContextMenuItemData::decode(IPC::ArgumentDecoder& decoder, WebContextMenuItemData& item)
{
WebCore::ContextMenuItemType type;
if (!decoder.decodeEnum(type))
diff --git a/Source/WebKit2/Shared/WebContextMenuItemData.h b/Source/WebKit2/Shared/WebContextMenuItemData.h
index 91506cd..59e6ee7 100644
--- a/Source/WebKit2/Shared/WebContextMenuItemData.h
+++ b/Source/WebKit2/Shared/WebContextMenuItemData.h
@@ -35,7 +35,7 @@
class Object;
}
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -65,8 +65,8 @@
API::Object* userData() const;
void setUserData(API::Object*);
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, WebContextMenuItemData&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, WebContextMenuItemData&);
private:
WebCore::ContextMenuItemType m_type;
diff --git a/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp b/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp
index e1e676e..478fb21 100644
--- a/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp
+++ b/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp
@@ -70,7 +70,7 @@
using namespace WebCore;
using namespace WebKit;
-namespace CoreIPC {
+namespace IPC {
void ArgumentCoder<AffineTransform>::encode(ArgumentEncoder& encoder, const AffineTransform& affineTransform)
{
@@ -1547,4 +1547,4 @@
}
#endif
-} // namespace CoreIPC
+} // namespace IPC
diff --git a/Source/WebKit2/Shared/WebCoreArgumentCoders.h b/Source/WebKit2/Shared/WebCoreArgumentCoders.h
index fa2bcc9..301d96e 100644
--- a/Source/WebKit2/Shared/WebCoreArgumentCoders.h
+++ b/Source/WebKit2/Shared/WebCoreArgumentCoders.h
@@ -92,7 +92,7 @@
}
#endif
-namespace CoreIPC {
+namespace IPC {
template<> struct ArgumentCoder<WebCore::AffineTransform> {
static void encode(ArgumentEncoder&, const WebCore::AffineTransform&);
@@ -357,6 +357,6 @@
};
#endif
-} // namespace CoreIPC
+} // namespace IPC
#endif // WebCoreArgumentCoders_h
diff --git a/Source/WebKit2/Shared/WebEvent.cpp b/Source/WebKit2/Shared/WebEvent.cpp
index f67d130..54f434b 100644
--- a/Source/WebKit2/Shared/WebEvent.cpp
+++ b/Source/WebKit2/Shared/WebEvent.cpp
@@ -46,14 +46,14 @@
{
}
-void WebEvent::encode(CoreIPC::ArgumentEncoder& encoder) const
+void WebEvent::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << m_type;
encoder << m_modifiers;
encoder << m_timestamp;
}
-bool WebEvent::decode(CoreIPC::ArgumentDecoder& decoder, WebEvent& result)
+bool WebEvent::decode(IPC::ArgumentDecoder& decoder, WebEvent& result)
{
if (!decoder.decode(result.m_type))
return false;
diff --git a/Source/WebKit2/Shared/WebEvent.h b/Source/WebKit2/Shared/WebEvent.h
index ecb4bd0..b5bbb58 100644
--- a/Source/WebKit2/Shared/WebEvent.h
+++ b/Source/WebKit2/Shared/WebEvent.h
@@ -36,7 +36,7 @@
#include <WebCore/IntSize.h>
#include <wtf/text/WTFString.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -96,8 +96,8 @@
WebEvent(Type, Modifiers, double timestamp);
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, WebEvent&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, WebEvent&);
private:
uint32_t m_type; // Type
@@ -127,8 +127,8 @@
float deltaZ() const { return m_deltaZ; }
int32_t clickCount() const { return m_clickCount; }
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, WebMouseEvent&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, WebMouseEvent&);
private:
static bool isMouseEventType(Type);
@@ -183,8 +183,8 @@
const WebCore::FloatSize& unacceleratedScrollingDelta() const { return m_unacceleratedScrollingDelta; }
#endif
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, WebWheelEvent&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, WebWheelEvent&);
private:
static bool isWheelEventType(Type);
@@ -221,8 +221,8 @@
bool isKeypad() const { return m_isKeypad; }
bool isSystemKey() const { return m_isSystemKey; }
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, WebKeyboardEvent&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, WebKeyboardEvent&);
static bool isKeyboardEventType(Type);
@@ -262,8 +262,8 @@
WebCore::IntPoint location() const { return m_location; }
TouchPointState phase() const { return static_cast<TouchPointState>(m_phase); }
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, WebPlatformTouchPoint&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, WebPlatformTouchPoint&);
private:
unsigned m_identifier;
@@ -293,8 +293,8 @@
float gestureScale() const { return m_gestureScale; }
float gestureRotation() const { return m_gestureRotation; }
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, WebTouchEvent&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, WebTouchEvent&);
private:
Vector<WebPlatformTouchPoint> m_touchPoints;
@@ -335,8 +335,8 @@
void setState(TouchPointState state) { m_state = state; }
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, WebPlatformTouchPoint&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, WebPlatformTouchPoint&);
private:
uint32_t m_id;
@@ -358,8 +358,8 @@
const Vector<WebPlatformTouchPoint>& touchPoints() const { return m_touchPoints; }
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, WebTouchEvent&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, WebTouchEvent&);
private:
static bool isTouchEventType(Type);
diff --git a/Source/WebKit2/Shared/WebGeolocationPosition.cpp b/Source/WebKit2/Shared/WebGeolocationPosition.cpp
index 84a0491..14b0345 100644
--- a/Source/WebKit2/Shared/WebGeolocationPosition.cpp
+++ b/Source/WebKit2/Shared/WebGeolocationPosition.cpp
@@ -51,14 +51,14 @@
{
}
-void WebGeolocationPosition::Data::encode(CoreIPC::ArgumentEncoder& encoder) const
+void WebGeolocationPosition::Data::encode(IPC::ArgumentEncoder& encoder) const
{
- CoreIPC::SimpleArgumentCoder<WebGeolocationPosition::Data>::encode(encoder, *this);
+ IPC::SimpleArgumentCoder<WebGeolocationPosition::Data>::encode(encoder, *this);
}
-bool WebGeolocationPosition::Data::decode(CoreIPC::ArgumentDecoder& decoder, Data& data)
+bool WebGeolocationPosition::Data::decode(IPC::ArgumentDecoder& decoder, Data& data)
{
- return CoreIPC::SimpleArgumentCoder<WebGeolocationPosition::Data>::decode(decoder, data);
+ return IPC::SimpleArgumentCoder<WebGeolocationPosition::Data>::decode(decoder, data);
}
} // namespace WebKit
diff --git a/Source/WebKit2/Shared/WebGeolocationPosition.h b/Source/WebKit2/Shared/WebGeolocationPosition.h
index f5d561d..31105fb 100644
--- a/Source/WebKit2/Shared/WebGeolocationPosition.h
+++ b/Source/WebKit2/Shared/WebGeolocationPosition.h
@@ -36,8 +36,8 @@
class WebGeolocationPosition : public API::ObjectImpl<API::Object::Type::GeolocationPosition> {
public:
struct Data {
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, Data&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, Data&);
double timestamp;
double latitude;
diff --git a/Source/WebKit2/Shared/WebHitTestResult.cpp b/Source/WebKit2/Shared/WebHitTestResult.cpp
index c9d84c0..03c4d1e 100644
--- a/Source/WebKit2/Shared/WebHitTestResult.cpp
+++ b/Source/WebKit2/Shared/WebHitTestResult.cpp
@@ -59,7 +59,7 @@
{
}
-void WebHitTestResult::Data::encode(CoreIPC::ArgumentEncoder& encoder) const
+void WebHitTestResult::Data::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << absoluteImageURL;
encoder << absolutePDFURL;
@@ -72,7 +72,7 @@
encoder << isScrollbar;
}
-bool WebHitTestResult::Data::decode(CoreIPC::ArgumentDecoder& decoder, WebHitTestResult::Data& hitTestResultData)
+bool WebHitTestResult::Data::decode(IPC::ArgumentDecoder& decoder, WebHitTestResult::Data& hitTestResultData)
{
if (!decoder.decode(hitTestResultData.absoluteImageURL)
|| !decoder.decode(hitTestResultData.absolutePDFURL)
diff --git a/Source/WebKit2/Shared/WebHitTestResult.h b/Source/WebKit2/Shared/WebHitTestResult.h
index 7fec38c..a2075aa 100644
--- a/Source/WebKit2/Shared/WebHitTestResult.h
+++ b/Source/WebKit2/Shared/WebHitTestResult.h
@@ -27,7 +27,7 @@
#include <wtf/RefPtr.h>
#include <wtf/text/WTFString.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -57,8 +57,8 @@
explicit Data(const WebCore::HitTestResult&);
~Data();
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, WebHitTestResult::Data&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, WebHitTestResult::Data&);
WebCore::IntRect elementBoundingBoxInWindowCoordinates(const WebCore::HitTestResult&);
};
diff --git a/Source/WebKit2/Shared/WebKeyboardEvent.cpp b/Source/WebKit2/Shared/WebKeyboardEvent.cpp
index 53ab16b..8aef309 100644
--- a/Source/WebKit2/Shared/WebKeyboardEvent.cpp
+++ b/Source/WebKit2/Shared/WebKeyboardEvent.cpp
@@ -45,7 +45,7 @@
ASSERT(isKeyboardEventType(type));
}
-void WebKeyboardEvent::encode(CoreIPC::ArgumentEncoder& encoder) const
+void WebKeyboardEvent::encode(IPC::ArgumentEncoder& encoder) const
{
WebEvent::encode(encoder);
@@ -60,7 +60,7 @@
encoder << m_isSystemKey;
}
-bool WebKeyboardEvent::decode(CoreIPC::ArgumentDecoder& decoder, WebKeyboardEvent& result)
+bool WebKeyboardEvent::decode(IPC::ArgumentDecoder& decoder, WebKeyboardEvent& result)
{
if (!WebEvent::decode(decoder, result))
return false;
diff --git a/Source/WebKit2/Shared/WebMouseEvent.cpp b/Source/WebKit2/Shared/WebMouseEvent.cpp
index f259d71..2d400a4c 100644
--- a/Source/WebKit2/Shared/WebMouseEvent.cpp
+++ b/Source/WebKit2/Shared/WebMouseEvent.cpp
@@ -56,7 +56,7 @@
ASSERT(isMouseEventType(type));
}
-void WebMouseEvent::encode(CoreIPC::ArgumentEncoder& encoder) const
+void WebMouseEvent::encode(IPC::ArgumentEncoder& encoder) const
{
WebEvent::encode(encoder);
@@ -69,7 +69,7 @@
encoder << m_clickCount;
}
-bool WebMouseEvent::decode(CoreIPC::ArgumentDecoder& decoder, WebMouseEvent& result)
+bool WebMouseEvent::decode(IPC::ArgumentDecoder& decoder, WebMouseEvent& result)
{
if (!WebEvent::decode(decoder, result))
return false;
diff --git a/Source/WebKit2/Shared/WebNavigationDataStore.h b/Source/WebKit2/Shared/WebNavigationDataStore.h
index 5defc9a..a331095 100644
--- a/Source/WebKit2/Shared/WebNavigationDataStore.h
+++ b/Source/WebKit2/Shared/WebNavigationDataStore.h
@@ -36,7 +36,7 @@
namespace WebKit {
struct WebNavigationDataStore {
- void encode(CoreIPC::ArgumentEncoder& encoder) const
+ void encode(IPC::ArgumentEncoder& encoder) const
{
encoder << url;
encoder << title;
@@ -44,7 +44,7 @@
encoder << response;
}
- static bool decode(CoreIPC::ArgumentDecoder& decoder, WebNavigationDataStore& store)
+ static bool decode(IPC::ArgumentDecoder& decoder, WebNavigationDataStore& store)
{
if (!decoder.decode(store.url))
return false;
diff --git a/Source/WebKit2/Shared/WebPageCreationParameters.cpp b/Source/WebKit2/Shared/WebPageCreationParameters.cpp
index c1edf9b..818f50b 100644
--- a/Source/WebKit2/Shared/WebPageCreationParameters.cpp
+++ b/Source/WebKit2/Shared/WebPageCreationParameters.cpp
@@ -30,7 +30,7 @@
namespace WebKit {
-void WebPageCreationParameters::encode(CoreIPC::ArgumentEncoder& encoder) const
+void WebPageCreationParameters::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << viewSize;
encoder << viewState;
@@ -66,7 +66,7 @@
#endif
}
-bool WebPageCreationParameters::decode(CoreIPC::ArgumentDecoder& decoder, WebPageCreationParameters& parameters)
+bool WebPageCreationParameters::decode(IPC::ArgumentDecoder& decoder, WebPageCreationParameters& parameters)
{
if (!decoder.decode(parameters.viewSize))
return false;
diff --git a/Source/WebKit2/Shared/WebPageCreationParameters.h b/Source/WebKit2/Shared/WebPageCreationParameters.h
index 8622ca4..fe6c0a8 100644
--- a/Source/WebKit2/Shared/WebPageCreationParameters.h
+++ b/Source/WebKit2/Shared/WebPageCreationParameters.h
@@ -42,7 +42,7 @@
#include "ColorSpaceData.h"
#endif
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -50,8 +50,8 @@
namespace WebKit {
struct WebPageCreationParameters {
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, WebPageCreationParameters&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, WebPageCreationParameters&);
WebCore::IntSize viewSize;
diff --git a/Source/WebKit2/Shared/WebPageGroupData.cpp b/Source/WebKit2/Shared/WebPageGroupData.cpp
index 3b5ef2a..28bace1 100644
--- a/Source/WebKit2/Shared/WebPageGroupData.cpp
+++ b/Source/WebKit2/Shared/WebPageGroupData.cpp
@@ -30,7 +30,7 @@
namespace WebKit {
-void WebPageGroupData::encode(CoreIPC::ArgumentEncoder& encoder) const
+void WebPageGroupData::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << identifer;
encoder << pageGroupID;
@@ -40,7 +40,7 @@
encoder << userScripts;
}
-bool WebPageGroupData::decode(CoreIPC::ArgumentDecoder& decoder, WebPageGroupData& data)
+bool WebPageGroupData::decode(IPC::ArgumentDecoder& decoder, WebPageGroupData& data)
{
if (!decoder.decode(data.identifer))
return false;
diff --git a/Source/WebKit2/Shared/WebPageGroupData.h b/Source/WebKit2/Shared/WebPageGroupData.h
index 37e3e61..7cbb1f8 100644
--- a/Source/WebKit2/Shared/WebPageGroupData.h
+++ b/Source/WebKit2/Shared/WebPageGroupData.h
@@ -31,7 +31,7 @@
#include <wtf/Vector.h>
#include <wtf/text/WTFString.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -39,8 +39,8 @@
namespace WebKit {
struct WebPageGroupData {
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, WebPageGroupData&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, WebPageGroupData&);
String identifer;
uint64_t pageGroupID;
diff --git a/Source/WebKit2/Shared/WebPlatformTouchPoint.cpp b/Source/WebKit2/Shared/WebPlatformTouchPoint.cpp
index f152013..f5b5c6c 100644
--- a/Source/WebKit2/Shared/WebPlatformTouchPoint.cpp
+++ b/Source/WebKit2/Shared/WebPlatformTouchPoint.cpp
@@ -57,7 +57,7 @@
{
}
-void WebPlatformTouchPoint::encode(CoreIPC::ArgumentEncoder& encoder) const
+void WebPlatformTouchPoint::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << m_id;
encoder << m_state;
@@ -68,7 +68,7 @@
encoder << m_force;
}
-bool WebPlatformTouchPoint::decode(CoreIPC::ArgumentDecoder& decoder, WebPlatformTouchPoint& result)
+bool WebPlatformTouchPoint::decode(IPC::ArgumentDecoder& decoder, WebPlatformTouchPoint& result)
{
if (!decoder.decode(result.m_id))
return false;
diff --git a/Source/WebKit2/Shared/WebPopupItem.cpp b/Source/WebKit2/Shared/WebPopupItem.cpp
index 89711ab..22c13c5 100644
--- a/Source/WebKit2/Shared/WebPopupItem.cpp
+++ b/Source/WebKit2/Shared/WebPopupItem.cpp
@@ -66,7 +66,7 @@
{
}
-void WebPopupItem::encode(CoreIPC::ArgumentEncoder& encoder) const
+void WebPopupItem::encode(IPC::ArgumentEncoder& encoder) const
{
encoder.encodeEnum(m_type);
encoder << m_text;
@@ -79,7 +79,7 @@
encoder << m_isSelected;
}
-bool WebPopupItem::decode(CoreIPC::ArgumentDecoder& decoder, WebPopupItem& item)
+bool WebPopupItem::decode(IPC::ArgumentDecoder& decoder, WebPopupItem& item)
{
Type type;
if (!decoder.decodeEnum(type))
diff --git a/Source/WebKit2/Shared/WebPopupItem.h b/Source/WebKit2/Shared/WebPopupItem.h
index 884ee9e..58c2766 100644
--- a/Source/WebKit2/Shared/WebPopupItem.h
+++ b/Source/WebKit2/Shared/WebPopupItem.h
@@ -29,7 +29,7 @@
#include <WebCore/TextDirection.h>
#include <wtf/text/WTFString.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -46,8 +46,8 @@
WebPopupItem(Type);
WebPopupItem(Type, const String& text, WebCore::TextDirection, bool hasTextDirectionOverride, const String& toolTip, const String& accessibilityText, bool isEnabled, bool isLabel, bool isSelected);
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, WebPopupItem&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, WebPopupItem&);
Type m_type;
String m_text;
diff --git a/Source/WebKit2/Shared/WebPreferencesStore.cpp b/Source/WebKit2/Shared/WebPreferencesStore.cpp
index 4dad9ab..60c2e0d 100644
--- a/Source/WebKit2/Shared/WebPreferencesStore.cpp
+++ b/Source/WebKit2/Shared/WebPreferencesStore.cpp
@@ -60,7 +60,7 @@
{
}
-void WebPreferencesStore::encode(CoreIPC::ArgumentEncoder& encoder) const
+void WebPreferencesStore::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << m_stringValues;
encoder << m_boolValues;
@@ -69,7 +69,7 @@
encoder << m_floatValues;
}
-bool WebPreferencesStore::decode(CoreIPC::ArgumentDecoder& decoder, WebPreferencesStore& result)
+bool WebPreferencesStore::decode(IPC::ArgumentDecoder& decoder, WebPreferencesStore& result)
{
if (!decoder.decode(result.m_stringValues))
return false;
diff --git a/Source/WebKit2/Shared/WebPreferencesStore.h b/Source/WebKit2/Shared/WebPreferencesStore.h
index d9ed54e..e9f7114 100644
--- a/Source/WebKit2/Shared/WebPreferencesStore.h
+++ b/Source/WebKit2/Shared/WebPreferencesStore.h
@@ -263,8 +263,8 @@
struct WebPreferencesStore {
WebPreferencesStore();
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, WebPreferencesStore&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, WebPreferencesStore&);
// NOTE: The getters in this class have non-standard names to aid in the use of the preference macros.
diff --git a/Source/WebKit2/Shared/WebProcessCreationParameters.cpp b/Source/WebKit2/Shared/WebProcessCreationParameters.cpp
index bb3db02..ed60389 100644
--- a/Source/WebKit2/Shared/WebProcessCreationParameters.cpp
+++ b/Source/WebKit2/Shared/WebProcessCreationParameters.cpp
@@ -47,7 +47,7 @@
{
}
-void WebProcessCreationParameters::encode(CoreIPC::ArgumentEncoder& encoder) const
+void WebProcessCreationParameters::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << injectedBundlePath;
encoder << injectedBundlePathExtensionHandle;
@@ -116,7 +116,7 @@
encoder << plugInAutoStartOrigins;
}
-bool WebProcessCreationParameters::decode(CoreIPC::ArgumentDecoder& decoder, WebProcessCreationParameters& parameters)
+bool WebProcessCreationParameters::decode(IPC::ArgumentDecoder& decoder, WebProcessCreationParameters& parameters)
{
if (!decoder.decode(parameters.injectedBundlePath))
return false;
diff --git a/Source/WebKit2/Shared/WebProcessCreationParameters.h b/Source/WebKit2/Shared/WebProcessCreationParameters.h
index a24a7ee..52ca24e 100644
--- a/Source/WebKit2/Shared/WebProcessCreationParameters.h
+++ b/Source/WebKit2/Shared/WebProcessCreationParameters.h
@@ -42,7 +42,7 @@
#include "HTTPCookieAcceptPolicy.h"
#endif
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -52,8 +52,8 @@
struct WebProcessCreationParameters {
WebProcessCreationParameters();
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, WebProcessCreationParameters&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, WebProcessCreationParameters&);
String injectedBundlePath;
SandboxExtension::Handle injectedBundlePathExtensionHandle;
@@ -119,7 +119,7 @@
uint64_t nsURLCacheMemoryCapacity;
uint64_t nsURLCacheDiskCapacity;
- CoreIPC::MachPort acceleratedCompositingPort;
+ IPC::MachPort acceleratedCompositingPort;
String uiProcessBundleResourcePath;
SandboxExtension::Handle uiProcessBundleResourcePathExtensionHandle;
diff --git a/Source/WebKit2/Shared/WebSerializedScriptValue.h b/Source/WebKit2/Shared/WebSerializedScriptValue.h
index 60d74d6..eaedee7 100644
--- a/Source/WebKit2/Shared/WebSerializedScriptValue.h
+++ b/Source/WebKit2/Shared/WebSerializedScriptValue.h
@@ -59,7 +59,7 @@
return m_serializedScriptValue->deserialize(context, exception);
}
- CoreIPC::DataReference dataReference() const { return m_serializedScriptValue->data(); }
+ IPC::DataReference dataReference() const { return m_serializedScriptValue->data(); }
void* internalRepresentation() { return m_serializedScriptValue.get(); }
diff --git a/Source/WebKit2/Shared/WebTouchEvent.cpp b/Source/WebKit2/Shared/WebTouchEvent.cpp
index 05b5fe5..8ffd4ba 100644
--- a/Source/WebKit2/Shared/WebTouchEvent.cpp
+++ b/Source/WebKit2/Shared/WebTouchEvent.cpp
@@ -40,14 +40,14 @@
ASSERT(isTouchEventType(type));
}
-void WebTouchEvent::encode(CoreIPC::ArgumentEncoder& encoder) const
+void WebTouchEvent::encode(IPC::ArgumentEncoder& encoder) const
{
WebEvent::encode(encoder);
encoder << m_touchPoints;
}
-bool WebTouchEvent::decode(CoreIPC::ArgumentDecoder& decoder, WebTouchEvent& result)
+bool WebTouchEvent::decode(IPC::ArgumentDecoder& decoder, WebTouchEvent& result)
{
if (!WebEvent::decode(decoder, result))
return false;
diff --git a/Source/WebKit2/Shared/WebWheelEvent.cpp b/Source/WebKit2/Shared/WebWheelEvent.cpp
index 0cd7216..fe3b973 100644
--- a/Source/WebKit2/Shared/WebWheelEvent.cpp
+++ b/Source/WebKit2/Shared/WebWheelEvent.cpp
@@ -69,7 +69,7 @@
}
#endif
-void WebWheelEvent::encode(CoreIPC::ArgumentEncoder& encoder) const
+void WebWheelEvent::encode(IPC::ArgumentEncoder& encoder) const
{
WebEvent::encode(encoder);
@@ -88,7 +88,7 @@
#endif
}
-bool WebWheelEvent::decode(CoreIPC::ArgumentDecoder& decoder, WebWheelEvent& t)
+bool WebWheelEvent::decode(IPC::ArgumentDecoder& decoder, WebWheelEvent& t)
{
if (!WebEvent::decode(decoder, t))
return false;
diff --git a/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp b/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp
index 2d59cef..3f94c1a 100644
--- a/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp
+++ b/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp
@@ -38,7 +38,7 @@
using namespace WebCore;
-namespace CoreIPC {
+namespace IPC {
CFTypeRef tokenNullTypeRef()
{
@@ -299,12 +299,12 @@
CFIndex length = CFDataGetLength(data);
const UInt8* bytePtr = CFDataGetBytePtr(data);
- encoder << CoreIPC::DataReference(bytePtr, length);
+ encoder << IPC::DataReference(bytePtr, length);
}
bool decode(ArgumentDecoder& decoder, RetainPtr<CFDataRef>& result)
{
- CoreIPC::DataReference dataReference;
+ IPC::DataReference dataReference;
if (!decoder.decode(dataReference))
return false;
@@ -384,7 +384,7 @@
ASSERT_UNUSED(result, result);
encoder.encodeEnum(numberType);
- encoder << CoreIPC::DataReference(buffer);
+ encoder << IPC::DataReference(buffer);
}
static size_t sizeForNumberType(CFNumberType numberType)
@@ -441,7 +441,7 @@
if (!decoder.decodeEnum(numberType))
return false;
- CoreIPC::DataReference dataReference;
+ IPC::DataReference dataReference;
if (!decoder.decode(dataReference))
return false;
@@ -472,7 +472,7 @@
ASSERT(numConvertedBytes == length);
encoder.encodeEnum(encoding);
- encoder << CoreIPC::DataReference(buffer);
+ encoder << IPC::DataReference(buffer);
}
bool decode(ArgumentDecoder& decoder, RetainPtr<CFStringRef>& result)
@@ -484,7 +484,7 @@
if (!CFStringIsEncodingAvailable(encoding))
return false;
- CoreIPC::DataReference dataReference;
+ IPC::DataReference dataReference;
if (!decoder.decode(dataReference))
return false;
@@ -505,7 +505,7 @@
URLCharBuffer urlBytes;
getURLBytes(url, urlBytes);
- CoreIPC::DataReference dataReference(reinterpret_cast<const uint8_t*>(urlBytes.data()), urlBytes.size());
+ IPC::DataReference dataReference(reinterpret_cast<const uint8_t*>(urlBytes.data()), urlBytes.size());
encoder << dataReference;
}
@@ -520,7 +520,7 @@
return false;
}
- CoreIPC::DataReference urlBytes;
+ IPC::DataReference urlBytes;
if (!decoder.decode(urlBytes))
return false;
@@ -568,7 +568,7 @@
bool decode(ArgumentDecoder& decoder, RetainPtr<SecKeychainItemRef>& result)
{
RetainPtr<CFDataRef> data;
- if (!CoreIPC::decode(decoder, data))
+ if (!IPC::decode(decoder, data))
return false;
SecKeychainItemRef item;
@@ -580,4 +580,4 @@
}
#endif
-} // namespace CoreIPC
+} // namespace IPC
diff --git a/Source/WebKit2/Shared/cf/ArgumentCodersCF.h b/Source/WebKit2/Shared/cf/ArgumentCodersCF.h
index 723b2e6..0c28676 100644
--- a/Source/WebKit2/Shared/cf/ArgumentCodersCF.h
+++ b/Source/WebKit2/Shared/cf/ArgumentCodersCF.h
@@ -33,7 +33,7 @@
#include <Security/SecKeychainItem.h>
#endif
-namespace CoreIPC {
+namespace IPC {
class ArgumentEncoder;
class ArgumentDecoder;
@@ -86,6 +86,6 @@
CFTypeRef tokenNullTypeRef();
-} // namespace CoreIPC
+} // namespace IPC
#endif // ArgumentCodersCF_h
diff --git a/Source/WebKit2/Shared/mac/ArgumentCodersMac.h b/Source/WebKit2/Shared/mac/ArgumentCodersMac.h
index dc0f665..1748051 100644
--- a/Source/WebKit2/Shared/mac/ArgumentCodersMac.h
+++ b/Source/WebKit2/Shared/mac/ArgumentCodersMac.h
@@ -28,7 +28,7 @@
#include <wtf/RetainPtr.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentEncoder;
class ArgumentDecoder;
@@ -77,6 +77,6 @@
void encode(ArgumentEncoder&, NSData *);
bool decode(ArgumentDecoder&, RetainPtr<NSData>&);
-} // namespace CoreIPC
+} // namespace IPC
#endif // ArgumentCodersMac_h
diff --git a/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm b/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm
index bc11b0b..0471cf9 100644
--- a/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm
+++ b/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm
@@ -34,7 +34,7 @@
using namespace WebCore;
-namespace CoreIPC {
+namespace IPC {
enum NSType {
NSAttributedStringType,
@@ -216,7 +216,7 @@
NSString *plainString = [string string];
NSUInteger length = [plainString length];
- CoreIPC::encode(encoder, plainString);
+ IPC::encode(encoder, plainString);
Vector<pair<NSRange, RetainPtr<NSDictionary>>> ranges;
@@ -239,14 +239,14 @@
for (size_t i = 0; i < ranges.size(); ++i) {
encoder << static_cast<uint64_t>(ranges[i].first.location);
encoder << static_cast<uint64_t>(ranges[i].first.length);
- CoreIPC::encode(encoder, ranges[i].second.get());
+ IPC::encode(encoder, ranges[i].second.get());
}
}
bool decode(ArgumentDecoder& decoder, RetainPtr<NSAttributedString>& result)
{
RetainPtr<NSString> plainString;
- if (!CoreIPC::decode(decoder, plainString))
+ if (!IPC::decode(decoder, plainString))
return false;
NSUInteger stringLength = [plainString.get() length];
@@ -271,7 +271,7 @@
if (rangeLocation + rangeLength <= rangeLocation || rangeLocation + rangeLength > stringLength)
return false;
- if (!CoreIPC::decode(decoder, attributes))
+ if (!IPC::decode(decoder, attributes))
return false;
[resultString.get() addAttributes:attributes.get() range:NSMakeRange(rangeLocation, rangeLength)];
}
@@ -462,4 +462,4 @@
return true;
}
-} // namespace CoreIPC
+} // namespace IPC
diff --git a/Source/WebKit2/Shared/mac/AttributedString.h b/Source/WebKit2/Shared/mac/AttributedString.h
index 0515f20..703c9e4 100644
--- a/Source/WebKit2/Shared/mac/AttributedString.h
+++ b/Source/WebKit2/Shared/mac/AttributedString.h
@@ -30,7 +30,7 @@
OBJC_CLASS NSAttributedString;
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -38,8 +38,8 @@
namespace WebKit {
struct AttributedString {
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, AttributedString&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, AttributedString&);
RetainPtr<NSAttributedString> string;
};
diff --git a/Source/WebKit2/Shared/mac/AttributedString.mm b/Source/WebKit2/Shared/mac/AttributedString.mm
index 414f808..b3f4620 100644
--- a/Source/WebKit2/Shared/mac/AttributedString.mm
+++ b/Source/WebKit2/Shared/mac/AttributedString.mm
@@ -32,22 +32,22 @@
namespace WebKit {
-void AttributedString::encode(CoreIPC::ArgumentEncoder& encoder) const
+void AttributedString::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << static_cast<bool>(!string);
if (!string)
return;
- CoreIPC::encode(encoder, string.get());
+ IPC::encode(encoder, string.get());
}
-bool AttributedString::decode(CoreIPC::ArgumentDecoder& decoder, AttributedString& attributedString)
+bool AttributedString::decode(IPC::ArgumentDecoder& decoder, AttributedString& attributedString)
{
bool isNull;
if (!decoder.decode(isNull))
return false;
if (isNull)
return true;
- return CoreIPC::decode(decoder, attributedString.string);
+ return IPC::decode(decoder, attributedString.string);
}
}
diff --git a/Source/WebKit2/Shared/mac/ColorSpaceData.h b/Source/WebKit2/Shared/mac/ColorSpaceData.h
index d3637b3..91a51af 100644
--- a/Source/WebKit2/Shared/mac/ColorSpaceData.h
+++ b/Source/WebKit2/Shared/mac/ColorSpaceData.h
@@ -28,7 +28,7 @@
#include <wtf/RetainPtr.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -36,8 +36,8 @@
namespace WebKit {
struct ColorSpaceData {
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, ColorSpaceData&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, ColorSpaceData&);
RetainPtr<CGColorSpaceRef> cgColorSpace;
};
diff --git a/Source/WebKit2/Shared/mac/ColorSpaceData.mm b/Source/WebKit2/Shared/mac/ColorSpaceData.mm
index 4040533..19a3d0f 100644
--- a/Source/WebKit2/Shared/mac/ColorSpaceData.mm
+++ b/Source/WebKit2/Shared/mac/ColorSpaceData.mm
@@ -38,21 +38,21 @@
Data,
};
-void ColorSpaceData::encode(CoreIPC::ArgumentEncoder& encoder) const
+void ColorSpaceData::encode(IPC::ArgumentEncoder& encoder) const
{
#if !PLATFORM(IOS)
if (cgColorSpace) {
// Try to encode the name.
if (RetainPtr<CFStringRef> name = adoptCF(CGColorSpaceCopyName(cgColorSpace.get()))) {
encoder.encodeEnum(Name);
- CoreIPC::encode(encoder, name.get());
+ IPC::encode(encoder, name.get());
return;
}
// Failing that, just encode the ICC data.
if (RetainPtr<CFDataRef> profileData = adoptCF(CGColorSpaceCopyICCProfile(cgColorSpace.get()))) {
encoder.encodeEnum(Data);
- CoreIPC::encode(encoder, profileData.get());
+ IPC::encode(encoder, profileData.get());
return;
}
}
@@ -62,7 +62,7 @@
encoder.encodeEnum(Null);
}
-bool ColorSpaceData::decode(CoreIPC::ArgumentDecoder& decoder, ColorSpaceData& colorSpaceData)
+bool ColorSpaceData::decode(IPC::ArgumentDecoder& decoder, ColorSpaceData& colorSpaceData)
{
EncodedDataType dataType;
if (!decoder.decodeEnum(dataType))
@@ -74,7 +74,7 @@
return true;
case Name: {
RetainPtr<CFStringRef> name;
- if (!CoreIPC::decode(decoder, name))
+ if (!IPC::decode(decoder, name))
return false;
colorSpaceData.cgColorSpace = adoptCF(CGColorSpaceCreateWithName(name.get()));
@@ -82,7 +82,7 @@
}
case Data: {
RetainPtr<CFDataRef> data;
- if (!CoreIPC::decode(decoder, data))
+ if (!IPC::decode(decoder, data))
return false;
colorSpaceData.cgColorSpace = adoptCF(CGColorSpaceCreateWithICCProfile(data.get()));
diff --git a/Source/WebKit2/Shared/mac/LayerTreeContextMac.mm b/Source/WebKit2/Shared/mac/LayerTreeContextMac.mm
index 3546c3b..5ec8c628 100644
--- a/Source/WebKit2/Shared/mac/LayerTreeContextMac.mm
+++ b/Source/WebKit2/Shared/mac/LayerTreeContextMac.mm
@@ -40,12 +40,12 @@
{
}
-void LayerTreeContext::encode(CoreIPC::ArgumentEncoder& encoder) const
+void LayerTreeContext::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << contextID;
}
-bool LayerTreeContext::decode(CoreIPC::ArgumentDecoder& decoder, LayerTreeContext& result)
+bool LayerTreeContext::decode(IPC::ArgumentDecoder& decoder, LayerTreeContext& result)
{
if (!decoder.decode(result.contextID))
return false;
diff --git a/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.h b/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.h
index 5c26872..c8c9400 100644
--- a/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.h
+++ b/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.h
@@ -39,7 +39,7 @@
class WebContextObjCObjectGraphEncoder {
public:
explicit WebContextObjCObjectGraphEncoder(ObjCObjectGraph*, WebProcessProxy&);
- void encode(CoreIPC::ArgumentEncoder&) const;
+ void encode(IPC::ArgumentEncoder&) const;
private:
ObjCObjectGraph* m_objectGraph;
@@ -49,7 +49,7 @@
class WebContextObjCObjectGraphDecoder {
public:
explicit WebContextObjCObjectGraphDecoder(RefPtr<ObjCObjectGraph>&, WebProcessProxy&);
- static bool decode(CoreIPC::ArgumentDecoder&, WebContextObjCObjectGraphDecoder&);
+ static bool decode(IPC::ArgumentDecoder&, WebContextObjCObjectGraphDecoder&);
private:
RefPtr<ObjCObjectGraph>& m_objectGraph;
@@ -60,7 +60,7 @@
class InjectedBundleObjCObjectGraphEncoder {
public:
explicit InjectedBundleObjCObjectGraphEncoder(ObjCObjectGraph*, WebProcess&);
- void encode(CoreIPC::ArgumentEncoder&) const;
+ void encode(IPC::ArgumentEncoder&) const;
private:
ObjCObjectGraph* m_objectGraph;
@@ -70,7 +70,7 @@
class InjectedBundleObjCObjectGraphDecoder {
public:
explicit InjectedBundleObjCObjectGraphDecoder(RefPtr<ObjCObjectGraph>&, WebProcess&);
- static bool decode(CoreIPC::ArgumentDecoder&, InjectedBundleObjCObjectGraphDecoder&);
+ static bool decode(IPC::ArgumentDecoder&, InjectedBundleObjCObjectGraphDecoder&);
private:
RefPtr<ObjCObjectGraph>& m_objectGraph;
diff --git a/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm b/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm
index af7b0bb..b264b77 100644
--- a/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm
+++ b/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm
@@ -90,7 +90,7 @@
template<typename Owner>
class ObjCObjectGraphEncoder {
public:
- bool baseEncode(CoreIPC::ArgumentEncoder& encoder, const Owner& coder, WebKitNSType& type) const
+ bool baseEncode(IPC::ArgumentEncoder& encoder, const Owner& coder, WebKitNSType& type) const
{
if (!m_root) {
encoder << static_cast<uint32_t>(NullType);
@@ -106,7 +106,7 @@
switch (type) {
case NSStringType: {
- CoreIPC::encode(encoder, static_cast<NSString *>(m_root));
+ IPC::encode(encoder, static_cast<NSString *>(m_root));
return true;
}
case NSArrayType: {
@@ -135,15 +135,15 @@
return true;
}
case NSNumberType: {
- CoreIPC::encode(encoder, static_cast<NSNumber *>(m_root));
+ IPC::encode(encoder, static_cast<NSNumber *>(m_root));
return true;
}
case NSDateType: {
- CoreIPC::encode(encoder, static_cast<NSDate *>(m_root));
+ IPC::encode(encoder, static_cast<NSDate *>(m_root));
return true;
}
case NSDataType: {
- CoreIPC::encode(encoder, static_cast<NSData *>(m_root));
+ IPC::encode(encoder, static_cast<NSData *>(m_root));
return true;
}
default:
@@ -165,7 +165,7 @@
template<typename Owner>
class ObjCObjectGraphDecoder {
public:
- static bool baseDecode(CoreIPC::ArgumentDecoder& decoder, Owner& coder, WebKitNSType& type)
+ static bool baseDecode(IPC::ArgumentDecoder& decoder, Owner& coder, WebKitNSType& type)
{
uint32_t typeAsUInt32;
if (!decoder.decode(typeAsUInt32))
@@ -176,7 +176,7 @@
switch (type) {
case NSStringType: {
RetainPtr<NSString> string;
- if (!CoreIPC::decode(decoder, string))
+ if (!IPC::decode(decoder, string))
return false;
coder.m_root = string;
break;
@@ -225,21 +225,21 @@
}
case NSNumberType: {
RetainPtr<NSNumber> number;
- if (!CoreIPC::decode(decoder, number))
+ if (!IPC::decode(decoder, number))
return false;
coder.m_root = number;
break;
}
case NSDateType: {
RetainPtr<NSDate> date;
- if (!CoreIPC::decode(decoder, date))
+ if (!IPC::decode(decoder, date))
return false;
coder.m_root = date;
break;
}
case NSDataType: {
RetainPtr<NSData> data;
- if (!CoreIPC::decode(decoder, data))
+ if (!IPC::decode(decoder, data))
return false;
coder.m_root = data;
break;
@@ -279,7 +279,7 @@
{
}
- void encode(CoreIPC::ArgumentEncoder& encoder) const
+ void encode(IPC::ArgumentEncoder& encoder) const
{
WebKitNSType type = NullType;
if (baseEncode(encoder, *this, type))
@@ -326,7 +326,7 @@
{
}
- static bool decode(CoreIPC::ArgumentDecoder& decoder, WebContextObjCObjectGraphDecoderImpl& coder)
+ static bool decode(IPC::ArgumentDecoder& decoder, WebContextObjCObjectGraphDecoderImpl& coder)
{
WebKitNSType type = NullType;
if (!Base::baseDecode(decoder, coder, type))
@@ -393,7 +393,7 @@
{
}
- void encode(CoreIPC::ArgumentEncoder& encoder) const
+ void encode(IPC::ArgumentEncoder& encoder) const
{
WebKitNSType type = NullType;
if (baseEncode(encoder, *this, type))
@@ -438,7 +438,7 @@
{
}
- static bool decode(CoreIPC::ArgumentDecoder& decoder, InjectedBundleObjCObjectGraphDecoderImpl& coder)
+ static bool decode(IPC::ArgumentDecoder& decoder, InjectedBundleObjCObjectGraphDecoderImpl& coder)
{
WebKitNSType type = NullType;
if (!Base::baseDecode(decoder, coder, type))
@@ -495,7 +495,7 @@
{
}
-void WebContextObjCObjectGraphEncoder::encode(CoreIPC::ArgumentEncoder& encoder) const
+void WebContextObjCObjectGraphEncoder::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << WebContextObjCObjectGraphEncoderImpl(m_objectGraph->rootObject(), m_process);
}
@@ -506,7 +506,7 @@
{
}
-bool WebContextObjCObjectGraphDecoder::decode(CoreIPC::ArgumentDecoder& decoder, WebContextObjCObjectGraphDecoder& coder)
+bool WebContextObjCObjectGraphDecoder::decode(IPC::ArgumentDecoder& decoder, WebContextObjCObjectGraphDecoder& coder)
{
RetainPtr<id> root;
WebContextObjCObjectGraphDecoderImpl coderImpl(root, coder.m_process);
@@ -523,7 +523,7 @@
{
}
-void InjectedBundleObjCObjectGraphEncoder::encode(CoreIPC::ArgumentEncoder& encoder) const
+void InjectedBundleObjCObjectGraphEncoder::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << InjectedBundleObjCObjectGraphEncoderImpl(m_objectGraph->rootObject(), m_process);
}
@@ -534,7 +534,7 @@
{
}
-bool InjectedBundleObjCObjectGraphDecoder::decode(CoreIPC::ArgumentDecoder& decoder, InjectedBundleObjCObjectGraphDecoder& coder)
+bool InjectedBundleObjCObjectGraphDecoder::decode(IPC::ArgumentDecoder& decoder, InjectedBundleObjCObjectGraphDecoder& coder)
{
RetainPtr<id> root;
InjectedBundleObjCObjectGraphDecoderImpl coderImpl(root, coder.m_process);
diff --git a/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h b/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h
index 7907018..69df7e6 100644
--- a/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h
+++ b/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h
@@ -66,8 +66,8 @@
PlatformCALayerRemote* layer() const { return m_layer; }
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, RemoteLayerBackingStore&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, RemoteLayerBackingStore&);
void enumerateRectsBeingDrawn(CGContextRef, void (^)(CGRect));
diff --git a/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm b/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm
index 69377fb..7dd52b6 100644
--- a/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm
+++ b/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm
@@ -75,7 +75,7 @@
m_frontBuffer = nullptr;
}
-void RemoteLayerBackingStore::encode(CoreIPC::ArgumentEncoder& encoder) const
+void RemoteLayerBackingStore::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << m_size;
encoder << m_scale;
@@ -84,7 +84,7 @@
#if USE(IOSURFACE)
if (m_acceleratesDrawing) {
mach_port_t port = IOSurfaceCreateMachPort(m_frontSurface.get());
- encoder << CoreIPC::MachPort(port, MACH_MSG_TYPE_MOVE_SEND);
+ encoder << IPC::MachPort(port, MACH_MSG_TYPE_MOVE_SEND);
return;
}
#else
@@ -96,7 +96,7 @@
encoder << handle;
}
-bool RemoteLayerBackingStore::decode(CoreIPC::ArgumentDecoder& decoder, RemoteLayerBackingStore& result)
+bool RemoteLayerBackingStore::decode(IPC::ArgumentDecoder& decoder, RemoteLayerBackingStore& result)
{
if (!decoder.decode(result.m_size))
return false;
@@ -109,7 +109,7 @@
#if USE(IOSURFACE)
if (result.m_acceleratesDrawing) {
- CoreIPC::MachPort machPort;
+ IPC::MachPort machPort;
if (!decoder.decode(machPort))
return false;
result.m_frontSurface = adoptCF(IOSurfaceLookupFromMachPort(machPort.port()));
diff --git a/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h b/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h
index 0d360f7..2523274 100644
--- a/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h
+++ b/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h
@@ -36,7 +36,7 @@
#include <wtf/HashMap.h>
#include <wtf/text/WTFString.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -83,8 +83,8 @@
struct LayerCreationProperties {
LayerCreationProperties();
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, LayerCreationProperties&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, LayerCreationProperties&);
LayerID layerID;
WebCore::PlatformCALayer::LayerType type;
@@ -95,8 +95,8 @@
struct LayerProperties {
LayerProperties();
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, LayerProperties&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, LayerProperties&);
void notePropertiesChanged(LayerChange layerChanges)
{
@@ -139,8 +139,8 @@
explicit RemoteLayerTreeTransaction();
~RemoteLayerTreeTransaction();
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, RemoteLayerTreeTransaction&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, RemoteLayerTreeTransaction&);
LayerID rootLayerID() const { return m_rootLayerID; }
void setRootLayerID(LayerID rootLayerID);
diff --git a/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm b/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm
index bfbd35d..dfb7200 100644
--- a/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm
+++ b/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm
@@ -44,7 +44,7 @@
{
}
-void RemoteLayerTreeTransaction::LayerCreationProperties::encode(CoreIPC::ArgumentEncoder& encoder) const
+void RemoteLayerTreeTransaction::LayerCreationProperties::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << layerID;
encoder.encodeEnum(type);
@@ -53,7 +53,7 @@
encoder << hostingContextID;
}
-bool RemoteLayerTreeTransaction::LayerCreationProperties::decode(CoreIPC::ArgumentDecoder& decoder, LayerCreationProperties& result)
+bool RemoteLayerTreeTransaction::LayerCreationProperties::decode(IPC::ArgumentDecoder& decoder, LayerCreationProperties& result)
{
if (!decoder.decode(result.layerID))
return false;
@@ -94,7 +94,7 @@
{
}
-void RemoteLayerTreeTransaction::LayerProperties::encode(CoreIPC::ArgumentEncoder& encoder) const
+void RemoteLayerTreeTransaction::LayerProperties::encode(IPC::ArgumentEncoder& encoder) const
{
encoder.encodeEnum(changedProperties);
@@ -180,7 +180,7 @@
encoder.encodeEnum(customAppearance);
}
-bool RemoteLayerTreeTransaction::LayerProperties::decode(CoreIPC::ArgumentDecoder& decoder, LayerProperties& result)
+bool RemoteLayerTreeTransaction::LayerProperties::decode(IPC::ArgumentDecoder& decoder, LayerProperties& result)
{
if (!decoder.decodeEnum(result.changedProperties))
return false;
@@ -336,7 +336,7 @@
{
}
-void RemoteLayerTreeTransaction::encode(CoreIPC::ArgumentEncoder& encoder) const
+void RemoteLayerTreeTransaction::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << m_rootLayerID;
encoder << m_createdLayers;
@@ -344,7 +344,7 @@
encoder << m_destroyedLayerIDs;
}
-bool RemoteLayerTreeTransaction::decode(CoreIPC::ArgumentDecoder& decoder, RemoteLayerTreeTransaction& result)
+bool RemoteLayerTreeTransaction::decode(IPC::ArgumentDecoder& decoder, RemoteLayerTreeTransaction& result)
{
if (!decoder.decode(result.m_rootLayerID))
return false;
diff --git a/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm b/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm
index 53d96b8..e2a2ec5 100644
--- a/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm
+++ b/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm
@@ -53,10 +53,10 @@
}
}
-void SandboxExtension::Handle::encode(CoreIPC::ArgumentEncoder& encoder) const
+void SandboxExtension::Handle::encode(IPC::ArgumentEncoder& encoder) const
{
if (!m_sandboxExtension) {
- encoder << CoreIPC::DataReference();
+ encoder << IPC::DataReference();
return;
}
@@ -64,18 +64,18 @@
const char *serializedFormat = WKSandboxExtensionGetSerializedFormat(m_sandboxExtension, &length);
ASSERT(serializedFormat);
- encoder << CoreIPC::DataReference(reinterpret_cast<const uint8_t*>(serializedFormat), length);
+ encoder << IPC::DataReference(reinterpret_cast<const uint8_t*>(serializedFormat), length);
// Encoding will destroy the sandbox extension locally.
WKSandboxExtensionDestroy(m_sandboxExtension);
m_sandboxExtension = 0;
}
-bool SandboxExtension::Handle::decode(CoreIPC::ArgumentDecoder& decoder, Handle& result)
+bool SandboxExtension::Handle::decode(IPC::ArgumentDecoder& decoder, Handle& result)
{
ASSERT(!result.m_sandboxExtension);
- CoreIPC::DataReference dataReference;
+ IPC::DataReference dataReference;
if (!decoder.decode(dataReference))
return false;
@@ -123,7 +123,7 @@
return m_size;
}
-void SandboxExtension::HandleArray::encode(CoreIPC::ArgumentEncoder& encoder) const
+void SandboxExtension::HandleArray::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << static_cast<uint64_t>(size());
for (size_t i = 0; i < m_size; ++i)
@@ -131,7 +131,7 @@
}
-bool SandboxExtension::HandleArray::decode(CoreIPC::ArgumentDecoder& decoder, SandboxExtension::HandleArray& handles)
+bool SandboxExtension::HandleArray::decode(IPC::ArgumentDecoder& decoder, SandboxExtension::HandleArray& handles)
{
uint64_t size;
if (!decoder.decode(size))
diff --git a/Source/WebKit2/Shared/mac/SecItemRequestData.cpp b/Source/WebKit2/Shared/mac/SecItemRequestData.cpp
index 4290519..8aef8a3 100644
--- a/Source/WebKit2/Shared/mac/SecItemRequestData.cpp
+++ b/Source/WebKit2/Shared/mac/SecItemRequestData.cpp
@@ -49,30 +49,30 @@
{
}
-void SecItemRequestData::encode(CoreIPC::ArgumentEncoder& encoder) const
+void SecItemRequestData::encode(IPC::ArgumentEncoder& encoder) const
{
encoder.encodeEnum(m_type);
- CoreIPC::encode(encoder, m_queryDictionary.get());
+ IPC::encode(encoder, m_queryDictionary.get());
encoder << static_cast<bool>(m_attributesToMatch);
if (m_attributesToMatch)
- CoreIPC::encode(encoder, m_attributesToMatch.get());
+ IPC::encode(encoder, m_attributesToMatch.get());
}
-bool SecItemRequestData::decode(CoreIPC::ArgumentDecoder& decoder, SecItemRequestData& secItemRequestData)
+bool SecItemRequestData::decode(IPC::ArgumentDecoder& decoder, SecItemRequestData& secItemRequestData)
{
if (!decoder.decodeEnum(secItemRequestData.m_type))
return false;
- if (!CoreIPC::decode(decoder, secItemRequestData.m_queryDictionary))
+ if (!IPC::decode(decoder, secItemRequestData.m_queryDictionary))
return false;
bool expectAttributes;
if (!decoder.decode(expectAttributes))
return false;
- if (expectAttributes && !CoreIPC::decode(decoder, secItemRequestData.m_attributesToMatch))
+ if (expectAttributes && !IPC::decode(decoder, secItemRequestData.m_attributesToMatch))
return false;
return true;
diff --git a/Source/WebKit2/Shared/mac/SecItemRequestData.h b/Source/WebKit2/Shared/mac/SecItemRequestData.h
index 5909af8..8fd01d7 100644
--- a/Source/WebKit2/Shared/mac/SecItemRequestData.h
+++ b/Source/WebKit2/Shared/mac/SecItemRequestData.h
@@ -28,7 +28,7 @@
#include <wtf/RetainPtr.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -49,8 +49,8 @@
SecItemRequestData(Type, CFDictionaryRef query);
SecItemRequestData(Type, CFDictionaryRef query, CFDictionaryRef attributesToMatch);
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, SecItemRequestData&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, SecItemRequestData&);
Type type() const { return m_type; }
diff --git a/Source/WebKit2/Shared/mac/SecItemResponseData.cpp b/Source/WebKit2/Shared/mac/SecItemResponseData.cpp
index 0dcf609..4b3aaa7 100644
--- a/Source/WebKit2/Shared/mac/SecItemResponseData.cpp
+++ b/Source/WebKit2/Shared/mac/SecItemResponseData.cpp
@@ -41,15 +41,15 @@
{
}
-void SecItemResponseData::encode(CoreIPC::ArgumentEncoder& encoder) const
+void SecItemResponseData::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << static_cast<int64_t>(m_resultCode);
encoder << static_cast<bool>(m_resultObject.get());
if (m_resultObject)
- CoreIPC::encode(encoder, m_resultObject.get());
+ IPC::encode(encoder, m_resultObject.get());
}
-bool SecItemResponseData::decode(CoreIPC::ArgumentDecoder& decoder, SecItemResponseData& secItemResponseData)
+bool SecItemResponseData::decode(IPC::ArgumentDecoder& decoder, SecItemResponseData& secItemResponseData)
{
int64_t resultCode;
if (!decoder.decode(resultCode))
@@ -61,7 +61,7 @@
if (!decoder.decode(expectResultObject))
return false;
- if (expectResultObject && !CoreIPC::decode(decoder, secItemResponseData.m_resultObject))
+ if (expectResultObject && !IPC::decode(decoder, secItemResponseData.m_resultObject))
return false;
return true;
diff --git a/Source/WebKit2/Shared/mac/SecItemResponseData.h b/Source/WebKit2/Shared/mac/SecItemResponseData.h
index 9de461f..305f589 100644
--- a/Source/WebKit2/Shared/mac/SecItemResponseData.h
+++ b/Source/WebKit2/Shared/mac/SecItemResponseData.h
@@ -28,7 +28,7 @@
#include <wtf/RetainPtr.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
}
@@ -40,8 +40,8 @@
SecItemResponseData();
SecItemResponseData(OSStatus, CFTypeRef result);
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, SecItemResponseData&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, SecItemResponseData&);
RetainPtr<CFTypeRef>& resultObject() { return m_resultObject; }
OSStatus resultCode() const { return m_resultCode; }
diff --git a/Source/WebKit2/Shared/mac/SecItemShim.cpp b/Source/WebKit2/Shared/mac/SecItemShim.cpp
index cac818c..f7db48d 100644
--- a/Source/WebKit2/Shared/mac/SecItemShim.cpp
+++ b/Source/WebKit2/Shared/mac/SecItemShim.cpp
@@ -138,7 +138,7 @@
func(callbacks);
}
-void SecItemShim::initializeConnection(CoreIPC::Connection* connection)
+void SecItemShim::initializeConnection(IPC::Connection* connection)
{
connection->addWorkQueueMessageReceiver(Messages::SecItemShim::messageReceiverName(), m_queue.get(), this);
}
diff --git a/Source/WebKit2/Shared/mac/SecItemShim.h b/Source/WebKit2/Shared/mac/SecItemShim.h
index 44fdc95..52cb9d6 100644
--- a/Source/WebKit2/Shared/mac/SecItemShim.h
+++ b/Source/WebKit2/Shared/mac/SecItemShim.h
@@ -35,19 +35,19 @@
class ChildProcess;
class SecItemResponseData;
-class SecItemShim : public CoreIPC::Connection::WorkQueueMessageReceiver {
+class SecItemShim : public IPC::Connection::WorkQueueMessageReceiver {
WTF_MAKE_NONCOPYABLE(SecItemShim);
public:
static SecItemShim& shared();
void initialize(ChildProcess*);
- void initializeConnection(CoreIPC::Connection*);
+ void initializeConnection(IPC::Connection*);
private:
SecItemShim();
- // CoreIPC::Connection::WorkQueueMessageReceiver.
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::Connection::WorkQueueMessageReceiver.
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
void secItemResponse(uint64_t requestID, const SecItemResponseData&);
diff --git a/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm b/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm
index a3a7209..edb6c8b 100644
--- a/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm
+++ b/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm
@@ -37,7 +37,7 @@
using namespace WebCore;
-namespace CoreIPC {
+namespace IPC {
void ArgumentCoder<ResourceRequest>::encodePlatformData(ArgumentEncoder& encoder, const ResourceRequest& resourceRequest)
{
@@ -57,8 +57,8 @@
[(NSMutableURLRequest *)requestToSerialize setHTTPBodyStream:nil];
}
- RetainPtr<CFDictionaryRef> dictionary = adoptCF(WKNSURLRequestCreateSerializableRepresentation(requestToSerialize.get(), CoreIPC::tokenNullTypeRef()));
- CoreIPC::encode(encoder, dictionary.get());
+ RetainPtr<CFDictionaryRef> dictionary = adoptCF(WKNSURLRequestCreateSerializableRepresentation(requestToSerialize.get(), IPC::tokenNullTypeRef()));
+ IPC::encode(encoder, dictionary.get());
// The fallback array is part of NSURLRequest, but it is not encoded by WKNSURLRequestCreateSerializableRepresentation.
encoder << resourceRequest.responseContentDispositionEncodingFallbackArray();
@@ -76,10 +76,10 @@
}
RetainPtr<CFDictionaryRef> dictionary;
- if (!CoreIPC::decode(decoder, dictionary))
+ if (!IPC::decode(decoder, dictionary))
return false;
- RetainPtr<NSURLRequest> nsURLRequest = WKNSURLRequestFromSerializableRepresentation(dictionary.get(), CoreIPC::tokenNullTypeRef());
+ RetainPtr<NSURLRequest> nsURLRequest = WKNSURLRequestFromSerializableRepresentation(dictionary.get(), IPC::tokenNullTypeRef());
if (!nsURLRequest)
return false;
@@ -106,8 +106,8 @@
if (!responseIsPresent)
return;
- RetainPtr<CFDictionaryRef> dictionary = adoptCF(WKNSURLResponseCreateSerializableRepresentation(resourceResponse.nsURLResponse(), CoreIPC::tokenNullTypeRef()));
- CoreIPC::encode(encoder, dictionary.get());
+ RetainPtr<CFDictionaryRef> dictionary = adoptCF(WKNSURLResponseCreateSerializableRepresentation(resourceResponse.nsURLResponse(), IPC::tokenNullTypeRef()));
+ IPC::encode(encoder, dictionary.get());
}
bool ArgumentCoder<ResourceResponse>::decodePlatformData(ArgumentDecoder& decoder, ResourceResponse& resourceResponse)
@@ -122,10 +122,10 @@
}
RetainPtr<CFDictionaryRef> dictionary;
- if (!CoreIPC::decode(decoder, dictionary))
+ if (!IPC::decode(decoder, dictionary))
return false;
- RetainPtr<NSURLResponse> nsURLResponse = WKNSURLResponseFromSerializableRepresentation(dictionary.get(), CoreIPC::tokenNullTypeRef());
+ RetainPtr<NSURLResponse> nsURLResponse = WKNSURLResponseFromSerializableRepresentation(dictionary.get(), IPC::tokenNullTypeRef());
if (!nsURLResponse)
return false;
@@ -143,7 +143,7 @@
}
encoder << true;
- CoreIPC::encode(encoder, certificateChain);
+ IPC::encode(encoder, certificateChain);
}
bool ArgumentCoder<CertificateInfo>::decode(ArgumentDecoder& decoder, CertificateInfo& certificateInfo)
@@ -156,7 +156,7 @@
return true;
RetainPtr<CFArrayRef> certificateChain;
- if (!CoreIPC::decode(decoder, certificateChain))
+ if (!IPC::decode(decoder, certificateChain))
return false;
certificateInfo.setCertificateChain(certificateChain.get());
@@ -189,7 +189,7 @@
CFDictionarySetValue(filteredUserInfo.get(), key, value);
}];
- CoreIPC::encode(encoder, filteredUserInfo.get());
+ IPC::encode(encoder, filteredUserInfo.get());
id peerCertificateChain = [userInfo objectForKey:@"NSErrorPeerCertificateChainKey"];
if (!peerCertificateChain) {
@@ -224,7 +224,7 @@
return false;
RetainPtr<CFDictionaryRef> userInfo;
- if (!CoreIPC::decode(decoder, userInfo))
+ if (!IPC::decode(decoder, userInfo))
return false;
CertificateInfo certificate;
@@ -258,4 +258,4 @@
return true;
}
-} // namespace CoreIPC
+} // namespace IPC
diff --git a/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h b/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h
index 2dae418..29a8444 100644
--- a/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h
+++ b/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h
@@ -115,7 +115,7 @@
virtual void exitAcceleratedCompositingMode();
virtual void updateAcceleratedCompositingMode(const LayerTreeContext&);
- virtual void accessibilityWebProcessTokenReceived(const CoreIPC::DataReference&);
+ virtual void accessibilityWebProcessTokenReceived(const IPC::DataReference&);
virtual void pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus);
virtual void setPluginComplexTextInputState(uint64_t pluginComplexTextInputIdentifier, PluginComplexTextInputState);
diff --git a/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm b/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm
index 5b602d4..93d5302 100644
--- a/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm
+++ b/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm
@@ -407,7 +407,7 @@
[m_wkView _setFindIndicator:findIndicator fadeOut:fadeOut animate:animate];
}
-void PageClientImpl::accessibilityWebProcessTokenReceived(const CoreIPC::DataReference& data)
+void PageClientImpl::accessibilityWebProcessTokenReceived(const IPC::DataReference& data)
{
NSData* remoteToken = [NSData dataWithBytes:data.data() length:data.size()];
[m_wkView _setAccessibilityWebProcessToken:remoteToken];
diff --git a/Source/WebKit2/UIProcess/API/mac/WKView.mm b/Source/WebKit2/UIProcess/API/mac/WKView.mm
index 6d6347c..4aa710c 100644
--- a/Source/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/Source/WebKit2/UIProcess/API/mac/WKView.mm
@@ -2044,8 +2044,8 @@
// Initialize remote accessibility when the window connection has been established.
NSData *remoteElementToken = WKAXRemoteTokenForElement(self);
NSData *remoteWindowToken = WKAXRemoteTokenForElement([self window]);
- CoreIPC::DataReference elementToken = CoreIPC::DataReference(reinterpret_cast<const uint8_t*>([remoteElementToken bytes]), [remoteElementToken length]);
- CoreIPC::DataReference windowToken = CoreIPC::DataReference(reinterpret_cast<const uint8_t*>([remoteWindowToken bytes]), [remoteWindowToken length]);
+ IPC::DataReference elementToken = IPC::DataReference(reinterpret_cast<const uint8_t*>([remoteElementToken bytes]), [remoteElementToken length]);
+ IPC::DataReference windowToken = IPC::DataReference(reinterpret_cast<const uint8_t*>([remoteWindowToken bytes]), [remoteWindowToken length]);
_data->_page->registerUIProcessAccessibilityTokens(elementToken, windowToken);
}
diff --git a/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h b/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h
index a4d6963..48e6b93 100644
--- a/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h
+++ b/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h
@@ -30,7 +30,7 @@
#import <wtf/Forward.h>
#import <wtf/Vector.h>
-namespace CoreIPC {
+namespace IPC {
class DataReference;
}
diff --git a/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp b/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp
index d5573da..8c5d26f 100644
--- a/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp
+++ b/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp
@@ -37,7 +37,7 @@
namespace WebKit {
-AuthenticationChallengeProxy::AuthenticationChallengeProxy(const WebCore::AuthenticationChallenge& authenticationChallenge, uint64_t challengeID, CoreIPC::Connection* connection)
+AuthenticationChallengeProxy::AuthenticationChallengeProxy(const WebCore::AuthenticationChallenge& authenticationChallenge, uint64_t challengeID, IPC::Connection* connection)
: m_coreAuthenticationChallenge(authenticationChallenge)
, m_challengeID(challengeID)
, m_connection(connection)
diff --git a/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.h b/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.h
index d52ca9c..a549d51 100644
--- a/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.h
+++ b/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.h
@@ -30,7 +30,7 @@
#include <WebCore/AuthenticationChallenge.h>
#include <wtf/PassRefPtr.h>
-namespace CoreIPC {
+namespace IPC {
class Connection;
}
@@ -43,7 +43,7 @@
class AuthenticationChallengeProxy : public API::ObjectImpl<API::Object::Type::AuthenticationChallenge> {
public:
- static PassRefPtr<AuthenticationChallengeProxy> create(const WebCore::AuthenticationChallenge& authenticationChallenge, uint64_t challengeID, CoreIPC::Connection* connection)
+ static PassRefPtr<AuthenticationChallengeProxy> create(const WebCore::AuthenticationChallenge& authenticationChallenge, uint64_t challengeID, IPC::Connection* connection)
{
return adoptRef(new AuthenticationChallengeProxy(authenticationChallenge, challengeID, connection));
}
@@ -60,11 +60,11 @@
const WebCore::AuthenticationChallenge& core() { return m_coreAuthenticationChallenge; }
private:
- AuthenticationChallengeProxy(const WebCore::AuthenticationChallenge&, uint64_t challengeID, CoreIPC::Connection*);
+ AuthenticationChallengeProxy(const WebCore::AuthenticationChallenge&, uint64_t challengeID, IPC::Connection*);
WebCore::AuthenticationChallenge m_coreAuthenticationChallenge;
uint64_t m_challengeID;
- RefPtr<CoreIPC::Connection> m_connection;
+ RefPtr<IPC::Connection> m_connection;
RefPtr<AuthenticationDecisionListener> m_listener;
mutable RefPtr<WebCredential> m_webCredential;
mutable RefPtr<WebProtectionSpace> m_webProtectionSpace;
diff --git a/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp b/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp
index ab22b13..74a33f3 100644
--- a/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp
+++ b/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp
@@ -58,11 +58,11 @@
platformGetLaunchOptions(launchOptions);
}
-void DatabaseProcessProxy::connectionWillOpen(CoreIPC::Connection*)
+void DatabaseProcessProxy::connectionWillOpen(IPC::Connection*)
{
}
-void DatabaseProcessProxy::connectionWillClose(CoreIPC::Connection*)
+void DatabaseProcessProxy::connectionWillClose(IPC::Connection*)
{
}
@@ -75,35 +75,35 @@
return;
}
- connection()->send(Messages::DatabaseProcess::CreateDatabaseToWebProcessConnection(), 0, CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply);
+ connection()->send(Messages::DatabaseProcess::CreateDatabaseToWebProcessConnection(), 0, IPC::DispatchMessageEvenWhenWaitingForSyncReply);
}
-void DatabaseProcessProxy::didClose(CoreIPC::Connection*)
+void DatabaseProcessProxy::didClose(IPC::Connection*)
{
}
-void DatabaseProcessProxy::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName)
+void DatabaseProcessProxy::didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
{
}
-void DatabaseProcessProxy::didCreateDatabaseToWebProcessConnection(const CoreIPC::Attachment& connectionIdentifier)
+void DatabaseProcessProxy::didCreateDatabaseToWebProcessConnection(const IPC::Attachment& connectionIdentifier)
{
ASSERT(!m_pendingConnectionReplies.isEmpty());
RefPtr<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
#if PLATFORM(MAC)
- reply->send(CoreIPC::Attachment(connectionIdentifier.port(), MACH_MSG_TYPE_MOVE_SEND));
+ reply->send(IPC::Attachment(connectionIdentifier.port(), MACH_MSG_TYPE_MOVE_SEND));
#else
notImplemented();
#endif
}
-void DatabaseProcessProxy::didFinishLaunching(ProcessLauncher* launcher, CoreIPC::Connection::Identifier connectionIdentifier)
+void DatabaseProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Connection::Identifier connectionIdentifier)
{
ChildProcessProxy::didFinishLaunching(launcher, connectionIdentifier);
- if (CoreIPC::Connection::identifierIsNull(connectionIdentifier)) {
+ if (IPC::Connection::identifierIsNull(connectionIdentifier)) {
// FIXME: Do better cleanup here.
return;
}
diff --git a/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h b/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h
index e5a1351..f48dc0c 100644
--- a/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h
+++ b/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h
@@ -49,19 +49,19 @@
// ChildProcessProxy
virtual void getLaunchOptions(ProcessLauncher::LaunchOptions&) OVERRIDE;
- virtual void connectionWillOpen(CoreIPC::Connection*) OVERRIDE;
- virtual void connectionWillClose(CoreIPC::Connection*) OVERRIDE;
+ virtual void connectionWillOpen(IPC::Connection*) OVERRIDE;
+ virtual void connectionWillClose(IPC::Connection*) OVERRIDE;
- // CoreIPC::Connection::Client
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
- virtual void didClose(CoreIPC::Connection*) OVERRIDE;
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
+ // IPC::Connection::Client
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
+ virtual void didClose(IPC::Connection*) OVERRIDE;
+ virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName) OVERRIDE;
// Message handlers
- void didCreateDatabaseToWebProcessConnection(const CoreIPC::Attachment&);
+ void didCreateDatabaseToWebProcessConnection(const IPC::Attachment&);
// ProcessLauncher::Client
- virtual void didFinishLaunching(ProcessLauncher*, CoreIPC::Connection::Identifier) OVERRIDE;
+ virtual void didFinishLaunching(ProcessLauncher*, IPC::Connection::Identifier) OVERRIDE;
void platformGetLaunchOptions(ProcessLauncher::LaunchOptions&);
diff --git a/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.messages.in b/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.messages.in
index 7113025..3445bf5 100644
--- a/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.messages.in
+++ b/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.messages.in
@@ -23,7 +23,7 @@
#if ENABLE(DATABASE_PROCESS)
messages -> DatabaseProcessProxy {
- DidCreateDatabaseToWebProcessConnection(CoreIPC::Attachment connectionIdentifier)
+ DidCreateDatabaseToWebProcessConnection(IPC::Attachment connectionIdentifier)
}
#endif // ENABLE(DATABASE_PROCESS)
diff --git a/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp b/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp
index fa3f752..01f53bb 100644
--- a/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp
+++ b/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp
@@ -175,7 +175,7 @@
m_downloadProxyMap.downloadFinished(this);
}
-static PassRefPtr<API::Data> createData(const CoreIPC::DataReference& data)
+static PassRefPtr<API::Data> createData(const IPC::DataReference& data)
{
if (data.isEmpty())
return 0;
@@ -183,7 +183,7 @@
return API::Data::create(data.data(), data.size());
}
-void DownloadProxy::didFail(const ResourceError& error, const CoreIPC::DataReference& resumeData)
+void DownloadProxy::didFail(const ResourceError& error, const IPC::DataReference& resumeData)
{
if (!m_webContext)
return;
@@ -196,7 +196,7 @@
m_downloadProxyMap.downloadFinished(this);
}
-void DownloadProxy::didCancel(const CoreIPC::DataReference& resumeData)
+void DownloadProxy::didCancel(const IPC::DataReference& resumeData)
{
m_resumeData = createData(resumeData);
diff --git a/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h b/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h
index 9295050..ca95443 100644
--- a/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h
+++ b/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h
@@ -49,7 +49,7 @@
class WebContext;
class WebPageProxy;
-class DownloadProxy : public API::ObjectImpl<API::Object::Type::Download>, public CoreIPC::MessageReceiver {
+class DownloadProxy : public API::ObjectImpl<API::Object::Type::Download>, public IPC::MessageReceiver {
public:
static PassRefPtr<DownloadProxy> create(DownloadProxyMap&, WebContext&);
~DownloadProxy();
@@ -63,15 +63,15 @@
void invalidate();
void processDidClose();
- void didReceiveDownloadProxyMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
- void didReceiveSyncDownloadProxyMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&);
+ void didReceiveDownloadProxyMessage(IPC::Connection*, IPC::MessageDecoder&);
+ void didReceiveSyncDownloadProxyMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
private:
explicit DownloadProxy(DownloadProxyMap&, WebContext&);
- // CoreIPC::MessageReceiver
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
- virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&) OVERRIDE;
+ // IPC::MessageReceiver
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
+ virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) OVERRIDE;
// Message handlers.
void didStart(const WebCore::ResourceRequest&);
@@ -82,8 +82,8 @@
void decideDestinationWithSuggestedFilename(const String& filename, String& destination, bool& allowOverwrite, SandboxExtension::Handle& sandboxExtensionHandle);
void didCreateDestination(const String& path);
void didFinish();
- void didFail(const WebCore::ResourceError&, const CoreIPC::DataReference& resumeData);
- void didCancel(const CoreIPC::DataReference& resumeData);
+ void didFail(const WebCore::ResourceError&, const IPC::DataReference& resumeData);
+ void didCancel(const IPC::DataReference& resumeData);
DownloadProxyMap& m_downloadProxyMap;
RefPtr<WebContext> m_webContext;
diff --git a/Source/WebKit2/UIProcess/Downloads/DownloadProxy.messages.in b/Source/WebKit2/UIProcess/Downloads/DownloadProxy.messages.in
index 7394c22..37ef52f 100644
--- a/Source/WebKit2/UIProcess/Downloads/DownloadProxy.messages.in
+++ b/Source/WebKit2/UIProcess/Downloads/DownloadProxy.messages.in
@@ -30,6 +30,6 @@
DecideDestinationWithSuggestedFilename(String filename) -> (String destination, bool allowOverwrite, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
DidCreateDestination(String path)
DidFinish()
- DidFail(WebCore::ResourceError error, CoreIPC::DataReference resumeData)
- DidCancel(CoreIPC::DataReference resumeData)
+ DidFail(WebCore::ResourceError error, IPC::DataReference resumeData)
+ DidCancel(IPC::DataReference resumeData)
}
diff --git a/Source/WebKit2/UIProcess/DrawingAreaProxy.h b/Source/WebKit2/UIProcess/DrawingAreaProxy.h
index a792d3b..457dca5 100644
--- a/Source/WebKit2/UIProcess/DrawingAreaProxy.h
+++ b/Source/WebKit2/UIProcess/DrawingAreaProxy.h
@@ -43,7 +43,7 @@
class UpdateInfo;
class WebPageProxy;
-class DrawingAreaProxy : public CoreIPC::MessageReceiver {
+class DrawingAreaProxy : public IPC::MessageReceiver {
WTF_MAKE_NONCOPYABLE(DrawingAreaProxy);
public:
@@ -85,10 +85,10 @@
private:
virtual void sizeDidChange() = 0;
- // CoreIPC::MessageReceiver
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::MessageReceiver
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
- // CoreIPC message handlers.
+ // Message handlers.
// FIXME: These should be pure virtual.
virtual void update(uint64_t /* backingStoreStateID */, const UpdateInfo&) { }
virtual void didUpdateBackingStoreState(uint64_t /* backingStoreStateID */, const UpdateInfo&, const LayerTreeContext&) { }
diff --git a/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp b/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp
index 05aae59..f20c19c 100644
--- a/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp
+++ b/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp
@@ -47,7 +47,7 @@
processLauncherWorkQueue()->dispatch(bind(&ProcessLauncher::launchProcess, this));
}
-void ProcessLauncher::didFinishLaunchingProcess(PlatformProcessIdentifier processIdentifier, CoreIPC::Connection::Identifier identifier)
+void ProcessLauncher::didFinishLaunchingProcess(PlatformProcessIdentifier processIdentifier, IPC::Connection::Identifier identifier)
{
m_processIdentifier = processIdentifier;
m_isLaunching = false;
diff --git a/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h b/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h
index c9eb352..6996bfe6 100644
--- a/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h
+++ b/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h
@@ -42,7 +42,7 @@
public:
virtual ~Client() { }
- virtual void didFinishLaunching(ProcessLauncher*, CoreIPC::Connection::Identifier) = 0;
+ virtual void didFinishLaunching(ProcessLauncher*, IPC::Connection::Identifier) = 0;
};
enum ProcessType {
@@ -92,7 +92,7 @@
ProcessLauncher(Client*, const LaunchOptions& launchOptions);
void launchProcess();
- void didFinishLaunchingProcess(PlatformProcessIdentifier, CoreIPC::Connection::Identifier);
+ void didFinishLaunchingProcess(PlatformProcessIdentifier, IPC::Connection::Identifier);
void platformInvalidate();
diff --git a/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm b/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm
index 949efa3..e4fca91 100644
--- a/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm
+++ b/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm
@@ -132,7 +132,7 @@
}
-typedef void (ProcessLauncher::*DidFinishLaunchingProcessFunction)(PlatformProcessIdentifier, CoreIPC::Connection::Identifier);
+typedef void (ProcessLauncher::*DidFinishLaunchingProcessFunction)(PlatformProcessIdentifier, IPC::Connection::Identifier);
static const char* serviceName(const ProcessLauncher::LaunchOptions& launchOptions, bool forDevelopment)
{
@@ -230,7 +230,7 @@
// And the receive right.
mach_port_mod_refs(mach_task_self(), listeningPort, MACH_PORT_RIGHT_RECEIVE, -1);
- RunLoop::main()->dispatch(bind(didFinishLaunchingProcessFunction, that, 0, CoreIPC::Connection::Identifier()));
+ RunLoop::main()->dispatch(bind(didFinishLaunchingProcessFunction, that, 0, IPC::Connection::Identifier()));
} else {
ASSERT(type == XPC_TYPE_DICTIONARY);
ASSERT(!strcmp(xpc_dictionary_get_string(reply, "message-name"), "process-finished-launching"));
@@ -239,7 +239,7 @@
pid_t processIdentifier = xpc_connection_get_pid(connection);
// We've finished launching the process, message back to the main run loop.
- RunLoop::main()->dispatch(bind(didFinishLaunchingProcessFunction, that, processIdentifier, CoreIPC::Connection::Identifier(listeningPort, connection)));
+ RunLoop::main()->dispatch(bind(didFinishLaunchingProcessFunction, that, processIdentifier, IPC::Connection::Identifier(listeningPort, connection)));
}
that->deref();
@@ -357,7 +357,7 @@
}
// We've finished launching the process, message back to the main run loop.
- RunLoop::main()->dispatch(bind(didFinishLaunchingProcessFunction, that, processIdentifier, CoreIPC::Connection::Identifier(listeningPort)));
+ RunLoop::main()->dispatch(bind(didFinishLaunchingProcessFunction, that, processIdentifier, IPC::Connection::Identifier(listeningPort)));
return true;
}
@@ -497,7 +497,7 @@
}
// We've finished launching the process, message back to the main run loop.
- RunLoop::main()->dispatch(bind(didFinishLaunchingProcessFunction, that, processIdentifier, CoreIPC::Connection::Identifier(listeningPort)));
+ RunLoop::main()->dispatch(bind(didFinishLaunchingProcessFunction, that, processIdentifier, IPC::Connection::Identifier(listeningPort)));
}
void ProcessLauncher::launchProcess()
diff --git a/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h b/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h
index 2145525..bb32daf 100644
--- a/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h
+++ b/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h
@@ -44,7 +44,7 @@
class ChildProcessProxy;
-class CustomProtocolManagerProxy : public CoreIPC::MessageReceiver {
+class CustomProtocolManagerProxy : public IPC::MessageReceiver {
public:
explicit CustomProtocolManagerProxy(ChildProcessProxy*);
@@ -52,8 +52,8 @@
void stopLoading(uint64_t customProtocolID);
private:
- // CoreIPC::MessageReceiver
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::MessageReceiver
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
ChildProcessProxy* m_childProcessProxy;
diff --git a/Source/WebKit2/UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm b/Source/WebKit2/UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm
index a5a19e3..19822f9 100644
--- a/Source/WebKit2/UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm
+++ b/Source/WebKit2/UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm
@@ -38,7 +38,7 @@
#import <WebCore/ResourceRequest.h>
#import <WebCore/ResourceResponse.h>
-using namespace CoreIPC;
+using namespace IPC;
using namespace WebCore;
using namespace WebKit;
@@ -103,7 +103,7 @@
- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data
{
- CoreIPC::DataReference coreData(static_cast<const uint8_t*>([data bytes]), [data length]);
+ IPC::DataReference coreData(static_cast<const uint8_t*>([data bytes]), [data length]);
_connection->send(Messages::CustomProtocolManager::DidLoadData(_customProtocolID, coreData), 0);
}
diff --git a/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp b/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp
index 1a8137a..cc1323d 100644
--- a/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp
+++ b/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp
@@ -72,14 +72,14 @@
platformGetLaunchOptions(launchOptions);
}
-void NetworkProcessProxy::connectionWillOpen(CoreIPC::Connection* connection)
+void NetworkProcessProxy::connectionWillOpen(IPC::Connection* connection)
{
#if ENABLE(SEC_ITEM_SHIM)
SecItemShimProxy::shared().initializeConnection(connection);
#endif
}
-void NetworkProcessProxy::connectionWillClose(CoreIPC::Connection*)
+void NetworkProcessProxy::connectionWillClose(IPC::Connection*)
{
}
@@ -92,7 +92,7 @@
return;
}
- connection()->send(Messages::NetworkProcess::CreateNetworkConnectionToWebProcess(), 0, CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply);
+ connection()->send(Messages::NetworkProcess::CreateNetworkConnectionToWebProcess(), 0, IPC::DispatchMessageEvenWhenWaitingForSyncReply);
}
DownloadProxy* NetworkProcessProxy::createDownloadProxy()
@@ -110,9 +110,9 @@
RefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
#if PLATFORM(MAC)
- reply->send(CoreIPC::Attachment(0, MACH_MSG_TYPE_MOVE_SEND));
+ reply->send(IPC::Attachment(0, MACH_MSG_TYPE_MOVE_SEND));
#elif USE(UNIX_DOMAIN_SOCKETS)
- reply->send(CoreIPC::Attachment());
+ reply->send(IPC::Attachment());
#else
notImplemented();
#endif
@@ -122,7 +122,7 @@
m_webContext.networkProcessCrashed(this);
}
-void NetworkProcessProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
+void NetworkProcessProxy::didReceiveMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder)
{
if (dispatchMessage(connection, decoder))
return;
@@ -133,7 +133,7 @@
didReceiveNetworkProcessProxyMessage(connection, decoder);
}
-void NetworkProcessProxy::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, std::unique_ptr<CoreIPC::MessageEncoder>& replyEncoder)
+void NetworkProcessProxy::didReceiveSyncMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)
{
if (dispatchSyncMessage(connection, decoder, replyEncoder))
return;
@@ -141,7 +141,7 @@
ASSERT_NOT_REACHED();
}
-void NetworkProcessProxy::didClose(CoreIPC::Connection*)
+void NetworkProcessProxy::didClose(IPC::Connection*)
{
if (m_downloadProxyMap)
m_downloadProxyMap->processDidClose();
@@ -150,11 +150,11 @@
networkProcessCrashedOrFailedToLaunch();
}
-void NetworkProcessProxy::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)
+void NetworkProcessProxy::didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference, IPC::StringReference)
{
}
-void NetworkProcessProxy::didCreateNetworkConnectionToWebProcess(const CoreIPC::Attachment& connectionIdentifier)
+void NetworkProcessProxy::didCreateNetworkConnectionToWebProcess(const IPC::Attachment& connectionIdentifier)
{
ASSERT(!m_pendingConnectionReplies.isEmpty());
@@ -162,7 +162,7 @@
RefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
#if PLATFORM(MAC)
- reply->send(CoreIPC::Attachment(connectionIdentifier.port(), MACH_MSG_TYPE_MOVE_SEND));
+ reply->send(IPC::Attachment(connectionIdentifier.port(), MACH_MSG_TYPE_MOVE_SEND));
#elif USE(UNIX_DOMAIN_SOCKETS)
reply->send(connectionIdentifier);
#else
@@ -179,11 +179,11 @@
page->didReceiveAuthenticationChallengeProxy(frameID, authenticationChallenge.release());
}
-void NetworkProcessProxy::didFinishLaunching(ProcessLauncher* launcher, CoreIPC::Connection::Identifier connectionIdentifier)
+void NetworkProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Connection::Identifier connectionIdentifier)
{
ChildProcessProxy::didFinishLaunching(launcher, connectionIdentifier);
- if (CoreIPC::Connection::identifierIsNull(connectionIdentifier)) {
+ if (IPC::Connection::identifierIsNull(connectionIdentifier)) {
// FIXME: Do better cleanup here.
return;
}
diff --git a/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h b/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h
index c3d170d..adc2298 100644
--- a/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h
+++ b/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h
@@ -66,25 +66,25 @@
// ChildProcessProxy
virtual void getLaunchOptions(ProcessLauncher::LaunchOptions&) OVERRIDE;
- virtual void connectionWillOpen(CoreIPC::Connection*) OVERRIDE;
- virtual void connectionWillClose(CoreIPC::Connection*) OVERRIDE;
+ virtual void connectionWillOpen(IPC::Connection*) OVERRIDE;
+ virtual void connectionWillClose(IPC::Connection*) OVERRIDE;
void platformGetLaunchOptions(ProcessLauncher::LaunchOptions&);
void networkProcessCrashedOrFailedToLaunch();
- // CoreIPC::Connection::Client
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
- virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&) OVERRIDE;
- virtual void didClose(CoreIPC::Connection*) OVERRIDE;
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
+ // IPC::Connection::Client
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
+ virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) OVERRIDE;
+ virtual void didClose(IPC::Connection*) OVERRIDE;
+ virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName) OVERRIDE;
// Message handlers
- void didReceiveNetworkProcessProxyMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
- void didCreateNetworkConnectionToWebProcess(const CoreIPC::Attachment&);
+ void didReceiveNetworkProcessProxyMessage(IPC::Connection*, IPC::MessageDecoder&);
+ void didCreateNetworkConnectionToWebProcess(const IPC::Attachment&);
void didReceiveAuthenticationChallenge(uint64_t pageID, uint64_t frameID, const WebCore::AuthenticationChallenge&, uint64_t challengeID);
// ProcessLauncher::Client
- virtual void didFinishLaunching(ProcessLauncher*, CoreIPC::Connection::Identifier);
+ virtual void didFinishLaunching(ProcessLauncher*, IPC::Connection::Identifier);
WebContext& m_webContext;
diff --git a/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in b/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in
index 7e91c38..3b41a54 100644
--- a/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in
+++ b/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in
@@ -23,7 +23,7 @@
#if ENABLE(NETWORK_PROCESS)
messages -> NetworkProcessProxy LegacyReceiver {
- DidCreateNetworkConnectionToWebProcess(CoreIPC::Attachment connectionIdentifier)
+ DidCreateNetworkConnectionToWebProcess(IPC::Attachment connectionIdentifier)
DidReceiveAuthenticationChallenge(uint64_t pageID, uint64_t frameID, WebCore::AuthenticationChallenge challenge, uint64_t challengeID)
}
diff --git a/Source/WebKit2/UIProcess/Notifications/WebNotification.h b/Source/WebKit2/UIProcess/Notifications/WebNotification.h
index b4b07cd..3682b4f 100644
--- a/Source/WebKit2/UIProcess/Notifications/WebNotification.h
+++ b/Source/WebKit2/UIProcess/Notifications/WebNotification.h
@@ -32,12 +32,12 @@
#include <wtf/RefPtr.h>
#include <wtf/text/WTFString.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class ArgumentEncoder;
-} // namespace CoreIPC
+} // namespace IPC
namespace WebKit {
diff --git a/Source/WebKit2/UIProcess/PageClient.h b/Source/WebKit2/UIProcess/PageClient.h
index 99287a2..aa3256e 100644
--- a/Source/WebKit2/UIProcess/PageClient.h
+++ b/Source/WebKit2/UIProcess/PageClient.h
@@ -165,7 +165,7 @@
virtual bool canUndoRedo(WebPageProxy::UndoOrRedo) = 0;
virtual void executeUndoRedo(WebPageProxy::UndoOrRedo) = 0;
#if PLATFORM(MAC)
- virtual void accessibilityWebProcessTokenReceived(const CoreIPC::DataReference&) = 0;
+ virtual void accessibilityWebProcessTokenReceived(const IPC::DataReference&) = 0;
virtual bool interpretKeyEvent(const NativeWebKeyboardEvent&, Vector<WebCore::KeypressCommand>&) = 0;
virtual bool executeSavedCommandBySelector(const String& selector) = 0;
virtual void setDragImage(const WebCore::IntPoint& clientPosition, PassRefPtr<ShareableBitmap> dragImage, bool isLinkDrag) = 0;
diff --git a/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h b/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h
index 67ac846..6c028d3 100644
--- a/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h
+++ b/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h
@@ -38,7 +38,7 @@
#include <wtf/Noncopyable.h>
#include <wtf/Vector.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentEncoder;
}
diff --git a/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp b/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp
index da637c4..882ea90 100644
--- a/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp
+++ b/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp
@@ -95,7 +95,7 @@
// Ask the plug-in process to create a connection. Since the plug-in can be waiting for a synchronous reply
// we need to make sure that this message is always processed, even when the plug-in is waiting for a synchronus reply.
- m_connection->send(Messages::PluginProcess::CreateWebProcessConnection(), 0, CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply);
+ m_connection->send(Messages::PluginProcess::CreateWebProcessConnection(), 0, IPC::DispatchMessageEvenWhenWaitingForSyncReply);
}
void PluginProcessProxy::getSitesWithData(WebPluginSiteDataManager* webPluginSiteDataManager, uint64_t callbackID)
@@ -138,9 +138,9 @@
RefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
#if PLATFORM(MAC)
- reply->send(CoreIPC::Attachment(0, MACH_MSG_TYPE_MOVE_SEND), false);
+ reply->send(IPC::Attachment(0, MACH_MSG_TYPE_MOVE_SEND), false);
#elif USE(UNIX_DOMAIN_SOCKETS)
- reply->send(CoreIPC::Attachment(), false);
+ reply->send(IPC::Attachment(), false);
#else
notImplemented();
#endif
@@ -156,7 +156,7 @@
m_pluginProcessManager->removePluginProcessProxy(this);
}
-void PluginProcessProxy::didClose(CoreIPC::Connection*)
+void PluginProcessProxy::didClose(IPC::Connection*)
{
#if PLATFORM(MAC)
if (m_modalWindowIsShowing)
@@ -174,20 +174,20 @@
pluginProcessCrashedOrFailedToLaunch();
}
-void PluginProcessProxy::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)
+void PluginProcessProxy::didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference, IPC::StringReference)
{
}
-void PluginProcessProxy::didFinishLaunching(ProcessLauncher*, CoreIPC::Connection::Identifier connectionIdentifier)
+void PluginProcessProxy::didFinishLaunching(ProcessLauncher*, IPC::Connection::Identifier connectionIdentifier)
{
ASSERT(!m_connection);
- if (CoreIPC::Connection::identifierIsNull(connectionIdentifier)) {
+ if (IPC::Connection::identifierIsNull(connectionIdentifier)) {
pluginProcessCrashedOrFailedToLaunch();
return;
}
- m_connection = CoreIPC::Connection::createServerConnection(connectionIdentifier, this, RunLoop::main());
+ m_connection = IPC::Connection::createServerConnection(connectionIdentifier, this, RunLoop::main());
#if PLATFORM(MAC)
m_connection->setShouldCloseConnectionOnMachExceptions();
#endif
@@ -230,7 +230,7 @@
#endif
}
-void PluginProcessProxy::didCreateWebProcessConnection(const CoreIPC::Attachment& connectionIdentifier, bool supportsAsynchronousPluginInitialization)
+void PluginProcessProxy::didCreateWebProcessConnection(const IPC::Attachment& connectionIdentifier, bool supportsAsynchronousPluginInitialization)
{
ASSERT(!m_pendingConnectionReplies.isEmpty());
@@ -238,7 +238,7 @@
RefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
#if PLATFORM(MAC)
- reply->send(CoreIPC::Attachment(connectionIdentifier.port(), MACH_MSG_TYPE_MOVE_SEND), supportsAsynchronousPluginInitialization);
+ reply->send(IPC::Attachment(connectionIdentifier.port(), MACH_MSG_TYPE_MOVE_SEND), supportsAsynchronousPluginInitialization);
#elif USE(UNIX_DOMAIN_SOCKETS)
reply->send(connectionIdentifier, supportsAsynchronousPluginInitialization);
#else
diff --git a/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h b/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h
index e3b81fb..61881d8 100644
--- a/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h
+++ b/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h
@@ -44,7 +44,7 @@
#endif
// FIXME: This is platform specific.
-namespace CoreIPC {
+namespace IPC {
class MachPort;
}
@@ -105,18 +105,18 @@
void pluginProcessCrashedOrFailedToLaunch();
- // CoreIPC::Connection::Client
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
- virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&) OVERRIDE;
+ // IPC::Connection::Client
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
+ virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) OVERRIDE;
- virtual void didClose(CoreIPC::Connection*) OVERRIDE;
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
+ virtual void didClose(IPC::Connection*) OVERRIDE;
+ virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName) OVERRIDE;
// ProcessLauncher::Client
- virtual void didFinishLaunching(ProcessLauncher*, CoreIPC::Connection::Identifier);
+ virtual void didFinishLaunching(ProcessLauncher*, IPC::Connection::Identifier);
// Message handlers
- void didCreateWebProcessConnection(const CoreIPC::Attachment&, bool supportsAsynchronousPluginInitialization);
+ void didCreateWebProcessConnection(const IPC::Attachment&, bool supportsAsynchronousPluginInitialization);
void didGetSitesWithData(const Vector<String>& sites, uint64_t callbackID);
void didClearSiteData(uint64_t callbackID);
@@ -150,7 +150,7 @@
uint64_t m_pluginProcessToken;
// The connection to the plug-in host process.
- RefPtr<CoreIPC::Connection> m_connection;
+ RefPtr<IPC::Connection> m_connection;
Deque<RefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>> m_pendingConnectionReplies;
diff --git a/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in b/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in
index 7ad2bdd..25afc5d 100644
--- a/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in
+++ b/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in
@@ -23,7 +23,7 @@
#if ENABLE(NETSCAPE_PLUGIN_API)
messages -> PluginProcessProxy {
- DidCreateWebProcessConnection(CoreIPC::Attachment connectionIdentifier, bool supportsAsynchronousPluginInitialization)
+ DidCreateWebProcessConnection(IPC::Attachment connectionIdentifier, bool supportsAsynchronousPluginInitialization)
DidGetSitesWithData(Vector<String> sites, uint64_t callbackID)
DidClearSiteData(uint64_t callbackID)
diff --git a/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm b/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm
index fa01deb..6978b0a 100644
--- a/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm
+++ b/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm
@@ -160,7 +160,7 @@
#if USE(ACCELERATED_COMPOSITING) && HAVE(HOSTED_CORE_ANIMATION)
mach_port_t renderServerPort = [[CARemoteLayerServer sharedServer] serverPort];
if (renderServerPort != MACH_PORT_NULL)
- parameters.acceleratedCompositingPort = CoreIPC::MachPort(renderServerPort, MACH_MSG_TYPE_COPY_SEND);
+ parameters.acceleratedCompositingPort = IPC::MachPort(renderServerPort, MACH_MSG_TYPE_COPY_SEND);
#endif
}
diff --git a/Source/WebKit2/UIProcess/Storage/StorageManager.cpp b/Source/WebKit2/UIProcess/Storage/StorageManager.cpp
index cdc82db..c08acc4 100644
--- a/Source/WebKit2/UIProcess/Storage/StorageManager.cpp
+++ b/Source/WebKit2/UIProcess/Storage/StorageManager.cpp
@@ -48,14 +48,14 @@
SecurityOrigin* securityOrigin() const { return m_securityOrigin.get(); }
- void addListener(CoreIPC::Connection*, uint64_t storageMapID);
- void removeListener(CoreIPC::Connection*, uint64_t storageMapID);
+ void addListener(IPC::Connection*, uint64_t storageMapID);
+ void removeListener(IPC::Connection*, uint64_t storageMapID);
PassRefPtr<StorageArea> clone() const;
- void setItem(CoreIPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String& key, const String& value, const String& urlString, bool& quotaException);
- void removeItem(CoreIPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String& key, const String& urlString);
- void clear(CoreIPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String& urlString);
+ void setItem(IPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String& key, const String& value, const String& urlString, bool& quotaException);
+ void removeItem(IPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String& key, const String& urlString);
+ void clear(IPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String& urlString);
const HashMap<String, String>& items();
void clear();
@@ -65,7 +65,7 @@
void openDatabaseAndImportItemsIfNeeded();
- void dispatchEvents(CoreIPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String& key, const String& oldValue, const String& newValue, const String& urlString) const;
+ void dispatchEvents(IPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String& key, const String& oldValue, const String& newValue, const String& urlString) const;
// Will be null if the storage area belongs to a session storage namespace.
LocalStorageNamespace* m_localStorageNamespace;
@@ -76,7 +76,7 @@
unsigned m_quotaInBytes;
RefPtr<StorageMap> m_storageMap;
- HashSet<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>> m_eventListeners;
+ HashSet<std::pair<RefPtr<IPC::Connection>, uint64_t>> m_eventListeners;
};
class StorageManager::LocalStorageNamespace : public ThreadSafeRefCounted<LocalStorageNamespace> {
@@ -128,13 +128,13 @@
m_localStorageNamespace->didDestroyStorageArea(this);
}
-void StorageManager::StorageArea::addListener(CoreIPC::Connection* connection, uint64_t storageMapID)
+void StorageManager::StorageArea::addListener(IPC::Connection* connection, uint64_t storageMapID)
{
ASSERT(!m_eventListeners.contains(std::make_pair(connection, storageMapID)));
m_eventListeners.add(std::make_pair(connection, storageMapID));
}
-void StorageManager::StorageArea::removeListener(CoreIPC::Connection* connection, uint64_t storageMapID)
+void StorageManager::StorageArea::removeListener(IPC::Connection* connection, uint64_t storageMapID)
{
ASSERT(m_eventListeners.contains(std::make_pair(connection, storageMapID)));
m_eventListeners.remove(std::make_pair(connection, storageMapID));
@@ -150,7 +150,7 @@
return storageArea.release();
}
-void StorageManager::StorageArea::setItem(CoreIPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String& key, const String& value, const String& urlString, bool& quotaException)
+void StorageManager::StorageArea::setItem(IPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String& key, const String& value, const String& urlString, bool& quotaException)
{
openDatabaseAndImportItemsIfNeeded();
@@ -169,7 +169,7 @@
dispatchEvents(sourceConnection, sourceStorageAreaID, key, oldValue, value, urlString);
}
-void StorageManager::StorageArea::removeItem(CoreIPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String& key, const String& urlString)
+void StorageManager::StorageArea::removeItem(IPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String& key, const String& urlString)
{
openDatabaseAndImportItemsIfNeeded();
@@ -187,7 +187,7 @@
dispatchEvents(sourceConnection, sourceStorageAreaID, key, oldValue, String(), urlString);
}
-void StorageManager::StorageArea::clear(CoreIPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String& urlString)
+void StorageManager::StorageArea::clear(IPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String& urlString)
{
openDatabaseAndImportItemsIfNeeded();
@@ -238,9 +238,9 @@
m_didImportItemsFromDatabase = true;
}
-void StorageManager::StorageArea::dispatchEvents(CoreIPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String& key, const String& oldValue, const String& newValue, const String& urlString) const
+void StorageManager::StorageArea::dispatchEvents(IPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String& key, const String& oldValue, const String& newValue, const String& urlString) const
{
- for (HashSet<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>>::const_iterator it = m_eventListeners.begin(), end = m_eventListeners.end(); it != end; ++it) {
+ for (HashSet<std::pair<RefPtr<IPC::Connection>, uint64_t>>::const_iterator it = m_eventListeners.begin(), end = m_eventListeners.end(); it != end; ++it) {
uint64_t storageAreaID = it->first == sourceConnection ? sourceStorageAreaID : 0;
it->first->send(Messages::StorageAreaMap::DispatchStorageEvent(storageAreaID, key, oldValue, newValue, urlString), it->second);
@@ -306,33 +306,33 @@
class StorageManager::SessionStorageNamespace : public ThreadSafeRefCounted<SessionStorageNamespace> {
public:
- static PassRefPtr<SessionStorageNamespace> create(CoreIPC::Connection* allowedConnection, unsigned quotaInBytes);
+ static PassRefPtr<SessionStorageNamespace> create(IPC::Connection* allowedConnection, unsigned quotaInBytes);
~SessionStorageNamespace();
bool isEmpty() const { return m_storageAreaMap.isEmpty(); }
- CoreIPC::Connection* allowedConnection() const { return m_allowedConnection.get(); }
- void setAllowedConnection(CoreIPC::Connection*);
+ IPC::Connection* allowedConnection() const { return m_allowedConnection.get(); }
+ void setAllowedConnection(IPC::Connection*);
PassRefPtr<StorageArea> getOrCreateStorageArea(PassRefPtr<SecurityOrigin>);
void cloneTo(SessionStorageNamespace& newSessionStorageNamespace);
private:
- SessionStorageNamespace(CoreIPC::Connection* allowedConnection, unsigned quotaInBytes);
+ SessionStorageNamespace(IPC::Connection* allowedConnection, unsigned quotaInBytes);
- RefPtr<CoreIPC::Connection> m_allowedConnection;
+ RefPtr<IPC::Connection> m_allowedConnection;
unsigned m_quotaInBytes;
HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageArea>> m_storageAreaMap;
};
-PassRefPtr<StorageManager::SessionStorageNamespace> StorageManager::SessionStorageNamespace::create(CoreIPC::Connection* allowedConnection, unsigned quotaInBytes)
+PassRefPtr<StorageManager::SessionStorageNamespace> StorageManager::SessionStorageNamespace::create(IPC::Connection* allowedConnection, unsigned quotaInBytes)
{
return adoptRef(new SessionStorageNamespace(allowedConnection, quotaInBytes));
}
-StorageManager::SessionStorageNamespace::SessionStorageNamespace(CoreIPC::Connection* allowedConnection, unsigned quotaInBytes)
+StorageManager::SessionStorageNamespace::SessionStorageNamespace(IPC::Connection* allowedConnection, unsigned quotaInBytes)
: m_allowedConnection(allowedConnection)
, m_quotaInBytes(quotaInBytes)
{
@@ -342,7 +342,7 @@
{
}
-void StorageManager::SessionStorageNamespace::setAllowedConnection(CoreIPC::Connection* allowedConnection)
+void StorageManager::SessionStorageNamespace::setAllowedConnection(IPC::Connection* allowedConnection)
{
ASSERT(!allowedConnection || !m_allowedConnection);
@@ -388,9 +388,9 @@
m_localStorageDatabaseTracker->setLocalStorageDirectory(localStorageDirectory);
}
-void StorageManager::createSessionStorageNamespace(uint64_t storageNamespaceID, CoreIPC::Connection* allowedConnection, unsigned quotaInBytes)
+void StorageManager::createSessionStorageNamespace(uint64_t storageNamespaceID, IPC::Connection* allowedConnection, unsigned quotaInBytes)
{
- m_queue->dispatch(bind(&StorageManager::createSessionStorageNamespaceInternal, this, storageNamespaceID, RefPtr<CoreIPC::Connection>(allowedConnection), quotaInBytes));
+ m_queue->dispatch(bind(&StorageManager::createSessionStorageNamespaceInternal, this, storageNamespaceID, RefPtr<IPC::Connection>(allowedConnection), quotaInBytes));
}
void StorageManager::destroySessionStorageNamespace(uint64_t storageNamespaceID)
@@ -398,9 +398,9 @@
m_queue->dispatch(bind(&StorageManager::destroySessionStorageNamespaceInternal, this, storageNamespaceID));
}
-void StorageManager::setAllowedSessionStorageNamespaceConnection(uint64_t storageNamespaceID, CoreIPC::Connection* allowedConnection)
+void StorageManager::setAllowedSessionStorageNamespaceConnection(uint64_t storageNamespaceID, IPC::Connection* allowedConnection)
{
- m_queue->dispatch(bind(&StorageManager::setAllowedSessionStorageNamespaceConnectionInternal, this, storageNamespaceID, RefPtr<CoreIPC::Connection>(allowedConnection)));
+ m_queue->dispatch(bind(&StorageManager::setAllowedSessionStorageNamespaceConnectionInternal, this, storageNamespaceID, RefPtr<IPC::Connection>(allowedConnection)));
}
void StorageManager::cloneSessionStorageNamespace(uint64_t storageNamespaceID, uint64_t newStorageNamespaceID)
@@ -417,7 +417,7 @@
{
webProcessProxy->connection()->removeWorkQueueMessageReceiver(Messages::StorageManager::messageReceiverName());
- m_queue->dispatch(bind(&StorageManager::invalidateConnectionInternal, this, RefPtr<CoreIPC::Connection>(webProcessProxy->connection())));
+ m_queue->dispatch(bind(&StorageManager::invalidateConnectionInternal, this, RefPtr<IPC::Connection>(webProcessProxy->connection())));
}
void StorageManager::getOrigins(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context))
@@ -435,14 +435,14 @@
m_queue->dispatch(bind(&StorageManager::deleteAllEntriesInternal, this));
}
-void StorageManager::createLocalStorageMap(CoreIPC::Connection* connection, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData& securityOriginData)
+void StorageManager::createLocalStorageMap(IPC::Connection* connection, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData& securityOriginData)
{
- std::pair<RefPtr<CoreIPC::Connection>, uint64_t> connectionAndStorageMapIDPair(connection, storageMapID);
+ std::pair<RefPtr<IPC::Connection>, uint64_t> connectionAndStorageMapIDPair(connection, storageMapID);
// FIXME: This should be a message check.
- ASSERT((HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>>::isValidKey(connectionAndStorageMapIDPair)));
+ ASSERT((HashMap<std::pair<RefPtr<IPC::Connection>, uint64_t>, RefPtr<StorageArea>>::isValidKey(connectionAndStorageMapIDPair)));
- HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>>::AddResult result = m_storageAreasByConnection.add(connectionAndStorageMapIDPair, nullptr);
+ HashMap<std::pair<RefPtr<IPC::Connection>, uint64_t>, RefPtr<StorageArea>>::AddResult result = m_storageAreasByConnection.add(connectionAndStorageMapIDPair, nullptr);
// FIXME: These should be a message checks.
ASSERT(result.isNewEntry);
@@ -459,7 +459,7 @@
result.iterator->value = storageArea.release();
}
-void StorageManager::createSessionStorageMap(CoreIPC::Connection* connection, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData& securityOriginData)
+void StorageManager::createSessionStorageMap(IPC::Connection* connection, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData& securityOriginData)
{
// FIXME: This should be a message check.
ASSERT((HashMap<uint64_t, RefPtr<SessionStorageNamespace>>::isValidKey(storageNamespaceID)));
@@ -470,12 +470,12 @@
return;
}
- std::pair<RefPtr<CoreIPC::Connection>, uint64_t> connectionAndStorageMapIDPair(connection, storageMapID);
+ std::pair<RefPtr<IPC::Connection>, uint64_t> connectionAndStorageMapIDPair(connection, storageMapID);
// FIXME: This should be a message check.
- ASSERT((HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>>::isValidKey(connectionAndStorageMapIDPair)));
+ ASSERT((HashMap<std::pair<RefPtr<IPC::Connection>, uint64_t>, RefPtr<StorageArea>>::isValidKey(connectionAndStorageMapIDPair)));
- HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>>::AddResult result = m_storageAreasByConnection.add(connectionAndStorageMapIDPair, nullptr);
+ HashMap<std::pair<RefPtr<IPC::Connection>, uint64_t>, RefPtr<StorageArea>>::AddResult result = m_storageAreasByConnection.add(connectionAndStorageMapIDPair, nullptr);
// FIXME: This should be a message check.
ASSERT(result.isNewEntry);
@@ -489,14 +489,14 @@
result.iterator->value = storageArea.release();
}
-void StorageManager::destroyStorageMap(CoreIPC::Connection* connection, uint64_t storageMapID)
+void StorageManager::destroyStorageMap(IPC::Connection* connection, uint64_t storageMapID)
{
- std::pair<RefPtr<CoreIPC::Connection>, uint64_t> connectionAndStorageMapIDPair(connection, storageMapID);
+ std::pair<RefPtr<IPC::Connection>, uint64_t> connectionAndStorageMapIDPair(connection, storageMapID);
// FIXME: This should be a message check.
- ASSERT((HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>>::isValidKey(connectionAndStorageMapIDPair)));
+ ASSERT((HashMap<std::pair<RefPtr<IPC::Connection>, uint64_t>, RefPtr<StorageArea>>::isValidKey(connectionAndStorageMapIDPair)));
- HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>>::iterator it = m_storageAreasByConnection.find(connectionAndStorageMapIDPair);
+ HashMap<std::pair<RefPtr<IPC::Connection>, uint64_t>, RefPtr<StorageArea>>::iterator it = m_storageAreasByConnection.find(connectionAndStorageMapIDPair);
if (it == m_storageAreasByConnection.end()) {
// The connection has been removed because the last page was closed.
return;
@@ -506,7 +506,7 @@
m_storageAreasByConnection.remove(connectionAndStorageMapIDPair);
}
-void StorageManager::getValues(CoreIPC::Connection* connection, uint64_t storageMapID, uint64_t storageMapSeed, HashMap<String, String>& values)
+void StorageManager::getValues(IPC::Connection* connection, uint64_t storageMapID, uint64_t storageMapSeed, HashMap<String, String>& values)
{
StorageArea* storageArea = findStorageArea(connection, storageMapID);
if (!storageArea) {
@@ -518,7 +518,7 @@
connection->send(Messages::StorageAreaMap::DidGetValues(storageMapSeed), storageMapID);
}
-void StorageManager::setItem(CoreIPC::Connection* connection, uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, const String& key, const String& value, const String& urlString)
+void StorageManager::setItem(IPC::Connection* connection, uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, const String& key, const String& value, const String& urlString)
{
StorageArea* storageArea = findStorageArea(connection, storageMapID);
if (!storageArea) {
@@ -531,7 +531,7 @@
connection->send(Messages::StorageAreaMap::DidSetItem(storageMapSeed, key, quotaError), storageMapID);
}
-void StorageManager::removeItem(CoreIPC::Connection* connection, uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, const String& key, const String& urlString)
+void StorageManager::removeItem(IPC::Connection* connection, uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, const String& key, const String& urlString)
{
StorageArea* storageArea = findStorageArea(connection, storageMapID);
if (!storageArea) {
@@ -543,7 +543,7 @@
connection->send(Messages::StorageAreaMap::DidRemoveItem(storageMapSeed, key), storageMapID);
}
-void StorageManager::clear(CoreIPC::Connection* connection, uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, const String& urlString)
+void StorageManager::clear(IPC::Connection* connection, uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, const String& urlString)
{
StorageArea* storageArea = findStorageArea(connection, storageMapID);
if (!storageArea) {
@@ -555,7 +555,7 @@
connection->send(Messages::StorageAreaMap::DidClear(storageMapSeed), storageMapID);
}
-void StorageManager::createSessionStorageNamespaceInternal(uint64_t storageNamespaceID, CoreIPC::Connection* allowedConnection, unsigned quotaInBytes)
+void StorageManager::createSessionStorageNamespaceInternal(uint64_t storageNamespaceID, IPC::Connection* allowedConnection, unsigned quotaInBytes)
{
ASSERT(!m_sessionStorageNamespaces.contains(storageNamespaceID));
@@ -568,7 +568,7 @@
m_sessionStorageNamespaces.remove(storageNamespaceID);
}
-void StorageManager::setAllowedSessionStorageNamespaceConnectionInternal(uint64_t storageNamespaceID, CoreIPC::Connection* allowedConnection)
+void StorageManager::setAllowedSessionStorageNamespaceConnectionInternal(uint64_t storageNamespaceID, IPC::Connection* allowedConnection)
{
ASSERT(m_sessionStorageNamespaces.contains(storageNamespaceID));
@@ -586,11 +586,11 @@
sessionStorageNamespace->cloneTo(*newSessionStorageNamespace);
}
-void StorageManager::invalidateConnectionInternal(CoreIPC::Connection* connection)
+void StorageManager::invalidateConnectionInternal(IPC::Connection* connection)
{
- Vector<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>> connectionAndStorageMapIDPairsToRemove;
- HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>> storageAreasByConnection = m_storageAreasByConnection;
- for (HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>>::const_iterator it = storageAreasByConnection.begin(), end = storageAreasByConnection.end(); it != end; ++it) {
+ Vector<std::pair<RefPtr<IPC::Connection>, uint64_t>> connectionAndStorageMapIDPairsToRemove;
+ HashMap<std::pair<RefPtr<IPC::Connection>, uint64_t>, RefPtr<StorageArea>> storageAreasByConnection = m_storageAreasByConnection;
+ for (HashMap<std::pair<RefPtr<IPC::Connection>, uint64_t>, RefPtr<StorageArea>>::const_iterator it = storageAreasByConnection.begin(), end = storageAreasByConnection.end(); it != end; ++it) {
if (it->key.first != connection)
continue;
@@ -602,10 +602,10 @@
m_storageAreasByConnection.remove(connectionAndStorageMapIDPairsToRemove[i]);
}
-StorageManager::StorageArea* StorageManager::findStorageArea(CoreIPC::Connection* connection, uint64_t storageMapID) const
+StorageManager::StorageArea* StorageManager::findStorageArea(IPC::Connection* connection, uint64_t storageMapID) const
{
- std::pair<CoreIPC::Connection*, uint64_t> connectionAndStorageMapIDPair(connection, storageMapID);
- if (!HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>>::isValidKey(connectionAndStorageMapIDPair))
+ std::pair<IPC::Connection*, uint64_t> connectionAndStorageMapIDPair(connection, storageMapID);
+ if (!HashMap<std::pair<RefPtr<IPC::Connection>, uint64_t>, RefPtr<StorageArea>>::isValidKey(connectionAndStorageMapIDPair))
return 0;
return m_storageAreasByConnection.get(connectionAndStorageMapIDPair);
diff --git a/Source/WebKit2/UIProcess/Storage/StorageManager.h b/Source/WebKit2/UIProcess/Storage/StorageManager.h
index e92f6de..0f91e55 100644
--- a/Source/WebKit2/UIProcess/Storage/StorageManager.h
+++ b/Source/WebKit2/UIProcess/Storage/StorageManager.h
@@ -44,16 +44,16 @@
class LocalStorageDatabaseTracker;
class WebProcessProxy;
-class StorageManager : public CoreIPC::Connection::WorkQueueMessageReceiver {
+class StorageManager : public IPC::Connection::WorkQueueMessageReceiver {
public:
static PassRefPtr<StorageManager> create();
~StorageManager();
void setLocalStorageDirectory(const String&);
- void createSessionStorageNamespace(uint64_t storageNamespaceID, CoreIPC::Connection* allowedConnection, unsigned quotaInBytes);
+ void createSessionStorageNamespace(uint64_t storageNamespaceID, IPC::Connection* allowedConnection, unsigned quotaInBytes);
void destroySessionStorageNamespace(uint64_t storageNamespaceID);
- void setAllowedSessionStorageNamespaceConnection(uint64_t storageNamespaceID, CoreIPC::Connection* allowedConnection);
+ void setAllowedSessionStorageNamespaceConnection(uint64_t storageNamespaceID, IPC::Connection* allowedConnection);
void cloneSessionStorageNamespace(uint64_t storageNamespaceID, uint64_t newStorageNamespaceID);
void processWillOpenConnection(WebProcessProxy*);
@@ -68,29 +68,29 @@
private:
StorageManager();
- // CoreIPC::Connection::WorkQueueMessageReceiver.
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
- virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>& replyEncoder) OVERRIDE;
+ // IPC::Connection::WorkQueueMessageReceiver.
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
+ virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>& replyEncoder) OVERRIDE;
// Message handlers.
- void createLocalStorageMap(CoreIPC::Connection*, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData&);
- void createSessionStorageMap(CoreIPC::Connection*, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData&);
- void destroyStorageMap(CoreIPC::Connection*, uint64_t storageMapID);
+ void createLocalStorageMap(IPC::Connection*, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData&);
+ void createSessionStorageMap(IPC::Connection*, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData&);
+ void destroyStorageMap(IPC::Connection*, uint64_t storageMapID);
- void getValues(CoreIPC::Connection*, uint64_t storageMapID, uint64_t storageMapSeed, HashMap<String, String>& values);
- void setItem(CoreIPC::Connection*, uint64_t storageAreaID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, const String& key, const String& value, const String& urlString);
- void removeItem(CoreIPC::Connection*, uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, const String& key, const String& urlString);
- void clear(CoreIPC::Connection*, uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, const String& urlString);
+ void getValues(IPC::Connection*, uint64_t storageMapID, uint64_t storageMapSeed, HashMap<String, String>& values);
+ void setItem(IPC::Connection*, uint64_t storageAreaID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, const String& key, const String& value, const String& urlString);
+ void removeItem(IPC::Connection*, uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, const String& key, const String& urlString);
+ void clear(IPC::Connection*, uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, const String& urlString);
- void createSessionStorageNamespaceInternal(uint64_t storageNamespaceID, CoreIPC::Connection* allowedConnection, unsigned quotaInBytes);
+ void createSessionStorageNamespaceInternal(uint64_t storageNamespaceID, IPC::Connection* allowedConnection, unsigned quotaInBytes);
void destroySessionStorageNamespaceInternal(uint64_t storageNamespaceID);
- void setAllowedSessionStorageNamespaceConnectionInternal(uint64_t storageNamespaceID, CoreIPC::Connection* allowedConnection);
+ void setAllowedSessionStorageNamespaceConnectionInternal(uint64_t storageNamespaceID, IPC::Connection* allowedConnection);
void cloneSessionStorageNamespaceInternal(uint64_t storageNamespaceID, uint64_t newStorageNamespaceID);
- void invalidateConnectionInternal(CoreIPC::Connection*);
+ void invalidateConnectionInternal(IPC::Connection*);
class StorageArea;
- StorageArea* findStorageArea(CoreIPC::Connection*, uint64_t) const;
+ StorageArea* findStorageArea(IPC::Connection*, uint64_t) const;
class LocalStorageNamespace;
LocalStorageNamespace* getOrCreateLocalStorageNamespace(uint64_t storageNamespaceID);
@@ -107,7 +107,7 @@
class SessionStorageNamespace;
HashMap<uint64_t, RefPtr<SessionStorageNamespace>> m_sessionStorageNamespaces;
- HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>> m_storageAreasByConnection;
+ HashMap<std::pair<RefPtr<IPC::Connection>, uint64_t>, RefPtr<StorageArea>> m_storageAreasByConnection;
};
} // namespace WebKit
diff --git a/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h b/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h
index 752c83a..bf94430 100644
--- a/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h
+++ b/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h
@@ -34,7 +34,7 @@
#include <wtf/RefPtr.h>
#include <wtf/Vector.h>
-namespace CoreIPC {
+namespace IPC {
class Connection;
}
@@ -45,7 +45,7 @@
typedef GenericCallback<WKArrayRef> ArrayCallback;
-class WebApplicationCacheManagerProxy : public API::ObjectImpl<API::Object::Type::ApplicationCacheManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
+class WebApplicationCacheManagerProxy : public API::ObjectImpl<API::Object::Type::ApplicationCacheManager>, public WebContextSupplement, private IPC::MessageReceiver {
public:
static const char* supplementName();
@@ -71,8 +71,8 @@
virtual void refWebContextSupplement() OVERRIDE;
virtual void derefWebContextSupplement() OVERRIDE;
- // CoreIPC::MessageReceiver
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::MessageReceiver
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
HashMap<uint64_t, RefPtr<ArrayCallback>> m_arrayCallbacks;
};
diff --git a/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp b/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp
index 3b6e63f..d3aa27e 100644
--- a/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp
+++ b/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp
@@ -50,12 +50,12 @@
// WebConnection
-void WebConnectionToWebProcess::encodeMessageBody(CoreIPC::ArgumentEncoder& encoder, API::Object* messageBody)
+void WebConnectionToWebProcess::encodeMessageBody(IPC::ArgumentEncoder& encoder, API::Object* messageBody)
{
encoder << WebContextUserMessageEncoder(messageBody, *m_process);
}
-bool WebConnectionToWebProcess::decodeMessageBody(CoreIPC::ArgumentDecoder& decoder, RefPtr<API::Object>& messageBody)
+bool WebConnectionToWebProcess::decodeMessageBody(IPC::ArgumentDecoder& decoder, RefPtr<API::Object>& messageBody)
{
WebContextUserMessageDecoder messageBodyDecoder(messageBody, *m_process);
return decoder.decode(messageBodyDecoder);
@@ -66,7 +66,7 @@
return m_process;
}
-CoreIPC::Connection* WebConnectionToWebProcess::messageSenderConnection()
+IPC::Connection* WebConnectionToWebProcess::messageSenderConnection()
{
return m_process->connection();
}
diff --git a/Source/WebKit2/UIProcess/WebConnectionToWebProcess.h b/Source/WebKit2/UIProcess/WebConnectionToWebProcess.h
index 951787f..07ad770 100644
--- a/Source/WebKit2/UIProcess/WebConnectionToWebProcess.h
+++ b/Source/WebKit2/UIProcess/WebConnectionToWebProcess.h
@@ -44,12 +44,12 @@
WebConnectionToWebProcess(WebProcessProxy*);
// WebConnection
- virtual void encodeMessageBody(CoreIPC::ArgumentEncoder&, API::Object*) OVERRIDE;
- virtual bool decodeMessageBody(CoreIPC::ArgumentDecoder&, RefPtr<API::Object>&) OVERRIDE;
+ virtual void encodeMessageBody(IPC::ArgumentEncoder&, API::Object*) OVERRIDE;
+ virtual bool decodeMessageBody(IPC::ArgumentDecoder&, RefPtr<API::Object>&) OVERRIDE;
virtual bool hasValidConnection() const OVERRIDE;
- // CoreIPC::MessageSender
- virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
+ // IPC::MessageSender
+ virtual IPC::Connection* messageSenderConnection() OVERRIDE;
virtual uint64_t messageSenderDestinationID() OVERRIDE;
WebProcessProxy* m_process;
diff --git a/Source/WebKit2/UIProcess/WebContext.cpp b/Source/WebKit2/UIProcess/WebContext.cpp
index 13cfab1..68312f7 100644
--- a/Source/WebKit2/UIProcess/WebContext.cpp
+++ b/Source/WebKit2/UIProcess/WebContext.cpp
@@ -297,7 +297,7 @@
m_webProcessCountLimit = maximumNumberOfProcesses;
}
-CoreIPC::Connection* WebContext::networkingProcessConnection()
+IPC::Connection* WebContext::networkingProcessConnection()
{
switch (m_processModel) {
case ProcessModelSharedSecondaryProcess:
@@ -478,7 +478,7 @@
s_invalidMessageCallback = invalidMessageCallback;
}
-void WebContext::didReceiveInvalidMessage(const CoreIPC::StringReference& messageReceiverName, const CoreIPC::StringReference& messageName)
+void WebContext::didReceiveInvalidMessage(const IPC::StringReference& messageReceiverName, const IPC::StringReference& messageName)
{
if (!s_invalidMessageCallback)
return;
@@ -597,11 +597,11 @@
for (size_t i = 0; i != m_messagesToInjectedBundlePostedToEmptyContext.size(); ++i) {
pair<String, RefPtr<API::Object>>& message = m_messagesToInjectedBundlePostedToEmptyContext[i];
- CoreIPC::ArgumentEncoder messageData;
+ IPC::ArgumentEncoder messageData;
messageData.encode(message.first);
messageData.encode(WebContextUserMessageEncoder(message.second.get(), *process));
- process->send(Messages::WebProcess::PostInjectedBundleMessage(CoreIPC::DataReference(messageData.buffer(), messageData.bufferSize())), 0);
+ process->send(Messages::WebProcess::PostInjectedBundleMessage(IPC::DataReference(messageData.buffer(), messageData.bufferSize())), 0);
}
m_messagesToInjectedBundlePostedToEmptyContext.clear();
} else
@@ -778,11 +778,11 @@
for (auto process : m_processes) {
// FIXME: Return early if the message body contains any references to WKPageRefs/WKFrameRefs etc. since they're local to a process.
- CoreIPC::ArgumentEncoder messageData;
+ IPC::ArgumentEncoder messageData;
messageData.encode(messageName);
messageData.encode(WebContextUserMessageEncoder(messageBody, *process.get()));
- process->send(Messages::WebProcess::PostInjectedBundleMessage(CoreIPC::DataReference(messageData.buffer(), messageData.bufferSize())), 0);
+ process->send(Messages::WebProcess::PostInjectedBundleMessage(IPC::DataReference(messageData.buffer(), messageData.bufferSize())), 0);
}
}
@@ -941,32 +941,32 @@
return ensureSharedWebProcess().createDownloadProxy();
}
-void WebContext::addMessageReceiver(CoreIPC::StringReference messageReceiverName, CoreIPC::MessageReceiver& messageReceiver)
+void WebContext::addMessageReceiver(IPC::StringReference messageReceiverName, IPC::MessageReceiver& messageReceiver)
{
m_messageReceiverMap.addMessageReceiver(messageReceiverName, messageReceiver);
}
-void WebContext::addMessageReceiver(CoreIPC::StringReference messageReceiverName, uint64_t destinationID, CoreIPC::MessageReceiver& messageReceiver)
+void WebContext::addMessageReceiver(IPC::StringReference messageReceiverName, uint64_t destinationID, IPC::MessageReceiver& messageReceiver)
{
m_messageReceiverMap.addMessageReceiver(messageReceiverName, destinationID, messageReceiver);
}
-void WebContext::removeMessageReceiver(CoreIPC::StringReference messageReceiverName, uint64_t destinationID)
+void WebContext::removeMessageReceiver(IPC::StringReference messageReceiverName, uint64_t destinationID)
{
m_messageReceiverMap.removeMessageReceiver(messageReceiverName, destinationID);
}
-bool WebContext::dispatchMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
+bool WebContext::dispatchMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder)
{
return m_messageReceiverMap.dispatchMessage(connection, decoder);
}
-bool WebContext::dispatchSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, std::unique_ptr<CoreIPC::MessageEncoder>& replyEncoder)
+bool WebContext::dispatchSyncMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)
{
return m_messageReceiverMap.dispatchSyncMessage(connection, decoder, replyEncoder);
}
-void WebContext::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
+void WebContext::didReceiveMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder)
{
if (decoder.messageReceiverName() == Messages::WebContext::messageReceiverName()) {
didReceiveWebContextMessage(connection, decoder);
@@ -990,7 +990,7 @@
ASSERT_NOT_REACHED();
}
-void WebContext::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, std::unique_ptr<CoreIPC::MessageEncoder>& replyEncoder)
+void WebContext::didReceiveSyncMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)
{
if (decoder.messageReceiverName() == Messages::WebContext::messageReceiverName()) {
didReceiveSyncWebContextMessage(connection, decoder, replyEncoder);
diff --git a/Source/WebKit2/UIProcess/WebContext.h b/Source/WebKit2/UIProcess/WebContext.h
index 32d5529..ed4794c 100644
--- a/Source/WebKit2/UIProcess/WebContext.h
+++ b/Source/WebKit2/UIProcess/WebContext.h
@@ -85,7 +85,7 @@
struct NetworkProcessCreationParameters;
#endif
-class WebContext : public API::ObjectImpl<API::Object::Type::Context>, private CoreIPC::MessageReceiver
+class WebContext : public API::ObjectImpl<API::Object::Type::Context>, private IPC::MessageReceiver
#if ENABLE(NETSCAPE_PLUGIN_API)
, private PluginInfoStoreClient
#endif
@@ -110,12 +110,12 @@
m_supplements.add(T::supplementName(), T::create(this));
}
- void addMessageReceiver(CoreIPC::StringReference messageReceiverName, CoreIPC::MessageReceiver&);
- void addMessageReceiver(CoreIPC::StringReference messageReceiverName, uint64_t destinationID, CoreIPC::MessageReceiver&);
- void removeMessageReceiver(CoreIPC::StringReference messageReceiverName, uint64_t destinationID);
+ void addMessageReceiver(IPC::StringReference messageReceiverName, IPC::MessageReceiver&);
+ void addMessageReceiver(IPC::StringReference messageReceiverName, uint64_t destinationID, IPC::MessageReceiver&);
+ void removeMessageReceiver(IPC::StringReference messageReceiverName, uint64_t destinationID);
- bool dispatchMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
- bool dispatchSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&);
+ bool dispatchMessage(IPC::Connection*, IPC::MessageDecoder&);
+ bool dispatchSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
void initializeClient(const WKContextClientBase*);
void initializeInjectedBundleClient(const WKContextInjectedBundleClientBase*);
@@ -130,7 +130,7 @@
unsigned maximumNumberOfProcesses() const { return m_webProcessCountLimit; }
// WebProcess or NetworkProcess as approporiate for current process model. The connection must be non-null.
- CoreIPC::Connection* networkingProcessConnection();
+ IPC::Connection* networkingProcessConnection();
template<typename T> void sendToAllProcesses(const T& message);
template<typename T> void sendToAllProcessesRelaunchingThemIfNecessary(const T& message);
@@ -186,8 +186,8 @@
void addVisitedLinkHash(WebCore::LinkHash);
// MessageReceiver.
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
- virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&) OVERRIDE;
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
+ virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) OVERRIDE;
void setCacheModel(CacheModel);
CacheModel cacheModel() const { return m_cacheModel; }
@@ -300,7 +300,7 @@
#endif
static void setInvalidMessageCallback(void (*)(WKStringRef));
- static void didReceiveInvalidMessage(const CoreIPC::StringReference& messageReceiverName, const CoreIPC::StringReference& messageName);
+ static void didReceiveInvalidMessage(const IPC::StringReference& messageReceiverName, const IPC::StringReference& messageName);
void processDidCachePage(WebProcessProxy*);
@@ -366,8 +366,8 @@
void didGetStatistics(const StatisticsData&, uint64_t callbackID);
// Implemented in generated WebContextMessageReceiver.cpp
- void didReceiveWebContextMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
- void didReceiveSyncWebContextMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&);
+ void didReceiveWebContextMessage(IPC::Connection*, IPC::MessageDecoder&);
+ void didReceiveSyncWebContextMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
static void languageChanged(void* context);
void languageChanged();
@@ -405,7 +405,7 @@
virtual void pluginInfoStoreDidLoadPlugins(PluginInfoStore*) OVERRIDE;
#endif
- CoreIPC::MessageReceiverMap m_messageReceiverMap;
+ IPC::MessageReceiverMap m_messageReceiverMap;
ProcessModel m_processModel;
unsigned m_webProcessCountLimit; // The limit has no effect when process model is ProcessModelSharedSecondaryProcess.
diff --git a/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h b/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h
index 8cd99b6..f3c147a 100644
--- a/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h
+++ b/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h
@@ -57,7 +57,7 @@
{
}
- void encode(CoreIPC::ArgumentEncoder& encoder) const
+ void encode(IPC::ArgumentEncoder& encoder) const
{
API::Object::Type type = API::Object::Type::Null;
if (baseEncode(encoder, *this, type))
@@ -117,7 +117,7 @@
{
}
- static bool decode(CoreIPC::ArgumentDecoder& decoder, WebContextUserMessageDecoder& coder)
+ static bool decode(IPC::ArgumentDecoder& decoder, WebContextUserMessageDecoder& coder)
{
API::Object::Type type = API::Object::Type::Null;
if (!Base::baseDecode(decoder, coder, type))
diff --git a/Source/WebKit2/UIProcess/WebCookieManagerProxy.h b/Source/WebKit2/UIProcess/WebCookieManagerProxy.h
index b22250a..c4e781e 100644
--- a/Source/WebKit2/UIProcess/WebCookieManagerProxy.h
+++ b/Source/WebKit2/UIProcess/WebCookieManagerProxy.h
@@ -51,7 +51,7 @@
typedef GenericCallback<WKArrayRef> ArrayCallback;
typedef GenericCallback<WKHTTPCookieAcceptPolicy, HTTPCookieAcceptPolicy> HTTPCookieAcceptPolicyCallback;
-class WebCookieManagerProxy : public API::ObjectImpl<API::Object::Type::CookieManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
+class WebCookieManagerProxy : public API::ObjectImpl<API::Object::Type::CookieManager>, public WebContextSupplement, private IPC::MessageReceiver {
public:
static const char* supplementName();
@@ -94,8 +94,8 @@
virtual void refWebContextSupplement() OVERRIDE;
virtual void derefWebContextSupplement() OVERRIDE;
- // CoreIPC::MessageReceiver
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::MessageReceiver
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
#if PLATFORM(MAC)
void persistHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy);
diff --git a/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h b/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h
index e9fd4d3..40cea9f 100644
--- a/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h
+++ b/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h
@@ -46,7 +46,7 @@
typedef GenericCallback<WKArrayRef> ArrayCallback;
-class WebDatabaseManagerProxy : public API::ObjectImpl<API::Object::Type::DatabaseManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
+class WebDatabaseManagerProxy : public API::ObjectImpl<API::Object::Type::DatabaseManager>, public WebContextSupplement, private IPC::MessageReceiver {
public:
static const char* supplementName();
@@ -84,8 +84,8 @@
virtual void refWebContextSupplement() OVERRIDE;
virtual void derefWebContextSupplement() OVERRIDE;
- // CoreIPC::MessageReceiver
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::MessageReceiver
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
// Message handlers.
void didGetDatabasesByOrigin(const Vector<OriginAndDatabases>& originAndDatabases, uint64_t callbackID);
diff --git a/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp b/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp
index bd9ca28..d3e8584 100644
--- a/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp
@@ -55,7 +55,7 @@
if (!m_page || !m_page->isValid())
return;
- m_page->process().send(Messages::WebPage::UnapplyEditCommand(m_commandID), m_page->pageID(), CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply);
+ m_page->process().send(Messages::WebPage::UnapplyEditCommand(m_commandID), m_page->pageID(), IPC::DispatchMessageEvenWhenWaitingForSyncReply);
m_page->registerEditCommand(this, WebPageProxy::Redo);
}
@@ -64,7 +64,7 @@
if (!m_page || !m_page->isValid())
return;
- m_page->process().send(Messages::WebPage::ReapplyEditCommand(m_commandID), m_page->pageID(), CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply);
+ m_page->process().send(Messages::WebPage::ReapplyEditCommand(m_commandID), m_page->pageID(), IPC::DispatchMessageEvenWhenWaitingForSyncReply);
m_page->registerEditCommand(this, WebPageProxy::Undo);
}
diff --git a/Source/WebKit2/UIProcess/WebFrameProxy.h b/Source/WebKit2/UIProcess/WebFrameProxy.h
index 7c7a43d..d82decb 100644
--- a/Source/WebKit2/UIProcess/WebFrameProxy.h
+++ b/Source/WebKit2/UIProcess/WebFrameProxy.h
@@ -35,7 +35,7 @@
#include <wtf/PassRefPtr.h>
#include <wtf/text/WTFString.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class Connection;
}
diff --git a/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.h b/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.h
index 5f27cf6..9102cab 100644
--- a/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.h
+++ b/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.h
@@ -53,7 +53,7 @@
virtual void beganExitFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame) = 0;
};
-class WebFullScreenManagerProxy : public RefCounted<WebFullScreenManagerProxy>, public CoreIPC::MessageReceiver {
+class WebFullScreenManagerProxy : public RefCounted<WebFullScreenManagerProxy>, public IPC::MessageReceiver {
public:
static PassRefPtr<WebFullScreenManagerProxy> create(WebPageProxy&, WebFullScreenManagerProxyClient&);
virtual ~WebFullScreenManagerProxy();
@@ -81,8 +81,8 @@
void beganEnterFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame);
void beganExitFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame);
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
- virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&) OVERRIDE;
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
+ virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) OVERRIDE;
WebPageProxy* m_page;
WebFullScreenManagerProxyClient* m_client;
diff --git a/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.cpp b/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.cpp
index 1b266a5..a420b90 100644
--- a/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.cpp
@@ -99,7 +99,7 @@
}
#endif
-void WebGeolocationManagerProxy::startUpdating(CoreIPC::Connection* connection)
+void WebGeolocationManagerProxy::startUpdating(IPC::Connection* connection)
{
bool wasUpdating = isUpdating();
m_updateRequesters.add(connection->client());
@@ -109,12 +109,12 @@
}
}
-void WebGeolocationManagerProxy::stopUpdating(CoreIPC::Connection* connection)
+void WebGeolocationManagerProxy::stopUpdating(IPC::Connection* connection)
{
removeRequester(connection->client());
}
-void WebGeolocationManagerProxy::removeRequester(const CoreIPC::Connection::Client* client)
+void WebGeolocationManagerProxy::removeRequester(const IPC::Connection::Client* client)
{
bool wasUpdating = isUpdating();
bool highAccuracyWasEnabled = isHighAccuracyEnabled();
@@ -131,7 +131,7 @@
}
}
-void WebGeolocationManagerProxy::setEnableHighAccuracy(CoreIPC::Connection* connection, bool enabled)
+void WebGeolocationManagerProxy::setEnableHighAccuracy(IPC::Connection* connection, bool enabled)
{
bool highAccuracyWasEnabled = isHighAccuracyEnabled();
diff --git a/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.h b/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.h
index 48b4388..9dcbc44 100644
--- a/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.h
+++ b/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.h
@@ -39,7 +39,7 @@
class WebContext;
class WebGeolocationPosition;
-class WebGeolocationManagerProxy : public API::ObjectImpl<API::Object::Type::GeolocationManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
+class WebGeolocationManagerProxy : public API::ObjectImpl<API::Object::Type::GeolocationManager>, public WebContextSupplement, private IPC::MessageReceiver {
public:
static const char* supplementName();
@@ -65,19 +65,19 @@
virtual void refWebContextSupplement() OVERRIDE;
virtual void derefWebContextSupplement() OVERRIDE;
- // CoreIPC::MessageReceiver
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::MessageReceiver
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
bool isUpdating() const { return !m_updateRequesters.isEmpty(); }
bool isHighAccuracyEnabled() const { return !m_highAccuracyRequesters.isEmpty(); }
- void startUpdating(CoreIPC::Connection*);
- void stopUpdating(CoreIPC::Connection*);
- void removeRequester(const CoreIPC::Connection::Client*);
- void setEnableHighAccuracy(CoreIPC::Connection*, bool);
+ void startUpdating(IPC::Connection*);
+ void stopUpdating(IPC::Connection*);
+ void removeRequester(const IPC::Connection::Client*);
+ void setEnableHighAccuracy(IPC::Connection*, bool);
- HashSet<const CoreIPC::Connection::Client*> m_updateRequesters;
- HashSet<const CoreIPC::Connection::Client*> m_highAccuracyRequesters;
+ HashSet<const IPC::Connection::Client*> m_updateRequesters;
+ HashSet<const IPC::Connection::Client*> m_highAccuracyRequesters;
WebGeolocationProvider m_provider;
};
diff --git a/Source/WebKit2/UIProcess/WebIconDatabase.cpp b/Source/WebKit2/UIProcess/WebIconDatabase.cpp
index a9dc7a4..8ed610a 100644
--- a/Source/WebKit2/UIProcess/WebIconDatabase.cpp
+++ b/Source/WebKit2/UIProcess/WebIconDatabase.cpp
@@ -127,7 +127,7 @@
m_iconDatabaseImpl->setIconURLForPageURL(iconURL, pageURL);
}
-void WebIconDatabase::setIconDataForIconURL(const CoreIPC::DataReference& iconData, const String& iconURL)
+void WebIconDatabase::setIconDataForIconURL(const IPC::DataReference& iconData, const String& iconURL)
{
LOG(IconDatabase, "WK2 UIProcess setting icon data (%i bytes) for page URL %s", (int)iconData.size(), iconURL.ascii().data());
if (!m_iconDatabaseImpl)
@@ -137,9 +137,9 @@
m_iconDatabaseImpl->setIconDataForIconURL(buffer.release(), iconURL);
}
-void WebIconDatabase::synchronousIconDataForPageURL(const String&, CoreIPC::DataReference& iconData)
+void WebIconDatabase::synchronousIconDataForPageURL(const String&, IPC::DataReference& iconData)
{
- iconData = CoreIPC::DataReference();
+ iconData = IPC::DataReference();
}
void WebIconDatabase::synchronousIconURLForPageURL(const String& pageURL, String& iconURL)
diff --git a/Source/WebKit2/UIProcess/WebIconDatabase.h b/Source/WebKit2/UIProcess/WebIconDatabase.h
index a9e3853..61d8365 100644
--- a/Source/WebKit2/UIProcess/WebIconDatabase.h
+++ b/Source/WebKit2/UIProcess/WebIconDatabase.h
@@ -39,7 +39,7 @@
#include <wtf/Vector.h>
#include <wtf/text/StringHash.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class DataReference;
}
@@ -53,7 +53,7 @@
class WebContext;
-class WebIconDatabase : public API::ObjectImpl<API::Object::Type::IconDatabase>, public WebCore::IconDatabaseClient, private CoreIPC::MessageReceiver {
+class WebIconDatabase : public API::ObjectImpl<API::Object::Type::IconDatabase>, public WebCore::IconDatabaseClient, private IPC::MessageReceiver {
public:
static PassRefPtr<WebIconDatabase> create(WebContext*);
virtual ~WebIconDatabase();
@@ -66,9 +66,9 @@
void retainIconForPageURL(const String&);
void releaseIconForPageURL(const String&);
void setIconURLForPageURL(const String&, const String&);
- void setIconDataForIconURL(const CoreIPC::DataReference&, const String&);
+ void setIconDataForIconURL(const IPC::DataReference&, const String&);
- void synchronousIconDataForPageURL(const String&, CoreIPC::DataReference&);
+ void synchronousIconDataForPageURL(const String&, IPC::DataReference&);
void synchronousIconURLForPageURL(const String&, String&);
void synchronousIconDataKnownForIconURL(const String&, bool&) const;
void synchronousLoadDecisionForIconURL(const String&, int&) const;
@@ -99,9 +99,9 @@
virtual void didRemoveAllIcons();
virtual void didFinishURLImport();
- // CoreIPC::MessageReceiver
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
- virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&) OVERRIDE;
+ // IPC::MessageReceiver
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
+ virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) OVERRIDE;
void notifyIconDataReadyForPageURL(const String&);
diff --git a/Source/WebKit2/UIProcess/WebIconDatabase.messages.in b/Source/WebKit2/UIProcess/WebIconDatabase.messages.in
index 38b33dc..37052b5 100644
--- a/Source/WebKit2/UIProcess/WebIconDatabase.messages.in
+++ b/Source/WebKit2/UIProcess/WebIconDatabase.messages.in
@@ -24,9 +24,9 @@
RetainIconForPageURL(String pageURL)
ReleaseIconForPageURL(String pageURL)
SetIconURLForPageURL(String iconURL, String pageURL)
- SetIconDataForIconURL(CoreIPC::DataReference iconData, String iconURL)
+ SetIconDataForIconURL(IPC::DataReference iconData, String iconURL)
- SynchronousIconDataForPageURL(String pageURL) -> (CoreIPC::DataReference iconData)
+ SynchronousIconDataForPageURL(String pageURL) -> (IPC::DataReference iconData)
SynchronousIconURLForPageURL(String pageURL) -> (String iconURL)
SynchronousIconDataKnownForIconURL(String iconURL) -> (bool dataKnown)
SynchronousLoadDecisionForIconURL(String iconURL) -> (int loadDecision)
diff --git a/Source/WebKit2/UIProcess/WebInspectorProxy.h b/Source/WebKit2/UIProcess/WebInspectorProxy.h
index 60df044..6552be43 100644
--- a/Source/WebKit2/UIProcess/WebInspectorProxy.h
+++ b/Source/WebKit2/UIProcess/WebInspectorProxy.h
@@ -69,7 +69,7 @@
AttachmentSideRight
};
-class WebInspectorProxy : public API::ObjectImpl<API::Object::Type::Inspector>, public CoreIPC::MessageReceiver {
+class WebInspectorProxy : public API::ObjectImpl<API::Object::Type::Inspector>, public IPC::MessageReceiver {
public:
static PassRefPtr<WebInspectorProxy> create(WebPageProxy* page)
{
@@ -149,9 +149,9 @@
private:
explicit WebInspectorProxy(WebPageProxy*);
- // CoreIPC::MessageReceiver
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
- virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&) OVERRIDE;
+ // IPC::MessageReceiver
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
+ virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) OVERRIDE;
WebPageProxy* platformCreateInspectorPage();
void platformOpen();
diff --git a/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h b/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h
index 16ddd4f..f1cf65e 100644
--- a/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h
+++ b/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h
@@ -41,7 +41,7 @@
typedef GenericCallback<WKArrayRef> ArrayCallback;
-class WebMediaCacheManagerProxy : public API::ObjectImpl<API::Object::Type::MediaCacheManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
+class WebMediaCacheManagerProxy : public API::ObjectImpl<API::Object::Type::MediaCacheManager>, public WebContextSupplement, private IPC::MessageReceiver {
public:
static const char* supplementName();
@@ -67,8 +67,8 @@
virtual void refWebContextSupplement() OVERRIDE;
virtual void derefWebContextSupplement() OVERRIDE;
- // CoreIPC::MessageReceiver
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::MessageReceiver
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
HashMap<uint64_t, RefPtr<ArrayCallback>> m_arrayCallbacks;
};
diff --git a/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h b/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h
index d0e2029..d85e352 100644
--- a/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h
+++ b/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h
@@ -36,7 +36,7 @@
#include <wtf/RefPtr.h>
#include <wtf/Vector.h>
-namespace CoreIPC {
+namespace IPC {
class Connection;
}
@@ -47,7 +47,7 @@
typedef GenericCallback<WKArrayRef> ArrayCallback;
-class WebOriginDataManagerProxy : public API::ObjectImpl<API::Object::Type::OriginDataManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
+class WebOriginDataManagerProxy : public API::ObjectImpl<API::Object::Type::OriginDataManager>, public WebContextSupplement, private IPC::MessageReceiver {
public:
static const char* supplementName();
@@ -78,8 +78,8 @@
virtual void refWebContextSupplement() OVERRIDE;
virtual void derefWebContextSupplement() OVERRIDE;
- // CoreIPC::MessageReceiver
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::MessageReceiver
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
HashMap<uint64_t, RefPtr<ArrayCallback>> m_arrayCallbacks;
diff --git a/Source/WebKit2/UIProcess/WebPageProxy.cpp b/Source/WebKit2/UIProcess/WebPageProxy.cpp
index 3ee858b..b074510 100644
--- a/Source/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebPageProxy.cpp
@@ -815,7 +815,7 @@
shouldGoToBackForwardItem = item && m_loaderClient.shouldGoToBackForwardListItem(this, item);
}
-void WebPageProxy::willGoToBackForwardListItem(uint64_t itemID, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::willGoToBackForwardListItem(uint64_t itemID, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2009,7 +2009,7 @@
// even if nothing changed in UI process, so that overrides get removed.
// Preferences need to be updated during synchronous printing to make "print backgrounds" preference work when toggled from a print dialog checkbox.
- m_process->send(Messages::WebPage::PreferencesDidChange(pageGroup().preferences()->store()), m_pageID, m_isPerformingDOMPrintOperation ? CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply : 0);
+ m_process->send(Messages::WebPage::PreferencesDidChange(pageGroup().preferences()->store()), m_pageID, m_isPerformingDOMPrintOperation ? IPC::DispatchMessageEvenWhenWaitingForSyncReply : 0);
}
void WebPageProxy::didCreateMainFrame(uint64_t frameID)
@@ -2066,7 +2066,7 @@
m_loaderClient.didFinishProgress(this);
}
-void WebPageProxy::didStartProvisionalLoadForFrame(uint64_t frameID, const String& url, const String& unreachableURL, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::didStartProvisionalLoadForFrame(uint64_t frameID, const String& url, const String& unreachableURL, IPC::MessageDecoder& decoder)
{
auto transaction = m_pageLoadState.transaction();
@@ -2091,7 +2091,7 @@
m_loaderClient.didStartProvisionalLoadForFrame(this, frame, userData.get());
}
-void WebPageProxy::didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, const String& url, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, const String& url, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2113,7 +2113,7 @@
m_loaderClient.didReceiveServerRedirectForProvisionalLoadForFrame(this, frame, userData.get());
}
-void WebPageProxy::didFailProvisionalLoadForFrame(uint64_t frameID, const ResourceError& error, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::didFailProvisionalLoadForFrame(uint64_t frameID, const ResourceError& error, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2147,7 +2147,7 @@
}
}
-void WebPageProxy::didCommitLoadForFrame(uint64_t frameID, const String& mimeType, uint32_t opaqueFrameLoadType, const WebCore::CertificateInfo& certificateInfo, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::didCommitLoadForFrame(uint64_t frameID, const String& mimeType, uint32_t opaqueFrameLoadType, const WebCore::CertificateInfo& certificateInfo, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2187,7 +2187,7 @@
m_loaderClient.didCommitLoadForFrame(this, frame, userData.get());
}
-void WebPageProxy::didFinishDocumentLoadForFrame(uint64_t frameID, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::didFinishDocumentLoadForFrame(uint64_t frameID, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2200,7 +2200,7 @@
m_loaderClient.didFinishDocumentLoadForFrame(this, frame, userData.get());
}
-void WebPageProxy::didFinishLoadForFrame(uint64_t frameID, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::didFinishLoadForFrame(uint64_t frameID, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2221,7 +2221,7 @@
m_loaderClient.didFinishLoadForFrame(this, frame, userData.get());
}
-void WebPageProxy::didFailLoadForFrame(uint64_t frameID, const ResourceError& error, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::didFailLoadForFrame(uint64_t frameID, const ResourceError& error, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2244,7 +2244,7 @@
m_loaderClient.didFailLoadWithErrorForFrame(this, frame, error, userData.get());
}
-void WebPageProxy::didSameDocumentNavigationForFrame(uint64_t frameID, uint32_t opaqueSameDocumentNavigationType, const String& url, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::didSameDocumentNavigationForFrame(uint64_t frameID, uint32_t opaqueSameDocumentNavigationType, const String& url, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2267,7 +2267,7 @@
m_loaderClient.didSameDocumentNavigationForFrame(this, frame, static_cast<SameDocumentNavigationType>(opaqueSameDocumentNavigationType), userData.get());
}
-void WebPageProxy::didReceiveTitleForFrame(uint64_t frameID, const String& title, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::didReceiveTitleForFrame(uint64_t frameID, const String& title, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2288,7 +2288,7 @@
m_loaderClient.didReceiveTitleForFrame(this, title, frame, userData.get());
}
-void WebPageProxy::didFirstLayoutForFrame(uint64_t frameID, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::didFirstLayoutForFrame(uint64_t frameID, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2301,7 +2301,7 @@
m_loaderClient.didFirstLayoutForFrame(this, frame, userData.get());
}
-void WebPageProxy::didFirstVisuallyNonEmptyLayoutForFrame(uint64_t frameID, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::didFirstVisuallyNonEmptyLayoutForFrame(uint64_t frameID, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2314,7 +2314,7 @@
m_loaderClient.didFirstVisuallyNonEmptyLayoutForFrame(this, frame, userData.get());
}
-void WebPageProxy::didLayout(uint32_t layoutMilestones, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::didLayout(uint32_t layoutMilestones, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2324,7 +2324,7 @@
m_loaderClient.didLayout(this, static_cast<LayoutMilestones>(layoutMilestones), userData.get());
}
-void WebPageProxy::didRemoveFrameFromHierarchy(uint64_t frameID, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::didRemoveFrameFromHierarchy(uint64_t frameID, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2337,7 +2337,7 @@
m_loaderClient.didRemoveFrameFromHierarchy(this, frame, userData.get());
}
-void WebPageProxy::didDisplayInsecureContentForFrame(uint64_t frameID, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::didDisplayInsecureContentForFrame(uint64_t frameID, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2354,7 +2354,7 @@
m_loaderClient.didDisplayInsecureContentForFrame(this, frame, userData.get());
}
-void WebPageProxy::didRunInsecureContentForFrame(uint64_t frameID, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::didRunInsecureContentForFrame(uint64_t frameID, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2371,7 +2371,7 @@
m_loaderClient.didRunInsecureContentForFrame(this, frame, userData.get());
}
-void WebPageProxy::didDetectXSSForFrame(uint64_t frameID, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::didDetectXSSForFrame(uint64_t frameID, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2395,7 +2395,7 @@
}
// PolicyClient
-void WebPageProxy::decidePolicyForNavigationAction(uint64_t frameID, uint32_t opaqueNavigationType, uint32_t opaqueModifiers, int32_t opaqueMouseButton, uint64_t originatingFrameID, const WebCore::ResourceRequest& originalRequest, const ResourceRequest& request, uint64_t listenerID, CoreIPC::MessageDecoder& decoder, bool& receivedPolicyAction, uint64_t& policyAction, uint64_t& downloadID)
+void WebPageProxy::decidePolicyForNavigationAction(uint64_t frameID, uint32_t opaqueNavigationType, uint32_t opaqueModifiers, int32_t opaqueMouseButton, uint64_t originatingFrameID, const WebCore::ResourceRequest& originalRequest, const ResourceRequest& request, uint64_t listenerID, IPC::MessageDecoder& decoder, bool& receivedPolicyAction, uint64_t& policyAction, uint64_t& downloadID)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2437,7 +2437,7 @@
}
}
-void WebPageProxy::decidePolicyForNewWindowAction(uint64_t frameID, uint32_t opaqueNavigationType, uint32_t opaqueModifiers, int32_t opaqueMouseButton, const ResourceRequest& request, const String& frameName, uint64_t listenerID, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::decidePolicyForNewWindowAction(uint64_t frameID, uint32_t opaqueNavigationType, uint32_t opaqueModifiers, int32_t opaqueMouseButton, const ResourceRequest& request, const String& frameName, uint64_t listenerID, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2457,7 +2457,7 @@
listener->use();
}
-void WebPageProxy::decidePolicyForResponse(uint64_t frameID, const ResourceResponse& response, const ResourceRequest& request, bool canShowMIMEType, uint64_t listenerID, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::decidePolicyForResponse(uint64_t frameID, const ResourceResponse& response, const ResourceRequest& request, bool canShowMIMEType, uint64_t listenerID, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2475,7 +2475,7 @@
listener->use();
}
-void WebPageProxy::decidePolicyForResponseSync(uint64_t frameID, const ResourceResponse& response, const ResourceRequest& request, bool canShowMIMEType, uint64_t listenerID, CoreIPC::MessageDecoder& decoder, bool& receivedPolicyAction, uint64_t& policyAction, uint64_t& downloadID)
+void WebPageProxy::decidePolicyForResponseSync(uint64_t frameID, const ResourceResponse& response, const ResourceRequest& request, bool canShowMIMEType, uint64_t listenerID, IPC::MessageDecoder& decoder, bool& receivedPolicyAction, uint64_t& policyAction, uint64_t& downloadID)
{
ASSERT(!m_inDecidePolicyForResponseSync);
@@ -2496,7 +2496,7 @@
}
}
-void WebPageProxy::unableToImplementPolicy(uint64_t frameID, const ResourceError& error, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::unableToImplementPolicy(uint64_t frameID, const ResourceError& error, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2511,7 +2511,7 @@
// FormClient
-void WebPageProxy::willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const Vector<std::pair<String, String>>& textFieldValues, uint64_t listenerID, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const Vector<std::pair<String, String>>& textFieldValues, uint64_t listenerID, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2604,7 +2604,7 @@
m_uiClient.setStatusText(this, text);
}
-void WebPageProxy::mouseDidMoveOverElement(const WebHitTestResult::Data& hitTestResultData, uint32_t opaqueModifiers, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::mouseDidMoveOverElement(const WebHitTestResult::Data& hitTestResultData, uint32_t opaqueModifiers, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -2616,14 +2616,14 @@
m_uiClient.mouseDidMoveOverElement(this, hitTestResultData, modifiers, userData.get());
}
-void WebPageProxy::connectionWillOpen(CoreIPC::Connection* connection)
+void WebPageProxy::connectionWillOpen(IPC::Connection* connection)
{
ASSERT(connection == m_process->connection());
m_process->context().storageManager().setAllowedSessionStorageNamespaceConnection(m_pageID, connection);
}
-void WebPageProxy::connectionWillClose(CoreIPC::Connection* connection)
+void WebPageProxy::connectionWillClose(IPC::Connection* connection)
{
ASSERT_UNUSED(connection, connection == m_process->connection());
@@ -3063,12 +3063,12 @@
m_findClient.didFailToFindString(this, string);
}
-bool WebPageProxy::sendMessage(std::unique_ptr<CoreIPC::MessageEncoder> encoder, unsigned messageSendFlags)
+bool WebPageProxy::sendMessage(std::unique_ptr<IPC::MessageEncoder> encoder, unsigned messageSendFlags)
{
return m_process->sendMessage(std::move(encoder), messageSendFlags);
}
-CoreIPC::Connection* WebPageProxy::messageSenderConnection()
+IPC::Connection* WebPageProxy::messageSenderConnection()
{
return m_process->connection();
}
@@ -3155,7 +3155,7 @@
}
#if ENABLE(CONTEXT_MENUS)
-void WebPageProxy::showContextMenu(const IntPoint& menuLocation, const WebHitTestResult::Data& hitTestResultData, const Vector<WebContextMenuItemData>& proposedItems, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::showContextMenu(const IntPoint& menuLocation, const WebHitTestResult::Data& hitTestResultData, const Vector<WebContextMenuItemData>& proposedItems, IPC::MessageDecoder& decoder)
{
internalShowContextMenu(menuLocation, hitTestResultData, proposedItems, decoder);
@@ -3163,7 +3163,7 @@
m_process->send(Messages::WebPage::ContextMenuHidden(), m_pageID);
}
-void WebPageProxy::internalShowContextMenu(const IntPoint& menuLocation, const WebHitTestResult::Data& hitTestResultData, const Vector<WebContextMenuItemData>& proposedItems, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::internalShowContextMenu(const IntPoint& menuLocation, const WebHitTestResult::Data& hitTestResultData, const Vector<WebContextMenuItemData>& proposedItems, IPC::MessageDecoder& decoder)
{
RefPtr<API::Object> userData;
WebContextUserMessageDecoder messageDecoder(userData, process());
@@ -3568,7 +3568,7 @@
callback->performCallback();
}
-void WebPageProxy::dataCallback(const CoreIPC::DataReference& dataReference, uint64_t callbackID)
+void WebPageProxy::dataCallback(const IPC::DataReference& dataReference, uint64_t callbackID)
{
RefPtr<DataCallback> callback = m_dataCallbacks.take(callbackID);
if (!callback) {
@@ -3604,7 +3604,7 @@
callback->performCallbackWithReturnValue(resultString.impl());
}
-void WebPageProxy::scriptValueCallback(const CoreIPC::DataReference& dataReference, uint64_t callbackID)
+void WebPageProxy::scriptValueCallback(const IPC::DataReference& dataReference, uint64_t callbackID)
{
RefPtr<ScriptValueCallback> callback = m_scriptValueCallbacks.take(callbackID);
if (!callback) {
@@ -4144,7 +4144,7 @@
return;
m_isInPrintingMode = true;
- m_process->send(Messages::WebPage::BeginPrinting(frame->frameID(), printInfo), m_pageID, m_isPerformingDOMPrintOperation ? CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply : 0);
+ m_process->send(Messages::WebPage::BeginPrinting(frame->frameID(), printInfo), m_pageID, m_isPerformingDOMPrintOperation ? IPC::DispatchMessageEvenWhenWaitingForSyncReply : 0);
}
void WebPageProxy::endPrinting()
@@ -4153,7 +4153,7 @@
return;
m_isInPrintingMode = false;
- m_process->send(Messages::WebPage::EndPrinting(), m_pageID, m_isPerformingDOMPrintOperation ? CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply : 0);
+ m_process->send(Messages::WebPage::EndPrinting(), m_pageID, m_isPerformingDOMPrintOperation ? IPC::DispatchMessageEvenWhenWaitingForSyncReply : 0);
}
void WebPageProxy::computePagesForPrinting(WebFrameProxy* frame, const PrintInfo& printInfo, PassRefPtr<ComputedPagesCallback> prpCallback)
@@ -4167,7 +4167,7 @@
uint64_t callbackID = callback->callbackID();
m_computedPagesCallbacks.set(callbackID, callback.get());
m_isInPrintingMode = true;
- m_process->send(Messages::WebPage::ComputePagesForPrinting(frame->frameID(), printInfo, callbackID), m_pageID, m_isPerformingDOMPrintOperation ? CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply : 0);
+ m_process->send(Messages::WebPage::ComputePagesForPrinting(frame->frameID(), printInfo, callbackID), m_pageID, m_isPerformingDOMPrintOperation ? IPC::DispatchMessageEvenWhenWaitingForSyncReply : 0);
}
#if PLATFORM(MAC)
@@ -4181,7 +4181,7 @@
uint64_t callbackID = callback->callbackID();
m_imageCallbacks.set(callbackID, callback.get());
- m_process->send(Messages::WebPage::DrawRectToImage(frame->frameID(), printInfo, rect, imageSize, callbackID), m_pageID, m_isPerformingDOMPrintOperation ? CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply : 0);
+ m_process->send(Messages::WebPage::DrawRectToImage(frame->frameID(), printInfo, rect, imageSize, callbackID), m_pageID, m_isPerformingDOMPrintOperation ? IPC::DispatchMessageEvenWhenWaitingForSyncReply : 0);
}
void WebPageProxy::drawPagesToPDF(WebFrameProxy* frame, const PrintInfo& printInfo, uint32_t first, uint32_t count, PassRefPtr<DataCallback> prpCallback)
@@ -4194,7 +4194,7 @@
uint64_t callbackID = callback->callbackID();
m_dataCallbacks.set(callbackID, callback.get());
- m_process->send(Messages::WebPage::DrawPagesToPDF(frame->frameID(), printInfo, first, count, callbackID), m_pageID, m_isPerformingDOMPrintOperation ? CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply : 0);
+ m_process->send(Messages::WebPage::DrawPagesToPDF(frame->frameID(), printInfo, first, count, callbackID), m_pageID, m_isPerformingDOMPrintOperation ? IPC::DispatchMessageEvenWhenWaitingForSyncReply : 0);
}
#elif PLATFORM(GTK)
void WebPageProxy::drawPagesForPrinting(WebFrameProxy* frame, const PrintInfo& printInfo, PassRefPtr<PrintFinishedCallback> didPrintCallback)
@@ -4208,7 +4208,7 @@
uint64_t callbackID = callback->callbackID();
m_printFinishedCallbacks.set(callbackID, callback.get());
m_isInPrintingMode = true;
- m_process->send(Messages::WebPage::DrawPagesForPrinting(frame->frameID(), printInfo, callbackID), m_pageID, m_isPerformingDOMPrintOperation ? CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply : 0);
+ m_process->send(Messages::WebPage::DrawPagesForPrinting(frame->frameID(), printInfo, callbackID), m_pageID, m_isPerformingDOMPrintOperation ? IPC::DispatchMessageEvenWhenWaitingForSyncReply : 0);
}
#endif
@@ -4231,7 +4231,7 @@
m_uiClient.saveDataToFileInDownloadsFolder(this, suggestedFilename, mimeType, originatingURLString, data);
}
-void WebPageProxy::savePDFToFileInDownloadsFolder(const String& suggestedFilename, const String& originatingURLString, const CoreIPC::DataReference& dataReference)
+void WebPageProxy::savePDFToFileInDownloadsFolder(const String& suggestedFilename, const String& originatingURLString, const IPC::DataReference& dataReference)
{
if (!suggestedFilename.endsWith(".pdf", false))
return;
diff --git a/Source/WebKit2/UIProcess/WebPageProxy.h b/Source/WebKit2/UIProcess/WebPageProxy.h
index a7acf8c..f4c07d0 100644
--- a/Source/WebKit2/UIProcess/WebPageProxy.h
+++ b/Source/WebKit2/UIProcess/WebPageProxy.h
@@ -99,7 +99,7 @@
class URLRequest;
}
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class Connection;
}
@@ -320,8 +320,8 @@
, public WebColorPicker::Client
#endif
, public WebPopupMenuProxy::Client
- , public CoreIPC::MessageReceiver
- , public CoreIPC::MessageSender {
+ , public IPC::MessageReceiver
+ , public IPC::MessageSender {
public:
static PassRefPtr<WebPageProxy> create(PageClient&, WebProcessProxy&, WebPageGroup&, uint64_t pageID);
@@ -389,7 +389,7 @@
void tryRestoreScrollPosition();
void didChangeBackForwardList(WebBackForwardListItem* addedItem, Vector<RefPtr<API::Object>>* removedItems);
void shouldGoToBackForwardListItem(uint64_t itemID, bool& shouldGoToBackForwardListItem);
- void willGoToBackForwardListItem(uint64_t itemID, CoreIPC::MessageDecoder&);
+ void willGoToBackForwardListItem(uint64_t itemID, IPC::MessageDecoder&);
bool willHandleHorizontalScrollEvents() const;
@@ -599,9 +599,9 @@
#if PLATFORM(MAC)
// Called by the web process through a message.
- void registerWebProcessAccessibilityToken(const CoreIPC::DataReference&);
+ void registerWebProcessAccessibilityToken(const IPC::DataReference&);
// Called by the UI process when it is ready to send its tokens to the web process.
- void registerUIProcessAccessibilityTokens(const CoreIPC::DataReference& elemenToken, const CoreIPC::DataReference& windowToken);
+ void registerUIProcessAccessibilityTokens(const IPC::DataReference& elemenToken, const IPC::DataReference& windowToken);
bool readSelectionFromPasteboard(const String& pasteboardName);
String stringSelectionForPasteboard();
PassRefPtr<WebCore::SharedBuffer> dataSelectionForPasteboard(const String& pasteboardType);
@@ -778,10 +778,10 @@
#endif
void saveDataToFileInDownloadsFolder(const String& suggestedFilename, const String& mimeType, const String& originatingURLString, API::Data*);
- void savePDFToFileInDownloadsFolder(const String& suggestedFilename, const String& originatingURLString, const CoreIPC::DataReference&);
+ void savePDFToFileInDownloadsFolder(const String& suggestedFilename, const String& originatingURLString, const IPC::DataReference&);
#if PLATFORM(MAC)
void savePDFToTemporaryFolderAndOpenWithNativeApplicationRaw(const String& suggestedFilename, const String& originatingURLString, const uint8_t* data, unsigned long size, const String& pdfUUID);
- void savePDFToTemporaryFolderAndOpenWithNativeApplication(const String& suggestedFilename, const String& originatingURLString, const CoreIPC::DataReference&, const String& pdfUUID);
+ void savePDFToTemporaryFolderAndOpenWithNativeApplication(const String& suggestedFilename, const String& originatingURLString, const IPC::DataReference&, const String& pdfUUID);
void openPDFFromTemporaryFolderWithNativeApplication(const String& pdfUUID);
#endif
@@ -841,8 +841,8 @@
void didFinishCheckingText(uint64_t requestID, const Vector<WebCore::TextCheckingResult>&);
void didCancelCheckingText(uint64_t requestID);
- void connectionWillOpen(CoreIPC::Connection*);
- void connectionWillClose(CoreIPC::Connection*);
+ void connectionWillOpen(IPC::Connection*);
+ void connectionWillClose(IPC::Connection*);
void didSaveToPageCache();
@@ -859,13 +859,13 @@
void resetState();
void resetStateAfterProcessExited();
- // CoreIPC::MessageReceiver
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
- virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&) OVERRIDE;
+ // IPC::MessageReceiver
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
+ virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) OVERRIDE;
- // CoreIPC::MessageSender
- virtual bool sendMessage(std::unique_ptr<CoreIPC::MessageEncoder>, unsigned messageSendFlags) OVERRIDE;
- virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
+ // IPC::MessageSender
+ virtual bool sendMessage(std::unique_ptr<IPC::MessageEncoder>, unsigned messageSendFlags) OVERRIDE;
+ virtual IPC::Connection* messageSenderConnection() OVERRIDE;
virtual uint64_t messageSenderDestinationID() OVERRIDE;
// WebPopupMenuProxy::Client
@@ -876,40 +876,40 @@
#endif
// Implemented in generated WebPageProxyMessageReceiver.cpp
- void didReceiveWebPageProxyMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
- void didReceiveSyncWebPageProxyMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&);
+ void didReceiveWebPageProxyMessage(IPC::Connection*, IPC::MessageDecoder&);
+ void didReceiveSyncWebPageProxyMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
void didCreateMainFrame(uint64_t frameID);
void didCreateSubframe(uint64_t frameID);
- void didStartProvisionalLoadForFrame(uint64_t frameID, const String& url, const String& unreachableURL, CoreIPC::MessageDecoder&);
- void didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, const String&, CoreIPC::MessageDecoder&);
- void didFailProvisionalLoadForFrame(uint64_t frameID, const WebCore::ResourceError&, CoreIPC::MessageDecoder&);
- void didCommitLoadForFrame(uint64_t frameID, const String& mimeType, uint32_t frameLoadType, const WebCore::CertificateInfo&, CoreIPC::MessageDecoder&);
- void didFinishDocumentLoadForFrame(uint64_t frameID, CoreIPC::MessageDecoder&);
- void didFinishLoadForFrame(uint64_t frameID, CoreIPC::MessageDecoder&);
- void didFailLoadForFrame(uint64_t frameID, const WebCore::ResourceError&, CoreIPC::MessageDecoder&);
- void didSameDocumentNavigationForFrame(uint64_t frameID, uint32_t sameDocumentNavigationType, const String&, CoreIPC::MessageDecoder&);
- void didReceiveTitleForFrame(uint64_t frameID, const String&, CoreIPC::MessageDecoder&);
- void didFirstLayoutForFrame(uint64_t frameID, CoreIPC::MessageDecoder&);
- void didFirstVisuallyNonEmptyLayoutForFrame(uint64_t frameID, CoreIPC::MessageDecoder&);
- void didLayout(uint32_t layoutMilestones, CoreIPC::MessageDecoder&);
- void didRemoveFrameFromHierarchy(uint64_t frameID, CoreIPC::MessageDecoder&);
- void didDisplayInsecureContentForFrame(uint64_t frameID, CoreIPC::MessageDecoder&);
- void didRunInsecureContentForFrame(uint64_t frameID, CoreIPC::MessageDecoder&);
- void didDetectXSSForFrame(uint64_t frameID, CoreIPC::MessageDecoder&);
+ void didStartProvisionalLoadForFrame(uint64_t frameID, const String& url, const String& unreachableURL, IPC::MessageDecoder&);
+ void didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, const String&, IPC::MessageDecoder&);
+ void didFailProvisionalLoadForFrame(uint64_t frameID, const WebCore::ResourceError&, IPC::MessageDecoder&);
+ void didCommitLoadForFrame(uint64_t frameID, const String& mimeType, uint32_t frameLoadType, const WebCore::CertificateInfo&, IPC::MessageDecoder&);
+ void didFinishDocumentLoadForFrame(uint64_t frameID, IPC::MessageDecoder&);
+ void didFinishLoadForFrame(uint64_t frameID, IPC::MessageDecoder&);
+ void didFailLoadForFrame(uint64_t frameID, const WebCore::ResourceError&, IPC::MessageDecoder&);
+ void didSameDocumentNavigationForFrame(uint64_t frameID, uint32_t sameDocumentNavigationType, const String&, IPC::MessageDecoder&);
+ void didReceiveTitleForFrame(uint64_t frameID, const String&, IPC::MessageDecoder&);
+ void didFirstLayoutForFrame(uint64_t frameID, IPC::MessageDecoder&);
+ void didFirstVisuallyNonEmptyLayoutForFrame(uint64_t frameID, IPC::MessageDecoder&);
+ void didLayout(uint32_t layoutMilestones, IPC::MessageDecoder&);
+ void didRemoveFrameFromHierarchy(uint64_t frameID, IPC::MessageDecoder&);
+ void didDisplayInsecureContentForFrame(uint64_t frameID, IPC::MessageDecoder&);
+ void didRunInsecureContentForFrame(uint64_t frameID, IPC::MessageDecoder&);
+ void didDetectXSSForFrame(uint64_t frameID, IPC::MessageDecoder&);
void frameDidBecomeFrameSet(uint64_t frameID, bool);
void didStartProgress();
void didChangeProgress(double);
void didFinishProgress();
- void decidePolicyForNavigationAction(uint64_t frameID, uint32_t navigationType, uint32_t modifiers, int32_t mouseButton, uint64_t originatingFrameID, const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceRequest& request, uint64_t listenerID, CoreIPC::MessageDecoder&, bool& receivedPolicyAction, uint64_t& policyAction, uint64_t& downloadID);
- void decidePolicyForNewWindowAction(uint64_t frameID, uint32_t navigationType, uint32_t modifiers, int32_t mouseButton, const WebCore::ResourceRequest&, const String& frameName, uint64_t listenerID, CoreIPC::MessageDecoder&);
- void decidePolicyForResponse(uint64_t frameID, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, uint64_t listenerID, CoreIPC::MessageDecoder&);
- void decidePolicyForResponseSync(uint64_t frameID, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, uint64_t listenerID, CoreIPC::MessageDecoder&, bool& receivedPolicyAction, uint64_t& policyAction, uint64_t& downloadID);
- void unableToImplementPolicy(uint64_t frameID, const WebCore::ResourceError&, CoreIPC::MessageDecoder&);
+ void decidePolicyForNavigationAction(uint64_t frameID, uint32_t navigationType, uint32_t modifiers, int32_t mouseButton, uint64_t originatingFrameID, const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceRequest& request, uint64_t listenerID, IPC::MessageDecoder&, bool& receivedPolicyAction, uint64_t& policyAction, uint64_t& downloadID);
+ void decidePolicyForNewWindowAction(uint64_t frameID, uint32_t navigationType, uint32_t modifiers, int32_t mouseButton, const WebCore::ResourceRequest&, const String& frameName, uint64_t listenerID, IPC::MessageDecoder&);
+ void decidePolicyForResponse(uint64_t frameID, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, uint64_t listenerID, IPC::MessageDecoder&);
+ void decidePolicyForResponseSync(uint64_t frameID, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, uint64_t listenerID, IPC::MessageDecoder&, bool& receivedPolicyAction, uint64_t& policyAction, uint64_t& downloadID);
+ void unableToImplementPolicy(uint64_t frameID, const WebCore::ResourceError&, IPC::MessageDecoder&);
- void willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const Vector<std::pair<String, String>>& textFieldValues, uint64_t listenerID, CoreIPC::MessageDecoder&);
+ void willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const Vector<std::pair<String, String>>& textFieldValues, uint64_t listenerID, IPC::MessageDecoder&);
// UI client
void createNewPage(const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, uint32_t modifiers, int32_t mouseButton, uint64_t& newPageID, WebPageCreationParameters&);
@@ -920,7 +920,7 @@
void runJavaScriptPrompt(uint64_t frameID, const String&, const String&, String& result);
void shouldInterruptJavaScript(bool& result);
void setStatusText(const String&);
- void mouseDidMoveOverElement(const WebHitTestResult::Data& hitTestResultData, uint32_t modifiers, CoreIPC::MessageDecoder&);
+ void mouseDidMoveOverElement(const WebHitTestResult::Data& hitTestResultData, uint32_t modifiers, IPC::MessageDecoder&);
#if ENABLE(NETSCAPE_PLUGIN_API)
void unavailablePluginButtonClicked(uint32_t opaquePluginUnavailabilityReason, const String& mimeType, const String& pluginURLString, const String& pluginsPageURLString, const String& frameURLString, const String& pageURLString);
#endif // ENABLE(NETSCAPE_PLUGIN_API)
@@ -1021,8 +1021,8 @@
#if ENABLE(CONTEXT_MENUS)
// Context Menu.
- void showContextMenu(const WebCore::IntPoint& menuLocation, const WebHitTestResult::Data&, const Vector<WebContextMenuItemData>&, CoreIPC::MessageDecoder&);
- void internalShowContextMenu(const WebCore::IntPoint& menuLocation, const WebHitTestResult::Data&, const Vector<WebContextMenuItemData>&, CoreIPC::MessageDecoder&);
+ void showContextMenu(const WebCore::IntPoint& menuLocation, const WebHitTestResult::Data&, const Vector<WebContextMenuItemData>&, IPC::MessageDecoder&);
+ void internalShowContextMenu(const WebCore::IntPoint& menuLocation, const WebHitTestResult::Data&, const Vector<WebContextMenuItemData>&, IPC::MessageDecoder&);
#endif
// Search popup results
@@ -1068,10 +1068,10 @@
void stopResponsivenessTimer();
void voidCallback(uint64_t);
- void dataCallback(const CoreIPC::DataReference&, uint64_t);
+ void dataCallback(const IPC::DataReference&, uint64_t);
void imageCallback(const ShareableBitmap::Handle&, uint64_t);
void stringCallback(const String&, uint64_t);
- void scriptValueCallback(const CoreIPC::DataReference&, uint64_t);
+ void scriptValueCallback(const IPC::DataReference&, uint64_t);
void computedPagesCallback(const Vector<WebCore::IntRect>&, double totalScaleFactorForPrinting, uint64_t);
void validateCommandCallback(const String&, bool, int, uint64_t);
#if PLATFORM(IOS)
diff --git a/Source/WebKit2/UIProcess/WebPageProxy.messages.in b/Source/WebKit2/UIProcess/WebPageProxy.messages.in
index a6219a1..670cdb3 100644
--- a/Source/WebKit2/UIProcess/WebPageProxy.messages.in
+++ b/Source/WebKit2/UIProcess/WebPageProxy.messages.in
@@ -141,10 +141,10 @@
# Callback messages
VoidCallback(uint64_t callbackID)
- DataCallback(CoreIPC::DataReference resultData, uint64_t callbackID)
+ DataCallback(IPC::DataReference resultData, uint64_t callbackID)
ImageCallback(WebKit::ShareableBitmap::Handle bitmapHandle, uint64_t callbackID)
StringCallback(String resultString, uint64_t callbackID)
- ScriptValueCallback(CoreIPC::DataReference resultData, uint64_t callbackID)
+ ScriptValueCallback(IPC::DataReference resultData, uint64_t callbackID)
ComputedPagesCallback(Vector<WebCore::IntRect> pageRects, double totalScaleFactorForPrinting, uint64_t callbackID)
ValidateCommandCallback(String command, bool isEnabled, int32_t state, uint64_t callbackID)
#if PLATFORM(IOS)
@@ -258,7 +258,7 @@
ExecuteSavedCommandBySelector(String selector) -> (bool handled)
# Remote accessibility messages
- RegisterWebProcessAccessibilityToken(CoreIPC::DataReference data)
+ RegisterWebProcessAccessibilityToken(IPC::DataReference data)
# Plug-in complex text input support messages
PluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus)
@@ -320,10 +320,10 @@
DidReceiveURIRequest(String uriString, uint64_t requestID);
#endif
- SavePDFToFileInDownloadsFolder(String suggestedFilename, String originatingURLString, CoreIPC::DataReference data)
+ SavePDFToFileInDownloadsFolder(String suggestedFilename, String originatingURLString, IPC::DataReference data)
#if PLATFORM(MAC)
- SavePDFToTemporaryFolderAndOpenWithNativeApplication(String suggestedFilename, String originatingURLString, CoreIPC::DataReference data, String pdfUUID)
+ SavePDFToTemporaryFolderAndOpenWithNativeApplication(String suggestedFilename, String originatingURLString, IPC::DataReference data, String pdfUUID)
OpenPDFFromTemporaryFolderWithNativeApplication(String pdfUUID)
#endif
diff --git a/Source/WebKit2/UIProcess/WebProcessProxy.cpp b/Source/WebKit2/UIProcess/WebProcessProxy.cpp
index 889988b..8f3ee23 100644
--- a/Source/WebKit2/UIProcess/WebProcessProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebProcessProxy.cpp
@@ -110,7 +110,7 @@
platformGetLaunchOptions(launchOptions);
}
-void WebProcessProxy::connectionWillOpen(CoreIPC::Connection* connection)
+void WebProcessProxy::connectionWillOpen(IPC::Connection* connection)
{
ASSERT(this->connection() == connection);
@@ -124,7 +124,7 @@
m_context->processWillOpenConnection(this);
}
-void WebProcessProxy::connectionWillClose(CoreIPC::Connection* connection)
+void WebProcessProxy::connectionWillClose(IPC::Connection* connection)
{
ASSERT(this->connection() == connection);
@@ -287,7 +287,7 @@
}
#endif
-void WebProcessProxy::addBackForwardItem(uint64_t itemID, const String& originalURL, const String& url, const String& title, const CoreIPC::DataReference& backForwardData)
+void WebProcessProxy::addBackForwardItem(uint64_t itemID, const String& originalURL, const String& url, const String& title, const IPC::DataReference& backForwardData)
{
MESSAGE_CHECK_URL(originalURL);
MESSAGE_CHECK_URL(url);
@@ -348,7 +348,7 @@
}
#endif // ENABLE(DATABASE_PROCESS)
-void WebProcessProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
+void WebProcessProxy::didReceiveMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder)
{
if (dispatchMessage(connection, decoder))
return;
@@ -364,7 +364,7 @@
// FIXME: Add unhandled message logging.
}
-void WebProcessProxy::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, std::unique_ptr<CoreIPC::MessageEncoder>& replyEncoder)
+void WebProcessProxy::didReceiveSyncMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)
{
if (dispatchSyncMessage(connection, decoder, replyEncoder))
return;
@@ -380,7 +380,7 @@
// FIXME: Add unhandled message logging.
}
-void WebProcessProxy::didClose(CoreIPC::Connection*)
+void WebProcessProxy::didClose(IPC::Connection*)
{
// Protect ourselves, as the call to disconnect() below may otherwise cause us
// to be deleted before we can finish our work.
@@ -398,7 +398,7 @@
}
-void WebProcessProxy::didReceiveInvalidMessage(CoreIPC::Connection* connection, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName)
+void WebProcessProxy::didReceiveInvalidMessage(IPC::Connection* connection, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
{
WTFLogAlways("Received an invalid message \"%s.%s\" from the web process.\n", messageReceiverName.toString().data(), messageName.toString().data());
@@ -407,7 +407,7 @@
// Terminate the WebProcess.
terminate();
- // Since we've invalidated the connection we'll never get a CoreIPC::Connection::Client::didClose
+ // Since we've invalidated the connection we'll never get a IPC::Connection::Client::didClose
// callback so we'll explicitly call it here instead.
didClose(connection);
}
@@ -436,7 +436,7 @@
pages[i]->processDidBecomeResponsive();
}
-void WebProcessProxy::didFinishLaunching(ProcessLauncher* launcher, CoreIPC::Connection::Identifier connectionIdentifier)
+void WebProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Connection::Identifier connectionIdentifier)
{
ChildProcessProxy::didFinishLaunching(launcher, connectionIdentifier);
diff --git a/Source/WebKit2/UIProcess/WebProcessProxy.h b/Source/WebKit2/UIProcess/WebProcessProxy.h
index bdd0ce0..f46ad33 100644
--- a/Source/WebKit2/UIProcess/WebProcessProxy.h
+++ b/Source/WebKit2/UIProcess/WebProcessProxy.h
@@ -67,7 +67,7 @@
static PassRefPtr<WebProcessProxy> create(WebContext&);
~WebProcessProxy();
- static WebProcessProxy* fromConnection(CoreIPC::Connection* connection)
+ static WebProcessProxy* fromConnection(IPC::Connection* connection)
{
return static_cast<WebProcessProxy*>(ChildProcessProxy::fromConnection(connection));
}
@@ -131,15 +131,15 @@
// From ChildProcessProxy
virtual void getLaunchOptions(ProcessLauncher::LaunchOptions&) OVERRIDE;
void platformGetLaunchOptions(ProcessLauncher::LaunchOptions&);
- virtual void connectionWillOpen(CoreIPC::Connection*) OVERRIDE;
- virtual void connectionWillClose(CoreIPC::Connection*) OVERRIDE;
+ virtual void connectionWillOpen(IPC::Connection*) OVERRIDE;
+ virtual void connectionWillClose(IPC::Connection*) OVERRIDE;
// Called when the web process has crashed or we know that it will terminate soon.
// Will potentially cause the WebProcessProxy object to be freed.
void disconnect();
- // CoreIPC message handlers.
- void addBackForwardItem(uint64_t itemID, const String& originalURLString, const String& urlString, const String& title, const CoreIPC::DataReference& backForwardData);
+ // IPC message handlers.
+ void addBackForwardItem(uint64_t itemID, const String& originalURLString, const String& urlString, const String& title, const IPC::DataReference& backForwardData);
void didDestroyFrame(uint64_t);
void shouldTerminate(bool& shouldTerminate);
@@ -158,12 +158,12 @@
void getDatabaseProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>);
#endif
- // CoreIPC::Connection::Client
+ // IPC::Connection::Client
friend class WebConnectionToWebProcess;
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
- virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&) OVERRIDE;
- virtual void didClose(CoreIPC::Connection*) OVERRIDE;
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
+ virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) OVERRIDE;
+ virtual void didClose(IPC::Connection*) OVERRIDE;
+ virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName) OVERRIDE;
// ResponsivenessTimer::Client
void didBecomeUnresponsive(ResponsivenessTimer*) OVERRIDE;
@@ -171,7 +171,7 @@
void didBecomeResponsive(ResponsivenessTimer*) OVERRIDE;
// ProcessLauncher::Client
- virtual void didFinishLaunching(ProcessLauncher*, CoreIPC::Connection::Identifier) OVERRIDE;
+ virtual void didFinishLaunching(ProcessLauncher*, IPC::Connection::Identifier) OVERRIDE;
// History client
void didNavigateWithNavigationData(uint64_t pageID, const WebNavigationDataStore&, uint64_t frameID);
@@ -180,8 +180,8 @@
void didUpdateHistoryTitle(uint64_t pageID, const String& title, const String& url, uint64_t frameID);
// Implemented in generated WebProcessProxyMessageReceiver.cpp
- void didReceiveWebProcessProxyMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
- void didReceiveSyncWebProcessProxyMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&);
+ void didReceiveWebProcessProxyMessage(IPC::Connection*, IPC::MessageDecoder&);
+ void didReceiveSyncWebProcessProxyMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
bool canTerminateChildProcess();
diff --git a/Source/WebKit2/UIProcess/WebProcessProxy.messages.in b/Source/WebKit2/UIProcess/WebProcessProxy.messages.in
index 7121bc1..9d49736 100644
--- a/Source/WebKit2/UIProcess/WebProcessProxy.messages.in
+++ b/Source/WebKit2/UIProcess/WebProcessProxy.messages.in
@@ -28,7 +28,7 @@
DidPerformServerRedirect(uint64_t pageID, String sourceURLString, String destinationURLString, uint64_t frameID)
DidUpdateHistoryTitle(uint64_t pageID, String title, String url, uint64_t frameID)
- AddBackForwardItem(uint64_t itemID, String originalURL, String url, String title, CoreIPC::DataReference backForwardData)
+ AddBackForwardItem(uint64_t itemID, String originalURL, String url, String title, IPC::DataReference backForwardData)
DidDestroyFrame(uint64_t frameID)
ShouldTerminate() -> (bool shouldTerminate)
@@ -39,12 +39,12 @@
# Plugin messages.
#if ENABLE(NETSCAPE_PLUGIN_API)
GetPlugins(bool refresh) -> (Vector<WebCore::PluginInfo> plugins, Vector<WebCore::PluginInfo> applicationPlugins)
- GetPluginProcessConnection(uint64_t pluginProcessToken) -> (CoreIPC::Attachment connectionHandle, bool supportsAsynchronousInitialization) Delayed
+ GetPluginProcessConnection(uint64_t pluginProcessToken) -> (IPC::Attachment connectionHandle, bool supportsAsynchronousInitialization) Delayed
#endif
#if ENABLE(NETWORK_PROCESS)
- GetNetworkProcessConnection() -> (CoreIPC::Attachment connectionHandle) Delayed
+ GetNetworkProcessConnection() -> (IPC::Attachment connectionHandle) Delayed
#endif
#if ENABLE(DATABASE_PROCESS)
- GetDatabaseProcessConnection() -> (CoreIPC::Attachment connectionHandle) Delayed
+ GetDatabaseProcessConnection() -> (IPC::Attachment connectionHandle) Delayed
#endif
}
diff --git a/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h b/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h
index 627a824..038dfe4 100644
--- a/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h
+++ b/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h
@@ -44,7 +44,7 @@
typedef GenericCallback<WKArrayRef> ArrayCallback;
-class WebResourceCacheManagerProxy : public API::ObjectImpl<API::Object::Type::CacheManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
+class WebResourceCacheManagerProxy : public API::ObjectImpl<API::Object::Type::CacheManager>, public WebContextSupplement, private IPC::MessageReceiver {
public:
static const char* supplementName();
@@ -68,8 +68,8 @@
virtual void refWebContextSupplement() OVERRIDE;
virtual void derefWebContextSupplement() OVERRIDE;
- // CoreIPC::MessageReceiver
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::MessageReceiver
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
// Message handlers.
void didGetCacheOrigins(const Vector<SecurityOriginData>& originIdentifiers, uint64_t callbackID);
diff --git a/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp b/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp
index 4078d39..08a46e2 100644
--- a/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp
+++ b/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp
@@ -105,8 +105,8 @@
RetainPtr<CFStringRef> title = m_entries[i]->title().createCFString();
RetainPtr<CFStringRef> originalURL = m_entries[i]->originalURL().createCFString();
- // FIXME: This uses the CoreIPC data encoding format, which means that whenever we change the CoreIPC encoding we need to bump the CurrentSessionStateDataVersion
- // constant in WebPageProxyCF.cpp. The CoreIPC data format is meant to be an implementation detail, and not something that should be written to disk.
+ // FIXME: This uses the IPC data encoding format, which means that whenever we change the IPC encoding we need to bump the CurrentSessionStateDataVersion
+ // constant in WebPageProxyCF.cpp. The IPC data format is meant to be an implementation detail, and not something that should be written to disk.
RetainPtr<CFDataRef> entryData = adoptCF(CFDataCreate(kCFAllocatorDefault, m_entries[i]->backForwardData().data(), m_entries[i]->backForwardData().size()));
const void* keys[4] = { sessionHistoryEntryURLKey, sessionHistoryEntryTitleKey, sessionHistoryEntryOriginalURLKey, sessionHistoryEntryDataKey };
diff --git a/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.h b/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.h
index 6e6db6e..b51608d 100644
--- a/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.h
+++ b/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.h
@@ -38,14 +38,14 @@
class WebPageProxy;
-class RemoteLayerTreeHost : private CoreIPC::MessageReceiver {
+class RemoteLayerTreeHost : private IPC::MessageReceiver {
public:
explicit RemoteLayerTreeHost(WebPageProxy*);
~RemoteLayerTreeHost();
private:
- // CoreIPC::MessageReceiver.
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::MessageReceiver.
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
// Message handlers.
void commit(const RemoteLayerTreeTransaction&);
diff --git a/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp b/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp
index 8f7501f..0e0a9fe 100644
--- a/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp
+++ b/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp
@@ -51,12 +51,12 @@
{
}
-void SecItemShimProxy::initializeConnection(CoreIPC::Connection* connection)
+void SecItemShimProxy::initializeConnection(IPC::Connection* connection)
{
connection->addWorkQueueMessageReceiver(Messages::SecItemShimProxy::messageReceiverName(), m_queue.get(), this);
}
-void SecItemShimProxy::secItemRequest(CoreIPC::Connection* connection, uint64_t requestID, const SecItemRequestData& request)
+void SecItemShimProxy::secItemRequest(IPC::Connection* connection, uint64_t requestID, const SecItemRequestData& request)
{
SecItemResponseData response;
diff --git a/Source/WebKit2/UIProcess/mac/SecItemShimProxy.h b/Source/WebKit2/UIProcess/mac/SecItemShimProxy.h
index 74af671..452dae1 100644
--- a/Source/WebKit2/UIProcess/mac/SecItemShimProxy.h
+++ b/Source/WebKit2/UIProcess/mac/SecItemShimProxy.h
@@ -34,20 +34,20 @@
class SecItemRequestData;
-class SecItemShimProxy : public CoreIPC::Connection::WorkQueueMessageReceiver {
+class SecItemShimProxy : public IPC::Connection::WorkQueueMessageReceiver {
WTF_MAKE_NONCOPYABLE(SecItemShimProxy);
public:
static SecItemShimProxy& shared();
- void initializeConnection(CoreIPC::Connection*);
+ void initializeConnection(IPC::Connection*);
private:
SecItemShimProxy();
- // CoreIPC::Connection::WorkQueueMessageReceiver
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::Connection::WorkQueueMessageReceiver
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
- void secItemRequest(CoreIPC::Connection*, uint64_t requestID, const SecItemRequestData&);
+ void secItemRequest(IPC::Connection*, uint64_t requestID, const SecItemRequestData&);
RefPtr<WorkQueue> m_queue;
};
diff --git a/Source/WebKit2/UIProcess/mac/ViewGestureController.h b/Source/WebKit2/UIProcess/mac/ViewGestureController.h
index 9f3f0a1..06a8c1b 100644
--- a/Source/WebKit2/UIProcess/mac/ViewGestureController.h
+++ b/Source/WebKit2/UIProcess/mac/ViewGestureController.h
@@ -33,7 +33,7 @@
class WebPageProxy;
-class ViewGestureController : private CoreIPC::MessageReceiver {
+class ViewGestureController : private IPC::MessageReceiver {
WTF_MAKE_NONCOPYABLE(ViewGestureController);
public:
ViewGestureController(WebPageProxy&);
@@ -53,8 +53,8 @@
};
private:
- // CoreIPC::MessageReceiver.
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::MessageReceiver.
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
// Message handlers.
void didCollectGeometryForMagnificationGesture(WebCore::FloatRect visibleContentBounds);
diff --git a/Source/WebKit2/UIProcess/mac/WebContextMac.mm b/Source/WebKit2/UIProcess/mac/WebContextMac.mm
index 1ed5023..dea6e68 100644
--- a/Source/WebKit2/UIProcess/mac/WebContextMac.mm
+++ b/Source/WebKit2/UIProcess/mac/WebContextMac.mm
@@ -297,7 +297,7 @@
#if !PLATFORM(IOS)
mach_port_t renderServerPort = [[CARemoteLayerServer sharedServer] serverPort];
if (renderServerPort != MACH_PORT_NULL)
- parameters.acceleratedCompositingPort = CoreIPC::MachPort(renderServerPort, MACH_MSG_TYPE_COPY_SEND);
+ parameters.acceleratedCompositingPort = IPC::MachPort(renderServerPort, MACH_MSG_TYPE_COPY_SEND);
#endif
#endif
diff --git a/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm b/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm
index 82c2957..4173d1d 100644
--- a/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm
+++ b/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm
@@ -430,7 +430,7 @@
m_pageClient.didPerformDictionaryLookup(text, dictionaryPopupInfo);
}
-void WebPageProxy::registerWebProcessAccessibilityToken(const CoreIPC::DataReference& data)
+void WebPageProxy::registerWebProcessAccessibilityToken(const IPC::DataReference& data)
{
m_pageClient.accessibilityWebProcessTokenReceived(data);
}
@@ -445,7 +445,7 @@
return m_pageClient.colorSpace();
}
-void WebPageProxy::registerUIProcessAccessibilityTokens(const CoreIPC::DataReference& elementToken, const CoreIPC::DataReference& windowToken)
+void WebPageProxy::registerUIProcessAccessibilityTokens(const IPC::DataReference& elementToken, const IPC::DataReference& windowToken)
{
if (!isValid())
return;
@@ -587,7 +587,7 @@
[[NSWorkspace sharedWorkspace] openFile:nsPath];
}
-void WebPageProxy::savePDFToTemporaryFolderAndOpenWithNativeApplication(const String& suggestedFilename, const String& originatingURLString, const CoreIPC::DataReference& data, const String& pdfUUID)
+void WebPageProxy::savePDFToTemporaryFolderAndOpenWithNativeApplication(const String& suggestedFilename, const String& originatingURLString, const IPC::DataReference& data, const String& pdfUUID)
{
if (data.isEmpty()) {
WTFLogAlways("Cannot save empty PDF file to the temporary directory.");
diff --git a/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj b/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
index 8647fe8..9d7e375 100644
--- a/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -81,6 +81,7 @@
1A1C649B11F4174200553C19 /* WebContextMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A1C648611F415B700553C19 /* WebContextMac.mm */; };
1A1D8BA11731A36300141DA4 /* LocalStorageDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1D8B9F1731A36300141DA4 /* LocalStorageDatabase.cpp */; };
1A1D8BA21731A36300141DA4 /* LocalStorageDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1D8BA01731A36300141DA4 /* LocalStorageDatabase.h */; };
+ 1A1EC69E1872092100B951F0 /* ImportanceAssertion.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1EC69D1872092100B951F0 /* ImportanceAssertion.h */; };
1A1FEC1C1627B45700700F6D /* WebConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1FEC1A1627B45600700F6D /* WebConnectionMessageReceiver.cpp */; };
1A1FEC1D1627B45700700F6D /* WebConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1FEC1B1627B45700700F6D /* WebConnectionMessages.h */; };
1A2161B011F37664008AD0F5 /* NPRuntimeObjectMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2161AE11F37664008AD0F5 /* NPRuntimeObjectMap.h */; };
@@ -1623,6 +1624,7 @@
1A1C648611F415B700553C19 /* WebContextMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContextMac.mm; sourceTree = "<group>"; };
1A1D8B9F1731A36300141DA4 /* LocalStorageDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocalStorageDatabase.cpp; sourceTree = "<group>"; };
1A1D8BA01731A36300141DA4 /* LocalStorageDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalStorageDatabase.h; sourceTree = "<group>"; };
+ 1A1EC69D1872092100B951F0 /* ImportanceAssertion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImportanceAssertion.h; sourceTree = "<group>"; };
1A1FA251127A0E4F0050E709 /* NPRemoteObjectMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NPRemoteObjectMap.h; sourceTree = "<group>"; };
1A1FA252127A0E4F0050E709 /* NPRemoteObjectMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NPRemoteObjectMap.cpp; sourceTree = "<group>"; };
1A1FA283127A13BC0050E709 /* NPObjectProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NPObjectProxy.h; sourceTree = "<group>"; };
@@ -5341,6 +5343,7 @@
isa = PBXGroup;
children = (
1A30EAC5115D7DA30053E937 /* ConnectionMac.cpp */,
+ 1A1EC69D1872092100B951F0 /* ImportanceAssertion.h */,
BCC56F771159957D001CCAF9 /* MachPort.h */,
);
path = mac;
@@ -5927,6 +5930,7 @@
1A2D90D21281C966001EB962 /* PluginProcessCreationParameters.h in Headers */,
1A0EC603124A9F2C007EF4A5 /* PluginProcessManager.h in Headers */,
1F7506B31859164500EC0FF7 /* WKWebProcessPlugInNodeHandle.h in Headers */,
+ 1A1EC69E1872092100B951F0 /* ImportanceAssertion.h in Headers */,
1A0EC6C0124BBD9B007EF4A5 /* PluginProcessMessages.h in Headers */,
1A0EC75E124BC7B2007EF4A5 /* PluginProcessProxy.h in Headers */,
1A043B5E124D5E9D00FFBFB5 /* PluginProcessProxyMessages.h in Headers */,
diff --git a/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.h b/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.h
index bbdf119..a95393b 100644
--- a/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.h
+++ b/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.h
@@ -36,7 +36,7 @@
class ChildProcess;
struct SecurityOriginData;
-class WebApplicationCacheManager : public WebProcessSupplement, public CoreIPC::MessageReceiver {
+class WebApplicationCacheManager : public WebProcessSupplement, public IPC::MessageReceiver {
WTF_MAKE_NONCOPYABLE(WebApplicationCacheManager);
public:
WebApplicationCacheManager(ChildProcess*);
@@ -50,8 +50,8 @@
void getApplicationCacheOrigins(uint64_t callbackID);
void deleteEntriesForOrigin(const SecurityOriginData&);
- // CoreIPC::MessageReceiver
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::MessageReceiver
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
ChildProcess* m_childProcess;
};
diff --git a/Source/WebKit2/WebProcess/Cookies/WebCookieManager.h b/Source/WebKit2/WebProcess/Cookies/WebCookieManager.h
index 14bab95..b834aea 100644
--- a/Source/WebKit2/WebProcess/Cookies/WebCookieManager.h
+++ b/Source/WebKit2/WebProcess/Cookies/WebCookieManager.h
@@ -42,7 +42,7 @@
class ChildProcess;
-class WebCookieManager : public WebProcessSupplement, public NetworkProcessSupplement, public CoreIPC::MessageReceiver {
+class WebCookieManager : public WebProcessSupplement, public NetworkProcessSupplement, public IPC::MessageReceiver {
WTF_MAKE_NONCOPYABLE(WebCookieManager);
public:
WebCookieManager(ChildProcess*);
@@ -55,8 +55,8 @@
#endif
private:
- // CoreIPC::MessageReceiver
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::MessageReceiver
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
void getHostnamesWithCookies(uint64_t callbackID);
void deleteCookiesForHostname(const String&);
diff --git a/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp b/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp
index aea65ca..170e2b3 100644
--- a/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp
+++ b/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp
@@ -343,7 +343,7 @@
{
}
-CoreIPC::Connection* WebIDBServerConnection::messageSenderConnection()
+IPC::Connection* WebIDBServerConnection::messageSenderConnection()
{
return WebProcess::shared().webToDatabaseProcessConnection()->connection();
}
diff --git a/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h b/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h
index 7db5af7..5062564 100644
--- a/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h
+++ b/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h
@@ -37,7 +37,7 @@
class AsyncRequest;
-class WebIDBServerConnection FINAL : public WebCore::IDBServerConnection, public CoreIPC::MessageSender {
+class WebIDBServerConnection FINAL : public WebCore::IDBServerConnection, public IPC::MessageSender {
public:
static PassRefPtr<WebIDBServerConnection> create(const String& databaseName, const WebCore::SecurityOrigin& openingOrigin, const WebCore::SecurityOrigin& mainFrameOrigin);
@@ -82,16 +82,16 @@
virtual void cursorPrefetchReset(WebCore::IDBCursorBackend&, int usedPrefetches) OVERRIDE;
// Message handlers.
- void didReceiveWebIDBServerConnectionMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
+ void didReceiveWebIDBServerConnectionMessage(IPC::Connection*, IPC::MessageDecoder&);
- // CoreIPC::MessageSender
+ // IPC::MessageSender
virtual uint64_t messageSenderDestinationID() OVERRIDE { return m_serverConnectionIdentifier; }
private:
WebIDBServerConnection(const String& databaseName, const WebCore::SecurityOrigin& openingOrigin, const WebCore::SecurityOrigin& mainFrameOrigin);
- // CoreIPC::MessageSender
- virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
+ // IPC::MessageSender
+ virtual IPC::Connection* messageSenderConnection() OVERRIDE;
void didGetOrEstablishIDBDatabaseMetadata(uint64_t requestID, bool success, const WebCore::IDBDatabaseMetadata&);
void didOpenTransaction(uint64_t requestID, bool success);
diff --git a/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp b/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp
index c99db4f..70ecb80 100644
--- a/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp
+++ b/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp
@@ -39,9 +39,9 @@
namespace WebKit {
-WebToDatabaseProcessConnection::WebToDatabaseProcessConnection(CoreIPC::Connection::Identifier connectionIdentifier)
+WebToDatabaseProcessConnection::WebToDatabaseProcessConnection(IPC::Connection::Identifier connectionIdentifier)
{
- m_connection = CoreIPC::Connection::createClientConnection(connectionIdentifier, this, RunLoop::main());
+ m_connection = IPC::Connection::createClientConnection(connectionIdentifier, this, RunLoop::main());
m_connection->open();
}
@@ -49,7 +49,7 @@
{
}
-void WebToDatabaseProcessConnection::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
+void WebToDatabaseProcessConnection::didReceiveMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder)
{
if (decoder.messageReceiverName() == Messages::WebIDBServerConnection::messageReceiverName()) {
HashMap<uint64_t, WebIDBServerConnection*>::iterator connectionIterator = m_webIDBServerConnections.find(decoder.destinationID());
@@ -61,12 +61,12 @@
ASSERT_NOT_REACHED();
}
-void WebToDatabaseProcessConnection::didClose(CoreIPC::Connection* connection)
+void WebToDatabaseProcessConnection::didClose(IPC::Connection* connection)
{
WebProcess::shared().webToDatabaseProcessConnectionClosed(this);
}
-void WebToDatabaseProcessConnection::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName)
+void WebToDatabaseProcessConnection::didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
{
}
diff --git a/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.h b/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.h
index 63b349d..aaa150e 100644
--- a/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.h
+++ b/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.h
@@ -38,32 +38,32 @@
class WebIDBServerConnection;
class WebProcessIDBDatabaseBackend;
-class WebToDatabaseProcessConnection : public RefCounted<WebToDatabaseProcessConnection>, public CoreIPC::Connection::Client, public CoreIPC::MessageSender {
+class WebToDatabaseProcessConnection : public RefCounted<WebToDatabaseProcessConnection>, public IPC::Connection::Client, public IPC::MessageSender {
public:
- static PassRefPtr<WebToDatabaseProcessConnection> create(CoreIPC::Connection::Identifier connectionIdentifier)
+ static PassRefPtr<WebToDatabaseProcessConnection> create(IPC::Connection::Identifier connectionIdentifier)
{
return adoptRef(new WebToDatabaseProcessConnection(connectionIdentifier));
}
~WebToDatabaseProcessConnection();
- CoreIPC::Connection* connection() const { return m_connection.get(); }
+ IPC::Connection* connection() const { return m_connection.get(); }
void registerWebIDBServerConnection(WebIDBServerConnection&);
void removeWebIDBServerConnection(WebIDBServerConnection&);
private:
- WebToDatabaseProcessConnection(CoreIPC::Connection::Identifier);
+ WebToDatabaseProcessConnection(IPC::Connection::Identifier);
- // CoreIPC::Connection::Client
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
- virtual void didClose(CoreIPC::Connection*) OVERRIDE;
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
+ // IPC::Connection::Client
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
+ virtual void didClose(IPC::Connection*) OVERRIDE;
+ virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName) OVERRIDE;
- // CoreIPC::MessageSender
- virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE { return m_connection.get(); }
+ // IPC::MessageSender
+ virtual IPC::Connection* messageSenderConnection() OVERRIDE { return m_connection.get(); }
virtual uint64_t messageSenderDestinationID() OVERRIDE { return 0; }
- RefPtr<CoreIPC::Connection> m_connection;
+ RefPtr<IPC::Connection> m_connection;
HashMap<uint64_t, WebIDBServerConnection*> m_webIDBServerConnections;
};
diff --git a/Source/WebKit2/WebProcess/EntryPoint/mac/LegacyProcess/WebContentProcessMain.mm b/Source/WebKit2/WebProcess/EntryPoint/mac/LegacyProcess/WebContentProcessMain.mm
index 335423f..58ed144 100644
--- a/Source/WebKit2/WebProcess/EntryPoint/mac/LegacyProcess/WebContentProcessMain.mm
+++ b/Source/WebKit2/WebProcess/EntryPoint/mac/LegacyProcess/WebContentProcessMain.mm
@@ -85,7 +85,7 @@
#endif // PLATFORM(IOS)
}
- virtual bool getConnectionIdentifier(CoreIPC::Connection::Identifier& identifier)
+ virtual bool getConnectionIdentifier(IPC::Connection::Identifier& identifier)
{
String clientExecutable = m_commandLine["client-executable"];
if (clientExecutable.isEmpty())
diff --git a/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp b/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp
index ef75e4a..de575b2 100644
--- a/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp
+++ b/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp
@@ -79,7 +79,7 @@
return m_element.get();
}
-void WebFullScreenManager::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
+void WebFullScreenManager::didReceiveMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder)
{
didReceiveWebFullScreenManagerMessage(connection, decoder);
}
diff --git a/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.h b/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.h
index 5618b2a..55b7920 100644
--- a/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.h
+++ b/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.h
@@ -31,7 +31,7 @@
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
-namespace CoreIPC {
+namespace IPC {
class Connection;
class MessageDecoder;
}
@@ -51,7 +51,7 @@
static PassRefPtr<WebFullScreenManager> create(WebPage*);
virtual ~WebFullScreenManager();
- void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
+ void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&);
bool supportsFullScreen(bool withKeyboard);
void enterFullScreenForElement(WebCore::Element*);
@@ -74,7 +74,7 @@
void saveScrollPosition();
void restoreScrollPosition();
- void didReceiveWebFullScreenManagerMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
+ void didReceiveWebFullScreenManagerMessage(IPC::Connection*, IPC::MessageDecoder&);
WebCore::IntRect m_initialFrame;
WebCore::IntRect m_finalFrame;
diff --git a/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.h b/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.h
index 6b6aa6c..1912b80 100644
--- a/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.h
+++ b/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.h
@@ -43,7 +43,7 @@
class WebProcess;
class WebPage;
-class WebGeolocationManager : public WebProcessSupplement, public CoreIPC::MessageReceiver {
+class WebGeolocationManager : public WebProcessSupplement, public IPC::MessageReceiver {
WTF_MAKE_NONCOPYABLE(WebGeolocationManager);
public:
explicit WebGeolocationManager(WebProcess*);
@@ -57,8 +57,8 @@
void requestPermission(WebCore::Geolocation*);
private:
- // CoreIPC::MessageReceiver
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::MessageReceiver
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
bool isUpdating() const { return !m_pageSet.isEmpty(); }
bool isHighAccuracyEnabled() const { return !m_highAccuracyPageSet.isEmpty(); }
diff --git a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp
index 2c2eb8b..7b8291d 100644
--- a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp
+++ b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp
@@ -74,7 +74,7 @@
Image* WebIconDatabaseProxy::synchronousIconForPageURL(const String& pageURL, const IntSize& /*size*/)
{
- CoreIPC::DataReference result;
+ IPC::DataReference result;
if (!m_process->parentProcessConnection()->sendSync(Messages::WebIconDatabase::SynchronousIconDataForPageURL(pageURL), Messages::WebIconDatabase::SynchronousIconDataForPageURL::Reply(result), 0))
return 0;
@@ -135,7 +135,7 @@
void WebIconDatabaseProxy::setIconDataForIconURL(PassRefPtr<SharedBuffer> iconData, const String& iconURL)
{
- CoreIPC::DataReference data(reinterpret_cast<const uint8_t*>(iconData ? iconData->data() : 0), iconData ? iconData->size() : 0);
+ IPC::DataReference data(reinterpret_cast<const uint8_t*>(iconData ? iconData->data() : 0), iconData ? iconData->size() : 0);
m_process->parentProcessConnection()->send(Messages::WebIconDatabase::SetIconDataForIconURL(data, iconURL), 0);
}
diff --git a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h
index 3a99ad5..ee57d42 100644
--- a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h
+++ b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h
@@ -38,7 +38,7 @@
class WebProcess;
-class WebIconDatabaseProxy : public WebCore::IconDatabaseBase, private CoreIPC::MessageReceiver {
+class WebIconDatabaseProxy : public WebCore::IconDatabaseBase, private IPC::MessageReceiver {
public:
explicit WebIconDatabaseProxy(WebProcess*);
virtual ~WebIconDatabaseProxy();
@@ -63,8 +63,8 @@
virtual void iconDataForIconURL(const String&, PassRefPtr<WebCore::IconDataCallback>);
private:
- // CoreIPC::MessageReceiver
- void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::MessageReceiver
+ void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
// Callbacks from the UIProcess
void urlImportFinished();
diff --git a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
index 7938814..a37b63e 100644
--- a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
+++ b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
@@ -100,7 +100,7 @@
void InjectedBundle::postMessage(const String& messageName, API::Object* messageBody)
{
- auto encoder = std::make_unique<CoreIPC::MessageEncoder>(WebContextLegacyMessages::messageReceiverName(), WebContextLegacyMessages::postMessageMessageName(), 0);
+ auto encoder = std::make_unique<IPC::MessageEncoder>(WebContextLegacyMessages::messageReceiverName(), WebContextLegacyMessages::postMessageMessageName(), 0);
encoder->encode(messageName);
encoder->encode(InjectedBundleUserMessageEncoder(messageBody));
@@ -112,11 +112,11 @@
InjectedBundleUserMessageDecoder messageDecoder(returnData);
uint64_t syncRequestID;
- std::unique_ptr<CoreIPC::MessageEncoder> encoder = WebProcess::shared().parentProcessConnection()->createSyncMessageEncoder(WebContextLegacyMessages::messageReceiverName(), WebContextLegacyMessages::postSynchronousMessageMessageName(), 0, syncRequestID);
+ std::unique_ptr<IPC::MessageEncoder> encoder = WebProcess::shared().parentProcessConnection()->createSyncMessageEncoder(WebContextLegacyMessages::messageReceiverName(), WebContextLegacyMessages::postSynchronousMessageMessageName(), 0, syncRequestID);
encoder->encode(messageName);
encoder->encode(InjectedBundleUserMessageEncoder(messageBody));
- std::unique_ptr<CoreIPC::MessageDecoder> replyDecoder = WebProcess::shared().parentProcessConnection()->sendSyncMessage(syncRequestID, std::move(encoder), CoreIPC::Connection::NoTimeout);
+ std::unique_ptr<IPC::MessageDecoder> replyDecoder = WebProcess::shared().parentProcessConnection()->sendSyncMessage(syncRequestID, std::move(encoder), IPC::Connection::NoTimeout);
if (!replyDecoder || !replyDecoder->decode(messageDecoder)) {
returnData = nullptr;
return;
diff --git a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h
index 8c0d102..4f39a8f 100644
--- a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h
+++ b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h
@@ -58,7 +58,7 @@
{
}
- void encode(CoreIPC::ArgumentEncoder& encoder) const
+ void encode(IPC::ArgumentEncoder& encoder) const
{
API::Object::Type type = API::Object::Type::Null;
if (baseEncode(encoder, *this, type))
@@ -113,7 +113,7 @@
{
}
- static bool decode(CoreIPC::ArgumentDecoder& decoder, InjectedBundleUserMessageDecoder& coder)
+ static bool decode(IPC::ArgumentDecoder& decoder, InjectedBundleUserMessageDecoder& coder)
{
API::Object::Type type = API::Object::Type::Null;
if (!Base::baseDecode(decoder, coder, type))
diff --git a/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.h b/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.h
index a147162..8e4ca88 100644
--- a/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.h
+++ b/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.h
@@ -36,7 +36,7 @@
class WebProcess;
-class WebMediaCacheManager : public WebProcessSupplement, public CoreIPC::MessageReceiver {
+class WebMediaCacheManager : public WebProcessSupplement, public IPC::MessageReceiver {
WTF_MAKE_NONCOPYABLE(WebMediaCacheManager);
public:
explicit WebMediaCacheManager(WebProcess*);
@@ -44,7 +44,7 @@
static const char* supplementName();
private:
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
void getHostnamesWithMediaCache(uint64_t callbackID);
void clearCacheForHostname(const String&);
diff --git a/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp b/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp
index dfeacdc..b216e12 100644
--- a/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp
+++ b/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp
@@ -43,9 +43,9 @@
namespace WebKit {
-NetworkProcessConnection::NetworkProcessConnection(CoreIPC::Connection::Identifier connectionIdentifier)
+NetworkProcessConnection::NetworkProcessConnection(IPC::Connection::Identifier connectionIdentifier)
{
- m_connection = CoreIPC::Connection::createClientConnection(connectionIdentifier, this, RunLoop::main());
+ m_connection = IPC::Connection::createClientConnection(connectionIdentifier, this, RunLoop::main());
m_connection->open();
}
@@ -53,7 +53,7 @@
{
}
-void NetworkProcessConnection::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
+void NetworkProcessConnection::didReceiveMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder)
{
if (decoder.messageReceiverName() == Messages::WebResourceLoader::messageReceiverName()) {
if (WebResourceLoader* webResourceLoader = WebProcess::shared().webResourceLoadScheduler().webResourceLoaderForIdentifier(decoder.destinationID()))
@@ -65,18 +65,18 @@
didReceiveNetworkProcessConnectionMessage(connection, decoder);
}
-void NetworkProcessConnection::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, std::unique_ptr<CoreIPC::MessageEncoder>& replyEncoder)
+void NetworkProcessConnection::didReceiveSyncMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)
{
ASSERT_NOT_REACHED();
}
-void NetworkProcessConnection::didClose(CoreIPC::Connection*)
+void NetworkProcessConnection::didClose(IPC::Connection*)
{
// The NetworkProcess probably crashed.
WebProcess::shared().networkProcessConnectionClosed(this);
}
-void NetworkProcessConnection::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)
+void NetworkProcessConnection::didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference, IPC::StringReference)
{
}
diff --git a/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h b/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h
index f07dbb0..1420f6b 100644
--- a/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h
+++ b/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h
@@ -33,7 +33,7 @@
#if ENABLE(NETWORK_PROCESS)
-namespace CoreIPC {
+namespace IPC {
class DataReference;
}
@@ -47,26 +47,26 @@
typedef uint64_t ResourceLoadIdentifier;
-class NetworkProcessConnection : public RefCounted<NetworkProcessConnection>, CoreIPC::Connection::Client {
+class NetworkProcessConnection : public RefCounted<NetworkProcessConnection>, IPC::Connection::Client {
public:
- static PassRefPtr<NetworkProcessConnection> create(CoreIPC::Connection::Identifier connectionIdentifier)
+ static PassRefPtr<NetworkProcessConnection> create(IPC::Connection::Identifier connectionIdentifier)
{
return adoptRef(new NetworkProcessConnection(connectionIdentifier));
}
~NetworkProcessConnection();
- CoreIPC::Connection* connection() const { return m_connection.get(); }
+ IPC::Connection* connection() const { return m_connection.get(); }
- void didReceiveNetworkProcessConnectionMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
+ void didReceiveNetworkProcessConnectionMessage(IPC::Connection*, IPC::MessageDecoder&);
private:
- NetworkProcessConnection(CoreIPC::Connection::Identifier);
+ NetworkProcessConnection(IPC::Connection::Identifier);
- // CoreIPC::Connection::Client
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
- virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&) OVERRIDE;
- virtual void didClose(CoreIPC::Connection*) OVERRIDE;
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
+ // IPC::Connection::Client
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
+ virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) OVERRIDE;
+ virtual void didClose(IPC::Connection*) OVERRIDE;
+ virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName) OVERRIDE;
#if ENABLE(SHAREABLE_RESOURCE)
// Message handlers.
@@ -74,7 +74,7 @@
#endif
// The connection from the web process to the network process.
- RefPtr<CoreIPC::Connection> m_connection;
+ RefPtr<IPC::Connection> m_connection;
};
} // namespace WebKit
diff --git a/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp b/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp
index 8459933..b0d0f69 100644
--- a/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp
+++ b/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp
@@ -59,7 +59,7 @@
{
}
-CoreIPC::Connection* WebResourceLoader::messageSenderConnection()
+IPC::Connection* WebResourceLoader::messageSenderConnection()
{
return WebProcess::shared().networkConnection()->connection();
}
@@ -123,7 +123,7 @@
send(Messages::NetworkResourceLoader::ContinueDidReceiveResponse());
}
-void WebResourceLoader::didReceiveData(const CoreIPC::DataReference& data, int64_t encodedDataLength)
+void WebResourceLoader::didReceiveData(const IPC::DataReference& data, int64_t encodedDataLength)
{
LOG(Network, "(WebProcess) WebResourceLoader::didReceiveData of size %i for '%s'", (int)data.size(), m_coreLoader->url().string().utf8().data());
m_coreLoader->didReceiveData(reinterpret_cast<const char*>(data.data()), data.size(), encodedDataLength, DataPayloadBytes);
diff --git a/Source/WebKit2/WebProcess/Network/WebResourceLoader.h b/Source/WebKit2/WebProcess/Network/WebResourceLoader.h
index f745219..93db62f 100644
--- a/Source/WebKit2/WebProcess/Network/WebResourceLoader.h
+++ b/Source/WebKit2/WebProcess/Network/WebResourceLoader.h
@@ -35,7 +35,7 @@
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
-namespace CoreIPC {
+namespace IPC {
class DataReference;
}
@@ -53,13 +53,13 @@
typedef uint64_t ResourceLoadIdentifier;
-class WebResourceLoader : public RefCounted<WebResourceLoader>, public CoreIPC::MessageSender {
+class WebResourceLoader : public RefCounted<WebResourceLoader>, public IPC::MessageSender {
public:
static PassRefPtr<WebResourceLoader> create(PassRefPtr<WebCore::ResourceLoader>);
~WebResourceLoader();
- void didReceiveWebResourceLoaderMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
+ void didReceiveWebResourceLoaderMessage(IPC::Connection*, IPC::MessageDecoder&);
WebCore::ResourceLoader* resourceLoader() const { return m_coreLoader.get(); }
@@ -68,8 +68,8 @@
private:
WebResourceLoader(PassRefPtr<WebCore::ResourceLoader>);
- // CoreIPC::MessageSender
- virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
+ // IPC::MessageSender
+ virtual IPC::Connection* messageSenderConnection() OVERRIDE;
virtual uint64_t messageSenderDestinationID() OVERRIDE;
void cancelResourceLoader();
@@ -77,7 +77,7 @@
void willSendRequest(const WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse);
void didSendData(uint64_t bytesSent, uint64_t totalBytesToBeSent);
void didReceiveResponseWithCertificateInfo(const WebCore::ResourceResponse&, const WebCore::CertificateInfo&, bool needsContinueDidReceiveResponseMessage);
- void didReceiveData(const CoreIPC::DataReference&, int64_t encodedDataLength);
+ void didReceiveData(const IPC::DataReference&, int64_t encodedDataLength);
void didFinishResourceLoad(double finishTime);
void didFailResourceLoad(const WebCore::ResourceError&);
#if ENABLE(SHAREABLE_RESOURCE)
diff --git a/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in b/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in
index 4a62042..86166de 100644
--- a/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in
+++ b/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in
@@ -30,7 +30,7 @@
WillSendRequest(WebCore::ResourceRequest request, WebCore::ResourceResponse redirectResponse)
DidSendData(uint64_t bytesSent, uint64_t totalBytesToBeSent)
DidReceiveResponseWithCertificateInfo(WebCore::ResourceResponse response, WebCore::CertificateInfo certificateInfo, bool needsContinueDidReceiveResponseMessage)
- DidReceiveData(CoreIPC::DataReference data, int64_t encodedDataLength)
+ DidReceiveData(IPC::DataReference data, int64_t encodedDataLength)
DidFinishResourceLoad(double finishTime)
DidFailResourceLoad(WebCore::ResourceError error)
diff --git a/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.h b/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.h
index cb1f87c..f902972 100644
--- a/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.h
+++ b/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.h
@@ -45,7 +45,7 @@
class WebPage;
class WebProcess;
-class WebNotificationManager : public WebProcessSupplement, public CoreIPC::MessageReceiver {
+class WebNotificationManager : public WebProcessSupplement, public IPC::MessageReceiver {
WTF_MAKE_NONCOPYABLE(WebNotificationManager);
public:
explicit WebNotificationManager(WebProcess*);
@@ -71,9 +71,9 @@
// WebProcessSupplement
virtual void initialize(const WebProcessCreationParameters&) OVERRIDE;
- // CoreIPC::MessageReceiver
+ // IPC::MessageReceiver
// Implemented in generated WebNotificationManagerMessageReceiver.cpp
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
void didShowNotification(uint64_t notificationID);
void didClickNotification(uint64_t notificationID);
diff --git a/Source/WebKit2/WebProcess/OriginData/WebOriginDataManager.h b/Source/WebKit2/WebProcess/OriginData/WebOriginDataManager.h
index 98ea515..4e8b0d3 100644
--- a/Source/WebKit2/WebProcess/OriginData/WebOriginDataManager.h
+++ b/Source/WebKit2/WebProcess/OriginData/WebOriginDataManager.h
@@ -37,7 +37,7 @@
class ChildProcess;
struct SecurityOriginData;
-class WebOriginDataManager : public WebProcessSupplement, public CoreIPC::MessageReceiver {
+class WebOriginDataManager : public WebProcessSupplement, public IPC::MessageReceiver {
WTF_MAKE_NONCOPYABLE(WebOriginDataManager);
public:
WebOriginDataManager(ChildProcess*);
@@ -52,8 +52,8 @@
void startObservingChanges(WKOriginDataTypes);
void stopObservingChanges(WKOriginDataTypes);
- // CoreIPC::MessageReceiver
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::MessageReceiver
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
ChildProcess* m_childProcess;
};
diff --git a/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h b/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h
index 3d292c5..92f96ff 100644
--- a/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h
+++ b/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h
@@ -49,7 +49,7 @@
OBJC_CLASS WKPDFPluginAccessibilityObject;
OBJC_CLASS WKPDFLayerControllerDelegate;
-namespace CoreIPC {
+namespace IPC {
class DataReference;
}
diff --git a/Source/WebKit2/WebProcess/Plugins/Plugin.cpp b/Source/WebKit2/WebProcess/Plugins/Plugin.cpp
index e89f911..119d5ab 100644
--- a/Source/WebKit2/WebProcess/Plugins/Plugin.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/Plugin.cpp
@@ -33,7 +33,7 @@
namespace WebKit {
-void Plugin::Parameters::encode(CoreIPC::ArgumentEncoder& encoder) const
+void Plugin::Parameters::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << url.string();
encoder << names;
@@ -46,7 +46,7 @@
#endif
}
-bool Plugin::Parameters::decode(CoreIPC::ArgumentDecoder& decoder, Parameters& parameters)
+bool Plugin::Parameters::decode(IPC::ArgumentDecoder& decoder, Parameters& parameters)
{
String urlString;
if (!decoder.decode(urlString))
diff --git a/Source/WebKit2/WebProcess/Plugins/Plugin.h b/Source/WebKit2/WebProcess/Plugins/Plugin.h
index d98da6c..9addf80 100644
--- a/Source/WebKit2/WebProcess/Plugins/Plugin.h
+++ b/Source/WebKit2/WebProcess/Plugins/Plugin.h
@@ -44,7 +44,7 @@
struct NPObject;
-namespace CoreIPC {
+namespace IPC {
class ArgumentEncoder;
class ArgumentDecoder;
}
@@ -83,8 +83,8 @@
LayerHostingMode layerHostingMode;
#endif
- void encode(CoreIPC::ArgumentEncoder&) const;
- static bool decode(CoreIPC::ArgumentDecoder&, Parameters&);
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, Parameters&);
};
// Sets the active plug-in controller and initializes the plug-in.
diff --git a/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp b/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp
index 6a7d009..aeab805 100644
--- a/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp
@@ -42,12 +42,12 @@
namespace WebKit {
-PluginProcessConnection::PluginProcessConnection(PluginProcessConnectionManager* pluginProcessConnectionManager, uint64_t pluginProcessToken, CoreIPC::Connection::Identifier connectionIdentifier, bool supportsAsynchronousPluginInitialization)
+PluginProcessConnection::PluginProcessConnection(PluginProcessConnectionManager* pluginProcessConnectionManager, uint64_t pluginProcessToken, IPC::Connection::Identifier connectionIdentifier, bool supportsAsynchronousPluginInitialization)
: m_pluginProcessConnectionManager(pluginProcessConnectionManager)
, m_pluginProcessToken(pluginProcessToken)
, m_supportsAsynchronousPluginInitialization(supportsAsynchronousPluginInitialization)
{
- m_connection = CoreIPC::Connection::createClientConnection(connectionIdentifier, this, RunLoop::main());
+ m_connection = IPC::Connection::createClientConnection(connectionIdentifier, this, RunLoop::main());
m_npRemoteObjectMap = NPRemoteObjectMap::create(m_connection.get());
@@ -88,7 +88,7 @@
m_pluginProcessConnectionManager->removePluginProcessConnection(this);
}
-void PluginProcessConnection::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
+void PluginProcessConnection::didReceiveMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder)
{
ASSERT(decoder.destinationID());
@@ -99,7 +99,7 @@
pluginProxy->didReceivePluginProxyMessage(connection, decoder);
}
-void PluginProcessConnection::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, std::unique_ptr<CoreIPC::MessageEncoder>& replyEncoder)
+void PluginProcessConnection::didReceiveSyncMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)
{
if (decoder.messageReceiverName() == Messages::NPObjectMessageReceiver::messageReceiverName()) {
m_npRemoteObjectMap->didReceiveSyncMessage(connection, decoder, replyEncoder);
@@ -120,7 +120,7 @@
pluginProxy->didReceiveSyncPluginProxyMessage(connection, decoder, replyEncoder);
}
-void PluginProcessConnection::didClose(CoreIPC::Connection*)
+void PluginProcessConnection::didClose(IPC::Connection*)
{
// The plug-in process must have crashed.
for (HashMap<uint64_t, PluginProxy*>::const_iterator::Values it = m_plugins.begin().values(), end = m_plugins.end().values(); it != end; ++it) {
@@ -130,7 +130,7 @@
}
}
-void PluginProcessConnection::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)
+void PluginProcessConnection::didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference, IPC::StringReference)
{
}
diff --git a/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.h b/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.h
index 85d7141..a9a2f95 100644
--- a/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.h
+++ b/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.h
@@ -34,17 +34,15 @@
#include "PluginProcessAttributes.h"
#include <wtf/RefCounted.h>
-// A CoreIPC connection to a plug-in process.
-
namespace WebKit {
class NPRemoteObjectMap;
class PluginProcessConnectionManager;
class PluginProxy;
-class PluginProcessConnection : public RefCounted<PluginProcessConnection>, CoreIPC::Connection::Client {
+class PluginProcessConnection : public RefCounted<PluginProcessConnection>, IPC::Connection::Client {
public:
- static PassRefPtr<PluginProcessConnection> create(PluginProcessConnectionManager* pluginProcessConnectionManager, uint64_t pluginProcessToken, CoreIPC::Connection::Identifier connectionIdentifier, bool supportsAsynchronousPluginInitialization)
+ static PassRefPtr<PluginProcessConnection> create(PluginProcessConnectionManager* pluginProcessConnectionManager, uint64_t pluginProcessToken, IPC::Connection::Identifier connectionIdentifier, bool supportsAsynchronousPluginInitialization)
{
return adoptRef(new PluginProcessConnection(pluginProcessConnectionManager, pluginProcessToken, connectionIdentifier, supportsAsynchronousPluginInitialization));
}
@@ -52,7 +50,7 @@
uint64_t pluginProcessToken() const { return m_pluginProcessToken; }
- CoreIPC::Connection* connection() const { return m_connection.get(); }
+ IPC::Connection* connection() const { return m_connection.get(); }
void addPluginProxy(PluginProxy*);
void removePluginProxy(PluginProxy*);
@@ -62,23 +60,23 @@
bool supportsAsynchronousPluginInitialization() const { return m_supportsAsynchronousPluginInitialization; }
private:
- PluginProcessConnection(PluginProcessConnectionManager*, uint64_t pluginProcessToken, CoreIPC::Connection::Identifier connectionIdentifier, bool supportsAsynchronousInitialization);
+ PluginProcessConnection(PluginProcessConnectionManager*, uint64_t pluginProcessToken, IPC::Connection::Identifier connectionIdentifier, bool supportsAsynchronousInitialization);
- // CoreIPC::Connection::Client
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
- virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&) OVERRIDE;
- virtual void didClose(CoreIPC::Connection*);
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
+ // IPC::Connection::Client
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
+ virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) OVERRIDE;
+ virtual void didClose(IPC::Connection*);
+ virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName) OVERRIDE;
// Message handlers.
- void didReceiveSyncPluginProcessConnectionMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&);
+ void didReceiveSyncPluginProcessConnectionMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
void setException(const String&);
PluginProcessConnectionManager* m_pluginProcessConnectionManager;
uint64_t m_pluginProcessToken;
// The connection from the web process to the plug-in process.
- RefPtr<CoreIPC::Connection> m_connection;
+ RefPtr<IPC::Connection> m_connection;
// The plug-ins. We use a weak reference to the plug-in proxies because the plug-in view holds the strong reference.
HashMap<uint64_t, PluginProxy*> m_plugins;
diff --git a/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp b/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp
index 065e77a..bd8af4b 100644
--- a/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp
@@ -56,7 +56,7 @@
{
}
-void PluginProcessConnectionManager::initializeConnection(CoreIPC::Connection* connection)
+void PluginProcessConnectionManager::initializeConnection(IPC::Connection* connection)
{
connection->addWorkQueueMessageReceiver(Messages::PluginProcessConnectionManager::messageReceiverName(), m_queue.get(), this);
}
@@ -68,18 +68,18 @@
return m_pluginProcessConnections[i].get();
}
- CoreIPC::Attachment encodedConnectionIdentifier;
+ IPC::Attachment encodedConnectionIdentifier;
bool supportsAsynchronousInitialization;
if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetPluginProcessConnection(pluginProcessToken),
Messages::WebProcessProxy::GetPluginProcessConnection::Reply(encodedConnectionIdentifier, supportsAsynchronousInitialization), 0))
return 0;
#if PLATFORM(MAC)
- CoreIPC::Connection::Identifier connectionIdentifier(encodedConnectionIdentifier.port());
- if (CoreIPC::Connection::identifierIsNull(connectionIdentifier))
+ IPC::Connection::Identifier connectionIdentifier(encodedConnectionIdentifier.port());
+ if (IPC::Connection::identifierIsNull(connectionIdentifier))
return 0;
#elif USE(UNIX_DOMAIN_SOCKETS)
- CoreIPC::Connection::Identifier connectionIdentifier = encodedConnectionIdentifier.fileDescriptor();
+ IPC::Connection::Identifier connectionIdentifier = encodedConnectionIdentifier.fileDescriptor();
if (connectionIdentifier == -1)
return 0;
#endif
@@ -115,7 +115,7 @@
void PluginProcessConnectionManager::pluginProcessCrashed(uint64_t pluginProcessToken)
{
MutexLocker locker(m_tokensAndConnectionsMutex);
- CoreIPC::Connection* connection = m_tokensAndConnections.get(pluginProcessToken);
+ IPC::Connection* connection = m_tokensAndConnections.get(pluginProcessToken);
// It's OK for connection to be null here; it will happen if this web process doesn't know
// anything about the plug-in process.
diff --git a/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h b/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h
index 26c6958..2a8d745 100644
--- a/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h
+++ b/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h
@@ -42,23 +42,23 @@
class PluginProcessConnection;
-class PluginProcessConnectionManager : public CoreIPC::Connection::WorkQueueMessageReceiver {
+class PluginProcessConnectionManager : public IPC::Connection::WorkQueueMessageReceiver {
public:
static PassRefPtr<PluginProcessConnectionManager> create();
~PluginProcessConnectionManager();
- void initializeConnection(CoreIPC::Connection*);
+ void initializeConnection(IPC::Connection*);
PluginProcessConnection* getPluginProcessConnection(uint64_t pluginProcessToken);
void removePluginProcessConnection(PluginProcessConnection*);
- void didReceivePluginProcessConnectionManagerMessageOnConnectionWorkQueue(CoreIPC::Connection*, OwnPtr<CoreIPC::MessageDecoder>&);
+ void didReceivePluginProcessConnectionManagerMessageOnConnectionWorkQueue(IPC::Connection*, OwnPtr<IPC::MessageDecoder>&);
private:
PluginProcessConnectionManager();
- // CoreIPC::Connection::WorkQueueMessageReceiver.
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::Connection::WorkQueueMessageReceiver.
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
void pluginProcessCrashed(uint64_t pluginProcessToken);
@@ -67,7 +67,7 @@
Vector<RefPtr<PluginProcessConnection>> m_pluginProcessConnections;
Mutex m_tokensAndConnectionsMutex;
- HashMap<uint64_t, RefPtr<CoreIPC::Connection>> m_tokensAndConnections;
+ HashMap<uint64_t, RefPtr<IPC::Connection>> m_tokensAndConnections;
};
}
diff --git a/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp b/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp
index 67d92a0..72caf64 100644
--- a/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp
@@ -286,7 +286,7 @@
m_pluginBackingStoreContainsValidData = false;
}
- m_connection->connection()->send(Messages::PluginControllerProxy::GeometryDidChange(m_pluginSize, m_clipRect, m_pluginToRootViewTransform, contentsScaleFactor(), pluginBackingStoreHandle), m_pluginInstanceID, CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply);
+ m_connection->connection()->send(Messages::PluginControllerProxy::GeometryDidChange(m_pluginSize, m_clipRect, m_pluginToRootViewTransform, contentsScaleFactor(), pluginBackingStoreHandle), m_pluginInstanceID, IPC::DispatchMessageEvenWhenWaitingForSyncReply);
}
void PluginProxy::geometryDidChange(const IntSize& pluginSize, const IntRect& clipRect, const AffineTransform& pluginToRootViewTransform)
@@ -331,7 +331,7 @@
void PluginProxy::streamDidReceiveData(uint64_t streamID, const char* bytes, int length)
{
- m_connection->connection()->send(Messages::PluginControllerProxy::StreamDidReceiveData(streamID, CoreIPC::DataReference(reinterpret_cast<const uint8_t*>(bytes), length)), m_pluginInstanceID);
+ m_connection->connection()->send(Messages::PluginControllerProxy::StreamDidReceiveData(streamID, IPC::DataReference(reinterpret_cast<const uint8_t*>(bytes), length)), m_pluginInstanceID);
}
void PluginProxy::streamDidFinishLoading(uint64_t streamID)
@@ -351,7 +351,7 @@
void PluginProxy::manualStreamDidReceiveData(const char* bytes, int length)
{
- m_connection->connection()->send(Messages::PluginControllerProxy::ManualStreamDidReceiveData(CoreIPC::DataReference(reinterpret_cast<const uint8_t*>(bytes), length)), m_pluginInstanceID);
+ m_connection->connection()->send(Messages::PluginControllerProxy::ManualStreamDidReceiveData(IPC::DataReference(reinterpret_cast<const uint8_t*>(bytes), length)), m_pluginInstanceID);
}
void PluginProxy::manualStreamDidFinishLoading()
diff --git a/Source/WebKit2/WebProcess/Plugins/PluginProxy.h b/Source/WebKit2/WebProcess/Plugins/PluginProxy.h
index 0667d49..8d5b768 100644
--- a/Source/WebKit2/WebProcess/Plugins/PluginProxy.h
+++ b/Source/WebKit2/WebProcess/Plugins/PluginProxy.h
@@ -62,8 +62,8 @@
uint64_t pluginInstanceID() const { return m_pluginInstanceID; }
void pluginProcessCrashed();
- void didReceivePluginProxyMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
- void didReceiveSyncPluginProxyMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&);
+ void didReceivePluginProxyMessage(IPC::Connection*, IPC::MessageDecoder&);
+ void didReceiveSyncPluginProxyMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
bool isBeingAsynchronouslyInitialized() const { return m_waitingOnAsynchronousInitialization; }
diff --git a/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.h b/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.h
index 1cebfa5..fae9679 100644
--- a/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.h
+++ b/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.h
@@ -39,7 +39,7 @@
class WebProcess;
struct SecurityOriginData;
-class WebResourceCacheManager : public WebProcessSupplement, public CoreIPC::MessageReceiver {
+class WebResourceCacheManager : public WebProcessSupplement, public IPC::MessageReceiver {
WTF_MAKE_NONCOPYABLE(WebResourceCacheManager);
public:
WebResourceCacheManager(WebProcess*);
@@ -47,9 +47,9 @@
static const char* supplementName();
private:
- // CoreIPC::MessageReceiver
+ // IPC::MessageReceiver
// Implemented in generated WebResourceCacheManagerMessageReceiver.cpp
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
void getCacheOrigins(uint64_t callbackID) const;
void returnCacheOrigins(uint64_t callbackID, const WebCore::MemoryCache::SecurityOriginSet&) const;
diff --git a/Source/WebKit2/WebProcess/Storage/StorageAreaMap.h b/Source/WebKit2/WebProcess/Storage/StorageAreaMap.h
index 74cc538..032568e 100644
--- a/Source/WebKit2/WebProcess/Storage/StorageAreaMap.h
+++ b/Source/WebKit2/WebProcess/Storage/StorageAreaMap.h
@@ -44,7 +44,7 @@
class StorageAreaImpl;
class StorageNamespaceImpl;
-class StorageAreaMap : public RefCounted<StorageAreaMap>, private CoreIPC::MessageReceiver {
+class StorageAreaMap : public RefCounted<StorageAreaMap>, private IPC::MessageReceiver {
public:
static PassRefPtr<StorageAreaMap> create(StorageNamespaceImpl*, PassRefPtr<WebCore::SecurityOrigin>);
~StorageAreaMap();
@@ -62,8 +62,8 @@
private:
StorageAreaMap(StorageNamespaceImpl*, PassRefPtr<WebCore::SecurityOrigin>);
- // CoreIPC::MessageReceiver
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::MessageReceiver
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
void didGetValues(uint64_t storageMapSeed);
void didSetItem(uint64_t storageMapSeed, const String& key, bool quotaError);
diff --git a/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp b/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp
index 94fc3c3..aeb602a 100644
--- a/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp
+++ b/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp
@@ -52,12 +52,12 @@
// WebConnection
-void WebConnectionToUIProcess::encodeMessageBody(CoreIPC::ArgumentEncoder& encoder, API::Object* messageBody)
+void WebConnectionToUIProcess::encodeMessageBody(IPC::ArgumentEncoder& encoder, API::Object* messageBody)
{
encoder << InjectedBundleUserMessageEncoder(messageBody);
}
-bool WebConnectionToUIProcess::decodeMessageBody(CoreIPC::ArgumentDecoder& decoder, RefPtr<API::Object>& messageBody)
+bool WebConnectionToUIProcess::decodeMessageBody(IPC::ArgumentDecoder& decoder, RefPtr<API::Object>& messageBody)
{
InjectedBundleUserMessageDecoder messageBodyDecoder(messageBody);
return decoder.decode(messageBodyDecoder);
@@ -68,7 +68,7 @@
return m_process;
}
-CoreIPC::Connection* WebConnectionToUIProcess::messageSenderConnection()
+IPC::Connection* WebConnectionToUIProcess::messageSenderConnection()
{
return m_process->parentProcessConnection();
}
diff --git a/Source/WebKit2/WebProcess/WebConnectionToUIProcess.h b/Source/WebKit2/WebProcess/WebConnectionToUIProcess.h
index 17609a7..a59c077 100644
--- a/Source/WebKit2/WebProcess/WebConnectionToUIProcess.h
+++ b/Source/WebKit2/WebProcess/WebConnectionToUIProcess.h
@@ -42,12 +42,12 @@
WebConnectionToUIProcess(WebProcess*);
// WebConnection
- virtual void encodeMessageBody(CoreIPC::ArgumentEncoder&, API::Object*) OVERRIDE;
- virtual bool decodeMessageBody(CoreIPC::ArgumentDecoder&, RefPtr<API::Object>&) OVERRIDE;
+ virtual void encodeMessageBody(IPC::ArgumentEncoder&, API::Object*) OVERRIDE;
+ virtual bool decodeMessageBody(IPC::ArgumentDecoder&, RefPtr<API::Object>&) OVERRIDE;
virtual bool hasValidConnection() const OVERRIDE;
- // CoreIPC::MessageSender
- virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
+ // IPC::MessageSender
+ virtual IPC::Connection* messageSenderConnection() OVERRIDE;
virtual uint64_t messageSenderDestinationID() OVERRIDE;
WebProcess* m_process;
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
index cf2f882..9525045 100644
--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
@@ -349,8 +349,8 @@
m_page->injectedBundleUIClient().willRunJavaScriptAlert(m_page, alertText, webFrame);
// FIXME (126021): It is not good to change IPC behavior conditionally, and SpinRunLoopWhileWaitingForReply was known to cause trouble in other similar cases.
- unsigned syncSendFlags = (WebCore::AXObjectCache::accessibilityEnabled()) ? CoreIPC::SpinRunLoopWhileWaitingForReply : 0;
- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptAlert(webFrame->frameID(), alertText), Messages::WebPageProxy::RunJavaScriptAlert::Reply(), m_page->pageID(), CoreIPC::Connection::NoTimeout, syncSendFlags);
+ unsigned syncSendFlags = (WebCore::AXObjectCache::accessibilityEnabled()) ? IPC::SpinRunLoopWhileWaitingForReply : 0;
+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptAlert(webFrame->frameID(), alertText), Messages::WebPageProxy::RunJavaScriptAlert::Reply(), m_page->pageID(), IPC::Connection::NoTimeout, syncSendFlags);
}
bool WebChromeClient::runJavaScriptConfirm(Frame* frame, const String& message)
@@ -363,9 +363,9 @@
m_page->injectedBundleUIClient().willRunJavaScriptConfirm(m_page, message, webFrame);
// FIXME (126021): It is not good to change IPC behavior conditionally, and SpinRunLoopWhileWaitingForReply was known to cause trouble in other similar cases.
- unsigned syncSendFlags = (WebCore::AXObjectCache::accessibilityEnabled()) ? CoreIPC::SpinRunLoopWhileWaitingForReply : 0;
+ unsigned syncSendFlags = (WebCore::AXObjectCache::accessibilityEnabled()) ? IPC::SpinRunLoopWhileWaitingForReply : 0;
bool result = false;
- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptConfirm(webFrame->frameID(), message), Messages::WebPageProxy::RunJavaScriptConfirm::Reply(result), m_page->pageID(), CoreIPC::Connection::NoTimeout, syncSendFlags))
+ if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptConfirm(webFrame->frameID(), message), Messages::WebPageProxy::RunJavaScriptConfirm::Reply(result), m_page->pageID(), IPC::Connection::NoTimeout, syncSendFlags))
return false;
return result;
@@ -381,8 +381,8 @@
m_page->injectedBundleUIClient().willRunJavaScriptPrompt(m_page, message, defaultValue, webFrame);
// FIXME (126021): It is not good to change IPC behavior conditionally, and SpinRunLoopWhileWaitingForReply was known to cause trouble in other similar cases.
- unsigned syncSendFlags = (WebCore::AXObjectCache::accessibilityEnabled()) ? CoreIPC::SpinRunLoopWhileWaitingForReply : 0;
- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptPrompt(webFrame->frameID(), message, defaultValue), Messages::WebPageProxy::RunJavaScriptPrompt::Reply(result), m_page->pageID(), CoreIPC::Connection::NoTimeout, syncSendFlags))
+ unsigned syncSendFlags = (WebCore::AXObjectCache::accessibilityEnabled()) ? IPC::SpinRunLoopWhileWaitingForReply : 0;
+ if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptPrompt(webFrame->frameID(), message, defaultValue), Messages::WebPageProxy::RunJavaScriptPrompt::Reply(result), m_page->pageID(), IPC::Connection::NoTimeout, syncSendFlags))
return false;
return !result.isNull();
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h b/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h
index 0807193..b7a0add 100644
--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h
@@ -38,7 +38,7 @@
class WebProcess;
-class WebDatabaseManager : public WebCore::DatabaseManagerClient, public WebProcessSupplement, public CoreIPC::MessageReceiver {
+class WebDatabaseManager : public WebCore::DatabaseManagerClient, public WebProcessSupplement, public IPC::MessageReceiver {
WTF_MAKE_NONCOPYABLE(WebDatabaseManager);
public:
explicit WebDatabaseManager(WebProcess*);
@@ -52,8 +52,8 @@
// WebProcessSupplement
virtual void initialize(const WebProcessCreationParameters&) OVERRIDE;
- // CoreIPC::MessageReceiver
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::MessageReceiver
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
void getDatabasesByOrigin(uint64_t callbackID) const;
void getDatabaseOrigins(uint64_t callbackID) const;
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
index 1bca1de..107ec6d 100644
--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -649,8 +649,8 @@
// Notify the UIProcess.
// FIXME (126021): It is not good to change IPC behavior conditionally, and SpinRunLoopWhileWaitingForReply was known to cause trouble in other similar cases.
- unsigned syncSendFlags = (WebCore::AXObjectCache::accessibilityEnabled()) ? CoreIPC::SpinRunLoopWhileWaitingForReply : 0;
- if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForResponseSync(m_frame->frameID(), response, request, canShowMIMEType, listenerID, InjectedBundleUserMessageEncoder(userData.get())), Messages::WebPageProxy::DecidePolicyForResponseSync::Reply(receivedPolicyAction, policyAction, downloadID), CoreIPC::Connection::NoTimeout, syncSendFlags))
+ unsigned syncSendFlags = (WebCore::AXObjectCache::accessibilityEnabled()) ? IPC::SpinRunLoopWhileWaitingForReply : 0;
+ if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForResponseSync(m_frame->frameID(), response, request, canShowMIMEType, listenerID, InjectedBundleUserMessageEncoder(userData.get())), Messages::WebPageProxy::DecidePolicyForResponseSync::Reply(receivedPolicyAction, policyAction, downloadID), IPC::Connection::NoTimeout, syncSendFlags))
return;
// We call this synchronously because CFNetwork can only convert a loading connection to a download from its didReceiveResponse callback.
diff --git a/Source/WebKit2/WebProcess/WebPage/DecoderAdapter.cpp b/Source/WebKit2/WebProcess/WebPage/DecoderAdapter.cpp
index 8970889..9cdcb2b 100644
--- a/Source/WebKit2/WebProcess/WebPage/DecoderAdapter.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/DecoderAdapter.cpp
@@ -44,7 +44,7 @@
bool DecoderAdapter::decodeBytes(Vector<uint8_t>& bytes)
{
- CoreIPC::DataReference dataReference;
+ IPC::DataReference dataReference;
if (!m_decoder.decode(dataReference))
return false;
@@ -94,9 +94,9 @@
bool DecoderAdapter::decodeString(String& value)
{
- // This mimics the CoreIPC binary encoding of Strings prior to r88886.
- // Whenever the CoreIPC binary encoding changes, we'll have to "undo" the changes here.
- // FIXME: We shouldn't use the CoreIPC binary encoding format for history,
+ // This mimics the IPC binary encoding of Strings prior to r88886.
+ // Whenever the IPC binary encoding changes, we'll have to "undo" the changes here.
+ // FIXME: We shouldn't use the IPC binary encoding format for history,
// and we should come up with a migration strategy so we can actually bump the version number
// without breaking encoding/decoding of the history tree.
diff --git a/Source/WebKit2/WebProcess/WebPage/DecoderAdapter.h b/Source/WebKit2/WebProcess/WebPage/DecoderAdapter.h
index d6b4eb7..a0e4c40 100644
--- a/Source/WebKit2/WebProcess/WebPage/DecoderAdapter.h
+++ b/Source/WebKit2/WebProcess/WebPage/DecoderAdapter.h
@@ -48,7 +48,7 @@
virtual bool decodeDouble(double&);
virtual bool decodeString(String&);
- CoreIPC::ArgumentDecoder m_decoder;
+ IPC::ArgumentDecoder m_decoder;
};
} // namespace WebKit
diff --git a/Source/WebKit2/WebProcess/WebPage/DrawingArea.h b/Source/WebKit2/WebProcess/WebPage/DrawingArea.h
index 1aa61ae0..ca5301d 100644
--- a/Source/WebKit2/WebProcess/WebPage/DrawingArea.h
+++ b/Source/WebKit2/WebProcess/WebPage/DrawingArea.h
@@ -33,7 +33,7 @@
#include <wtf/Forward.h>
#include <wtf/Noncopyable.h>
-namespace CoreIPC {
+namespace IPC {
class Connection;
class MessageDecoder;
}
@@ -60,7 +60,7 @@
static std::unique_ptr<DrawingArea> create(WebPage*, const WebPageCreationParameters&);
virtual ~DrawingArea();
- void didReceiveDrawingAreaMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
+ void didReceiveDrawingAreaMessage(IPC::Connection*, IPC::MessageDecoder&);
virtual void setNeedsDisplay() = 0;
virtual void setNeedsDisplayInRect(const WebCore::IntRect&) = 0;
@@ -100,7 +100,7 @@
#endif
#if USE(COORDINATED_GRAPHICS)
- virtual void didReceiveCoordinatedLayerTreeHostMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) = 0;
+ virtual void didReceiveCoordinatedLayerTreeHostMessage(IPC::Connection*, IPC::MessageDecoder&) = 0;
#endif
virtual void dispatchAfterEnsuringUpdatedScrollPosition(const Function<void ()>&);
@@ -116,7 +116,7 @@
WebPage* m_webPage;
private:
- // CoreIPC message handlers.
+ // Message handlers.
// FIXME: These should be pure virtual.
virtual void updateBackingStoreState(uint64_t /*backingStoreStateID*/, bool /*respondImmediately*/, float /*deviceScaleFactor*/, const WebCore::IntSize& /*size*/,
const WebCore::IntSize& /*scrollOffset*/) { }
diff --git a/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp b/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp
index 8c5b559..dedac43 100644
--- a/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp
@@ -39,14 +39,14 @@
m_encoder << static_cast<uint64_t>(0);
}
-CoreIPC::DataReference EncoderAdapter::dataReference() const
+IPC::DataReference EncoderAdapter::dataReference() const
{
- return CoreIPC::DataReference(m_encoder.buffer(), m_encoder.bufferSize());
+ return IPC::DataReference(m_encoder.buffer(), m_encoder.bufferSize());
}
void EncoderAdapter::encodeBytes(const uint8_t* bytes, size_t size)
{
- m_encoder << CoreIPC::DataReference(bytes, size);
+ m_encoder << IPC::DataReference(bytes, size);
}
void EncoderAdapter::encodeBool(bool value)
@@ -91,9 +91,9 @@
void EncoderAdapter::encodeString(const String& value)
{
- // This mimics the CoreIPC binary encoding of Strings prior to r88886.
- // Whenever the CoreIPC binary encoding changes, we'll have to "undo" the changes here.
- // FIXME: We shouldn't use the CoreIPC binary encoding format for history,
+ // This mimics the IPC binary encoding of Strings prior to r88886.
+ // Whenever the IPC binary encoding changes, we'll have to "undo" the changes here.
+ // FIXME: We shouldn't use the IPC binary encoding format for history,
// and we should come up with a migration strategy so we can actually bump the version number
// without breaking encoding/decoding of the history tree.
diff --git a/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.h b/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.h
index 2eb9077..ccddaaa 100644
--- a/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.h
+++ b/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.h
@@ -30,7 +30,7 @@
#include <wtf/Encoder.h>
#include <wtf/Forward.h>
-namespace CoreIPC {
+namespace IPC {
class ArgumentEncoder;
class DataReference;
}
@@ -41,7 +41,7 @@
public:
EncoderAdapter();
- CoreIPC::DataReference dataReference() const;
+ IPC::DataReference dataReference() const;
private:
virtual void encodeBytes(const uint8_t*, size_t);
@@ -55,7 +55,7 @@
virtual void encodeDouble(double);
virtual void encodeString(const String&);
- CoreIPC::ArgumentEncoder m_encoder;
+ IPC::ArgumentEncoder m_encoder;
};
} // namespace WebKit
diff --git a/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp b/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp
index 5260c0f..77da100 100644
--- a/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp
@@ -79,7 +79,7 @@
}
#endif
-void EventDispatcher::initializeConnection(CoreIPC::Connection* connection)
+void EventDispatcher::initializeConnection(IPC::Connection* connection)
{
connection->addWorkQueueMessageReceiver(Messages::EventDispatcher::messageReceiverName(), m_queue.get(), this);
}
diff --git a/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h b/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h
index 8d3f226..a63c803 100644
--- a/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h
+++ b/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h
@@ -42,7 +42,7 @@
class WebPage;
class WebWheelEvent;
-class EventDispatcher : public CoreIPC::Connection::WorkQueueMessageReceiver {
+class EventDispatcher : public IPC::Connection::WorkQueueMessageReceiver {
public:
static PassRefPtr<EventDispatcher> create();
~EventDispatcher();
@@ -52,13 +52,13 @@
void removeScrollingTreeForPage(WebPage*);
#endif
- void initializeConnection(CoreIPC::Connection*);
+ void initializeConnection(IPC::Connection*);
private:
EventDispatcher();
- // CoreIPC::Connection::WorkQueueMessageReceiver.
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::Connection::WorkQueueMessageReceiver.
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
// Message handlers
void wheelEvent(uint64_t pageID, const WebWheelEvent&, bool canRubberBandAtLeft, bool canRubberBandAtRight, bool canRubberBandAtTop, bool canRubberBandAtBottom);
diff --git a/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h b/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h
index 143c7c3..c059c45 100644
--- a/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h
+++ b/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h
@@ -31,7 +31,7 @@
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
-namespace CoreIPC {
+namespace IPC {
class Connection;
class MessageDecoder;
}
@@ -86,7 +86,7 @@
virtual void setBackgroundColor(const WebCore::Color&) { }
#if USE(COORDINATED_GRAPHICS)
- virtual void didReceiveCoordinatedLayerTreeHostMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) = 0;
+ virtual void didReceiveCoordinatedLayerTreeHostMessage(IPC::Connection*, IPC::MessageDecoder&) = 0;
#endif
#if PLATFORM(MAC)
diff --git a/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.h b/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.h
index e2ad7c6..0fcc22e 100644
--- a/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.h
+++ b/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.h
@@ -36,14 +36,14 @@
class WebPage;
-class ViewGestureGeometryCollector : private CoreIPC::MessageReceiver {
+class ViewGestureGeometryCollector : private IPC::MessageReceiver {
public:
ViewGestureGeometryCollector(WebPage&);
~ViewGestureGeometryCollector();
private:
- // CoreIPC::MessageReceiver.
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+ // IPC::MessageReceiver.
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
// Message handlers.
void collectGeometryForMagnificationGesture();
diff --git a/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp b/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp
index 105bab3..05c5b2a 100644
--- a/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp
@@ -78,7 +78,7 @@
if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebInspectorProxy::CreateInspectorPage(),
Messages::WebInspectorProxy::CreateInspectorPage::Reply(inspectorPageID, parameters),
- m_page->pageID(), CoreIPC::Connection::NoTimeout)) {
+ m_page->pageID(), IPC::Connection::NoTimeout)) {
return 0;
}
diff --git a/Source/WebKit2/WebProcess/WebPage/WebInspector.h b/Source/WebKit2/WebProcess/WebPage/WebInspector.h
index 5c62174..14f5a3b 100644
--- a/Source/WebKit2/WebProcess/WebPage/WebInspector.h
+++ b/Source/WebKit2/WebProcess/WebPage/WebInspector.h
@@ -47,7 +47,7 @@
WebPage* inspectorPage() const { return m_inspectorPage; }
// Implemented in generated WebInspectorMessageReceiver.cpp
- void didReceiveWebInspectorMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
+ void didReceiveWebInspectorMessage(IPC::Connection*, IPC::MessageDecoder&);
// Called by WebInspector messages
void show();
diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
index 535a9c4..904a88e 100644
--- a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -475,7 +475,7 @@
{
}
-CoreIPC::Connection* WebPage::messageSenderConnection()
+IPC::Connection* WebPage::messageSenderConnection()
{
return WebProcess::shared().parentProcessConnection();
}
@@ -864,7 +864,7 @@
send(Messages::WebPageProxy::ClosePage(false));
}
-void WebPage::loadURL(const String& url, const SandboxExtension::Handle& sandboxExtensionHandle, CoreIPC::MessageDecoder& decoder)
+void WebPage::loadURL(const String& url, const SandboxExtension::Handle& sandboxExtensionHandle, IPC::MessageDecoder& decoder)
{
loadURLRequest(ResourceRequest(URL(URL(), url)), sandboxExtensionHandle, decoder);
}
@@ -878,7 +878,7 @@
frame->coreFrame()->loader().load(FrameLoadRequest(frame->coreFrame(), ResourceRequest(URL(URL(), url))));
}
-void WebPage::loadURLRequest(const ResourceRequest& request, const SandboxExtension::Handle& sandboxExtensionHandle, CoreIPC::MessageDecoder& decoder)
+void WebPage::loadURLRequest(const ResourceRequest& request, const SandboxExtension::Handle& sandboxExtensionHandle, IPC::MessageDecoder& decoder)
{
SendStopResponsivenessTimer stopper(this);
@@ -897,7 +897,7 @@
m_mainFrame->coreFrame()->loader().load(FrameLoadRequest(m_mainFrame->coreFrame(), request));
}
-void WebPage::loadDataImpl(PassRefPtr<SharedBuffer> sharedBuffer, const String& MIMEType, const String& encodingName, const URL& baseURL, const URL& unreachableURL, CoreIPC::MessageDecoder& decoder)
+void WebPage::loadDataImpl(PassRefPtr<SharedBuffer> sharedBuffer, const String& MIMEType, const String& encodingName, const URL& baseURL, const URL& unreachableURL, IPC::MessageDecoder& decoder)
{
SendStopResponsivenessTimer stopper(this);
@@ -917,7 +917,7 @@
m_mainFrame->coreFrame()->loader().load(FrameLoadRequest(m_mainFrame->coreFrame(), request, substituteData));
}
-void WebPage::loadString(const String& htmlString, const String& MIMEType, const URL& baseURL, const URL& unreachableURL, CoreIPC::MessageDecoder& decoder)
+void WebPage::loadString(const String& htmlString, const String& MIMEType, const URL& baseURL, const URL& unreachableURL, IPC::MessageDecoder& decoder)
{
if (!htmlString.isNull() && htmlString.is8Bit()) {
RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(htmlString.characters8()), htmlString.length() * sizeof(LChar));
@@ -928,32 +928,32 @@
}
}
-void WebPage::loadData(const CoreIPC::DataReference& data, const String& MIMEType, const String& encodingName, const String& baseURLString, CoreIPC::MessageDecoder& decoder)
+void WebPage::loadData(const IPC::DataReference& data, const String& MIMEType, const String& encodingName, const String& baseURLString, IPC::MessageDecoder& decoder)
{
RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(data.data()), data.size());
URL baseURL = baseURLString.isEmpty() ? blankURL() : URL(URL(), baseURLString);
loadDataImpl(sharedBuffer, MIMEType, encodingName, baseURL, URL(), decoder);
}
-void WebPage::loadHTMLString(const String& htmlString, const String& baseURLString, CoreIPC::MessageDecoder& decoder)
+void WebPage::loadHTMLString(const String& htmlString, const String& baseURLString, IPC::MessageDecoder& decoder)
{
URL baseURL = baseURLString.isEmpty() ? blankURL() : URL(URL(), baseURLString);
loadString(htmlString, ASCIILiteral("text/html"), baseURL, URL(), decoder);
}
-void WebPage::loadAlternateHTMLString(const String& htmlString, const String& baseURLString, const String& unreachableURLString, CoreIPC::MessageDecoder& decoder)
+void WebPage::loadAlternateHTMLString(const String& htmlString, const String& baseURLString, const String& unreachableURLString, IPC::MessageDecoder& decoder)
{
URL baseURL = baseURLString.isEmpty() ? blankURL() : URL(URL(), baseURLString);
URL unreachableURL = unreachableURLString.isEmpty() ? URL() : URL(URL(), unreachableURLString);
loadString(htmlString, ASCIILiteral("text/html"), baseURL, unreachableURL, decoder);
}
-void WebPage::loadPlainTextString(const String& string, CoreIPC::MessageDecoder& decoder)
+void WebPage::loadPlainTextString(const String& string, IPC::MessageDecoder& decoder)
{
loadString(string, ASCIILiteral("text/plain"), blankURL(), URL(), decoder);
}
-void WebPage::loadWebArchiveData(const CoreIPC::DataReference& webArchiveData, CoreIPC::MessageDecoder& decoder)
+void WebPage::loadWebArchiveData(const IPC::DataReference& webArchiveData, IPC::MessageDecoder& decoder)
{
RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(webArchiveData.data()), webArchiveData.size() * sizeof(uint8_t));
loadDataImpl(sharedBuffer, ASCIILiteral("application/x-webarchive"), ASCIILiteral("utf-16"), blankURL(), URL(), decoder);
@@ -1373,7 +1373,7 @@
m_page->setPagination(pagination);
}
-void WebPage::postInjectedBundleMessage(const String& messageName, CoreIPC::MessageDecoder& decoder)
+void WebPage::postInjectedBundleMessage(const String& messageName, IPC::MessageDecoder& decoder)
{
InjectedBundle* injectedBundle = WebProcess::shared().injectedBundle();
if (!injectedBundle)
@@ -2198,7 +2198,7 @@
// Retain the SerializedScriptValue at this level so it (and the internal data) lives
// long enough for the DataReference to be encoded by the sent message.
RefPtr<SerializedScriptValue> serializedResultValue;
- CoreIPC::DataReference dataReference;
+ IPC::DataReference dataReference;
JSLockHolder lock(JSDOMWindow::commonVM());
if (JSValue resultValue = m_mainFrame->coreFrame()->script().executeScript(script, true).jsValue()) {
@@ -2218,14 +2218,14 @@
#if ENABLE(MHTML)
void WebPage::getContentsAsMHTMLData(uint64_t callbackID, bool useBinaryEncoding)
{
- CoreIPC::DataReference dataReference;
+ IPC::DataReference dataReference;
RefPtr<SharedBuffer> buffer = useBinaryEncoding
? MHTMLArchive::generateMHTMLDataUsingBinaryEncoding(m_page.get())
: MHTMLArchive::generateMHTMLData(m_page.get());
if (buffer)
- dataReference = CoreIPC::DataReference(reinterpret_cast<const uint8_t*>(buffer->data()), buffer->size());
+ dataReference = IPC::DataReference(reinterpret_cast<const uint8_t*>(buffer->data()), buffer->size());
send(Messages::WebPageProxy::DataCallback(dataReference, callbackID));
}
@@ -2249,7 +2249,7 @@
void WebPage::getSelectionAsWebArchiveData(uint64_t callbackID)
{
- CoreIPC::DataReference dataReference;
+ IPC::DataReference dataReference;
#if PLATFORM(MAC)
RefPtr<LegacyWebArchive> archive;
@@ -2259,7 +2259,7 @@
if (frame) {
archive = LegacyWebArchive::createFromSelection(frame);
data = archive->rawDataRepresentation();
- dataReference = CoreIPC::DataReference(CFDataGetBytePtr(data.get()), CFDataGetLength(data.get()));
+ dataReference = IPC::DataReference(CFDataGetBytePtr(data.get()), CFDataGetLength(data.get()));
}
#endif
@@ -2285,20 +2285,20 @@
void WebPage::getMainResourceDataOfFrame(uint64_t frameID, uint64_t callbackID)
{
- CoreIPC::DataReference dataReference;
+ IPC::DataReference dataReference;
RefPtr<ResourceBuffer> buffer;
RefPtr<SharedBuffer> pdfResource;
if (WebFrame* frame = WebProcess::shared().webFrame(frameID)) {
if (PluginView* pluginView = pluginViewForFrame(frame->coreFrame())) {
if ((pdfResource = pluginView->liveResourceData()))
- dataReference = CoreIPC::DataReference(reinterpret_cast<const uint8_t*>(pdfResource->data()), pdfResource->size());
+ dataReference = IPC::DataReference(reinterpret_cast<const uint8_t*>(pdfResource->data()), pdfResource->size());
}
if (dataReference.isEmpty()) {
if (DocumentLoader* loader = frame->coreFrame()->loader().documentLoader()) {
if ((buffer = loader->mainResourceData()))
- dataReference = CoreIPC::DataReference(reinterpret_cast<const uint8_t*>(buffer->data()), buffer->size());
+ dataReference = IPC::DataReference(reinterpret_cast<const uint8_t*>(buffer->data()), buffer->size());
}
}
}
@@ -2321,7 +2321,7 @@
void WebPage::getResourceDataFromFrame(uint64_t frameID, const String& resourceURLString, uint64_t callbackID)
{
- CoreIPC::DataReference dataReference;
+ IPC::DataReference dataReference;
URL resourceURL(URL(), resourceURLString);
RefPtr<SharedBuffer> buffer;
@@ -2333,7 +2333,7 @@
}
if (buffer)
- dataReference = CoreIPC::DataReference(reinterpret_cast<const uint8_t*>(buffer->data()), buffer->size());
+ dataReference = IPC::DataReference(reinterpret_cast<const uint8_t*>(buffer->data()), buffer->size());
}
send(Messages::WebPageProxy::DataCallback(dataReference, callbackID));
@@ -2341,13 +2341,13 @@
void WebPage::getWebArchiveOfFrame(uint64_t frameID, uint64_t callbackID)
{
- CoreIPC::DataReference dataReference;
+ IPC::DataReference dataReference;
#if PLATFORM(MAC)
RetainPtr<CFDataRef> data;
if (WebFrame* frame = WebProcess::shared().webFrame(frameID)) {
if ((data = frame->webArchiveData(0, 0)))
- dataReference = CoreIPC::DataReference(CFDataGetBytePtr(data.get()), CFDataGetLength(data.get()));
+ dataReference = IPC::DataReference(CFDataGetBytePtr(data.get()), CFDataGetLength(data.get()));
}
#else
UNUSED_PARAM(frameID);
@@ -3125,7 +3125,7 @@
return m_page->focusController().isFocused() && m_page->focusController().isActive();
}
-void WebPage::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
+void WebPage::didReceiveMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder)
{
if (decoder.messageReceiverName() == Messages::DrawingArea::messageReceiverName()) {
if (m_drawingArea)
@@ -3159,7 +3159,7 @@
didReceiveWebPageMessage(connection, decoder);
}
-void WebPage::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, std::unique_ptr<CoreIPC::MessageEncoder>& replyEncoder)
+void WebPage::didReceiveSyncMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)
{
didReceiveSyncWebPageMessage(connection, decoder, replyEncoder);
}
@@ -3498,7 +3498,7 @@
}
#endif
- send(Messages::WebPageProxy::DataCallback(CoreIPC::DataReference(CFDataGetBytePtr(pdfPageData.get()), CFDataGetLength(pdfPageData.get())), callbackID));
+ send(Messages::WebPageProxy::DataCallback(IPC::DataReference(CFDataGetBytePtr(pdfPageData.get()), CFDataGetLength(pdfPageData.get())), callbackID));
}
#elif PLATFORM(GTK)
@@ -3517,13 +3517,13 @@
void WebPage::savePDFToFileInDownloadsFolder(const String& suggestedFilename, const String& originatingURLString, const uint8_t* data, unsigned long size)
{
- send(Messages::WebPageProxy::SavePDFToFileInDownloadsFolder(suggestedFilename, originatingURLString, CoreIPC::DataReference(data, size)));
+ send(Messages::WebPageProxy::SavePDFToFileInDownloadsFolder(suggestedFilename, originatingURLString, IPC::DataReference(data, size)));
}
#if PLATFORM(MAC)
void WebPage::savePDFToTemporaryFolderAndOpenWithNativeApplication(const String& suggestedFilename, const String& originatingURLString, const uint8_t* data, unsigned long size, const String& pdfUUID)
{
- send(Messages::WebPageProxy::SavePDFToTemporaryFolderAndOpenWithNativeApplication(suggestedFilename, originatingURLString, CoreIPC::DataReference(data, size), pdfUUID));
+ send(Messages::WebPageProxy::SavePDFToTemporaryFolderAndOpenWithNativeApplication(suggestedFilename, originatingURLString, IPC::DataReference(data, size), pdfUUID));
}
#endif
diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.h b/Source/WebKit2/WebProcess/WebPage/WebPage.h
index 2e320f2..9fbc2e4 100644
--- a/Source/WebKit2/WebProcess/WebPage/WebPage.h
+++ b/Source/WebKit2/WebProcess/WebPage/WebPage.h
@@ -103,7 +103,7 @@
class Array;
}
-namespace CoreIPC {
+namespace IPC {
class ArgumentDecoder;
class Connection;
}
@@ -164,7 +164,7 @@
typedef Vector<RefPtr<PageOverlay>> PageOverlayList;
-class WebPage : public API::ObjectImpl<API::Object::Type::BundlePage>, public CoreIPC::MessageReceiver, public CoreIPC::MessageSender {
+class WebPage : public API::ObjectImpl<API::Object::Type::BundlePage>, public IPC::MessageReceiver, public IPC::MessageSender {
public:
static PassRefPtr<WebPage> create(uint64_t pageID, const WebPageCreationParameters&);
virtual ~WebPage();
@@ -238,8 +238,8 @@
WebOpenPanelResultListener* activeOpenPanelResultListener() const { return m_activeOpenPanelResultListener.get(); }
void setActiveOpenPanelResultListener(PassRefPtr<WebOpenPanelResultListener>);
- void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
- void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&) OVERRIDE;
+ void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
+ void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) OVERRIDE;
// -- InjectedBundle methods
#if ENABLE(CONTEXT_MENUS)
@@ -326,7 +326,7 @@
void setPageLength(double);
void setGapBetweenPages(double);
- void postInjectedBundleMessage(const String& messageName, CoreIPC::MessageDecoder&);
+ void postInjectedBundleMessage(const String& messageName, IPC::MessageDecoder&);
bool drawsBackground() const { return m_drawsBackground; }
bool drawsTransparentBackground() const { return m_drawsTransparentBackground; }
@@ -482,7 +482,7 @@
void didChangeSelection();
#if PLATFORM(MAC)
- void registerUIProcessAccessibilityTokens(const CoreIPC::DataReference& elemenToken, const CoreIPC::DataReference& windowToken);
+ void registerUIProcessAccessibilityTokens(const IPC::DataReference& elemenToken, const IPC::DataReference& windowToken);
WKAccessibilityWebPageObject* accessibilityRemoteObject();
NSObject *accessibilityObjectForMainFramePlugin();
const WebCore::FloatPoint& accessibilityPosition() const { return m_accessibilityPosition; }
@@ -686,14 +686,14 @@
private:
WebPage(uint64_t pageID, const WebPageCreationParameters&);
- // CoreIPC::MessageSender
- virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
+ // IPC::MessageSender
+ virtual IPC::Connection* messageSenderConnection() OVERRIDE;
virtual uint64_t messageSenderDestinationID() OVERRIDE;
void platformInitialize();
- void didReceiveWebPageMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
- void didReceiveSyncWebPageMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&);
+ void didReceiveWebPageMessage(IPC::Connection*, IPC::MessageDecoder&);
+ void didReceiveSyncWebPageMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
#if !PLATFORM(MAC)
static const char* interpretKeyEvent(const WebCore::KeyboardEvent*);
@@ -706,20 +706,20 @@
String sourceForFrame(WebFrame*);
- void loadDataImpl(PassRefPtr<WebCore::SharedBuffer>, const String& MIMEType, const String& encodingName, const WebCore::URL& baseURL, const WebCore::URL& failingURL, CoreIPC::MessageDecoder&);
- void loadString(const String&, const String& MIMEType, const WebCore::URL& baseURL, const WebCore::URL& failingURL, CoreIPC::MessageDecoder&);
+ void loadDataImpl(PassRefPtr<WebCore::SharedBuffer>, const String& MIMEType, const String& encodingName, const WebCore::URL& baseURL, const WebCore::URL& failingURL, IPC::MessageDecoder&);
+ void loadString(const String&, const String& MIMEType, const WebCore::URL& baseURL, const WebCore::URL& failingURL, IPC::MessageDecoder&);
bool platformHasLocalDataForURL(const WebCore::URL&);
// Actions
void tryClose();
- void loadURL(const String&, const SandboxExtension::Handle&, CoreIPC::MessageDecoder&);
- void loadURLRequest(const WebCore::ResourceRequest&, const SandboxExtension::Handle&, CoreIPC::MessageDecoder&);
- void loadData(const CoreIPC::DataReference&, const String& MIMEType, const String& encodingName, const String& baseURL, CoreIPC::MessageDecoder&);
- void loadHTMLString(const String& htmlString, const String& baseURL, CoreIPC::MessageDecoder&);
- void loadAlternateHTMLString(const String& htmlString, const String& baseURL, const String& unreachableURL, CoreIPC::MessageDecoder&);
- void loadPlainTextString(const String&, CoreIPC::MessageDecoder&);
- void loadWebArchiveData(const CoreIPC::DataReference&, CoreIPC::MessageDecoder&);
+ void loadURL(const String&, const SandboxExtension::Handle&, IPC::MessageDecoder&);
+ void loadURLRequest(const WebCore::ResourceRequest&, const SandboxExtension::Handle&, IPC::MessageDecoder&);
+ void loadData(const IPC::DataReference&, const String& MIMEType, const String& encodingName, const String& baseURL, IPC::MessageDecoder&);
+ void loadHTMLString(const String& htmlString, const String& baseURL, IPC::MessageDecoder&);
+ void loadAlternateHTMLString(const String& htmlString, const String& baseURL, const String& unreachableURL, IPC::MessageDecoder&);
+ void loadPlainTextString(const String&, IPC::MessageDecoder&);
+ void loadWebArchiveData(const IPC::DataReference&, IPC::MessageDecoder&);
void linkClicked(const String& url, const WebMouseEvent&);
void reload(bool reloadFromOrigin, const SandboxExtension::Handle&);
void goForward(uint64_t);
diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in
index 617f7cf..19b8e25 100644
--- a/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in
+++ b/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in
@@ -77,11 +77,11 @@
LoadURL(String url, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::WebContextUserMessageEncoder userData) Variadic
LoadURLInFrame(String url, uint64_t frameID)
LoadURLRequest(WebCore::ResourceRequest request, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::WebContextUserMessageEncoder userData) Variadic
- LoadData(CoreIPC::DataReference data, String MIMEType, String encoding, String baseURL, WebKit::WebContextUserMessageEncoder userData) Variadic
+ LoadData(IPC::DataReference data, String MIMEType, String encoding, String baseURL, WebKit::WebContextUserMessageEncoder userData) Variadic
LoadHTMLString(String htmlString, String baseURL, WebKit::WebContextUserMessageEncoder userData) Variadic
LoadAlternateHTMLString(String htmlString, String baseURL, String unreachableURL, WebKit::WebContextUserMessageEncoder userData) Variadic
LoadPlainTextString(String string, WebKit::WebContextUserMessageEncoder userData) Variadic
- LoadWebArchiveData(CoreIPC::DataReference webArchiveData, WebKit::WebContextUserMessageEncoder userData) Variadic
+ LoadWebArchiveData(IPC::DataReference webArchiveData, WebKit::WebContextUserMessageEncoder userData) Variadic
LinkClicked(String url, WebKit::WebMouseEvent event)
@@ -267,7 +267,7 @@
WindowAndViewFramesChanged(WebCore::FloatRect windowFrameInScreenCoordinates, WebCore::FloatRect windowFrameInUnflippedScreenCoordinates, WebCore::FloatRect viewFrameInWindowCoordinates, WebCore::FloatPoint accessibilityViewCoordinates)
ViewExposedRectChanged(WebCore::FloatRect exposedRect, bool clipsToExposedRect)
SetMainFrameIsScrollable(bool isScrollable)
- RegisterUIProcessAccessibilityTokens(CoreIPC::DataReference elemenToken, CoreIPC::DataReference windowToken)
+ RegisterUIProcessAccessibilityTokens(IPC::DataReference elemenToken, IPC::DataReference windowToken)
GetStringSelectionForPasteboard() -> (String stringValue)
GetDataSelectionForPasteboard(String pasteboardType) -> (WebKit::SharedMemory::Handle handle, uint64_t size)
ReadSelectionFromPasteboard(String pasteboardName) -> (bool result)
diff --git a/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.h b/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.h
index 0333c6d..5e7d50b 100644
--- a/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.h
+++ b/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.h
@@ -30,7 +30,7 @@
#include "WebPageGroupData.h"
#include <wtf/PassRefPtr.h>
-namespace CoreIPC {
+namespace IPC {
class Connection;
class MessageDecoder;
}
@@ -52,7 +52,7 @@
bool isVisibleToHistoryClient() const { return m_data.visibleToHistoryClient; }
WebCore::PageGroup* corePageGroup() const { return m_pageGroup; }
- void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
+ void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&);
private:
WebPageGroupProxy(const WebPageGroupData&);
diff --git a/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm b/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm
index 33b6205..570aa97 100644
--- a/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm
+++ b/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm
@@ -92,7 +92,7 @@
// send data back over
NSData* remoteToken = (NSData *)WKAXRemoteTokenForElement(mockAccessibilityElement);
- CoreIPC::DataReference dataToken = CoreIPC::DataReference(reinterpret_cast<const uint8_t*>([remoteToken bytes]), [remoteToken length]);
+ IPC::DataReference dataToken = IPC::DataReference(reinterpret_cast<const uint8_t*>([remoteToken bytes]), [remoteToken length]);
send(Messages::WebPageProxy::RegisterWebProcessAccessibilityToken(dataToken));
m_mockAccessibilityElement = mockAccessibilityElement;
}
@@ -653,7 +653,7 @@
return false;
}
-void WebPage::registerUIProcessAccessibilityTokens(const CoreIPC::DataReference& elementToken, const CoreIPC::DataReference& windowToken)
+void WebPage::registerUIProcessAccessibilityTokens(const IPC::DataReference& elementToken, const IPC::DataReference& windowToken)
{
NSData* elementTokenData = [NSData dataWithBytes:elementToken.data() length:elementToken.size()];
NSData* windowTokenData = [NSData dataWithBytes:windowToken.data() length:windowToken.size()];
diff --git a/Source/WebKit2/WebProcess/WebProcess.cpp b/Source/WebKit2/WebProcess/WebProcess.cpp
index bd4ea61..1c06c1d 100644
--- a/Source/WebKit2/WebProcess/WebProcess.cpp
+++ b/Source/WebKit2/WebProcess/WebProcess.cpp
@@ -210,7 +210,7 @@
platformInitializeProcess(parameters);
}
-void WebProcess::initializeConnection(CoreIPC::Connection* connection)
+void WebProcess::initializeConnection(IPC::Connection* connection)
{
ChildProcess::initializeConnection(connection);
@@ -250,7 +250,7 @@
enableTermination();
}
-CoreIPC::Connection* WebProcess::downloadProxyConnection()
+IPC::Connection* WebProcess::downloadProxyConnection()
{
return parentProcessConnection();
}
@@ -260,7 +260,7 @@
return *supplement<AuthenticationManager>();
}
-void WebProcess::initializeWebProcess(const WebProcessCreationParameters& parameters, CoreIPC::MessageDecoder& decoder)
+void WebProcess::initializeWebProcess(const WebProcessCreationParameters& parameters, IPC::MessageDecoder& decoder)
{
ASSERT(m_pageMap.isEmpty());
@@ -366,20 +366,20 @@
if (m_networkProcessConnection)
return;
- CoreIPC::Attachment encodedConnectionIdentifier;
+ IPC::Attachment encodedConnectionIdentifier;
if (!parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetNetworkProcessConnection(),
Messages::WebProcessProxy::GetNetworkProcessConnection::Reply(encodedConnectionIdentifier), 0))
return;
#if PLATFORM(MAC)
- CoreIPC::Connection::Identifier connectionIdentifier(encodedConnectionIdentifier.port());
+ IPC::Connection::Identifier connectionIdentifier(encodedConnectionIdentifier.port());
#elif USE(UNIX_DOMAIN_SOCKETS)
- CoreIPC::Connection::Identifier connectionIdentifier = encodedConnectionIdentifier.releaseFileDescriptor();
+ IPC::Connection::Identifier connectionIdentifier = encodedConnectionIdentifier.releaseFileDescriptor();
#else
ASSERT_NOT_REACHED();
#endif
- if (CoreIPC::Connection::identifierIsNull(connectionIdentifier))
+ if (IPC::Connection::identifierIsNull(connectionIdentifier))
return;
m_networkProcessConnection = NetworkProcessConnection::create(connectionIdentifier);
}
@@ -629,12 +629,12 @@
ChildProcess::terminate();
}
-void WebProcess::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, std::unique_ptr<CoreIPC::MessageEncoder>& replyEncoder)
+void WebProcess::didReceiveSyncMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)
{
messageReceiverMap().dispatchSyncMessage(connection, decoder, replyEncoder);
}
-void WebProcess::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
+void WebProcess::didReceiveMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder)
{
if (messageReceiverMap().dispatchMessage(connection, decoder))
return;
@@ -657,7 +657,7 @@
}
}
-void WebProcess::didClose(CoreIPC::Connection*)
+void WebProcess::didClose(IPC::Connection*)
{
#ifndef NDEBUG
m_inDidClose = true;
@@ -678,7 +678,7 @@
stopRunLoop();
}
-void WebProcess::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)
+void WebProcess::didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference, IPC::StringReference)
{
// We received an invalid message, but since this is from the UI process (which we trust),
// we'll let it slide.
@@ -973,13 +973,13 @@
gcController().setJavaScriptGarbageCollectorTimerEnabled(flag);
}
-void WebProcess::postInjectedBundleMessage(const CoreIPC::DataReference& messageData)
+void WebProcess::postInjectedBundleMessage(const IPC::DataReference& messageData)
{
InjectedBundle* injectedBundle = WebProcess::shared().injectedBundle();
if (!injectedBundle)
return;
- CoreIPC::ArgumentDecoder decoder(messageData.data(), messageData.size());
+ IPC::ArgumentDecoder decoder(messageData.data(), messageData.size());
String messageName;
if (!decoder.decode(messageName))
@@ -1047,15 +1047,15 @@
if (m_webToDatabaseProcessConnection)
return;
- CoreIPC::Attachment encodedConnectionIdentifier;
+ IPC::Attachment encodedConnectionIdentifier;
if (!parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetDatabaseProcessConnection(),
Messages::WebProcessProxy::GetDatabaseProcessConnection::Reply(encodedConnectionIdentifier), 0))
return;
#if PLATFORM(MAC)
- CoreIPC::Connection::Identifier connectionIdentifier(encodedConnectionIdentifier.port());
- if (CoreIPC::Connection::identifierIsNull(connectionIdentifier))
+ IPC::Connection::Identifier connectionIdentifier(encodedConnectionIdentifier.port());
+ if (IPC::Connection::identifierIsNull(connectionIdentifier))
return;
#else
ASSERT_NOT_REACHED();
diff --git a/Source/WebKit2/WebProcess/WebProcess.h b/Source/WebKit2/WebProcess/WebProcess.h
index 2f8d096..dafefcf 100644
--- a/Source/WebKit2/WebProcess/WebProcess.h
+++ b/Source/WebKit2/WebProcess/WebProcess.h
@@ -192,11 +192,11 @@
// DownloadManager::Client.
virtual void didCreateDownload() OVERRIDE;
virtual void didDestroyDownload() OVERRIDE;
- virtual CoreIPC::Connection* downloadProxyConnection() OVERRIDE;
+ virtual IPC::Connection* downloadProxyConnection() OVERRIDE;
virtual AuthenticationManager& downloadsAuthenticationManager() OVERRIDE;
- void initializeWebProcess(const WebProcessCreationParameters&, CoreIPC::MessageDecoder&);
- void platformInitializeWebProcess(const WebProcessCreationParameters&, CoreIPC::MessageDecoder&);
+ void initializeWebProcess(const WebProcessCreationParameters&, IPC::MessageDecoder&);
+ void platformInitializeWebProcess(const WebProcessCreationParameters&, IPC::MessageDecoder&);
void platformTerminate();
void registerURLSchemeAsEmptyDocument(const String&);
@@ -244,13 +244,13 @@
void setIgnoreTLSErrors(bool);
#endif
- void postInjectedBundleMessage(const CoreIPC::DataReference& messageData);
+ void postInjectedBundleMessage(const IPC::DataReference& messageData);
// ChildProcess
virtual void initializeProcess(const ChildProcessInitializationParameters&) OVERRIDE;
virtual void initializeProcessName(const ChildProcessInitializationParameters&) OVERRIDE;
virtual void initializeSandbox(const ChildProcessInitializationParameters&, SandboxInitializationParameters&) OVERRIDE;
- virtual void initializeConnection(CoreIPC::Connection*) OVERRIDE;
+ virtual void initializeConnection(IPC::Connection*) OVERRIDE;
virtual bool shouldTerminate() OVERRIDE;
virtual void terminate() OVERRIDE;
@@ -260,15 +260,15 @@
void platformInitializeProcess(const ChildProcessInitializationParameters&);
- // CoreIPC::Connection::Client
+ // IPC::Connection::Client
friend class WebConnectionToUIProcess;
- virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
- virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&);
- virtual void didClose(CoreIPC::Connection*);
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&);
+ virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
+ virtual void didClose(IPC::Connection*);
+ virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName) OVERRIDE;
// Implemented in generated WebProcessMessageReceiver.cpp
- void didReceiveWebProcessMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
+ void didReceiveWebProcessMessage(IPC::Connection*, IPC::MessageDecoder&);
RefPtr<WebConnectionToUIProcess> m_webConnection;
diff --git a/Source/WebKit2/WebProcess/WebProcess.messages.in b/Source/WebKit2/WebProcess/WebProcess.messages.in
index 4fe8bf2..1c8f8cb 100644
--- a/Source/WebKit2/WebProcess/WebProcess.messages.in
+++ b/Source/WebKit2/WebProcess/WebProcess.messages.in
@@ -75,7 +75,7 @@
GarbageCollectJavaScriptObjects()
SetJavaScriptGarbageCollectorTimerEnabled(bool enable)
- PostInjectedBundleMessage(CoreIPC::DataReference messageData);
+ PostInjectedBundleMessage(IPC::DataReference messageData);
ReleasePageCache()
diff --git a/Source/WebKit2/WebProcess/mac/WebProcessMac.mm b/Source/WebKit2/WebProcess/mac/WebProcessMac.mm
index 832f049..42fafd6 100644
--- a/Source/WebKit2/WebProcess/mac/WebProcessMac.mm
+++ b/Source/WebKit2/WebProcess/mac/WebProcessMac.mm
@@ -152,7 +152,7 @@
return [page->accessibilityRemoteObject() accessibilityFocusedUIElement];
}
-void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters& parameters, CoreIPC::MessageDecoder&)
+void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters& parameters, IPC::MessageDecoder&)
{
SandboxExtension::consumePermanently(parameters.uiProcessBundleResourcePathExtensionHandle);
SandboxExtension::consumePermanently(parameters.localStorageDirectoryExtensionHandle);
diff --git a/Source/WebKit2/config.h b/Source/WebKit2/config.h
index 88f18ce..8b26666 100644
--- a/Source/WebKit2/config.h
+++ b/Source/WebKit2/config.h
@@ -80,6 +80,3 @@
#define ENABLE_SEC_ITEM_SHIM 1
#endif
#endif
-
-// FIXME: Remove this once everything has been moved over to the IPC namespace.
-#define CoreIPC IPC
