Changeset 155277 in webkit
- Timestamp:
- Sep 7, 2013 8:17:30 PM (11 years ago)
- Location:
- trunk/Source
- Files:
-
- 1 deleted
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WTF/ChangeLog
r155262 r155277 1 2013-09-07 Anders Carlsson <andersca@apple.com> 2 3 Remove NonCopyableSort.h from WTF 4 https://bugs.webkit.org/show_bug.cgi?id=120984 5 6 Reviewed by Andreas Kling. 7 8 std::sort as defined by C++11 moves elements when possible, so there's no need for nonCopyableSort anymore. 9 10 * GNUmakefile.list.am: 11 * WTF.pro: 12 * WTF.vcxproj/WTF.vcxproj: 13 * WTF.vcxproj/WTF.vcxproj.filters: 14 * WTF.xcodeproj/project.pbxproj: 15 * wtf/NonCopyingSort.h: Removed. 16 1 17 2013-09-07 Anders Carlsson <andersca@apple.com> 2 18 -
trunk/Source/WTF/GNUmakefile.list.am
r155262 r155277 92 92 Source/WTF/wtf/NeverDestroyed.h \ 93 93 Source/WTF/wtf/NoLock.h \ 94 Source/WTF/wtf/NonCopyingSort.h \95 94 Source/WTF/wtf/Noncopyable.h \ 96 95 Source/WTF/wtf/NotFound.h \ -
trunk/Source/WTF/WTF.pro
r155262 r155277 89 89 Ref.h \ 90 90 Noncopyable.h \ 91 NonCopyingSort.h \92 91 NotFound.h \ 93 92 NullPtr.h \ -
trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj
r155262 r155277 193 193 <ClInclude Include="..\wtf\NeverDestroyed.h" /> 194 194 <ClInclude Include="..\wtf\Noncopyable.h" /> 195 <ClInclude Include="..\wtf\NonCopyingSort.h" />196 195 <ClInclude Include="..\wtf\NotFound.h" /> 197 196 <ClInclude Include="..\wtf\NullPtr.h" /> -
trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters
r155262 r155277 499 499 </ClInclude> 500 500 <ClInclude Include="..\wtf\Noncopyable.h"> 501 <Filter>wtf</Filter>502 </ClInclude>503 <ClInclude Include="..\wtf\NonCopyingSort.h">504 501 <Filter>wtf</Filter> 505 502 </ClInclude> -
trunk/Source/WTF/WTF.xcodeproj/project.pbxproj
r155262 r155277 158 158 A8A473EE151A825B004123FF /* MetaAllocatorHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472CF151A825B004123FF /* MetaAllocatorHandle.h */; }; 159 159 A8A473EF151A825B004123FF /* Noncopyable.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472D0151A825B004123FF /* Noncopyable.h */; }; 160 A8A473F0151A825B004123FF /* NonCopyingSort.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472D1151A825B004123FF /* NonCopyingSort.h */; };161 160 A8A473F1151A825B004123FF /* NotFound.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472D2151A825B004123FF /* NotFound.h */; }; 162 161 A8A473F2151A825B004123FF /* NullPtr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A472D3151A825B004123FF /* NullPtr.cpp */; }; … … 433 432 A8A472CF151A825B004123FF /* MetaAllocatorHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MetaAllocatorHandle.h; sourceTree = "<group>"; }; 434 433 A8A472D0151A825B004123FF /* Noncopyable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Noncopyable.h; sourceTree = "<group>"; }; 435 A8A472D1151A825B004123FF /* NonCopyingSort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NonCopyingSort.h; sourceTree = "<group>"; };436 434 A8A472D2151A825B004123FF /* NotFound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotFound.h; sourceTree = "<group>"; }; 437 435 A8A472D3151A825B004123FF /* NullPtr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NullPtr.cpp; sourceTree = "<group>"; }; … … 710 708 0F0D85B317234CB100338210 /* NoLock.h */, 711 709 A8A472D0151A825B004123FF /* Noncopyable.h */, 712 A8A472D1151A825B004123FF /* NonCopyingSort.h */,713 710 A8A472D2151A825B004123FF /* NotFound.h */, 714 711 A8A472D3151A825B004123FF /* NullPtr.cpp */, … … 1014 1011 0F0D85B417234CC100338210 /* NoLock.h in Headers */, 1015 1012 A8A473EF151A825B004123FF /* Noncopyable.h in Headers */, 1016 A8A473F0151A825B004123FF /* NonCopyingSort.h in Headers */,1017 1013 A8A473F1151A825B004123FF /* NotFound.h in Headers */, 1018 1014 A8A473F3151A825B004123FF /* NullPtr.h in Headers */, -
trunk/Source/WTF/wtf/CMakeLists.txt
r155262 r155277 54 54 MetaAllocator.h 55 55 MetaAllocatorHandle.h 56 NonCopyingSort.h57 56 ThreadRestrictionVerifier.h 58 57 Ref.h -
trunk/Source/WebCore/ChangeLog
r155264 r155277 1 2013-09-07 Anders Carlsson <andersca@apple.com> 2 3 Remove NonCopyableSort.h from WTF 4 https://bugs.webkit.org/show_bug.cgi?id=120984 5 6 Reviewed by Andreas Kling. 7 8 * css/MediaQuery.cpp: 9 (WebCore::MediaQuery::MediaQuery): 10 * html/HTMLMediaElement.cpp: 11 (WebCore::HTMLMediaElement::updateActiveTextTrackCues): 12 * html/RangeInputType.cpp: 13 (WebCore::RangeInputType::updateTickMarkValues): 14 * inspector/InspectorMemoryAgent.cpp: 15 * page/CaptionUserPreferences.cpp: 16 (WebCore::CaptionUserPreferences::sortedTrackListForMenu): 17 * page/CaptionUserPreferences.h: 18 * page/CaptionUserPreferencesMediaAF.cpp: 19 (WebCore::CaptionUserPreferencesMediaAF::sortedTrackListForMenu): 20 * platform/graphics/texmap/TextureMapper.cpp: 21 (WebCore::BitmapTexturePool::releaseUnusedTexturesTimerFired): 22 1 23 2013-09-07 Antti Koivisto <antti@apple.com> 2 24 -
trunk/Source/WebCore/css/MediaQuery.cpp
r154533 r155277 31 31 32 32 #include "MediaQueryExp.h" 33 #include <wtf/NonCopyingSort.h>34 33 #include <wtf/text/StringBuilder.h> 35 34 … … 79 78 } 80 79 81 82 80 MediaQuery::MediaQuery(Restrictor r, const String& mediaType, PassOwnPtr<ExpressionVector> exprs) 83 81 : m_restrictor(r) … … 91 89 } 92 90 93 nonCopyingSort(m_expressions->begin(), m_expressions->end(), expressionCompare);91 std::sort(m_expressions->begin(), m_expressions->end(), expressionCompare); 94 92 95 93 // remove all duplicated expressions -
trunk/Source/WebCore/html/HTMLMediaElement.cpp
r155194 r155277 83 83 #include <wtf/CurrentTime.h> 84 84 #include <wtf/MathExtras.h> 85 #include <wtf/NonCopyingSort.h>86 85 #include <wtf/Ref.h> 87 86 #include <wtf/text/CString.h> … … 1311 1310 // 12 - Sort the tasks in events in ascending time order (tasks with earlier 1312 1311 // times first). 1313 nonCopyingSort(eventTasks.begin(), eventTasks.end(), eventTimeCueCompare);1312 std::sort(eventTasks.begin(), eventTasks.end(), eventTimeCueCompare); 1314 1313 1315 1314 for (size_t i = 0; i < eventTasks.size(); ++i) { … … 1345 1344 // 14 - Sort affected tracks in the same order as the text tracks appear in 1346 1345 // the media element's list of text tracks, and remove duplicates. 1347 nonCopyingSort(affectedTracks.begin(), affectedTracks.end(), trackIndexCompare);1346 std::sort(affectedTracks.begin(), affectedTracks.end(), trackIndexCompare); 1348 1347 1349 1348 // 15 - For each text track in affected tracks, in the list order, queue a -
trunk/Source/WebCore/html/RangeInputType.cpp
r154877 r155277 61 61 #include "HTMLDataListElement.h" 62 62 #include "HTMLOptionElement.h" 63 #include <wtf/NonCopyingSort.h>64 63 #endif 65 64 … … 349 348 } 350 349 351 static bool decimalCompare(const Decimal& a, const Decimal& b)352 {353 return a < b;354 }355 356 350 void RangeInputType::updateTickMarkValues() 357 351 { … … 374 368 } 375 369 m_tickMarkValues.shrinkToFit(); 376 nonCopyingSort(m_tickMarkValues.begin(), m_tickMarkValues.end(), decimalCompare);370 std::sort(m_tickMarkValues.begin(), m_tickMarkValues.end()); 377 371 } 378 372 -
trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp
r153728 r155277 53 53 #include <runtime/ArrayBufferView.h> 54 54 #include <wtf/HashSet.h> 55 #include <wtf/NonCopyingSort.h>56 55 #include <wtf/OwnPtr.h> 57 56 #include <wtf/PassOwnPtr.h> -
trunk/Source/WebCore/page/CaptionUserPreferences.cpp
r155048 r155277 35 35 #include "TextTrackList.h" 36 36 #include "UserStyleSheetTypes.h" 37 #include <wtf/NonCopyingSort.h>38 37 39 38 namespace WebCore { … … 180 179 } 181 180 182 Vector<RefPtr<TextTrack> 181 Vector<RefPtr<TextTrack>> CaptionUserPreferences::sortedTrackListForMenu(TextTrackList* trackList) 183 182 { 184 183 ASSERT(trackList); 185 184 186 Vector<RefPtr<TextTrack> 185 Vector<RefPtr<TextTrack>> tracksForMenu; 187 186 188 187 for (unsigned i = 0, length = trackList->length(); i < length; ++i) 189 188 tracksForMenu.append(trackList->item(i)); 190 189 191 nonCopyingSort(tracksForMenu.begin(), tracksForMenu.end(), textTrackCompare); 190 std::sort(tracksForMenu.begin(), tracksForMenu.end(), textTrackCompare); 191 192 192 tracksForMenu.insert(0, TextTrack::captionMenuOffItem()); 193 193 tracksForMenu.insert(1, TextTrack::captionMenuAutomaticItem()); -
trunk/Source/WebCore/page/CaptionUserPreferences.h
r148285 r155277 80 80 81 81 virtual String displayNameForTrack(TextTrack*) const; 82 virtual Vector<RefPtr<TextTrack> 82 virtual Vector<RefPtr<TextTrack>> sortedTrackListForMenu(TextTrackList*); 83 83 84 84 void setPrimaryAudioTrackLanguageOverride(const String& language) { m_primaryAudioTrackLanguageOverride = language; } -
trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp
r155130 r155277 46 46 #include "TextTrackList.h" 47 47 #include "UserStyleSheetTypes.h" 48 #include <wtf/NonCopyingSort.h>49 48 #include <wtf/RetainPtr.h> 50 49 #include <wtf/text/StringBuilder.h> … … 846 845 } 847 846 848 nonCopyingSort(tracksForMenu.begin(), tracksForMenu.end(), textTrackCompare);847 std::sort(tracksForMenu.begin(), tracksForMenu.end(), textTrackCompare); 849 848 850 849 tracksForMenu.insert(0, TextTrack::captionMenuOffItem()); -
trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp
r148748 r155277 26 26 #include "Timer.h" 27 27 #include <wtf/CurrentTime.h> 28 #include <wtf/NonCopyingSort.h>29 28 30 29 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER) … … 86 85 87 86 // Delete entries, which have been unused in s_releaseUnusedSecondsTolerance. 88 nonCopyingSort(m_textures.begin(), m_textures.end(), BitmapTexturePoolEntry::compareTimeLastUsed);87 std::sort(m_textures.begin(), m_textures.end(), BitmapTexturePoolEntry::compareTimeLastUsed); 89 88 90 89 double minUsedTime = monotonicallyIncreasingTime() - s_releaseUnusedSecondsTolerance; -
trunk/Source/WebKit/blackberry/ChangeLog
r155228 r155277 1 2013-09-07 Anders Carlsson <andersca@apple.com> 2 3 Remove NonCopyableSort.h from WTF 4 https://bugs.webkit.org/show_bug.cgi?id=120984 5 6 Reviewed by Andreas Kling. 7 8 * WebKitSupport/RenderQueue.cpp: 9 (BlackBerry::WebKit::RenderQueue::quickSort): 10 1 11 2013-09-06 Ryosuke Niwa <rniwa@webkit.org> 2 12 -
trunk/Source/WebKit/blackberry/WebKitSupport/RenderQueue.cpp
r148739 r155277 25 25 #include "WebPage_p.h" 26 26 27 #include <wtf/NonCopyingSort.h>28 29 27 #define DEBUG_RENDER_QUEUE 0 30 28 #define DEBUG_RENDER_QUEUE_SORT 0 … … 379 377 return; 380 378 381 WTF::nonCopyingSort(queue->begin(), queue->end(), TileIndexLessThan(m_primarySortDirection, m_secondarySortDirection));379 std::sort(queue->begin(), queue->end(), TileIndexLessThan(m_primarySortDirection, m_secondarySortDirection)); 382 380 } 383 381
Note: See TracChangeset
for help on using the changeset viewer.