diff options
author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-17 11:01:33 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
commit | 2925efd2fcef1f8b9fd48979144877c1a5ec214b (patch) | |
tree | 5e0720412202468499c2bd41d4ec8d5952618f8a /Source/WebKit2/Shared | |
parent | 4ff1d0e1e73e6467aeed9313afe09ec6ece4884d (diff) | |
download | qtwebkit-2925efd2fcef1f8b9fd48979144877c1a5ec214b.tar.gz |
Remove C++11 requirement in WebKit2
Removes all use of C++11 specific features in WebKit2. This consists of
template<S<T>> syntax, a few uses of auto, and a single use of std::move.
Change-Id: I1bbd356c430802caf5f7440cd0d3bb2ba49ed098
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebKit2/Shared')
-rw-r--r-- | Source/WebKit2/Shared/BlockingResponseMap.h | 2 | ||||
-rw-r--r-- | Source/WebKit2/Shared/ChildProcessProxy.h | 2 | ||||
-rw-r--r-- | Source/WebKit2/Shared/ImmutableArray.cpp | 2 | ||||
-rw-r--r-- | Source/WebKit2/Shared/ImmutableArray.h | 6 | ||||
-rw-r--r-- | Source/WebKit2/Shared/ImmutableDictionary.cpp | 2 | ||||
-rw-r--r-- | Source/WebKit2/Shared/ImmutableDictionary.h | 2 | ||||
-rw-r--r-- | Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h | 2 | ||||
-rw-r--r-- | Source/WebKit2/Shared/SecurityOriginData.cpp | 2 | ||||
-rw-r--r-- | Source/WebKit2/Shared/SessionState.cpp | 2 | ||||
-rw-r--r-- | Source/WebKit2/Shared/StatisticsData.h | 2 | ||||
-rw-r--r-- | Source/WebKit2/Shared/UserMessageCoders.h | 2 | ||||
-rw-r--r-- | Source/WebKit2/Shared/WebContextMenuItem.cpp | 2 | ||||
-rw-r--r-- | Source/WebKit2/Shared/WebOpenPanelParameters.cpp | 4 |
13 files changed, 16 insertions, 16 deletions
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) |