diff options
Diffstat (limited to 'Source/WebKit2')
103 files changed, 289 insertions, 273 deletions
diff --git a/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h b/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h index 33b96c19e..6c8241e71 100644 --- a/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h +++ b/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h @@ -49,7 +49,7 @@ template<typename T> struct SimpleArgumentCoder { } }; -template<typename T, typename U> struct ArgumentCoder<std::pair<T, U>> { +template<typename T, typename U> struct ArgumentCoder<std::pair<T, U> > { static void encode(ArgumentEncoder& encoder, const std::pair<T, U>& pair) { encoder << pair.first << pair.second; @@ -71,7 +71,7 @@ template<typename T, typename U> struct ArgumentCoder<std::pair<T, U>> { } }; -template<typename KeyType, typename ValueType> struct ArgumentCoder<WTF::KeyValuePair<KeyType, ValueType>> { +template<typename KeyType, typename ValueType> struct ArgumentCoder<WTF::KeyValuePair<KeyType, ValueType> > { static void encode(ArgumentEncoder& encoder, const WTF::KeyValuePair<KeyType, ValueType>& pair) { encoder << pair.key << pair.value; @@ -155,9 +155,9 @@ template<typename T> struct VectorArgumentCoder<true, T> { } }; -template<typename T> struct ArgumentCoder<Vector<T>> : VectorArgumentCoder<WTF::IsArithmetic<T>::value, T> { }; +template<typename T> struct ArgumentCoder<Vector<T> > : VectorArgumentCoder<WTF::IsArithmetic<T>::value, T> { }; -template<typename KeyArg, typename MappedArg, typename HashArg, typename KeyTraitsArg, typename MappedTraitsArg> struct ArgumentCoder<HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>> { +template<typename KeyArg, typename MappedArg, typename HashArg, typename KeyTraitsArg, typename MappedTraitsArg> struct ArgumentCoder<HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg> > { typedef HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg> HashMapType; static void encode(ArgumentEncoder& encoder, const HashMapType& hashMap) diff --git a/Source/WebKit2/Platform/CoreIPC/Connection.cpp b/Source/WebKit2/Platform/CoreIPC/Connection.cpp index b3afee222..fa38b4159 100644 --- a/Source/WebKit2/Platform/CoreIPC/Connection.cpp +++ b/Source/WebKit2/Platform/CoreIPC/Connection.cpp @@ -84,7 +84,7 @@ private: Mutex m_mutex; // The set of connections for which we've scheduled a call to dispatchMessageAndResetDidScheduleDispatchMessagesForConnection. - HashSet<RefPtr<Connection>> m_didScheduleDispatchMessagesWorkSet; + HashSet<RefPtr<Connection> > m_didScheduleDispatchMessagesWorkSet; struct ConnectionAndIncomingMessage { RefPtr<Connection> connection; @@ -387,7 +387,7 @@ PassOwnPtr<MessageDecoder> Connection::waitForMessage(StringReference messageRec { MutexLocker locker(m_incomingMessagesLock); - for (Deque<OwnPtr<MessageDecoder>>::iterator it = m_incomingMessages.begin(), end = m_incomingMessages.end(); it != end; ++it) { + for (Deque<OwnPtr<MessageDecoder> >::iterator it = m_incomingMessages.begin(), end = m_incomingMessages.end(); it != end; ++it) { OwnPtr<MessageDecoder>& message = *it; if (message->messageReceiverName() == messageReceiverName && message->messageName() == messageName && message->destinationID() == destinationID) { @@ -417,7 +417,7 @@ PassOwnPtr<MessageDecoder> Connection::waitForMessage(StringReference messageRec while (true) { MutexLocker locker(m_waitForMessageMutex); - HashMap<std::pair<std::pair<StringReference, StringReference>, uint64_t>, OwnPtr<MessageDecoder>>::iterator it = m_waitForMessageMap.find(messageAndDestination); + HashMap<std::pair<std::pair<StringReference, StringReference>, uint64_t>, OwnPtr<MessageDecoder> >::iterator it = m_waitForMessageMap.find(messageAndDestination); if (it->value) { OwnPtr<MessageDecoder> decoder = it->value.release(); m_waitForMessageMap.remove(it); @@ -639,7 +639,7 @@ void Connection::processIncomingMessage(PassOwnPtr<MessageDecoder> incomingMessa return; } - HashMap<StringReference, std::pair<RefPtr<WorkQueue>, RefPtr<WorkQueueMessageReceiver>>>::const_iterator it = m_workQueueMessageReceivers.find(message->messageReceiverName()); + HashMap<StringReference, std::pair<RefPtr<WorkQueue>, RefPtr<WorkQueueMessageReceiver> > >::const_iterator it = m_workQueueMessageReceivers.find(message->messageReceiverName()); if (it != m_workQueueMessageReceivers.end()) { it->value.first->dispatch(bind(&Connection::dispatchWorkQueueMessageReceiverMessage, this, it->value.second, message.release().leakPtr())); return; @@ -655,7 +655,7 @@ void Connection::processIncomingMessage(PassOwnPtr<MessageDecoder> incomingMessa { MutexLocker locker(m_waitForMessageMutex); - HashMap<std::pair<std::pair<StringReference, StringReference>, uint64_t>, OwnPtr<MessageDecoder>>::iterator it = m_waitForMessageMap.find(std::make_pair(std::make_pair(message->messageReceiverName(), message->messageName()), message->destinationID())); + HashMap<std::pair<std::pair<StringReference, StringReference>, uint64_t>, OwnPtr<MessageDecoder> >::iterator it = m_waitForMessageMap.find(std::make_pair(std::make_pair(message->messageReceiverName(), message->messageName()), message->destinationID())); if (it != m_waitForMessageMap.end()) { it->value = message.release(); ASSERT(it->value); diff --git a/Source/WebKit2/Platform/CoreIPC/Connection.h b/Source/WebKit2/Platform/CoreIPC/Connection.h index cfac48f42..50a9c9876 100644 --- a/Source/WebKit2/Platform/CoreIPC/Connection.h +++ b/Source/WebKit2/Platform/CoreIPC/Connection.h @@ -235,7 +235,7 @@ private: RefPtr<WorkQueue> m_connectionQueue; WebCore::RunLoop* m_clientRunLoop; - HashMap<StringReference, std::pair<RefPtr<WorkQueue>, RefPtr<WorkQueueMessageReceiver>>> m_workQueueMessageReceivers; + HashMap<StringReference, std::pair<RefPtr<WorkQueue>, RefPtr<WorkQueueMessageReceiver> > > m_workQueueMessageReceivers; unsigned m_inSendSyncCount; unsigned m_inDispatchMessageCount; @@ -244,15 +244,15 @@ private: // Incoming messages. Mutex m_incomingMessagesLock; - Deque<OwnPtr<MessageDecoder>> m_incomingMessages; + Deque<OwnPtr<MessageDecoder> > m_incomingMessages; // Outgoing messages. Mutex m_outgoingMessagesLock; - Deque<OwnPtr<MessageEncoder>> m_outgoingMessages; + Deque<OwnPtr<MessageEncoder> > m_outgoingMessages; ThreadCondition m_waitForMessageCondition; Mutex m_waitForMessageMutex; - HashMap<std::pair<std::pair<StringReference, StringReference>, uint64_t>, OwnPtr<MessageDecoder>> m_waitForMessageMap; + HashMap<std::pair<std::pair<StringReference, StringReference>, uint64_t>, OwnPtr<MessageDecoder> > m_waitForMessageMap; // Represents a sync request for which we're waiting on a reply. struct PendingSyncReply { diff --git a/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp b/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp index e111350c3..2ceac7706 100644 --- a/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp +++ b/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp @@ -97,9 +97,9 @@ void Connection::platformInitialize(Identifier identifier) m_sendPort = identifier.port; } - m_deadNameSource = nullptr; - m_receivePortDataAvailableSource = nullptr; - m_exceptionPortDataAvailableSource = nullptr; + m_deadNameSource = 0; + m_receivePortDataAvailableSource = 0; + m_exceptionPortDataAvailableSource = 0; #if HAVE(XPC) m_xpcConnection = identifier.xpcConnection; diff --git a/Source/WebKit2/PluginProcess/PluginProcess.h b/Source/WebKit2/PluginProcess/PluginProcess.h index d9e1aeaae..b8163bd1f 100644 --- a/Source/WebKit2/PluginProcess/PluginProcess.h +++ b/Source/WebKit2/PluginProcess/PluginProcess.h @@ -91,7 +91,7 @@ private: void setMinimumLifetime(double); void minimumLifetimeTimerFired(); // Our web process connections. - Vector<RefPtr<WebProcessConnection>> m_webProcessConnections; + Vector<RefPtr<WebProcessConnection> > m_webProcessConnections; // The plug-in path. String m_pluginPath; diff --git a/Source/WebKit2/PluginProcess/WebProcessConnection.cpp b/Source/WebKit2/PluginProcess/WebProcessConnection.cpp index 60a5722f6..94cdcf5e0 100644 --- a/Source/WebKit2/PluginProcess/WebProcessConnection.cpp +++ b/Source/WebKit2/PluginProcess/WebProcessConnection.cpp @@ -171,7 +171,10 @@ void WebProcessConnection::didClose(CoreIPC::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. Vector<PluginControllerProxy*> pluginControllers; - for (auto it = m_pluginControllers.values().begin(), end = m_pluginControllers.values().end(); it != end; ++it) + HashMap<uint64_t, OwnPtr<PluginControllerProxy> >::iterator::Values it = m_pluginControllers.values().begin(); + HashMap<uint64_t, OwnPtr<PluginControllerProxy> >::iterator::Values end = m_pluginControllers.values().end(); + + for (; it != end; ++it) pluginControllers.append(it->get()); for (size_t i = 0; i < pluginControllers.size(); ++i) diff --git a/Source/WebKit2/PluginProcess/WebProcessConnection.h b/Source/WebKit2/PluginProcess/WebProcessConnection.h index 7b6aec7fd..c00b04668 100644 --- a/Source/WebKit2/PluginProcess/WebProcessConnection.h +++ b/Source/WebKit2/PluginProcess/WebProcessConnection.h @@ -78,7 +78,7 @@ private: RefPtr<CoreIPC::Connection> m_connection; - HashMap<uint64_t, OwnPtr<PluginControllerProxy>> m_pluginControllers; + HashMap<uint64_t, OwnPtr<PluginControllerProxy> > m_pluginControllers; RefPtr<NPRemoteObjectMap> m_npRemoteObjectMap; HashSet<uint64_t> m_asynchronousInstanceIDsToIgnore; }; diff --git a/Source/WebKit2/Shared/BlockingResponseMap.h b/Source/WebKit2/Shared/BlockingResponseMap.h index 72feca816..87ba8fdf6 100644 --- a/Source/WebKit2/Shared/BlockingResponseMap.h +++ b/Source/WebKit2/Shared/BlockingResponseMap.h @@ -77,7 +77,7 @@ private: Mutex m_mutex; ThreadCondition m_condition; - HashMap<uint64_t, OwnPtr<T>> m_responses; + HashMap<uint64_t, OwnPtr<T> > m_responses; bool m_canceled; }; diff --git a/Source/WebKit2/Shared/ChildProcessProxy.h b/Source/WebKit2/Shared/ChildProcessProxy.h index 2d86bcde4..a22901c6b 100644 --- a/Source/WebKit2/Shared/ChildProcessProxy.h +++ b/Source/WebKit2/Shared/ChildProcessProxy.h @@ -83,7 +83,7 @@ private: bool sendMessage(PassOwnPtr<CoreIPC::MessageEncoder>, unsigned messageSendFlags); - Vector<std::pair<OwnPtr<CoreIPC::MessageEncoder>, unsigned>> m_pendingMessages; + Vector<std::pair<OwnPtr<CoreIPC::MessageEncoder>, unsigned> > m_pendingMessages; RefPtr<ProcessLauncher> m_processLauncher; RefPtr<CoreIPC::Connection> m_connection; CoreIPC::MessageReceiverMap m_messageReceiverMap; diff --git a/Source/WebKit2/Shared/ImmutableArray.cpp b/Source/WebKit2/Shared/ImmutableArray.cpp index 539eb4d8e..2d45ae9be 100644 --- a/Source/WebKit2/Shared/ImmutableArray.cpp +++ b/Source/WebKit2/Shared/ImmutableArray.cpp @@ -46,7 +46,7 @@ ImmutableArray::ImmutableArray(APIObject** entries, size_t size) m_entries[i] = entries[i]; } -ImmutableArray::ImmutableArray(Vector<RefPtr<APIObject>>& entries) +ImmutableArray::ImmutableArray(Vector<RefPtr<APIObject> >& entries) { m_entries.swap(entries); } diff --git a/Source/WebKit2/Shared/ImmutableArray.h b/Source/WebKit2/Shared/ImmutableArray.h index 6ffe9d0f2..6f7e768e6 100644 --- a/Source/WebKit2/Shared/ImmutableArray.h +++ b/Source/WebKit2/Shared/ImmutableArray.h @@ -51,7 +51,7 @@ public: { return adoptRef(new ImmutableArray(Adopt, entries, size)); } - static PassRefPtr<ImmutableArray> adopt(Vector<RefPtr<APIObject>>& entries) + static PassRefPtr<ImmutableArray> adopt(Vector<RefPtr<APIObject> >& entries) { return adoptRef(new ImmutableArray(entries)); } @@ -70,9 +70,9 @@ protected: ImmutableArray(); ImmutableArray(AdoptTag, APIObject** entries, size_t); ImmutableArray(APIObject** entries, size_t); - ImmutableArray(Vector<RefPtr<APIObject>>& entries); + ImmutableArray(Vector<RefPtr<APIObject> >& entries); - Vector<RefPtr<APIObject>> m_entries; + Vector<RefPtr<APIObject> > m_entries; }; } // namespace WebKit diff --git a/Source/WebKit2/Shared/ImmutableDictionary.cpp b/Source/WebKit2/Shared/ImmutableDictionary.cpp index edb0e78df..1af988ea6 100644 --- a/Source/WebKit2/Shared/ImmutableDictionary.cpp +++ b/Source/WebKit2/Shared/ImmutableDictionary.cpp @@ -49,7 +49,7 @@ PassRefPtr<ImmutableArray> ImmutableDictionary::keys() const if (m_map.isEmpty()) return ImmutableArray::create(); - Vector<RefPtr<APIObject>> vector; + Vector<RefPtr<APIObject> > vector; vector.reserveInitialCapacity(m_map.size()); MapType::const_iterator::Keys it = m_map.begin().keys(); diff --git a/Source/WebKit2/Shared/ImmutableDictionary.h b/Source/WebKit2/Shared/ImmutableDictionary.h index f7f0572f5..d8d851098 100644 --- a/Source/WebKit2/Shared/ImmutableDictionary.h +++ b/Source/WebKit2/Shared/ImmutableDictionary.h @@ -40,7 +40,7 @@ class ImmutableArray; class ImmutableDictionary : public TypedAPIObject<APIObject::TypeDictionary> { public: - typedef HashMap<String, RefPtr<APIObject>> MapType; + typedef HashMap<String, RefPtr<APIObject> > MapType; static PassRefPtr<ImmutableDictionary> create() { diff --git a/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h b/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h index d34ffbf41..b0fe3c3b9 100644 --- a/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h +++ b/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h @@ -101,7 +101,7 @@ private: RefPtr<WorkQueue> m_messageQueue; #if PLATFORM(MAC) - typedef HashMap<uint64_t, RetainPtr<WKCustomProtocol>> CustomProtocolMap; + typedef HashMap<uint64_t, RetainPtr<WKCustomProtocol> > CustomProtocolMap; CustomProtocolMap m_customProtocolMap; Mutex m_customProtocolMapMutex; diff --git a/Source/WebKit2/Shared/SecurityOriginData.cpp b/Source/WebKit2/Shared/SecurityOriginData.cpp index 87882f354..007e05328 100644 --- a/Source/WebKit2/Shared/SecurityOriginData.cpp +++ b/Source/WebKit2/Shared/SecurityOriginData.cpp @@ -78,7 +78,7 @@ void performAPICallbackWithSecurityOriginDataVector(const Vector<SecurityOriginD } size_t originDataCount = originDatas.size(); - Vector<RefPtr<APIObject>> securityOrigins; + Vector<RefPtr<APIObject> > securityOrigins; securityOrigins.reserveCapacity(originDataCount); for (size_t i = 0; i < originDataCount; ++i) { diff --git a/Source/WebKit2/Shared/SessionState.cpp b/Source/WebKit2/Shared/SessionState.cpp index 00b465fb9..2e1bdbbf1 100644 --- a/Source/WebKit2/Shared/SessionState.cpp +++ b/Source/WebKit2/Shared/SessionState.cpp @@ -29,7 +29,7 @@ namespace CoreIPC { // 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>> { +template<typename T> struct ArgumentCoder<RefPtr<T> > { static void encode(ArgumentEncoder& encoder, const RefPtr<T>& item) { item->encode(encoder); diff --git a/Source/WebKit2/Shared/StatisticsData.h b/Source/WebKit2/Shared/StatisticsData.h index 1dbfe2acf..93fb39d17 100644 --- a/Source/WebKit2/Shared/StatisticsData.h +++ b/Source/WebKit2/Shared/StatisticsData.h @@ -42,7 +42,7 @@ struct StatisticsData { HashMap<String, uint64_t> statisticsNumbers; HashMap<String, uint64_t> javaScriptProtectedObjectTypeCounts; HashMap<String, uint64_t> javaScriptObjectTypeCounts; - Vector<HashMap<String, uint64_t>> webCoreCacheStatistics; + Vector<HashMap<String, uint64_t> > webCoreCacheStatistics; StatisticsData(); }; diff --git a/Source/WebKit2/Shared/UserMessageCoders.h b/Source/WebKit2/Shared/UserMessageCoders.h index 0022f3105..eb6bec969 100644 --- a/Source/WebKit2/Shared/UserMessageCoders.h +++ b/Source/WebKit2/Shared/UserMessageCoders.h @@ -274,7 +274,7 @@ public: if (!decoder.decode(size)) return false; - Vector<RefPtr<APIObject>> vector; + Vector<RefPtr<APIObject> > vector; for (size_t i = 0; i < size; ++i) { RefPtr<APIObject> element; Owner messageCoder(coder, element); diff --git a/Source/WebKit2/Shared/WebContextMenuItem.cpp b/Source/WebKit2/Shared/WebContextMenuItem.cpp index 1c0c3c7c5..4c6b4643a 100644 --- a/Source/WebKit2/Shared/WebContextMenuItem.cpp +++ b/Source/WebKit2/Shared/WebContextMenuItem.cpp @@ -69,7 +69,7 @@ PassRefPtr<ImmutableArray> WebContextMenuItem::submenuItemsAsImmutableArray() co const Vector<WebContextMenuItemData>& submenuVector(m_webContextMenuItemData.submenu()); unsigned size = submenuVector.size(); - Vector<RefPtr<APIObject>> result; + Vector<RefPtr<APIObject> > result; result.reserveCapacity(size); for (unsigned i = 0; i < size; ++i) diff --git a/Source/WebKit2/Shared/WebOpenPanelParameters.cpp b/Source/WebKit2/Shared/WebOpenPanelParameters.cpp index 482f36c33..a5a1468b4 100644 --- a/Source/WebKit2/Shared/WebOpenPanelParameters.cpp +++ b/Source/WebKit2/Shared/WebOpenPanelParameters.cpp @@ -53,7 +53,7 @@ PassRefPtr<ImmutableArray> WebOpenPanelParameters::acceptMIMETypes() const { size_t size = m_settings.acceptMIMETypes.size(); - Vector<RefPtr<APIObject>> vector; + Vector<RefPtr<APIObject> > vector; vector.reserveInitialCapacity(size); for (size_t i = 0; i < size; ++i) @@ -72,7 +72,7 @@ PassRefPtr<ImmutableArray> WebOpenPanelParameters::selectedFileNames() const { size_t size = m_settings.selectedFiles.size(); - Vector<RefPtr<APIObject>> vector; + Vector<RefPtr<APIObject> > vector; vector.reserveInitialCapacity(size); for (size_t i = 0; i < size; ++i) diff --git a/Source/WebKit2/UIProcess/API/C/WKPage.cpp b/Source/WebKit2/UIProcess/API/C/WKPage.cpp index 611186f5a..2d9ae5e51 100644 --- a/Source/WebKit2/UIProcess/API/C/WKPage.cpp +++ b/Source/WebKit2/UIProcess/API/C/WKPage.cpp @@ -884,11 +884,11 @@ WKScrollPinningBehavior WKPageGetScrollPinningBehavior(WKPageRef page) ScrollPinningBehavior pinning = toImpl(page)->scrollPinningBehavior(); switch (pinning) { - case WebCore::ScrollPinningBehavior::DoNotPin: + case DoNotPin: return kWKScrollPinningBehaviorDoNotPin; - case WebCore::ScrollPinningBehavior::PinToTop: + case PinToTop: return kWKScrollPinningBehaviorPinToTop; - case WebCore::ScrollPinningBehavior::PinToBottom: + case PinToBottom: return kWKScrollPinningBehaviorPinToBottom; } @@ -898,17 +898,17 @@ WKScrollPinningBehavior WKPageGetScrollPinningBehavior(WKPageRef page) void WKPageSetScrollPinningBehavior(WKPageRef page, WKScrollPinningBehavior pinning) { - ScrollPinningBehavior corePinning = ScrollPinningBehavior::DoNotPin; + ScrollPinningBehavior corePinning = DoNotPin; switch (pinning) { case kWKScrollPinningBehaviorDoNotPin: - corePinning = ScrollPinningBehavior::DoNotPin; + corePinning = DoNotPin; break; case kWKScrollPinningBehaviorPinToTop: - corePinning = ScrollPinningBehavior::PinToTop; + corePinning = PinToTop; break; case kWKScrollPinningBehaviorPinToBottom: - corePinning = ScrollPinningBehavior::PinToBottom; + corePinning = PinToBottom; break; default: ASSERT_NOT_REACHED(); diff --git a/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp b/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp index f9b9f3ea8..f1c1eecd0 100644 --- a/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp +++ b/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp @@ -67,7 +67,7 @@ void DownloadProxyMap::downloadFinished(DownloadProxy* downloadProxy) void DownloadProxyMap::processDidClose() { // Invalidate all outstanding downloads. - for (HashMap<uint64_t, RefPtr<DownloadProxy>>::iterator::Values it = m_downloads.begin().values(), end = m_downloads.end().values(); it != end; ++it) { + for (HashMap<uint64_t, RefPtr<DownloadProxy> >::iterator::Values it = m_downloads.begin().values(), end = m_downloads.end().values(); it != end; ++it) { (*it)->processDidClose(); (*it)->invalidate(); } diff --git a/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.h b/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.h index f1648ad9f..72359d55d 100644 --- a/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.h +++ b/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.h @@ -52,7 +52,7 @@ public: private: ChildProcessProxy* m_process; - HashMap<uint64_t, RefPtr<DownloadProxy>> m_downloads; + HashMap<uint64_t, RefPtr<DownloadProxy> > m_downloads; }; } // namespace WebKit diff --git a/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.h b/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.h index a5f685a9b..98885bf07 100644 --- a/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.h +++ b/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.h @@ -46,7 +46,7 @@ public: void didReceiveGeolocationPermissionDecision(uint64_t, bool allow); private: - typedef HashMap<uint64_t, RefPtr<GeolocationPermissionRequestProxy>> PendingRequestMap; + typedef HashMap<uint64_t, RefPtr<GeolocationPermissionRequestProxy> > PendingRequestMap; PendingRequestMap m_pendingRequests; WebPageProxy* m_page; }; diff --git a/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.h b/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.h index 72ef99f23..12775fb06 100644 --- a/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.h +++ b/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.h @@ -47,7 +47,7 @@ public: void didReceiveNotificationPermissionDecision(uint64_t notificationID, bool allow); private: - typedef HashMap<uint64_t, RefPtr<NotificationPermissionRequest>> PendingRequestMap; + typedef HashMap<uint64_t, RefPtr<NotificationPermissionRequest> > PendingRequestMap; PendingRequestMap m_pendingRequests; WebPageProxy* m_page; }; diff --git a/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp b/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp index 9e462af9b..5bb3db5f7 100644 --- a/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp +++ b/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp @@ -118,7 +118,7 @@ void WebNotificationManagerProxy::cancel(WebPageProxy* webPage, uint64_t pageNot void WebNotificationManagerProxy::didDestroyNotification(WebPageProxy* webPage, uint64_t pageNotificationID) { - auto globalIDNotificationPair = m_notifications.take(make_pair(webPage->pageID(), pageNotificationID)); + pair<uint64_t, RefPtr<WebNotification> > globalIDNotificationPair = m_notifications.take(make_pair(webPage->pageID(), pageNotificationID)); if (uint64_t globalNotificationID = globalIDNotificationPair.first) { WebNotification* notification = globalIDNotificationPair.second.get(); m_globalNotificationMap.remove(globalNotificationID); @@ -153,19 +153,28 @@ void WebNotificationManagerProxy::clearNotifications(WebPageProxy* webPage, cons Vector<uint64_t> globalNotificationIDs; globalNotificationIDs.reserveCapacity(m_globalNotificationMap.size()); - for (auto it = m_notifications.begin(), end = m_notifications.end(); it != end; ++it) { - uint64_t webPageID = it->key.first; - uint64_t pageNotificationID = it->key.second; - if (!filterFunction(webPageID, pageNotificationID, targetPageID, pageNotificationIDs)) - continue; - - uint64_t globalNotificationID = it->value.first; - globalNotificationIDs.append(globalNotificationID); + { + HashMap<pair<uint64_t, uint64_t>, pair<uint64_t, RefPtr<WebNotification> > >::iterator it = m_notifications.begin(); + HashMap<pair<uint64_t, uint64_t>, pair<uint64_t, RefPtr<WebNotification> > >::iterator end = m_notifications.end(); + for (; it != end; ++it) { + uint64_t webPageID = it->key.first; + uint64_t pageNotificationID = it->key.second; + if (!filterFunction(webPageID, pageNotificationID, targetPageID, pageNotificationIDs)) + continue; + + uint64_t globalNotificationID = it->value.first; + globalNotificationIDs.append(globalNotificationID); + } } - for (auto it = globalNotificationIDs.begin(), end = globalNotificationIDs.end(); it != end; ++it) { - auto pageNotification = m_globalNotificationMap.take(*it); - m_notifications.remove(pageNotification); + + { + Vector<uint64_t>::iterator it = globalNotificationIDs.begin(); + Vector<uint64_t>::iterator end = globalNotificationIDs.end(); + for (; it != end; ++it) { + pair<uint64_t, uint64_t> pageNotification = m_globalNotificationMap.take(*it); + m_notifications.remove(pageNotification); + } } m_provider.clearNotifications(globalNotificationIDs); @@ -173,7 +182,7 @@ void WebNotificationManagerProxy::clearNotifications(WebPageProxy* webPage, cons void WebNotificationManagerProxy::providerDidShowNotification(uint64_t globalNotificationID) { - auto it = m_globalNotificationMap.find(globalNotificationID); + HashMap<uint64_t, pair<uint64_t, uint64_t> >::iterator it = m_globalNotificationMap.find(globalNotificationID); if (it == m_globalNotificationMap.end()) return; @@ -188,7 +197,7 @@ void WebNotificationManagerProxy::providerDidShowNotification(uint64_t globalNot void WebNotificationManagerProxy::providerDidClickNotification(uint64_t globalNotificationID) { - auto it = m_globalNotificationMap.find(globalNotificationID); + HashMap<uint64_t, pair<uint64_t, uint64_t> >::iterator it = m_globalNotificationMap.find(globalNotificationID); if (it == m_globalNotificationMap.end()) return; @@ -204,16 +213,16 @@ void WebNotificationManagerProxy::providerDidClickNotification(uint64_t globalNo void WebNotificationManagerProxy::providerDidCloseNotifications(ImmutableArray* globalNotificationIDs) { - HashMap<WebPageProxy*, Vector<uint64_t>> pageNotificationIDs; + HashMap<WebPageProxy*, Vector<uint64_t> > pageNotificationIDs; size_t size = globalNotificationIDs->size(); for (size_t i = 0; i < size; ++i) { - auto it = m_globalNotificationMap.find(globalNotificationIDs->at<WebUInt64>(i)->value()); + HashMap<uint64_t, pair<uint64_t, uint64_t> >::iterator it = m_globalNotificationMap.find(globalNotificationIDs->at<WebUInt64>(i)->value()); if (it == m_globalNotificationMap.end()) continue; if (WebPageProxy* webPage = WebProcessProxy::webPage(it->value.first)) { - auto pageIt = pageNotificationIDs.find(webPage); + HashMap<WebPageProxy*, Vector<uint64_t> >::iterator pageIt = pageNotificationIDs.find(webPage); if (pageIt == pageNotificationIDs.end()) { Vector<uint64_t> newVector; newVector.reserveInitialCapacity(size); @@ -228,7 +237,7 @@ void WebNotificationManagerProxy::providerDidCloseNotifications(ImmutableArray* m_globalNotificationMap.remove(it); } - for (auto it = pageNotificationIDs.begin(), end = pageNotificationIDs.end(); it != end; ++it) + for (HashMap<WebPageProxy*, Vector<uint64_t> >::iterator it = pageNotificationIDs.begin(), end = pageNotificationIDs.end(); it != end; ++it) it->key->process()->send(Messages::WebNotificationManager::DidCloseNotifications(it->value), 0); } diff --git a/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h b/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h index 5890b5c1b..98b472e82 100644 --- a/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h +++ b/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h @@ -81,9 +81,9 @@ private: WebNotificationProvider m_provider; // Pair comprised of web page ID and the web process's notification ID - HashMap<uint64_t, pair<uint64_t, uint64_t>> m_globalNotificationMap; + HashMap<uint64_t, pair<uint64_t, uint64_t> > m_globalNotificationMap; // Key pair comprised of web page ID and the web process's notification ID; value pair comprised of global notification ID, and notification object - HashMap<pair<uint64_t, uint64_t>, pair<uint64_t, RefPtr<WebNotification>>> m_notifications; + HashMap<pair<uint64_t, uint64_t>, pair<uint64_t, RefPtr<WebNotification> > > m_notifications; }; } // namespace WebKit diff --git a/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp b/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp index 6af593a54..e89accaf4 100644 --- a/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp +++ b/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp @@ -71,7 +71,11 @@ uint64_t PluginProcessManager::pluginProcessToken(const PluginModuleInfo& plugin attributes.processType = pluginProcessType; attributes.sandboxPolicy = pluginProcessSandboxPolicy; +#if COMPILER_SUPPORTS(CXX_RVALUE_REFERENCES) m_pluginProcessTokens.append(std::make_pair(std::move(attributes), token)); +#else + m_pluginProcessTokens.append(std::make_pair(attributes, token)); +#endif m_knownTokens.add(token); return token; @@ -113,7 +117,7 @@ PluginProcessProxy* PluginProcessManager::getOrCreatePluginProcess(uint64_t plug } for (size_t i = 0; i < m_pluginProcessTokens.size(); ++i) { - auto& attributesAndToken = m_pluginProcessTokens[i]; + std::pair<PluginProcessAttributes, uint64_t>& attributesAndToken = m_pluginProcessTokens[i]; if (attributesAndToken.second == pluginProcessToken) { RefPtr<PluginProcessProxy> pluginProcess = PluginProcessProxy::create(this, attributesAndToken.first, attributesAndToken.second); PluginProcessProxy* pluginProcessPtr = pluginProcess.get(); diff --git a/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h b/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h index 307c39810..0ffd4099a 100644 --- a/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h +++ b/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h @@ -70,10 +70,10 @@ private: PluginProcessProxy* getOrCreatePluginProcess(uint64_t pluginProcessToken); - Vector<std::pair<PluginProcessAttributes, uint64_t>> m_pluginProcessTokens; + Vector<std::pair<PluginProcessAttributes, uint64_t> > m_pluginProcessTokens; HashSet<uint64_t> m_knownTokens; - Vector<RefPtr<PluginProcessProxy>> m_pluginProcesses; + Vector<RefPtr<PluginProcessProxy> > m_pluginProcesses; }; } // namespace WebKit diff --git a/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h b/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h index 1cb2268a9..a76cba196 100644 --- a/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h +++ b/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h @@ -151,10 +151,10 @@ private: // The connection to the plug-in host process. RefPtr<CoreIPC::Connection> m_connection; - Deque<RefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>> m_pendingConnectionReplies; + Deque<RefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> > m_pendingConnectionReplies; Vector<uint64_t> m_pendingGetSitesRequests; - HashMap<uint64_t, RefPtr<WebPluginSiteDataManager>> m_pendingGetSitesReplies; + HashMap<uint64_t, RefPtr<WebPluginSiteDataManager> > m_pendingGetSitesReplies; struct ClearSiteDataRequest { Vector<String> sites; @@ -163,7 +163,7 @@ private: uint64_t callbackID; }; Vector<ClearSiteDataRequest> m_pendingClearSiteDataRequests; - HashMap<uint64_t, RefPtr<WebPluginSiteDataManager>> m_pendingClearSiteDataReplies; + HashMap<uint64_t, RefPtr<WebPluginSiteDataManager> > m_pendingClearSiteDataReplies; // If createPluginConnection is called while the process is still launching we'll keep count of it and send a bunch of requests // when the process finishes launching. diff --git a/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp b/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp index 005591cc8..1ea01a088 100644 --- a/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp +++ b/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp @@ -181,7 +181,7 @@ void WebPluginSiteDataManager::didGetSitesWithData(const Vector<String>& sites, return; } - Vector<RefPtr<APIObject>> sitesWK(sites.size()); + Vector<RefPtr<APIObject> > sitesWK(sites.size()); for (size_t i = 0; i < sites.size(); ++i) sitesWK[i] = WebString::create(sites[i]); diff --git a/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h b/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h index 1edeceef8..8430a2330 100644 --- a/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h +++ b/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h @@ -66,18 +66,18 @@ private: explicit WebPluginSiteDataManager(WebContext*); WebContext* m_webContext; - HashMap<uint64_t, RefPtr<ArrayCallback>> m_arrayCallbacks; - HashMap<uint64_t, RefPtr<VoidCallback>> m_voidCallbacks; + HashMap<uint64_t, RefPtr<ArrayCallback> > m_arrayCallbacks; + HashMap<uint64_t, RefPtr<VoidCallback> > m_voidCallbacks; #if ENABLE(PLUGIN_PROCESS) void didGetSitesWithDataForAllPlugins(const Vector<String>& sites, uint64_t callbackID); void didClearSiteDataForAllPlugins(uint64_t callbackID); class GetSitesWithDataState; - HashMap<uint64_t, OwnPtr<GetSitesWithDataState>> m_pendingGetSitesWithData; + HashMap<uint64_t, OwnPtr<GetSitesWithDataState> > m_pendingGetSitesWithData; class ClearSiteDataState; - HashMap<uint64_t, OwnPtr<ClearSiteDataState>> m_pendingClearSiteData; + HashMap<uint64_t, OwnPtr<ClearSiteDataState> > m_pendingClearSiteData; #endif }; diff --git a/Source/WebKit2/UIProcess/SharedWorkers/SharedWorkerProcessManager.h b/Source/WebKit2/UIProcess/SharedWorkers/SharedWorkerProcessManager.h index cd30dc00c..299133879 100644 --- a/Source/WebKit2/UIProcess/SharedWorkers/SharedWorkerProcessManager.h +++ b/Source/WebKit2/UIProcess/SharedWorkers/SharedWorkerProcessManager.h @@ -62,7 +62,7 @@ private: SharedWorkerProcessProxy* getOrCreateSharedWorkerProcess(const String& url, const String& name); - Vector<RefPtr<SharedWorkerProcessProxy>> m_sharedWorkerProcesses; + Vector<RefPtr<SharedWorkerProcessProxy> > m_sharedWorkerProcesses; }; } // namespace WebKit diff --git a/Source/WebKit2/UIProcess/StatisticsRequest.cpp b/Source/WebKit2/UIProcess/StatisticsRequest.cpp index d2b22fa5b..0fa1fb7a7 100644 --- a/Source/WebKit2/UIProcess/StatisticsRequest.cpp +++ b/Source/WebKit2/UIProcess/StatisticsRequest.cpp @@ -86,7 +86,7 @@ void StatisticsRequest::completedRequest(uint64_t requestID, const StatisticsDat size_t cacheStatisticsCount = data.webCoreCacheStatistics.size(); if (cacheStatisticsCount) { - Vector<RefPtr<APIObject>> cacheStatisticsVector(cacheStatisticsCount); + Vector<RefPtr<APIObject> > cacheStatisticsVector(cacheStatisticsCount); for (size_t i = 0; i < cacheStatisticsCount; ++i) cacheStatisticsVector[i] = createDictionaryFromHashMap(data.webCoreCacheStatistics[i]); m_responseDictionary->set("WebCoreCacheStatistics", ImmutableArray::adopt(cacheStatisticsVector).get()); diff --git a/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp b/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp index 7c58578eb..4dbb9eab1 100644 --- a/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp +++ b/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp @@ -258,7 +258,7 @@ void LocalStorageDatabase::updateDatabase() m_changedItems.swap(changedItems); } else { for (int i = 0; i < maximumItemsToUpdate; ++i) { - auto it = m_changedItems.begin(); + HashMap<String, String>::iterator it = m_changedItems.begin(); changedItems.add(it->key, it->value); m_changedItems.remove(it); @@ -311,7 +311,9 @@ void LocalStorageDatabase::updateDatabaseWithChangedItems(const HashMap<String, SQLiteTransaction transaction(m_database); transaction.begin(); - for (auto it = changedItems.begin(), end = changedItems.end(); it != end; ++it) { + HashMap<String, String>::const_iterator it = changedItems.begin(); + const HashMap<String, String>::const_iterator end = changedItems.end(); + for (; it != end; ++it) { // A null value means that the key/value pair should be deleted. SQLiteStatement& statement = it->value.isNull() ? deleteStatement : insertStatement; diff --git a/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp b/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp index 1612444e1..3a106e0d0 100644 --- a/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp +++ b/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp @@ -121,9 +121,9 @@ void LocalStorageDatabaseTracker::deleteAllDatabases() deleteEmptyDirectory(m_localStorageDirectory); } -Vector<RefPtr<WebCore::SecurityOrigin>> LocalStorageDatabaseTracker::origins() const +Vector<RefPtr<WebCore::SecurityOrigin> > LocalStorageDatabaseTracker::origins() const { - Vector<RefPtr<SecurityOrigin>> origins; + Vector<RefPtr<SecurityOrigin> > origins; origins.reserveInitialCapacity(m_origins.size()); for (HashSet<String>::const_iterator it = m_origins.begin(), end = m_origins.end(); it != end; ++it) @@ -232,7 +232,7 @@ void LocalStorageDatabaseTracker::updateTrackerDatabaseFromLocalStorageDatabaseF originsFromLocalStorageDatabaseFiles.add(originIdentifier); } - for (auto it = origins.begin(), end = origins.end(); it != end; ++it) { + for (HashSet<String>::iterator it = origins.begin(), end = origins.end(); it != end; ++it) { const String& originIdentifier = *it; if (origins.contains(originIdentifier)) continue; diff --git a/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h b/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h index e16428907..1e633512d 100644 --- a/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h +++ b/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h @@ -54,7 +54,7 @@ public: void deleteDatabaseWithOrigin(WebCore::SecurityOrigin*); void deleteAllDatabases(); - Vector<RefPtr<WebCore::SecurityOrigin>> origins() const; + Vector<RefPtr<WebCore::SecurityOrigin> > origins() const; private: explicit LocalStorageDatabaseTracker(PassRefPtr<WorkQueue>); diff --git a/Source/WebKit2/UIProcess/Storage/StorageManager.cpp b/Source/WebKit2/UIProcess/Storage/StorageManager.cpp index 5350dde05..8e5dbef8b 100644 --- a/Source/WebKit2/UIProcess/Storage/StorageManager.cpp +++ b/Source/WebKit2/UIProcess/Storage/StorageManager.cpp @@ -76,7 +76,7 @@ private: unsigned m_quotaInBytes; RefPtr<StorageMap> m_storageMap; - HashSet<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>> m_eventListeners; + HashSet<std::pair<RefPtr<CoreIPC::Connection>, uint64_t> > m_eventListeners; }; class StorageManager::LocalStorageNamespace : public ThreadSafeRefCounted<LocalStorageNamespace> { @@ -218,7 +218,7 @@ void StorageManager::StorageArea::clear() m_localStorageDatabase = nullptr; } - for (auto it = m_eventListeners.begin(), end = m_eventListeners.end(); it != end; ++it) + for (HashSet<std::pair<RefPtr<CoreIPC::Connection>, uint64_t> >::iterator it = m_eventListeners.begin(), end = m_eventListeners.end(); it != end; ++it) it->first->send(Messages::StorageAreaMap::ClearCache(), it->second); } @@ -240,7 +240,7 @@ void StorageManager::StorageArea::openDatabaseAndImportItemsIfNeeded() void StorageManager::StorageArea::dispatchEvents(CoreIPC::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<CoreIPC::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); @@ -292,7 +292,7 @@ void StorageManager::LocalStorageNamespace::didDestroyStorageArea(StorageArea* s void StorageManager::LocalStorageNamespace::clearStorageAreasMatchingOrigin(SecurityOrigin* securityOrigin) { - for (auto it = m_storageAreaMap.begin(), end = m_storageAreaMap.end(); it != end; ++it) { + for (HashMap<RefPtr<SecurityOrigin>, StorageArea*>::iterator it = m_storageAreaMap.begin(), end = m_storageAreaMap.end(); it != end; ++it) { if (it->key->equal(securityOrigin)) it->value->clear(); } @@ -300,7 +300,7 @@ void StorageManager::LocalStorageNamespace::clearStorageAreasMatchingOrigin(Secu void StorageManager::LocalStorageNamespace::clearAllStorageAreas() { - for (auto it = m_storageAreaMap.begin(), end = m_storageAreaMap.end(); it != end; ++it) + for (HashMap<RefPtr<SecurityOrigin>, StorageArea*>::iterator it = m_storageAreaMap.begin(), end = m_storageAreaMap.end(); it != end; ++it) it->value->clear(); } @@ -324,7 +324,7 @@ private: RefPtr<CoreIPC::Connection> m_allowedConnection; unsigned m_quotaInBytes; - HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageArea>> m_storageAreaMap; + HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageArea> > m_storageAreaMap; }; PassRefPtr<StorageManager::SessionStorageNamespace> StorageManager::SessionStorageNamespace::create(CoreIPC::Connection* allowedConnection, unsigned quotaInBytes) @@ -351,7 +351,7 @@ void StorageManager::SessionStorageNamespace::setAllowedConnection(CoreIPC::Conn PassRefPtr<StorageManager::StorageArea> StorageManager::SessionStorageNamespace::getOrCreateStorageArea(PassRefPtr<SecurityOrigin> securityOrigin) { - HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageArea>>::AddResult result = m_storageAreaMap.add(securityOrigin, 0); + HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageArea> >::AddResult result = m_storageAreaMap.add(securityOrigin, 0); if (result.isNewEntry) result.iterator->value = StorageArea::create(0, result.iterator->key, m_quotaInBytes); @@ -362,7 +362,7 @@ void StorageManager::SessionStorageNamespace::cloneTo(SessionStorageNamespace& n { ASSERT_UNUSED(newSessionStorageNamespace, newSessionStorageNamespace.isEmpty()); - for (HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageArea>>::const_iterator it = m_storageAreaMap.begin(), end = m_storageAreaMap.end(); it != end; ++it) + for (HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageArea> >::const_iterator it = m_storageAreaMap.begin(), end = m_storageAreaMap.end(); it != end; ++it) newSessionStorageNamespace.m_storageAreaMap.add(it->key, it->value->clone()); } @@ -420,7 +420,7 @@ void StorageManager::processWillCloseConnection(WebProcessProxy* webProcessProxy m_queue->dispatch(bind(&StorageManager::invalidateConnectionInternal, this, RefPtr<CoreIPC::Connection>(webProcessProxy->connection()))); } -void StorageManager::getOrigins(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context)) +void StorageManager::getOrigins(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<RefPtr<WebCore::SecurityOrigin> >& securityOrigins, void* context)) { m_queue->dispatch(bind(&StorageManager::getOriginsInternal, this, RefPtr<FunctionDispatcher>(callbackDispatcher), context, callback)); } @@ -440,13 +440,13 @@ void StorageManager::createLocalStorageMap(CoreIPC::Connection* connection, uint std::pair<RefPtr<CoreIPC::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<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::isValidKey(connectionAndStorageMapIDPair))); - HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>>::AddResult result = m_storageAreasByConnection.add(connectionAndStorageMapIDPair, 0); + HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::AddResult result = m_storageAreasByConnection.add(connectionAndStorageMapIDPair, 0); // FIXME: These should be a message checks. ASSERT(result.isNewEntry); - ASSERT((HashMap<uint64_t, RefPtr<LocalStorageNamespace>>::isValidKey(storageNamespaceID))); + ASSERT((HashMap<uint64_t, RefPtr<LocalStorageNamespace> >::isValidKey(storageNamespaceID))); LocalStorageNamespace* localStorageNamespace = getOrCreateLocalStorageNamespace(storageNamespaceID); @@ -462,7 +462,7 @@ void StorageManager::createLocalStorageMap(CoreIPC::Connection* connection, uint void StorageManager::createSessionStorageMap(CoreIPC::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))); + ASSERT((HashMap<uint64_t, RefPtr<SessionStorageNamespace> >::isValidKey(storageNamespaceID))); SessionStorageNamespace* sessionStorageNamespace = m_sessionStorageNamespaces.get(storageNamespaceID); if (!sessionStorageNamespace) { // We're getting an incoming message from the web process that's for session storage for a web page @@ -473,9 +473,9 @@ void StorageManager::createSessionStorageMap(CoreIPC::Connection* connection, ui std::pair<RefPtr<CoreIPC::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<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::isValidKey(connectionAndStorageMapIDPair))); - HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>>::AddResult result = m_storageAreasByConnection.add(connectionAndStorageMapIDPair, 0); + HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::AddResult result = m_storageAreasByConnection.add(connectionAndStorageMapIDPair, 0); // FIXME: This should be a message check. ASSERT(result.isNewEntry); @@ -494,9 +494,9 @@ void StorageManager::destroyStorageMap(CoreIPC::Connection* connection, uint64_t std::pair<RefPtr<CoreIPC::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<CoreIPC::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<CoreIPC::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; @@ -588,9 +588,9 @@ void StorageManager::cloneSessionStorageNamespaceInternal(uint64_t storageNamesp void StorageManager::invalidateConnectionInternal(CoreIPC::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<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) { if (it->key.first != connection) continue; @@ -605,7 +605,7 @@ void StorageManager::invalidateConnectionInternal(CoreIPC::Connection* connectio StorageManager::StorageArea* StorageManager::findStorageArea(CoreIPC::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)) + if (!HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::isValidKey(connectionAndStorageMapIDPair)) return 0; return m_storageAreasByConnection.get(connectionAndStorageMapIDPair); @@ -613,31 +613,31 @@ StorageManager::StorageArea* StorageManager::findStorageArea(CoreIPC::Connection StorageManager::LocalStorageNamespace* StorageManager::getOrCreateLocalStorageNamespace(uint64_t storageNamespaceID) { - if (!HashMap<uint64_t, RefPtr<LocalStorageNamespace>>::isValidKey(storageNamespaceID)) + if (!HashMap<uint64_t, RefPtr<LocalStorageNamespace> >::isValidKey(storageNamespaceID)) return 0; - HashMap<uint64_t, RefPtr<LocalStorageNamespace>>::AddResult result = m_localStorageNamespaces.add(storageNamespaceID, 0); + HashMap<uint64_t, RefPtr<LocalStorageNamespace> >::AddResult result = m_localStorageNamespaces.add(storageNamespaceID, 0); if (result.isNewEntry) result.iterator->value = LocalStorageNamespace::create(this, storageNamespaceID); return result.iterator->value.get(); } -static void callCallbackFunction(void* context, void (*callbackFunction)(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context), Vector<RefPtr<WebCore::SecurityOrigin>>* securityOriginsPtr) +static void callCallbackFunction(void* context, void (*callbackFunction)(const Vector<RefPtr<WebCore::SecurityOrigin> >& securityOrigins, void* context), Vector<RefPtr<WebCore::SecurityOrigin> >* securityOriginsPtr) { - OwnPtr<Vector<RefPtr<WebCore::SecurityOrigin>>> securityOrigins = adoptPtr(securityOriginsPtr); + OwnPtr<Vector<RefPtr<WebCore::SecurityOrigin> > > securityOrigins = adoptPtr(securityOriginsPtr); callbackFunction(*securityOrigins, context); } -void StorageManager::getOriginsInternal(FunctionDispatcher* dispatcher, void* context, void (*callbackFunction)(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context)) +void StorageManager::getOriginsInternal(FunctionDispatcher* dispatcher, void* context, void (*callbackFunction)(const Vector<RefPtr<WebCore::SecurityOrigin> >& securityOrigins, void* context)) { - OwnPtr<Vector<RefPtr<WebCore::SecurityOrigin>>> securityOrigins = adoptPtr(new Vector<RefPtr<WebCore::SecurityOrigin>>(m_localStorageDatabaseTracker->origins())); + OwnPtr<Vector<RefPtr<WebCore::SecurityOrigin> > > securityOrigins = adoptPtr(new Vector<RefPtr<WebCore::SecurityOrigin> >(m_localStorageDatabaseTracker->origins())); dispatcher->dispatch(bind(callCallbackFunction, context, callbackFunction, securityOrigins.leakPtr())); } void StorageManager::deleteEntriesForOriginInternal(SecurityOrigin* securityOrigin) { - for (auto it = m_localStorageNamespaces.begin(), end = m_localStorageNamespaces.end(); it != end; ++it) + for (HashMap<uint64_t, RefPtr<LocalStorageNamespace> >::iterator it = m_localStorageNamespaces.begin(), end = m_localStorageNamespaces.end(); it != end; ++it) it->value->clearStorageAreasMatchingOrigin(securityOrigin); m_localStorageDatabaseTracker->deleteDatabaseWithOrigin(securityOrigin); @@ -645,7 +645,7 @@ void StorageManager::deleteEntriesForOriginInternal(SecurityOrigin* securityOrig void StorageManager::deleteAllEntriesInternal() { - for (auto it = m_localStorageNamespaces.begin(), end = m_localStorageNamespaces.end(); it != end; ++it) + for (HashMap<uint64_t, RefPtr<LocalStorageNamespace> >::iterator it = m_localStorageNamespaces.begin(), end = m_localStorageNamespaces.end(); it != end; ++it) it->value->clearAllStorageAreas(); m_localStorageDatabaseTracker->deleteAllDatabases(); diff --git a/Source/WebKit2/UIProcess/Storage/StorageManager.h b/Source/WebKit2/UIProcess/Storage/StorageManager.h index 5fc5261e4..2f0f5bfa9 100644 --- a/Source/WebKit2/UIProcess/Storage/StorageManager.h +++ b/Source/WebKit2/UIProcess/Storage/StorageManager.h @@ -61,7 +61,7 @@ public: // FIXME: Instead of a context + C function, this should take a WTF::Function, but we currently don't // support arguments in functions. - void getOrigins(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context)); + void getOrigins(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<RefPtr<WebCore::SecurityOrigin> >& securityOrigins, void* context)); void deleteEntriesForOrigin(WebCore::SecurityOrigin*); void deleteAllEntries(); @@ -95,19 +95,19 @@ private: class LocalStorageNamespace; LocalStorageNamespace* getOrCreateLocalStorageNamespace(uint64_t storageNamespaceID); - void getOriginsInternal(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context)); + void getOriginsInternal(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<RefPtr<WebCore::SecurityOrigin> >& securityOrigins, void* context)); void deleteEntriesForOriginInternal(WebCore::SecurityOrigin*); void deleteAllEntriesInternal(); RefPtr<WorkQueue> m_queue; RefPtr<LocalStorageDatabaseTracker> m_localStorageDatabaseTracker; - HashMap<uint64_t, RefPtr<LocalStorageNamespace>> m_localStorageNamespaces; + HashMap<uint64_t, RefPtr<LocalStorageNamespace> > m_localStorageNamespaces; class SessionStorageNamespace; - HashMap<uint64_t, RefPtr<SessionStorageNamespace>> m_sessionStorageNamespaces; + HashMap<uint64_t, RefPtr<SessionStorageNamespace> > m_sessionStorageNamespaces; - HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>> m_storageAreasByConnection; + HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> > m_storageAreasByConnection; }; } // namespace WebKit diff --git a/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h b/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h index f5f8ce1c4..ee5a27051 100644 --- a/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h +++ b/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h @@ -75,7 +75,7 @@ private: // CoreIPC::MessageReceiver virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE; - HashMap<uint64_t, RefPtr<ArrayCallback>> m_arrayCallbacks; + HashMap<uint64_t, RefPtr<ArrayCallback> > m_arrayCallbacks; }; } // namespace WebKit diff --git a/Source/WebKit2/UIProcess/WebBackForwardList.cpp b/Source/WebKit2/UIProcess/WebBackForwardList.cpp index 18c93ecd4..763023d07 100644 --- a/Source/WebKit2/UIProcess/WebBackForwardList.cpp +++ b/Source/WebKit2/UIProcess/WebBackForwardList.cpp @@ -74,7 +74,7 @@ void WebBackForwardList::addItem(WebBackForwardListItem* newItem) if (!m_capacity || !newItem || !m_page) return; - Vector<RefPtr<APIObject>> removedItems; + Vector<RefPtr<APIObject> > removedItems; if (m_hasCurrentIndex) { // Toss everything in the forward list. @@ -212,7 +212,7 @@ PassRefPtr<ImmutableArray> WebBackForwardList::backListAsImmutableArrayWithLimit if (!size) return ImmutableArray::create(); - Vector<RefPtr<APIObject>> vector; + Vector<RefPtr<APIObject> > vector; vector.reserveInitialCapacity(size); ASSERT(backListSize >= size); @@ -235,7 +235,7 @@ PassRefPtr<ImmutableArray> WebBackForwardList::forwardListAsImmutableArrayWithLi if (!size) return ImmutableArray::create(); - Vector<RefPtr<APIObject>> vector; + Vector<RefPtr<APIObject> > vector; vector.reserveInitialCapacity(size); unsigned last = m_currentIndex + size; @@ -257,7 +257,7 @@ void WebBackForwardList::clear() return; RefPtr<WebBackForwardListItem> currentItem = this->currentItem(); - Vector<RefPtr<APIObject>> removedItems; + Vector<RefPtr<APIObject> > removedItems; if (!currentItem) { // We should only ever have no current item if we also have no current item index. diff --git a/Source/WebKit2/UIProcess/WebBackForwardList.h b/Source/WebKit2/UIProcess/WebBackForwardList.h index 0525d5826..ecef42b4f 100644 --- a/Source/WebKit2/UIProcess/WebBackForwardList.h +++ b/Source/WebKit2/UIProcess/WebBackForwardList.h @@ -39,7 +39,7 @@ namespace WebKit { -typedef Vector<RefPtr<WebBackForwardListItem>> BackForwardListItemVector; +typedef Vector<RefPtr<WebBackForwardListItem> > BackForwardListItemVector; /* * Current diff --git a/Source/WebKit2/UIProcess/WebContext.cpp b/Source/WebKit2/UIProcess/WebContext.cpp index e1ef1021d..aee99940a 100644 --- a/Source/WebKit2/UIProcess/WebContext.cpp +++ b/Source/WebKit2/UIProcess/WebContext.cpp @@ -557,7 +557,7 @@ WebProcessProxy* WebContext::createNewWebProcess() if (m_processModel == ProcessModelSharedSecondaryProcess) { for (size_t i = 0; i != m_messagesToInjectedBundlePostedToEmptyContext.size(); ++i) { - pair<String, RefPtr<APIObject>>& message = m_messagesToInjectedBundlePostedToEmptyContext[i]; + pair<String, RefPtr<APIObject> >& message = m_messagesToInjectedBundlePostedToEmptyContext[i]; OwnPtr<CoreIPC::ArgumentEncoder> messageData = CoreIPC::ArgumentEncoder::create(); @@ -589,7 +589,7 @@ void WebContext::warmInitialProcess() void WebContext::enableProcessTermination() { m_processTerminationEnabled = true; - Vector<RefPtr<WebProcessProxy>> processes = m_processes; + Vector<RefPtr<WebProcessProxy> > processes = m_processes; for (size_t i = 0; i < processes.size(); ++i) { if (shouldTerminate(processes[i].get())) processes[i]->terminate(); @@ -1226,7 +1226,7 @@ void WebContext::pluginInfoStoreDidLoadPlugins(PluginInfoStore* store) #endif ASSERT(store == &m_pluginInfoStore); - Vector<RefPtr<APIObject>> pluginArray; + Vector<RefPtr<APIObject> > pluginArray; Vector<PluginModuleInfo> plugins = m_pluginInfoStore.plugins(); for (size_t i = 0; i < plugins.size(); ++i) { @@ -1236,7 +1236,7 @@ void WebContext::pluginInfoStoreDidLoadPlugins(PluginInfoStore* store) map.set(ASCIILiteral("name"), WebString::create(plugin.info.name)); map.set(ASCIILiteral("file"), WebString::create(plugin.info.file)); map.set(ASCIILiteral("desc"), WebString::create(plugin.info.desc)); - Vector<RefPtr<APIObject>> mimeArray; + Vector<RefPtr<APIObject> > mimeArray; for (size_t j = 0; j < plugin.info.mimes.size(); ++j) mimeArray.append(WebString::create(plugin.info.mimes[j].type)); map.set(ASCIILiteral("mimes"), ImmutableArray::adopt(mimeArray)); diff --git a/Source/WebKit2/UIProcess/WebContext.h b/Source/WebKit2/UIProcess/WebContext.h index 4e9958d83..84a385653 100644 --- a/Source/WebKit2/UIProcess/WebContext.h +++ b/Source/WebKit2/UIProcess/WebContext.h @@ -389,7 +389,7 @@ private: ProcessModel m_processModel; unsigned m_webProcessCountLimit; // The limit has no effect when process model is ProcessModelSharedSecondaryProcess. - Vector<RefPtr<WebProcessProxy>> m_processes; + Vector<RefPtr<WebProcessProxy> > m_processes; bool m_haveInitialEmptyProcess; WebProcessProxy* m_processWithPageCache; @@ -424,7 +424,7 @@ private: // Messages that were posted before any pages were created. // The client should use initialization messages instead, so that a restarted process would get the same state. - Vector<pair<String, RefPtr<APIObject>>> m_messagesToInjectedBundlePostedToEmptyContext; + Vector<pair<String, RefPtr<APIObject> > > m_messagesToInjectedBundlePostedToEmptyContext; CacheModel m_cacheModel; @@ -438,7 +438,7 @@ private: RefPtr<StorageManager> m_storageManager; - typedef HashMap<const char*, RefPtr<WebContextSupplement>, PtrHash<const char*>> WebContextSupplementMap; + typedef HashMap<const char*, RefPtr<WebContextSupplement>, PtrHash<const char*> > WebContextSupplementMap; WebContextSupplementMap m_supplements; #if USE(SOUP) @@ -472,8 +472,8 @@ private: RefPtr<NetworkProcessProxy> m_networkProcess; #endif - HashMap<uint64_t, RefPtr<DictionaryCallback>> m_dictionaryCallbacks; - HashMap<uint64_t, RefPtr<StatisticsRequest>> m_statisticsRequests; + HashMap<uint64_t, RefPtr<DictionaryCallback> > m_dictionaryCallbacks; + HashMap<uint64_t, RefPtr<StatisticsRequest> > m_statisticsRequests; #if PLATFORM(MAC) bool m_processSuppressionEnabled; diff --git a/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp b/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp index b7986221d..4830cf0c6 100644 --- a/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp +++ b/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp @@ -116,7 +116,7 @@ void WebCookieManagerProxy::didGetHostnamesWithCookies(const Vector<String>& hos } size_t hostnameCount = hostnameList.size(); - Vector<RefPtr<APIObject>> hostnames(hostnameCount); + Vector<RefPtr<APIObject> > hostnames(hostnameCount); for (size_t i = 0; i < hostnameCount; ++i) hostnames[i] = WebString::create(hostnameList[i]); diff --git a/Source/WebKit2/UIProcess/WebCookieManagerProxy.h b/Source/WebKit2/UIProcess/WebCookieManagerProxy.h index 215f22d69..ae3b5c265 100644 --- a/Source/WebKit2/UIProcess/WebCookieManagerProxy.h +++ b/Source/WebKit2/UIProcess/WebCookieManagerProxy.h @@ -98,8 +98,8 @@ private: void persistHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy); #endif - HashMap<uint64_t, RefPtr<ArrayCallback>> m_arrayCallbacks; - HashMap<uint64_t, RefPtr<HTTPCookieAcceptPolicyCallback>> m_httpCookieAcceptPolicyCallbacks; + HashMap<uint64_t, RefPtr<ArrayCallback> > m_arrayCallbacks; + HashMap<uint64_t, RefPtr<HTTPCookieAcceptPolicyCallback> > m_httpCookieAcceptPolicyCallbacks; WebCookieManagerProxyClient m_client; diff --git a/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp b/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp index 959cb5f24..c4febdc26 100644 --- a/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp +++ b/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp @@ -157,7 +157,7 @@ void WebDatabaseManagerProxy::didGetDatabasesByOrigin(const Vector<OriginAndData } size_t originAndDatabasesCount = originAndDatabasesVector.size(); - Vector<RefPtr<APIObject>> result(originAndDatabasesCount); + Vector<RefPtr<APIObject> > result(originAndDatabasesCount); for (size_t i = 0; i < originAndDatabasesCount; ++i) { const OriginAndDatabases& originAndDatabases = originAndDatabasesVector[i]; @@ -165,11 +165,11 @@ void WebDatabaseManagerProxy::didGetDatabasesByOrigin(const Vector<OriginAndData RefPtr<APIObject> origin = WebSecurityOrigin::createFromDatabaseIdentifier(originAndDatabases.originIdentifier); size_t databasesCount = originAndDatabases.databases.size(); - Vector<RefPtr<APIObject>> databases(databasesCount); + Vector<RefPtr<APIObject> > databases(databasesCount); for (size_t j = 0; j < databasesCount; ++j) { const DatabaseDetails& details = originAndDatabases.databases[i]; - HashMap<String, RefPtr<APIObject>> detailsMap; + HashMap<String, RefPtr<APIObject> > detailsMap; detailsMap.set(databaseDetailsNameKey(), WebString::create(details.name())); detailsMap.set(databaseDetailsDisplayNameKey(), WebString::create(details.displayName())); @@ -178,7 +178,7 @@ void WebDatabaseManagerProxy::didGetDatabasesByOrigin(const Vector<OriginAndData databases.append(ImmutableDictionary::adopt(detailsMap)); } - HashMap<String, RefPtr<APIObject>> originAndDatabasesMap; + HashMap<String, RefPtr<APIObject> > originAndDatabasesMap; originAndDatabasesMap.set(originKey(), origin); originAndDatabasesMap.set(originQuotaKey(), WebUInt64::create(originAndDatabases.originQuota)); originAndDatabasesMap.set(originUsageKey(), WebUInt64::create(originAndDatabases.originUsage)); @@ -209,7 +209,7 @@ void WebDatabaseManagerProxy::didGetDatabaseOrigins(const Vector<String>& origin } size_t originIdentifiersCount = originIdentifiers.size(); - Vector<RefPtr<APIObject>> securityOrigins(originIdentifiersCount); + Vector<RefPtr<APIObject> > securityOrigins(originIdentifiersCount); for (size_t i = 0; i < originIdentifiersCount; ++i) securityOrigins[i] = WebSecurityOrigin::createFromDatabaseIdentifier(originIdentifiers[i]); diff --git a/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h b/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h index c8abbe400..3266d5849 100644 --- a/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h +++ b/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h @@ -93,7 +93,7 @@ private: void didModifyOrigin(const String& originIdentifier); void didModifyDatabase(const String& originIdentifier, const String& databaseIdentifier); - HashMap<uint64_t, RefPtr<ArrayCallback>> m_arrayCallbacks; + HashMap<uint64_t, RefPtr<ArrayCallback> > m_arrayCallbacks; WebDatabaseManagerProxyClient m_client; }; diff --git a/Source/WebKit2/UIProcess/WebFormClient.cpp b/Source/WebKit2/UIProcess/WebFormClient.cpp index a17f61344..ecddbcc42 100644 --- a/Source/WebKit2/UIProcess/WebFormClient.cpp +++ b/Source/WebKit2/UIProcess/WebFormClient.cpp @@ -33,7 +33,7 @@ namespace WebKit { -bool WebFormClient::willSubmitForm(WebPageProxy* page, WebFrameProxy* frame, WebFrameProxy* sourceFrame, const Vector<std::pair<String, String>>& textFieldValues, APIObject* userData, WebFormSubmissionListenerProxy* listener) +bool WebFormClient::willSubmitForm(WebPageProxy* page, WebFrameProxy* frame, WebFrameProxy* sourceFrame, const Vector<std::pair<String, String> >& textFieldValues, APIObject* userData, WebFormSubmissionListenerProxy* listener) { if (!m_client.willSubmitForm) return false; diff --git a/Source/WebKit2/UIProcess/WebFormClient.h b/Source/WebKit2/UIProcess/WebFormClient.h index ca0f2b4b6..05925239f 100644 --- a/Source/WebKit2/UIProcess/WebFormClient.h +++ b/Source/WebKit2/UIProcess/WebFormClient.h @@ -41,7 +41,7 @@ class WebFormSubmissionListenerProxy; class WebFormClient : public APIClient<WKPageFormClient, kWKPageFormClientCurrentVersion> { public: - bool willSubmitForm(WebPageProxy*, WebFrameProxy*, WebFrameProxy*, const Vector<std::pair<String, String>>& textFieldValues, APIObject* userData, WebFormSubmissionListenerProxy*); + bool willSubmitForm(WebPageProxy*, WebFrameProxy*, WebFrameProxy*, const Vector<std::pair<String, String> >& textFieldValues, APIObject* userData, WebFormSubmissionListenerProxy*); }; } // namespace WebKit diff --git a/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp b/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp index 8507543c0..cb10ee0b2 100644 --- a/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp +++ b/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp @@ -65,11 +65,11 @@ void WebKeyValueStorageManager::derefWebContextSupplement() APIObject::deref(); } -static void didGetKeyValueStorageOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context) +static void didGetKeyValueStorageOrigins(const Vector<RefPtr<WebCore::SecurityOrigin> >& securityOrigins, void* context) { RefPtr<ArrayCallback> callback = adoptRef(static_cast<ArrayCallback*>(context)); - Vector<RefPtr<APIObject>> webSecurityOrigins; + Vector<RefPtr<APIObject> > webSecurityOrigins; webSecurityOrigins.reserveInitialCapacity(securityOrigins.size()); for (unsigned i = 0; i < securityOrigins.size(); ++i) diff --git a/Source/WebKit2/UIProcess/WebLoaderClient.cpp b/Source/WebKit2/UIProcess/WebLoaderClient.cpp index 82123f4d8..e1c587c13 100644 --- a/Source/WebKit2/UIProcess/WebLoaderClient.cpp +++ b/Source/WebKit2/UIProcess/WebLoaderClient.cpp @@ -246,7 +246,7 @@ void WebLoaderClient::processDidCrash(WebPageProxy* page) m_client.processDidCrash(toAPI(page), m_client.clientInfo); } -void WebLoaderClient::didChangeBackForwardList(WebPageProxy* page, WebBackForwardListItem* addedItem, Vector<RefPtr<APIObject>>* removedItems) +void WebLoaderClient::didChangeBackForwardList(WebPageProxy* page, WebBackForwardListItem* addedItem, Vector<RefPtr<APIObject> >* removedItems) { if (!m_client.didChangeBackForwardList) return; diff --git a/Source/WebKit2/UIProcess/WebLoaderClient.h b/Source/WebKit2/UIProcess/WebLoaderClient.h index ce5a31cb3..c3fe2b422 100644 --- a/Source/WebKit2/UIProcess/WebLoaderClient.h +++ b/Source/WebKit2/UIProcess/WebLoaderClient.h @@ -86,7 +86,7 @@ public: void processDidBecomeResponsive(WebPageProxy*); void processDidCrash(WebPageProxy*); - void didChangeBackForwardList(WebPageProxy*, WebBackForwardListItem* addedItem, Vector<RefPtr<APIObject>>* removedItems); + void didChangeBackForwardList(WebPageProxy*, WebBackForwardListItem* addedItem, Vector<RefPtr<APIObject> >* removedItems); bool shouldGoToBackForwardListItem(WebPageProxy*, WebBackForwardListItem*); void willGoToBackForwardListItem(WebPageProxy*, WebBackForwardListItem*, APIObject*); diff --git a/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp b/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp index b8d6ffd8f..425dc91e8 100644 --- a/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp +++ b/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp @@ -99,7 +99,7 @@ void WebMediaCacheManagerProxy::didGetHostnamesWithMediaCache(const Vector<Strin } size_t hostnameCount = hostnameList.size(); - Vector<RefPtr<APIObject>> hostnames(hostnameCount); + Vector<RefPtr<APIObject> > hostnames(hostnameCount); for (size_t i = 0; i < hostnameCount; ++i) hostnames[i] = WebString::create(hostnameList[i]); diff --git a/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h b/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h index 5d557879e..5c10b24f0 100644 --- a/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h +++ b/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h @@ -71,7 +71,7 @@ private: // CoreIPC::MessageReceiver virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE; - HashMap<uint64_t, RefPtr<ArrayCallback>> m_arrayCallbacks; + HashMap<uint64_t, RefPtr<ArrayCallback> > m_arrayCallbacks; }; } // namespace WebKit diff --git a/Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp b/Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp index f81df3a57..96275760c 100644 --- a/Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp +++ b/Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp @@ -100,7 +100,7 @@ bool WebPageContextMenuClient::showContextMenu(WebPageProxy* page, const WebCore unsigned size = menuItemsVector.size(); - Vector<RefPtr<APIObject>> menuItems; + Vector<RefPtr<APIObject> > menuItems; menuItems.reserveCapacity(size); for (unsigned i = 0; i < size; ++i) diff --git a/Source/WebKit2/UIProcess/WebPageProxy.cpp b/Source/WebKit2/UIProcess/WebPageProxy.cpp index 737d71356..765a7cee1 100644 --- a/Source/WebKit2/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit2/UIProcess/WebPageProxy.cpp @@ -164,7 +164,7 @@ private: ExceededDatabaseQuotaRecords() { } ~ExceededDatabaseQuotaRecords() { } - Deque<OwnPtr<Record>> m_records; + Deque<OwnPtr<Record> > m_records; OwnPtr<Record> m_currentRecord; }; @@ -395,7 +395,7 @@ PassRefPtr<ImmutableArray> WebPageProxy::relatedPages() const // pages() returns a list of pages in WebProcess, so this page may or may not be among them - a client can use a reference to WebPageProxy after the page has closed. Vector<WebPageProxy*> pages = m_process->pages(); - Vector<RefPtr<APIObject>> result; + Vector<RefPtr<APIObject> > result; result.reserveCapacity(pages.size()); for (size_t i = 0; i < pages.size(); ++i) { if (pages[i] != this) @@ -888,7 +888,7 @@ void WebPageProxy::tryRestoreScrollPosition() m_process->send(Messages::WebPage::TryRestoreScrollPosition(), m_pageID); } -void WebPageProxy::didChangeBackForwardList(WebBackForwardListItem* added, Vector<RefPtr<APIObject>>* removed) +void WebPageProxy::didChangeBackForwardList(WebBackForwardListItem* added, Vector<RefPtr<APIObject> >* removed) { m_loaderClient.didChangeBackForwardList(this, added, removed); } @@ -1362,7 +1362,7 @@ void WebPageProxy::handleWheelEvent(const NativeWebWheelEvent& event) return; } - OwnPtr<Vector<NativeWebWheelEvent>> coalescedWheelEvent = adoptPtr(new Vector<NativeWebWheelEvent>); + OwnPtr<Vector<NativeWebWheelEvent> > coalescedWheelEvent = adoptPtr(new Vector<NativeWebWheelEvent>); coalescedWheelEvent->append(event); m_currentlyProcessedWheelEvents.append(coalescedWheelEvent.release()); sendWheelEvent(event); @@ -1370,7 +1370,7 @@ void WebPageProxy::handleWheelEvent(const NativeWebWheelEvent& event) void WebPageProxy::processNextQueuedWheelEvent() { - OwnPtr<Vector<NativeWebWheelEvent>> nextCoalescedEvent = adoptPtr(new Vector<NativeWebWheelEvent>); + OwnPtr<Vector<NativeWebWheelEvent> > nextCoalescedEvent = adoptPtr(new Vector<NativeWebWheelEvent>); WebWheelEvent nextWheelEvent = coalescedWheelEvent(m_wheelEventQueue, *nextCoalescedEvent.get()); m_currentlyProcessedWheelEvents.append(nextCoalescedEvent.release()); sendWheelEvent(nextWheelEvent); @@ -1925,7 +1925,7 @@ void WebPageProxy::setMemoryCacheClientCallsEnabled(bool memoryCacheClientCallsE void WebPageProxy::findStringMatches(const String& string, FindOptions options, unsigned maxMatchCount) { if (string.isEmpty()) { - didFindStringMatches(string, Vector<Vector<WebCore::IntRect>> (), 0); + didFindStringMatches(string, Vector<Vector<WebCore::IntRect> > (), 0); return; } @@ -2578,7 +2578,7 @@ void WebPageProxy::unableToImplementPolicy(uint64_t frameID, const ResourceError // 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, CoreIPC::MessageDecoder& decoder) { RefPtr<APIObject> userData; WebContextUserMessageDecoder messageDecoder(userData, m_process.get()); @@ -3114,15 +3114,15 @@ void WebPageProxy::didFindString(const String& string, uint32_t matchCount) m_findClient.didFindString(this, string, matchCount); } -void WebPageProxy::didFindStringMatches(const String& string, Vector<Vector<WebCore::IntRect>> matchRects, int32_t firstIndexAfterSelection) +void WebPageProxy::didFindStringMatches(const String& string, Vector<Vector<WebCore::IntRect> > matchRects, int32_t firstIndexAfterSelection) { - Vector<RefPtr<APIObject>> matches; + Vector<RefPtr<APIObject> > matches; matches.reserveInitialCapacity(matchRects.size()); for (size_t i = 0; i < matchRects.size(); ++i) { const Vector<WebCore::IntRect>& rects = matchRects[i]; size_t numRects = matchRects[i].size(); - Vector<RefPtr<APIObject>> apiRects; + Vector<RefPtr<APIObject> > apiRects; apiRects.reserveInitialCapacity(numRects); for (size_t i = 0; i < numRects; ++i) @@ -3576,7 +3576,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) case WebEvent::Wheel: { ASSERT(!m_currentlyProcessedWheelEvents.isEmpty()); - OwnPtr<Vector<NativeWebWheelEvent>> oldestCoalescedEvent = m_currentlyProcessedWheelEvents.takeFirst(); + OwnPtr<Vector<NativeWebWheelEvent> > oldestCoalescedEvent = m_currentlyProcessedWheelEvents.takeFirst(); // FIXME: Dispatch additional events to the didNotHandleWheelEvent client function. if (!handled && m_uiClient.implementsDidNotHandleWheelEvent()) diff --git a/Source/WebKit2/UIProcess/WebPageProxy.h b/Source/WebKit2/UIProcess/WebPageProxy.h index 64aa05116..80d1d28fd 100644 --- a/Source/WebKit2/UIProcess/WebPageProxy.h +++ b/Source/WebKit2/UIProcess/WebPageProxy.h @@ -301,7 +301,7 @@ public: void goToBackForwardItem(WebBackForwardListItem*); void tryRestoreScrollPosition(); - void didChangeBackForwardList(WebBackForwardListItem* addedItem, Vector<RefPtr<APIObject>>* removedItems); + void didChangeBackForwardList(WebBackForwardListItem* addedItem, Vector<RefPtr<APIObject> >* removedItems); void shouldGoToBackForwardListItem(uint64_t itemID, bool& shouldGoToBackForwardListItem); void willGoToBackForwardListItem(uint64_t itemID, CoreIPC::MessageDecoder&); @@ -555,7 +555,7 @@ public: void setFindIndicator(const WebCore::FloatRect& selectionRectInWindowCoordinates, const Vector<WebCore::FloatRect>& textRectsInSelectionRectCoordinates, float contentImageScaleFactor, const ShareableBitmap::Handle& contentImageHandle, bool fadeOut, bool animate); void didFindString(const String&, uint32_t matchCount); void didFailToFindString(const String&); - void didFindStringMatches(const String&, Vector<Vector<WebCore::IntRect>> matchRects, int32_t firstIndexAfterSelection); + void didFindStringMatches(const String&, Vector<Vector<WebCore::IntRect> > matchRects, int32_t firstIndexAfterSelection); void getContentsAsString(PassRefPtr<StringCallback>); #if ENABLE(MHTML) @@ -828,7 +828,7 @@ private: void decidePolicyForResponseSync(uint64_t frameID, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, uint64_t listenerID, CoreIPC::MessageDecoder&, bool& receivedPolicyAction, uint64_t& policyAction, uint64_t& downloadID); void unableToImplementPolicy(uint64_t frameID, const WebCore::ResourceError&, CoreIPC::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, CoreIPC::MessageDecoder&); // UI client void createNewPage(const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, uint32_t modifiers, int32_t mouseButton, uint64_t& newPageID, WebPageCreationParameters&); @@ -1088,16 +1088,16 @@ private: RefPtr<WebVibrationProxy> m_vibration; #endif - HashMap<uint64_t, RefPtr<VoidCallback>> m_voidCallbacks; - HashMap<uint64_t, RefPtr<DataCallback>> m_dataCallbacks; - HashMap<uint64_t, RefPtr<ImageCallback>> m_imageCallbacks; - HashMap<uint64_t, RefPtr<StringCallback>> m_stringCallbacks; + HashMap<uint64_t, RefPtr<VoidCallback> > m_voidCallbacks; + HashMap<uint64_t, RefPtr<DataCallback> > m_dataCallbacks; + HashMap<uint64_t, RefPtr<ImageCallback> > m_imageCallbacks; + HashMap<uint64_t, RefPtr<StringCallback> > m_stringCallbacks; HashSet<uint64_t> m_loadDependentStringCallbackIDs; - HashMap<uint64_t, RefPtr<ScriptValueCallback>> m_scriptValueCallbacks; - HashMap<uint64_t, RefPtr<ComputedPagesCallback>> m_computedPagesCallbacks; - HashMap<uint64_t, RefPtr<ValidateCommandCallback>> m_validateCommandCallbacks; + HashMap<uint64_t, RefPtr<ScriptValueCallback> > m_scriptValueCallbacks; + HashMap<uint64_t, RefPtr<ComputedPagesCallback> > m_computedPagesCallbacks; + HashMap<uint64_t, RefPtr<ValidateCommandCallback> > m_validateCommandCallbacks; #if PLATFORM(GTK) - HashMap<uint64_t, RefPtr<PrintFinishedCallback>> m_printFinishedCallbacks; + HashMap<uint64_t, RefPtr<PrintFinishedCallback> > m_printFinishedCallbacks; #endif HashSet<WebEditCommandProxy*> m_editCommandSet; @@ -1188,7 +1188,7 @@ private: #endif Deque<NativeWebKeyboardEvent> m_keyEventQueue; Deque<NativeWebWheelEvent> m_wheelEventQueue; - Deque<OwnPtr<Vector<NativeWebWheelEvent>>> m_currentlyProcessedWheelEvents; + Deque<OwnPtr<Vector<NativeWebWheelEvent> > > m_currentlyProcessedWheelEvents; bool m_processingMouseMoveEvent; OwnPtr<NativeWebMouseEvent> m_nextMouseMoveEvent; @@ -1268,7 +1268,7 @@ private: #endif #if PLATFORM(QT) - WTF::HashSet<RefPtr<QtRefCountedNetworkRequestData>> m_applicationSchemeRequests; + WTF::HashSet<RefPtr<QtRefCountedNetworkRequestData> > m_applicationSchemeRequests; #endif #if ENABLE(PAGE_VISIBILITY_API) diff --git a/Source/WebKit2/UIProcess/WebPageProxy.messages.in b/Source/WebKit2/UIProcess/WebPageProxy.messages.in index 667bfa2c8..20e9f624e 100644 --- a/Source/WebKit2/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit2/UIProcess/WebPageProxy.messages.in @@ -141,7 +141,7 @@ messages -> WebPageProxy { #endif # Forms messages - WillSubmitForm(uint64_t frameID, uint64_t sourceFrameID, WTF::Vector<std::pair<WTF::String, WTF::String>> textFieldValues, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic + WillSubmitForm(uint64_t frameID, uint64_t sourceFrameID, WTF::Vector<std::pair<WTF::String, WTF::String> > textFieldValues, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic # Callback messages VoidCallback(uint64_t callbackID) @@ -194,7 +194,7 @@ messages -> WebPageProxy { SetFindIndicator(WebCore::FloatRect selectionRect, Vector<WebCore::FloatRect> textRects, float contentImageScaleFactor, WebKit::ShareableBitmap::Handle contentImageHandle, bool fadeOut, bool animate) DidFindString(WTF::String string, uint32_t matchCount) DidFailToFindString(WTF::String string) - DidFindStringMatches(WTF::String string, Vector<Vector<WebCore::IntRect>> matches, int32_t firstIndexAfterSelection) + DidFindStringMatches(WTF::String string, Vector<Vector<WebCore::IntRect> > matches, int32_t firstIndexAfterSelection) DidGetImageForFindMatch(WebKit::ShareableBitmap::Handle contentImageHandle, uint32_t matchIndex) # PopupMenu messages diff --git a/Source/WebKit2/UIProcess/WebProcessProxy.cpp b/Source/WebKit2/UIProcess/WebProcessProxy.cpp index 88659844a..5090abd97 100644 --- a/Source/WebKit2/UIProcess/WebProcessProxy.cpp +++ b/Source/WebKit2/UIProcess/WebProcessProxy.cpp @@ -148,7 +148,7 @@ void WebProcessProxy::disconnect() m_responsivenessTimer.invalidate(); - Vector<RefPtr<WebFrameProxy>> frames; + Vector<RefPtr<WebFrameProxy> > frames; copyValuesToVector(m_frameMap, frames); for (size_t i = 0, size = frames.size(); i < size; ++i) @@ -404,7 +404,7 @@ void WebProcessProxy::didClose(CoreIPC::Connection*) webConnection()->didClose(); - Vector<RefPtr<WebPageProxy>> pages; + Vector<RefPtr<WebPageProxy> > pages; copyValuesToVector(m_pageMap, pages); disconnect(); @@ -430,7 +430,7 @@ void WebProcessProxy::didReceiveInvalidMessage(CoreIPC::Connection* connection, void WebProcessProxy::didBecomeUnresponsive(ResponsivenessTimer*) { - Vector<RefPtr<WebPageProxy>> pages; + Vector<RefPtr<WebPageProxy> > pages; copyValuesToVector(m_pageMap, pages); for (size_t i = 0, size = pages.size(); i < size; ++i) pages[i]->processDidBecomeUnresponsive(); @@ -438,7 +438,7 @@ void WebProcessProxy::didBecomeUnresponsive(ResponsivenessTimer*) void WebProcessProxy::interactionOccurredWhileUnresponsive(ResponsivenessTimer*) { - Vector<RefPtr<WebPageProxy>> pages; + Vector<RefPtr<WebPageProxy> > pages; copyValuesToVector(m_pageMap, pages); for (size_t i = 0, size = pages.size(); i < size; ++i) pages[i]->interactionOccurredWhileProcessUnresponsive(); @@ -446,7 +446,7 @@ void WebProcessProxy::interactionOccurredWhileUnresponsive(ResponsivenessTimer*) void WebProcessProxy::didBecomeResponsive(ResponsivenessTimer*) { - Vector<RefPtr<WebPageProxy>> pages; + Vector<RefPtr<WebPageProxy> > pages; copyValuesToVector(m_pageMap, pages); for (size_t i = 0, size = pages.size(); i < size; ++i) pages[i]->processDidBecomeResponsive(); @@ -495,7 +495,7 @@ void WebProcessProxy::didDestroyFrame(uint64_t frameID) void WebProcessProxy::disconnectFramesFromPage(WebPageProxy* page) { - Vector<RefPtr<WebFrameProxy>> frames; + Vector<RefPtr<WebFrameProxy> > frames; copyValuesToVector(m_frameMap, frames); for (size_t i = 0, size = frames.size(); i < size; ++i) { if (frames[i]->page() == page) @@ -506,7 +506,7 @@ void WebProcessProxy::disconnectFramesFromPage(WebPageProxy* page) size_t WebProcessProxy::frameCountInPage(WebPageProxy* page) const { size_t result = 0; - for (HashMap<uint64_t, RefPtr<WebFrameProxy>>::const_iterator iter = m_frameMap.begin(); iter != m_frameMap.end(); ++iter) { + for (HashMap<uint64_t, RefPtr<WebFrameProxy> >::const_iterator iter = m_frameMap.begin(); iter != m_frameMap.end(); ++iter) { if (iter->value->page() == page) ++result; } diff --git a/Source/WebKit2/UIProcess/WebProcessProxy.h b/Source/WebKit2/UIProcess/WebProcessProxy.h index 7d9b7f6ba..a22f4723f 100644 --- a/Source/WebKit2/UIProcess/WebProcessProxy.h +++ b/Source/WebKit2/UIProcess/WebProcessProxy.h @@ -60,8 +60,8 @@ struct WebNavigationDataStore; class WebProcessProxy : public ChildProcessProxy, ResponsivenessTimer::Client { public: - typedef HashMap<uint64_t, RefPtr<WebBackForwardListItem>> WebBackForwardListItemMap; - typedef HashMap<uint64_t, RefPtr<WebFrameProxy>> WebFrameProxyMap; + typedef HashMap<uint64_t, RefPtr<WebBackForwardListItem> > WebBackForwardListItemMap; + typedef HashMap<uint64_t, RefPtr<WebFrameProxy> > WebFrameProxyMap; typedef HashMap<uint64_t, WebPageProxy*> WebPageProxyMap; static PassRefPtr<WebProcessProxy> create(PassRefPtr<WebContext>); diff --git a/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h b/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h index e80afc3c6..3b5a3b2d9 100644 --- a/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h +++ b/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h @@ -74,7 +74,7 @@ private: // Message handlers. void didGetCacheOrigins(const Vector<SecurityOriginData>& originIdentifiers, uint64_t callbackID); - HashMap<uint64_t, RefPtr<ArrayCallback>> m_arrayCallbacks; + HashMap<uint64_t, RefPtr<ArrayCallback> > m_arrayCallbacks; }; } // namespace WebKit diff --git a/Source/WebKit2/WebKit2.pri b/Source/WebKit2/WebKit2.pri index a1da0451a..cf1d549dd 100644 --- a/Source/WebKit2/WebKit2.pri +++ b/Source/WebKit2/WebKit2.pri @@ -85,5 +85,3 @@ have?(QTQUICK): QT += qml quick have?(qtlocation):enable?(GEOLOCATION): QT += location enable?(SECCOMP_FILTERS): PKGCONFIG += libseccomp - -CONFIG += c++11 diff --git a/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp b/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp index 484790402..0d6211423 100644 --- a/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp +++ b/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp @@ -53,15 +53,15 @@ WebApplicationCacheManager::WebApplicationCacheManager(ChildProcess* childProces void WebApplicationCacheManager::getApplicationCacheOrigins(uint64_t callbackID) { - HashSet<RefPtr<SecurityOrigin>> origins; + HashSet<RefPtr<SecurityOrigin> > origins; cacheStorage().getOriginsWithCache(origins); Vector<SecurityOriginData> identifiers; identifiers.reserveCapacity(origins.size()); - HashSet<RefPtr<SecurityOrigin>>::iterator end = origins.end(); - HashSet<RefPtr<SecurityOrigin>>::iterator i = origins.begin(); + HashSet<RefPtr<SecurityOrigin> >::iterator end = origins.end(); + HashSet<RefPtr<SecurityOrigin> >::iterator i = origins.begin(); for (; i != end; ++i) { RefPtr<SecurityOrigin> origin = *i; diff --git a/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.cpp b/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.cpp index aa42f5a6d..140e4c638 100644 --- a/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.cpp +++ b/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.cpp @@ -78,7 +78,7 @@ void WebGeolocationManager::didChangePosition(const WebGeolocationPosition::Data #if ENABLE(GEOLOCATION) RefPtr<GeolocationPosition> position = GeolocationPosition::create(data.timestamp, data.latitude, data.longitude, data.accuracy, data.canProvideAltitude, data.altitude, data.canProvideAltitudeAccuracy, data.altitudeAccuracy, data.canProvideHeading, data.heading, data.canProvideSpeed, data.speed); - Vector<RefPtr<WebPage>> webPageCopy; + Vector<RefPtr<WebPage> > webPageCopy; copyToVector(m_pageSet, webPageCopy); for (size_t i = 0; i < webPageCopy.size(); ++i) { WebPage* page = webPageCopy[i].get(); @@ -96,7 +96,7 @@ void WebGeolocationManager::didFailToDeterminePosition(const String& errorMessag // FIXME: Add localized error string. RefPtr<GeolocationError> error = GeolocationError::create(GeolocationError::PositionUnavailable, errorMessage); - Vector<RefPtr<WebPage>> webPageCopy; + Vector<RefPtr<WebPage> > webPageCopy; copyToVector(m_pageSet, webPageCopy); for (size_t i = 0; i < webPageCopy.size(); ++i) { WebPage* page = webPageCopy[i].get(); diff --git a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h index 3a99ad570..f4dd4ab72 100644 --- a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h +++ b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h @@ -72,7 +72,7 @@ private: bool m_isEnabled; WebProcess* m_process; - HashMap<uint64_t, RefPtr<WebCore::IconLoadDecisionCallback>> m_iconLoadDecisionCallbacks; + HashMap<uint64_t, RefPtr<WebCore::IconLoadDecisionCallback> > m_iconLoadDecisionCallbacks; }; } // namespace WebKit diff --git a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp index ef4a82f6e..e2d957b93 100644 --- a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp +++ b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp @@ -420,12 +420,12 @@ void InjectedBundle::resetApplicationCacheOriginQuota(const String& originString PassRefPtr<ImmutableArray> InjectedBundle::originsWithApplicationCache() { - HashSet<RefPtr<SecurityOrigin>> origins; + HashSet<RefPtr<SecurityOrigin> > origins; cacheStorage().getOriginsWithCache(origins); - Vector< RefPtr<APIObject>> originsVector; + Vector< RefPtr<APIObject> > originsVector; - HashSet<RefPtr<SecurityOrigin>>::iterator it = origins.begin(); - HashSet<RefPtr<SecurityOrigin>>::iterator end = origins.end(); + HashSet<RefPtr<SecurityOrigin> >::iterator it = origins.begin(); + HashSet<RefPtr<SecurityOrigin> >::iterator end = origins.end(); for ( ; it != end; ++it) originsVector.append(WebString::create((*it)->databaseIdentifier())); diff --git a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.cpp b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.cpp index b4c5f0f4c..92a7e695e 100644 --- a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.cpp +++ b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.cpp @@ -36,7 +36,7 @@ PassRefPtr<ImmutableArray> InjectedBundleBackForwardListItem::children() const { const HistoryItemVector& children = m_item->children(); size_t size = children.size(); - Vector<RefPtr<APIObject>> vector(size); + Vector<RefPtr<APIObject> > vector(size); for (size_t i = 0; i < size; ++i) vector[i] = InjectedBundleBackForwardListItem::create(children[i]); return ImmutableArray::adopt(vector); diff --git a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp index faa9b7fbb..90ebb5dd9 100644 --- a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp +++ b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp @@ -136,7 +136,7 @@ void InjectedBundlePageEditorClient::willWriteToPasteboard(WebPage* page, Range* } } -void InjectedBundlePageEditorClient::getPasteboardDataForRange(WebPage* page, Range* range, Vector<String>& pasteboardTypes, Vector<RefPtr<SharedBuffer>>& pasteboardData) +void InjectedBundlePageEditorClient::getPasteboardDataForRange(WebPage* page, Range* range, Vector<String>& pasteboardTypes, Vector<RefPtr<SharedBuffer> >& pasteboardData) { if (m_client.getPasteboardDataForRange) { RefPtr<InjectedBundleRangeHandle> rangeHandle = InjectedBundleRangeHandle::getOrCreate(range); diff --git a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h index 1400d5f47..96d8bc28b 100644 --- a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h +++ b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h @@ -59,7 +59,7 @@ public: void didChange(WebPage*, StringImpl* notificationName); void didChangeSelection(WebPage*, StringImpl* notificationName); void willWriteToPasteboard(WebPage*, WebCore::Range*); - void getPasteboardDataForRange(WebPage*, WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer>>& pasteboardData); + void getPasteboardDataForRange(WebPage*, WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData); void didWriteToPasteboard(WebPage*); }; diff --git a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp index 3af6cf49a..27216bbdf 100644 --- a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp +++ b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp @@ -93,7 +93,7 @@ bool InjectedBundlePageFormClient::shouldPerformActionInTextField(WebPage* page, return m_client.shouldPerformActionInTextField(toAPI(page), toAPI(nodeHandle.get()), actionType, toAPI(frame), m_client.clientInfo); } -void InjectedBundlePageFormClient::willSendSubmitEvent(WebPage* page, HTMLFormElement* formElement, WebFrame* frame, WebFrame* sourceFrame, const Vector<std::pair<String, String>>& values) +void InjectedBundlePageFormClient::willSendSubmitEvent(WebPage* page, HTMLFormElement* formElement, WebFrame* frame, WebFrame* sourceFrame, const Vector<std::pair<String, String> >& values) { if (!m_client.willSendSubmitEvent) return; @@ -108,7 +108,7 @@ void InjectedBundlePageFormClient::willSendSubmitEvent(WebPage* page, HTMLFormEl m_client.willSendSubmitEvent(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), toAPI(sourceFrame), toAPI(textFieldsMap.get()), m_client.clientInfo); } -void InjectedBundlePageFormClient::willSubmitForm(WebPage* page, HTMLFormElement* formElement, WebFrame* frame, WebFrame* sourceFrame, const Vector<std::pair<String, String>>& values, RefPtr<APIObject>& userData) +void InjectedBundlePageFormClient::willSubmitForm(WebPage* page, HTMLFormElement* formElement, WebFrame* frame, WebFrame* sourceFrame, const Vector<std::pair<String, String> >& values, RefPtr<APIObject>& userData) { if (!m_client.willSubmitForm) return; @@ -125,14 +125,14 @@ void InjectedBundlePageFormClient::willSubmitForm(WebPage* page, HTMLFormElement userData = adoptRef(toImpl(userDataToPass)); } -void InjectedBundlePageFormClient::didAssociateFormControls(WebPage* page, const Vector<RefPtr<WebCore::Element>>& elements) +void InjectedBundlePageFormClient::didAssociateFormControls(WebPage* page, const Vector<RefPtr<WebCore::Element> >& elements) { if (!m_client.didAssociateFormControls) return; size_t size = elements.size(); - Vector<RefPtr<APIObject>> elementHandles; + Vector<RefPtr<APIObject> > elementHandles; elementHandles.reserveCapacity(size); for (size_t i = 0; i < size; ++i) diff --git a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.h b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.h index 47bbc72ed..4b697b921 100644 --- a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.h +++ b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.h @@ -54,9 +54,9 @@ public: void textDidChangeInTextField(WebPage*, WebCore::HTMLInputElement*, WebFrame*); void textDidChangeInTextArea(WebPage*, WebCore::HTMLTextAreaElement*, WebFrame*); bool shouldPerformActionInTextField(WebPage*, WebCore::HTMLInputElement*, WKInputFieldActionType, WebFrame*); - void willSubmitForm(WebPage*, WebCore::HTMLFormElement*, WebFrame*, WebFrame* sourceFrame, const Vector<std::pair<String, String>>&, RefPtr<APIObject>& userData); - void willSendSubmitEvent(WebPage*, WebCore::HTMLFormElement*, WebFrame*, WebFrame* sourceFrame, const Vector<std::pair<String, String>>&); - void didAssociateFormControls(WebPage*, const Vector<RefPtr<WebCore::Element>>&); + void willSubmitForm(WebPage*, WebCore::HTMLFormElement*, WebFrame*, WebFrame* sourceFrame, const Vector<std::pair<String, String> >&, RefPtr<APIObject>& userData); + void willSendSubmitEvent(WebPage*, WebCore::HTMLFormElement*, WebFrame*, WebFrame* sourceFrame, const Vector<std::pair<String, String> >&); + void didAssociateFormControls(WebPage*, const Vector<RefPtr<WebCore::Element> >&); bool shouldNotifyOnFormChanges(WebPage*); }; diff --git a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp index c2819a286..cf1cc7ec6 100644 --- a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp +++ b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp @@ -351,7 +351,7 @@ void InjectedBundlePageLoaderClient::featuresUsedInPage(WebPage* page, const Vec if (!m_client.featuresUsedInPage) return; - Vector<RefPtr<APIObject>> featureStringObjectsVector; + Vector<RefPtr<APIObject> > featureStringObjectsVector; Vector<String>::const_iterator end = features.end(); for (Vector<String>::const_iterator it = features.begin(); it != end; ++it) diff --git a/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp b/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp index 2014c6bfe..3f7b7ceeb 100644 --- a/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp +++ b/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp @@ -148,7 +148,7 @@ void WebResourceLoadScheduler::scheduleInternallyFailedLoad(WebCore::ResourceLoa void WebResourceLoadScheduler::internallyFailedLoadTimerFired() { - Vector<RefPtr<ResourceLoader>> internallyFailedResourceLoaders; + Vector<RefPtr<ResourceLoader> > internallyFailedResourceLoaders; copyToVector(m_internallyFailedResourceLoaders, internallyFailedResourceLoaders); for (size_t i = 0; i < internallyFailedResourceLoaders.size(); ++i) diff --git a/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h b/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h index 55f6e317d..f1876f655 100644 --- a/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h +++ b/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h @@ -67,10 +67,10 @@ private: void scheduleInternallyFailedLoad(WebCore::ResourceLoader*); void internallyFailedLoadTimerFired(); - HashSet<RefPtr<WebCore::ResourceLoader>> m_internallyFailedResourceLoaders; + HashSet<RefPtr<WebCore::ResourceLoader> > m_internallyFailedResourceLoaders; WebCore::RunLoop::Timer<WebResourceLoadScheduler> m_internallyFailedLoadTimer; - HashMap<unsigned long, RefPtr<WebResourceLoader>> m_webResourceLoaders; + HashMap<unsigned long, RefPtr<WebResourceLoader> > m_webResourceLoaders; unsigned m_suspendPendingRequestsCount; diff --git a/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.h b/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.h index 312f0646c..153ab2118 100644 --- a/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.h +++ b/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.h @@ -69,13 +69,13 @@ private: NotificationPermissionRequestManager(WebPage*); #if ENABLE(NOTIFICATIONS) - HashMap<uint64_t, RefPtr<WebCore::NotificationPermissionCallback>> m_idToCallbackMap; + HashMap<uint64_t, RefPtr<WebCore::NotificationPermissionCallback> > m_idToCallbackMap; #endif #if ENABLE(LEGACY_NOTIFICATIONS) - HashMap<uint64_t, RefPtr<WebCore::VoidCallback>> m_idToVoidCallbackMap; + HashMap<uint64_t, RefPtr<WebCore::VoidCallback> > m_idToVoidCallbackMap; #endif HashMap<RefPtr<WebCore::SecurityOrigin>, uint64_t> m_originToIDMap; - HashMap<uint64_t, RefPtr<WebCore::SecurityOrigin>> m_idToOriginMap; + HashMap<uint64_t, RefPtr<WebCore::SecurityOrigin> > m_idToOriginMap; #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) WebPage* m_page; diff --git a/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.h b/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.h index cb1f87caf..bc9eb8c69 100644 --- a/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.h +++ b/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.h @@ -90,10 +90,10 @@ private: typedef HashMap<RefPtr<WebCore::Notification>, uint64_t> NotificationMap; NotificationMap m_notificationMap; - typedef HashMap<uint64_t, RefPtr<WebCore::Notification>> NotificationIDMap; + typedef HashMap<uint64_t, RefPtr<WebCore::Notification> > NotificationIDMap; NotificationIDMap m_notificationIDMap; - typedef HashMap<RefPtr<WebCore::ScriptExecutionContext>, Vector<uint64_t>> NotificationContextMap; + typedef HashMap<RefPtr<WebCore::ScriptExecutionContext>, Vector<uint64_t> > NotificationContextMap; NotificationContextMap m_notificationContextMap; HashMap<String, bool> m_permissionsMap; diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp index 9956f1f80..09e0079d6 100644 --- a/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp +++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp @@ -218,7 +218,7 @@ void NPRuntimeObjectMap::invalidate() Vector<NPObject*> objects; - for (HashMap<NPObject*, JSC::Weak<JSNPObject>>::iterator ptr = m_jsNPObjects.begin(), end = m_jsNPObjects.end(); ptr != end; ++ptr) { + for (HashMap<NPObject*, JSC::Weak<JSNPObject> >::iterator ptr = m_jsNPObjects.begin(), end = m_jsNPObjects.end(); ptr != end; ++ptr) { JSNPObject* jsNPObject = ptr->value.get(); if (!jsNPObject) // Skip zombies. continue; diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h b/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h index e5178ad17..9d4a623e1 100644 --- a/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h +++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h @@ -96,7 +96,7 @@ private: PluginView* m_pluginView; HashMap<JSC::JSObject*, NPJSObject*> m_npJSObjects; - HashMap<NPObject*, JSC::Weak<JSNPObject>> m_jsNPObjects; + HashMap<NPObject*, JSC::Weak<JSNPObject> > m_jsNPObjects; Vector<NPObject*> m_npObjectsToFinalize; WebCore::RunLoop::Timer<NPRuntimeObjectMap> m_finalizationTimer; }; diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp index efcf193dc..fab342b02 100644 --- a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp +++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp @@ -533,7 +533,7 @@ NetscapePluginStream* NetscapePlugin::streamFromID(uint64_t streamID) void NetscapePlugin::stopAllStreams() { - Vector<RefPtr<NetscapePluginStream>> streams; + Vector<RefPtr<NetscapePluginStream> > streams; copyValuesToVector(m_streams, streams); for (size_t i = 0; i < streams.size(); ++i) diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h index 651dc4d0e..f4e9feb5c 100644 --- a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h +++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h @@ -274,10 +274,10 @@ private: uint64_t m_nextRequestID; - typedef HashMap<uint64_t, std::pair<String, void*>> PendingURLNotifyMap; + typedef HashMap<uint64_t, std::pair<String, void*> > PendingURLNotifyMap; PendingURLNotifyMap m_pendingURLNotifications; - typedef HashMap<uint64_t, RefPtr<NetscapePluginStream>> StreamsMap; + typedef HashMap<uint64_t, RefPtr<NetscapePluginStream> > StreamsMap; StreamsMap m_streams; RefPtr<NetscapePluginModule> m_pluginModule; @@ -334,7 +334,7 @@ private: WebCore::RunLoop::Timer<Timer> m_timer; }; - typedef HashMap<unsigned, OwnPtr<Timer>> TimerMap; + typedef HashMap<unsigned, OwnPtr<Timer> > TimerMap; TimerMap m_timers; unsigned m_nextTimerID; diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h index ffa55cb25..b95b23517 100644 --- a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h +++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h @@ -106,7 +106,7 @@ private: CString m_headers; WebCore::RunLoop::Timer<NetscapePluginStream> m_deliveryDataTimer; - OwnPtr< Vector<uint8_t>> m_deliveryData; + OwnPtr< Vector<uint8_t> > m_deliveryData; bool m_stopStreamWhenDoneDelivering; }; diff --git a/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h b/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h index 69bc478d9..19e15d7b3 100644 --- a/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h +++ b/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h @@ -64,10 +64,10 @@ private: RefPtr<WorkQueue> m_queue; - Vector<RefPtr<PluginProcessConnection>> m_pluginProcessConnections; + Vector<RefPtr<PluginProcessConnection> > m_pluginProcessConnections; Mutex m_tokensAndConnectionsMutex; - HashMap<uint64_t, RefPtr<CoreIPC::Connection>> m_tokensAndConnections; + HashMap<uint64_t, RefPtr<CoreIPC::Connection> > m_tokensAndConnections; }; } diff --git a/Source/WebKit2/WebProcess/Plugins/PluginView.cpp b/Source/WebKit2/WebProcess/Plugins/PluginView.cpp index b8857017f..bb240d558 100644 --- a/Source/WebKit2/WebProcess/Plugins/PluginView.cpp +++ b/Source/WebKit2/WebProcess/Plugins/PluginView.cpp @@ -1200,7 +1200,7 @@ void PluginView::removeStream(Stream* stream) void PluginView::cancelAllStreams() { - Vector<RefPtr<Stream>> streams; + Vector<RefPtr<Stream> > streams; copyValuesToVector(m_streams, streams); for (size_t i = 0; i < streams.size(); ++i) diff --git a/Source/WebKit2/WebProcess/Plugins/PluginView.h b/Source/WebKit2/WebProcess/Plugins/PluginView.h index 3524c9a1f..585d603c6 100644 --- a/Source/WebKit2/WebProcess/Plugins/PluginView.h +++ b/Source/WebKit2/WebProcess/Plugins/PluginView.h @@ -233,15 +233,15 @@ private: bool m_pluginProcessHasCrashed; // Pending URLRequests that the plug-in has made. - Deque<RefPtr<URLRequest>> m_pendingURLRequests; + Deque<RefPtr<URLRequest> > m_pendingURLRequests; WebCore::RunLoop::Timer<PluginView> m_pendingURLRequestsTimer; // Pending frame loads that the plug-in has made. - typedef HashMap<RefPtr<WebFrame>, RefPtr<URLRequest>> FrameLoadMap; + typedef HashMap<RefPtr<WebFrame>, RefPtr<URLRequest> > FrameLoadMap; FrameLoadMap m_pendingFrameLoads; // Streams that the plug-in has requested to load. - HashMap<uint64_t, RefPtr<Stream>> m_streams; + HashMap<uint64_t, RefPtr<Stream> > m_streams; #if ENABLE(NETSCAPE_PLUGIN_API) // A map of all related NPObjects for this plug-in view. diff --git a/Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp b/Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp index 4a8582db7..dd8f14ac7 100644 --- a/Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp +++ b/Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp @@ -251,7 +251,7 @@ void StorageAreaMap::applyChange(const String& key, const String& newValue) RefPtr<StorageMap> newStorageMap = StorageMap::create(m_quotaInBytes); // Any changes that were made locally after the clear must still be kept around in the new map. - for (auto it = m_pendingValueChanges.begin().keys(), end = m_pendingValueChanges.end().keys(); it != end; ++it) { + for (HashCountedSet<String>::iterator::Keys it = m_pendingValueChanges.begin().keys(), end = m_pendingValueChanges.end().keys(); it != end; ++it) { const String& key = *it; String value = m_storageMap->getItem(key); @@ -309,7 +309,7 @@ void StorageAreaMap::dispatchSessionStorageEvent(uint64_t sourceStorageAreaID, c if (!webPage) return; - Vector<RefPtr<Frame>> frames; + Vector<RefPtr<Frame> > frames; Page* page = webPage->corePage(); for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext()) { @@ -337,7 +337,7 @@ void StorageAreaMap::dispatchLocalStorageEvent(uint64_t sourceStorageAreaID, con { ASSERT(storageType() == LocalStorage); - Vector<RefPtr<Frame>> frames; + Vector<RefPtr<Frame> > frames; PageGroup& pageGroup = *WebProcess::shared().webPageGroup(m_storageNamespaceID)->corePageGroup(); const HashSet<Page*>& pages = pageGroup.pages(); diff --git a/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp b/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp index 4b4bd17f6..a13e469d5 100644 --- a/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp +++ b/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp @@ -85,7 +85,7 @@ StorageNamespaceImpl::~StorageNamespaceImpl() PassRefPtr<StorageArea> StorageNamespaceImpl::storageArea(PassRefPtr<SecurityOrigin> securityOrigin) { - HashMap<RefPtr<WebCore::SecurityOrigin>, RefPtr<StorageAreaMap>>::AddResult result = m_storageAreaMaps.add(securityOrigin.get(), 0); + HashMap<RefPtr<WebCore::SecurityOrigin>, RefPtr<StorageAreaMap> >::AddResult result = m_storageAreaMaps.add(securityOrigin.get(), 0); if (result.isNewEntry) result.iterator->value = StorageAreaMap::create(this, securityOrigin); diff --git a/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h b/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h index b14e9da59..d4820aa66 100644 --- a/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h +++ b/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h @@ -61,7 +61,7 @@ private: uint64_t m_storageNamespaceID; unsigned m_quotaInBytes; - HashMap<RefPtr<WebCore::SecurityOrigin>, RefPtr<StorageAreaMap>> m_storageAreaMaps; + HashMap<RefPtr<WebCore::SecurityOrigin>, RefPtr<StorageAreaMap> > m_storageAreaMaps; }; } // namespace WebKit diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp index ce16006db..a75d4344b 100644 --- a/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp +++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp @@ -715,7 +715,7 @@ void WebChromeClient::formStateDidChange(const Node*) notImplemented(); } -void WebChromeClient::didAssociateFormControls(const Vector<RefPtr<WebCore::Element>>& elements) +void WebChromeClient::didAssociateFormControls(const Vector<RefPtr<WebCore::Element> >& elements) { return m_page->injectedBundleFormClient().didAssociateFormControls(m_page, elements); } diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h b/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h index 4f28bb374..d48b67ab0 100644 --- a/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h +++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h @@ -170,7 +170,7 @@ private: // will be called frequently, so handling should be very fast. virtual void formStateDidChange(const WebCore::Node*) OVERRIDE; - virtual void didAssociateFormControls(const Vector<RefPtr<WebCore::Element>>&) OVERRIDE; + virtual void didAssociateFormControls(const Vector<RefPtr<WebCore::Element> >&) OVERRIDE; virtual bool shouldNotifyOnFormChanges() OVERRIDE; virtual bool selectItemWritingDirectionIsNatural() OVERRIDE; diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp index 48eb3a9f7..ce71a9ac1 100644 --- a/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp +++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp @@ -65,7 +65,7 @@ void WebDatabaseManager::getDatabasesByOrigin(uint64_t callbackID) const // to get both the origins and the Vector of DatabaseDetails for each origin in one // shot. That would avoid taking the numerous locks this requires. - Vector<RefPtr<SecurityOrigin>> origins; + Vector<RefPtr<SecurityOrigin> > origins; DatabaseManager::manager().origins(origins); Vector<OriginAndDatabases> originAndDatabasesVector; @@ -103,7 +103,7 @@ void WebDatabaseManager::getDatabasesByOrigin(uint64_t callbackID) const void WebDatabaseManager::getDatabaseOrigins(uint64_t callbackID) const { - Vector<RefPtr<SecurityOrigin>> origins; + Vector<RefPtr<SecurityOrigin> > origins; DatabaseManager::manager().origins(origins); size_t numOrigins = origins.size(); diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp index b1b0543e3..32bdabf87 100644 --- a/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp +++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp @@ -232,7 +232,7 @@ void WebEditorClient::willWriteSelectionToPasteboard(Range* range) m_page->injectedBundleEditorClient().willWriteToPasteboard(m_page, range); } -void WebEditorClient::getClientPasteboardDataForRange(Range* range, Vector<String>& pasteboardTypes, Vector<RefPtr<SharedBuffer>>& pasteboardData) +void WebEditorClient::getClientPasteboardDataForRange(Range* range, Vector<String>& pasteboardTypes, Vector<RefPtr<SharedBuffer> >& pasteboardData) { m_page->injectedBundleEditorClient().getPasteboardDataForRange(m_page, range, pasteboardTypes, pasteboardData); } diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h b/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h index 99bd8bd59..9ed815080 100644 --- a/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h +++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h @@ -68,7 +68,7 @@ private: virtual void didEndEditing() OVERRIDE; virtual void willWriteSelectionToPasteboard(WebCore::Range*) OVERRIDE; virtual void didWriteSelectionToPasteboard() OVERRIDE; - virtual void getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer>>& pasteboardData) OVERRIDE; + virtual void getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData) OVERRIDE; virtual void didSetSelectionTypesForPasteboard() OVERRIDE; virtual void registerUndoStep(PassRefPtr<WebCore::UndoStep>) OVERRIDE; @@ -95,7 +95,7 @@ private: #if PLATFORM(MAC) virtual NSString *userVisibleString(NSURL *) OVERRIDE; - virtual WebCore::DocumentFragment* documentFragmentFromAttributedString(NSAttributedString *, Vector< RefPtr<WebCore::ArchiveResource>>&) OVERRIDE; + virtual WebCore::DocumentFragment* documentFragmentFromAttributedString(NSAttributedString *, Vector< RefPtr<WebCore::ArchiveResource> >&) OVERRIDE; virtual void setInsertionPasteboard(const String& pasteboardName) OVERRIDE; virtual NSURL* canonicalizeURL(NSURL*) OVERRIDE; virtual NSURL* canonicalizeURLString(NSString*) OVERRIDE; diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp index 3bc85db9b..0c02f31e5 100644 --- a/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp +++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp @@ -765,7 +765,7 @@ void WebFrameLoaderClient::dispatchWillSubmitForm(FramePolicyFunction function, WebFrame* sourceFrame = webFrameLoaderClient ? webFrameLoaderClient->webFrame() : 0; ASSERT(sourceFrame); - const Vector<std::pair<String, String>>& values = formState->textFieldValues(); + const Vector<std::pair<String, String> >& values = formState->textFieldValues(); RefPtr<APIObject> userData; webPage->injectedBundleFormClient().willSubmitForm(webPage, form, m_frame, sourceFrame, values, userData); diff --git a/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h b/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h index c93e17720..069a9a2ac 100644 --- a/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h +++ b/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h @@ -84,7 +84,7 @@ private: #if ENABLE(THREADED_SCROLLING) Mutex m_scrollingTreesMutex; - HashMap<uint64_t, RefPtr<WebCore::ScrollingTree>> m_scrollingTrees; + HashMap<uint64_t, RefPtr<WebCore::ScrollingTree> > m_scrollingTrees; #endif }; diff --git a/Source/WebKit2/WebProcess/WebPage/FindController.cpp b/Source/WebKit2/WebProcess/WebPage/FindController.cpp index 9773cee89..1f8eca8e8 100644 --- a/Source/WebKit2/WebProcess/WebPage/FindController.cpp +++ b/Source/WebKit2/WebProcess/WebPage/FindController.cpp @@ -189,7 +189,7 @@ void FindController::findStringMatches(const String& string, FindOptions options m_webPage->corePage()->findStringMatchingRanges(string, core(options), maxMatchCount, &m_findMatches, indexForSelection); - Vector<Vector<IntRect>> matchRects; + Vector<Vector<IntRect> > matchRects; for (size_t i = 0; i < m_findMatches.size(); ++i) { Vector<IntRect> rects; m_findMatches[i]->textRects(rects); diff --git a/Source/WebKit2/WebProcess/WebPage/FindController.h b/Source/WebKit2/WebProcess/WebPage/FindController.h index af0c0a1c4..ba5e77121 100644 --- a/Source/WebKit2/WebProcess/WebPage/FindController.h +++ b/Source/WebKit2/WebProcess/WebPage/FindController.h @@ -85,7 +85,7 @@ private: // the find indicator isn't showing, but it will never be false when it is showing. bool m_isShowingFindIndicator; WebCore::IntRect m_findIndicatorRect; - Vector<RefPtr<WebCore::Range>> m_findMatches; + Vector<RefPtr<WebCore::Range> > m_findMatches; }; } // namespace WebKit diff --git a/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp b/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp index c971e0dea..a307db30f 100644 --- a/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp +++ b/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp @@ -47,7 +47,7 @@ static const unsigned NoCurrentItemIndex = UINT_MAX; // FIXME <rdar://problem/8819268>: This leaks all HistoryItems that go into these maps. // We need to clear up the life time of these objects. -typedef HashMap<uint64_t, RefPtr<HistoryItem>> IDToHistoryItemMap; +typedef HashMap<uint64_t, RefPtr<HistoryItem> > IDToHistoryItemMap; typedef HashMap<RefPtr<HistoryItem>, uint64_t> HistoryItemToIDMap; static IDToHistoryItemMap& idToHistoryItemMap() diff --git a/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp b/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp index ae53d3cdc..6c72b32e3 100644 --- a/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp +++ b/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp @@ -431,7 +431,7 @@ PassRefPtr<ImmutableArray> WebFrame::childFrames() if (!size) return ImmutableArray::create(); - Vector<RefPtr<APIObject>> vector; + Vector<RefPtr<APIObject> > vector; vector.reserveInitialCapacity(size); for (Frame* child = m_coreFrame->tree()->firstChild(); child; child = child->tree()->nextSibling()) { diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp index 899ede75d..b25bd0245 100644 --- a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp @@ -731,7 +731,7 @@ PassRefPtr<ImmutableArray> WebPage::trackedRepaintRects() if (!size) return ImmutableArray::create(); - Vector<RefPtr<APIObject>> vector; + Vector<RefPtr<APIObject> > vector; vector.reserveInitialCapacity(size); for (size_t i = 0; i < size; ++i) diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.h b/Source/WebKit2/WebProcess/WebPage/WebPage.h index b15887b6c..d4682e5b0 100644 --- a/Source/WebKit2/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit2/WebProcess/WebPage/WebPage.h @@ -165,7 +165,7 @@ class WebGestureEvent; class WebTouchEvent; #endif -typedef Vector<RefPtr<PageOverlay>> PageOverlayList; +typedef Vector<RefPtr<PageOverlay> > PageOverlayList; class WebPage : public TypedAPIObject<APIObject::TypeBundlePage>, public CoreIPC::MessageReceiver, public CoreIPC::MessageSender { public: @@ -857,7 +857,7 @@ private: HashSet<PluginView*> m_pluginViews; - HashMap<uint64_t, RefPtr<WebCore::TextCheckingRequest>> m_pendingTextCheckingRequestMap; + HashMap<uint64_t, RefPtr<WebCore::TextCheckingRequest> > m_pendingTextCheckingRequestMap; bool m_useFixedLayout; @@ -931,7 +931,7 @@ private: WebCore::RunLoop::Timer<WebPage> m_sendDidUpdateInWindowStateTimer; bool m_mayStartMediaWhenInWindow; - HashMap<uint64_t, RefPtr<WebUndoStep>> m_undoStepMap; + HashMap<uint64_t, RefPtr<WebUndoStep> > m_undoStepMap; WebCore::IntSize m_windowResizerSize; @@ -986,7 +986,7 @@ private: uint64_t m_pageID; RefPtr<SandboxExtension> m_pendingDropSandboxExtension; - Vector<RefPtr<SandboxExtension>> m_pendingDropExtensionsForFileUpload; + Vector<RefPtr<SandboxExtension> > m_pendingDropExtensionsForFileUpload; bool m_canRunBeforeUnloadConfirmPanel; diff --git a/Source/WebKit2/WebProcess/WebProcess.cpp b/Source/WebKit2/WebProcess/WebProcess.cpp index 33d30cf05..e03f8c777 100644 --- a/Source/WebKit2/WebProcess/WebProcess.cpp +++ b/Source/WebKit2/WebProcess/WebProcess.cpp @@ -495,8 +495,8 @@ void WebProcess::visitedLinkStateChanged(const Vector<WebCore::LinkHash>& linkHa { // FIXME: We may want to track visited links per WebPageGroup rather than per WebContext. for (size_t i = 0; i < linkHashes.size(); ++i) { - HashMap<uint64_t, RefPtr<WebPageGroupProxy>>::const_iterator it = m_pageGroupMap.begin(); - HashMap<uint64_t, RefPtr<WebPageGroupProxy>>::const_iterator end = m_pageGroupMap.end(); + HashMap<uint64_t, RefPtr<WebPageGroupProxy> >::const_iterator it = m_pageGroupMap.begin(); + HashMap<uint64_t, RefPtr<WebPageGroupProxy> >::const_iterator end = m_pageGroupMap.end(); for (; it != end; ++it) Page::visitedStateChanged(PageGroup::pageGroup(it->value->identifier()), linkHashes[i]); } @@ -507,8 +507,8 @@ void WebProcess::visitedLinkStateChanged(const Vector<WebCore::LinkHash>& linkHa void WebProcess::allVisitedLinkStateChanged() { // FIXME: We may want to track visited links per WebPageGroup rather than per WebContext. - HashMap<uint64_t, RefPtr<WebPageGroupProxy>>::const_iterator it = m_pageGroupMap.begin(); - HashMap<uint64_t, RefPtr<WebPageGroupProxy>>::const_iterator end = m_pageGroupMap.end(); + HashMap<uint64_t, RefPtr<WebPageGroupProxy> >::const_iterator it = m_pageGroupMap.begin(); + HashMap<uint64_t, RefPtr<WebPageGroupProxy> >::const_iterator end = m_pageGroupMap.end(); for (; it != end; ++it) Page::allVisitedStateChanged(PageGroup::pageGroup(it->value->identifier())); @@ -540,8 +540,8 @@ void WebProcess::setCacheModel(uint32_t cm) WebPage* WebProcess::focusedWebPage() const { - HashMap<uint64_t, RefPtr<WebPage>>::const_iterator end = m_pageMap.end(); - for (HashMap<uint64_t, RefPtr<WebPage>>::const_iterator it = m_pageMap.begin(); it != end; ++it) { + HashMap<uint64_t, RefPtr<WebPage> >::const_iterator end = m_pageMap.end(); + for (HashMap<uint64_t, RefPtr<WebPage> >::const_iterator it = m_pageMap.begin(); it != end; ++it) { WebPage* page = (*it).value.get(); if (page->windowAndWebPageAreFocused()) return page; @@ -571,7 +571,7 @@ void WebProcess::createWebPage(uint64_t pageID, const WebPageCreationParameters& { // It is necessary to check for page existence here since during a window.open() (or targeted // link) the WebPage gets created both in the synchronous handler and through the normal way. - HashMap<uint64_t, RefPtr<WebPage>>::AddResult result = m_pageMap.add(pageID, 0); + HashMap<uint64_t, RefPtr<WebPage> >::AddResult result = m_pageMap.add(pageID, 0); if (result.isNewEntry) { ASSERT(!result.iterator->value); result.iterator->value = WebPage::create(pageID, parameters); @@ -662,7 +662,7 @@ void WebProcess::didClose(CoreIPC::Connection*) m_inDidClose = true; // Close all the live pages. - Vector<RefPtr<WebPage>> pages; + Vector<RefPtr<WebPage> > pages; copyValuesToVector(m_pageMap, pages); for (size_t i = 0; i < pages.size(); ++i) pages[i]->close(); @@ -708,7 +708,7 @@ void WebProcess::removeWebFrame(uint64_t frameID) WebPageGroupProxy* WebProcess::webPageGroup(PageGroup* pageGroup) { - for (HashMap<uint64_t, RefPtr<WebPageGroupProxy>>::const_iterator it = m_pageGroupMap.begin(), end = m_pageGroupMap.end(); it != end; ++it) { + for (HashMap<uint64_t, RefPtr<WebPageGroupProxy> >::const_iterator it = m_pageGroupMap.begin(), end = m_pageGroupMap.end(); it != end; ++it) { if (it->value->corePageGroup() == pageGroup) return it->value.get(); } @@ -723,7 +723,7 @@ WebPageGroupProxy* WebProcess::webPageGroup(uint64_t pageGroupID) WebPageGroupProxy* WebProcess::webPageGroup(const WebPageGroupData& pageGroupData) { - HashMap<uint64_t, RefPtr<WebPageGroupProxy>>::AddResult result = m_pageGroupMap.add(pageGroupData.pageGroupID, 0); + HashMap<uint64_t, RefPtr<WebPageGroupProxy> >::AddResult result = m_pageGroupMap.add(pageGroupData.pageGroupID, 0); if (result.isNewEntry) { ASSERT(!result.iterator->value); result.iterator->value = WebPageGroupProxy::create(pageGroupData); @@ -812,8 +812,8 @@ static inline void addCaseFoldedCharacters(StringHasher& hasher, const String& s if (string.isEmpty()) return; if (string.is8Bit()) - return hasher.addCharacters<LChar, CaseFoldingHash::foldCase<LChar>>(string.characters8(), string.length()); - return hasher.addCharacters<UChar, CaseFoldingHash::foldCase<UChar>>(string.characters16(), string.length()); + return hasher.addCharacters<LChar, CaseFoldingHash::foldCase<LChar> >(string.characters8(), string.length()); + return hasher.addCharacters<UChar, CaseFoldingHash::foldCase<UChar> >(string.characters16(), string.length()); } static unsigned hashForPlugInOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType) @@ -914,7 +914,7 @@ static void fromCountedSetToHashMap(TypeCountSet* countedSet, HashMap<String, ui map.set(it->key, it->value); } -static void getWebCoreMemoryCacheStatistics(Vector<HashMap<String, uint64_t>>& result) +static void getWebCoreMemoryCacheStatistics(Vector<HashMap<String, uint64_t> >& result) { String imagesString(ASCIILiteral("Images")); String cssString(ASCIILiteral("CSS")); @@ -1127,8 +1127,8 @@ void WebProcess::setTextCheckerState(const TextCheckerState& textCheckerState) if (!continuousSpellCheckingTurnedOff && !grammarCheckingTurnedOff) return; - HashMap<uint64_t, RefPtr<WebPage>>::iterator end = m_pageMap.end(); - for (HashMap<uint64_t, RefPtr<WebPage>>::iterator it = m_pageMap.begin(); it != end; ++it) { + HashMap<uint64_t, RefPtr<WebPage> >::iterator end = m_pageMap.end(); + for (HashMap<uint64_t, RefPtr<WebPage> >::iterator it = m_pageMap.begin(); it != end; ++it) { WebPage* page = (*it).value.get(); if (continuousSpellCheckingTurnedOff) page->unmarkAllMisspellings(); diff --git a/Source/WebKit2/WebProcess/WebProcess.h b/Source/WebKit2/WebProcess/WebProcess.h index a784e4df5..5a6af0751 100644 --- a/Source/WebKit2/WebProcess/WebProcess.h +++ b/Source/WebKit2/WebProcess/WebProcess.h @@ -260,8 +260,8 @@ private: RefPtr<WebConnectionToUIProcess> m_webConnection; - HashMap<uint64_t, RefPtr<WebPage>> m_pageMap; - HashMap<uint64_t, RefPtr<WebPageGroupProxy>> m_pageGroupMap; + HashMap<uint64_t, RefPtr<WebPage> > m_pageMap; + HashMap<uint64_t, RefPtr<WebPageGroupProxy> > m_pageGroupMap; RefPtr<InjectedBundle> m_injectedBundle; RefPtr<EventDispatcher> m_eventDispatcher; @@ -295,7 +295,7 @@ private: HashMap<uint64_t, WebFrame*> m_frameMap; - typedef HashMap<const char*, OwnPtr<WebProcessSupplement>, PtrHash<const char*>> WebProcessSupplementMap; + typedef HashMap<const char*, OwnPtr<WebProcessSupplement>, PtrHash<const char*> > WebProcessSupplementMap; WebProcessSupplementMap m_supplements; TextCheckerState m_textCheckerState; |