Changeset 201333 in webkit


Ignore:
Timestamp:
May 24, 2016, 9:50:26 AM (9 years ago)
Author:
Chris Dumez
Message:

Use auto for some of our lambda function parameters
​https://bugs.webkit.org/show_bug.cgi?id=158001

Reviewed by Darin Adler.

Use auto for some of our lambda function parameters now that we build with c++14.

Source/WebCore:

  • Modules/mediasource/MediaSource.cpp:

(WebCore::MediaSource::buffered):
(WebCore::MediaSource::monitorSourceBuffers):
(WebCore::MediaSource::endOfStream):

  • Modules/mediasource/SampleMap.cpp:

(WebCore::PresentationOrderSampleMap::findSamplesWithinPresentationRangeFromEnd):

  • accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::ariaSelectedRows):

  • bindings/js/SerializedScriptValue.cpp:

(WebCore::SerializedScriptValue::writeBlobsToDiskForIndexedDB):

  • css/CSSValueList.cpp:

(WebCore::CSSValueList::removeAll):

  • css/MediaList.cpp:

(WebCore::MediaQuerySet::remove):

  • css/MediaQuery.cpp:

(WebCore::MediaQuery::MediaQuery):

  • css/MediaQueryMatcher.cpp:

(WebCore::MediaQueryMatcher::removeListener):

  • dom/Document.cpp:

(WebCore::Document::validateAutoSizingNodes):

  • dom/Element.cpp:

(WebCore::Element::detachAttrNodeFromElementWithValue):

  • dom/MutationObserver.cpp:

(WebCore::MutationObserver::deliverAllMutations):

  • dom/Node.cpp:

(WebCore::Node::unregisterMutationObserver):

  • html/LinkIconCollector.cpp:
  • inspector/InspectorIndexedDBAgent.cpp:

(WebCore::InspectorIndexedDBAgent::requestDatabaseNames):

  • loader/ResourceLoader.cpp:

(WebCore::ResourceLoader::loadDataURL):

  • page/CaptionUserPreferences.cpp:

(WebCore::CaptionUserPreferences::sortedTrackListForMenu):

  • page/CaptionUserPreferencesMediaAF.cpp:

(WebCore::CaptionUserPreferencesMediaAF::sortedTrackListForMenu):

  • page/animation/AnimationController.cpp:

(WebCore::AnimationControllerPrivate::clear):

  • platform/graphics/FontCascade.cpp:

(WebCore::pruneUnreferencedEntriesFromFontCascadeCache):

  • platform/graphics/FontCascadeFonts.cpp:

(WebCore::FontCascadeFonts::pruneSystemFallbacks):

  • platform/graphics/PathUtilities.cpp:

(WebCore::addIntersectionPoints):

  • platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:

(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::updateTracks):

  • platform/graphics/texmap/TextureMapperGL.cpp:

(WebCore::TextureMapperGLData::SharedGLData::~SharedGLData):

  • platform/mac/HIDGamepad.cpp:

(WebCore::HIDGamepad::initElements):

  • svg/SVGToOTFFontConversion.cpp:

(WebCore::SVGToOTFFontConverter::appendLigatureSubtable):
(WebCore::SVGToOTFFontConverter::finishAppendingKERNSubtable):

Source/WebKit2:

  • DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp:

(WebKit::WebIDBConnectionToClient::didGetRecord):

  • NetworkProcess/NetworkConnectionToWebProcess.cpp:

(WebKit::NetworkConnectionToWebProcess::writeBlobsToTemporaryFiles):

  • NetworkProcess/NetworkProcess.cpp:

(WebKit::fetchDiskCacheEntries):
(WebKit::NetworkProcess::fetchWebsiteData):
(WebKit::clearDiskCacheEntries):

  • NetworkProcess/NetworkResourceLoader.cpp:

(WebKit::NetworkResourceLoader::retrieveCacheEntry):
(WebKit::NetworkResourceLoader::tryStoreAsCacheEntry):

  • NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:

(WebKit::NetworkCache::SpeculativeLoad::didFinishLoading):

  • NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:

(WebKit::NetworkCache::SpeculativeLoadManager::registerLoad):
(WebKit::NetworkCache::SpeculativeLoadManager::retrieveEntryFromStorage):
(WebKit::NetworkCache::SpeculativeLoadManager::revalidateEntry):
(WebKit::NetworkCache::SpeculativeLoadManager::preloadEntry):
(WebKit::NetworkCache::SpeculativeLoadManager::retrieveSubresourcesEntry):

  • NetworkProcess/cache/NetworkCacheStorage.cpp:

(WebKit::NetworkCache::Storage::removeFromPendingWriteOperations):

  • NetworkProcess/cocoa/NetworkSessionCocoa.mm:

(-[WKNetworkSessionDelegate URLSession:task:willPerformHTTPRedirection:newRequest:completionHandler:]):
(-[WKNetworkSessionDelegate URLSession:task:_schemeUpgraded:completionHandler:]):

  • Shared/API/Cocoa/_WKRemoteObjectInterface.mm:

(-[_WKRemoteObjectInterface debugDescription]):

  • UIProcess/API/C/WKApplicationCacheManager.cpp:

(WKApplicationCacheManagerGetApplicationCacheOrigins):

  • UIProcess/API/C/WKKeyValueStorageManager.cpp:

(WKKeyValueStorageManagerGetKeyValueStorageOrigins):
(WKKeyValueStorageManagerGetStorageDetailsByOrigin):

  • UIProcess/API/C/WKResourceCacheManager.cpp:

(WKResourceCacheManagerGetCacheOrigins):

  • UIProcess/API/Cocoa/WKWebsiteDataStore.mm:

(-[WKWebsiteDataStore _fetchDataRecordsOfTypes:withOptions:completionHandler:]):

  • UIProcess/UserContent/WebUserContentControllerProxy.cpp:

(WebKit::WebUserContentControllerProxy::removeAllUserScripts):
(WebKit::WebUserContentControllerProxy::removeAllUserStyleSheets):
(WebKit::WebUserContentControllerProxy::removeAllUserMessageHandlers):

  • WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:

(WebKit::PlatformCALayerRemote::removeAnimationForKey):

Source/WTF:

  • wtf/BubbleSort.h:

(WTF::bubbleSort):

Tools:

  • WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:

(WTR::InjectedBundle::willDestroyPage):

Location:
trunk
Files:
47 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r201314 r201333  
     12016-05-24  Chris Dumez  <cdumez@apple.com>
     2
     3        Use auto for some of our lambda function parameters
     4        https://bugs.webkit.org/show_bug.cgi?id=158001
     5
     6        Reviewed by Darin Adler.
     7
     8        Use auto for some of our lambda function parameters now that we build with c++14.
     9
     10        * wtf/BubbleSort.h:
     11        (WTF::bubbleSort):
     12
    1132016-05-23  Chris Dumez  <cdumez@apple.com>
    214

  • trunk/Source/WTF/wtf/BubbleSort.h

    r192295 r201333  
    9090    bubbleSort(
    9191        begin, end,
    92         [] (const typename std::iterator_traits<IteratorType>::value_type& left,
    93             const typename std::iterator_traits<IteratorType>::value_type& right) -> bool {
     92        [](auto& left, auto& right) {
    9493            return left < right;
    9594        });

  • trunk/Source/WebCore/ChangeLog

    r201332 r201333  
     12016-05-24  Chris Dumez  <cdumez@apple.com>
     2
     3        Use auto for some of our lambda function parameters
     4        https://bugs.webkit.org/show_bug.cgi?id=158001
     5
     6        Reviewed by Darin Adler.
     7
     8        Use auto for some of our lambda function parameters now that we build with c++14.
     9
     10        * Modules/mediasource/MediaSource.cpp:
     11        (WebCore::MediaSource::buffered):
     12        (WebCore::MediaSource::monitorSourceBuffers):
     13        (WebCore::MediaSource::endOfStream):
     14        * Modules/mediasource/SampleMap.cpp:
     15        (WebCore::PresentationOrderSampleMap::findSamplesWithinPresentationRangeFromEnd):
     16        * accessibility/AccessibilityRenderObject.cpp:
     17        (WebCore::AccessibilityRenderObject::ariaSelectedRows):
     18        * bindings/js/SerializedScriptValue.cpp:
     19        (WebCore::SerializedScriptValue::writeBlobsToDiskForIndexedDB):
     20        * css/CSSValueList.cpp:
     21        (WebCore::CSSValueList::removeAll):
     22        * css/MediaList.cpp:
     23        (WebCore::MediaQuerySet::remove):
     24        * css/MediaQuery.cpp:
     25        (WebCore::MediaQuery::MediaQuery):
     26        * css/MediaQueryMatcher.cpp:
     27        (WebCore::MediaQueryMatcher::removeListener):
     28        * dom/Document.cpp:
     29        (WebCore::Document::validateAutoSizingNodes):
     30        * dom/Element.cpp:
     31        (WebCore::Element::detachAttrNodeFromElementWithValue):
     32        * dom/MutationObserver.cpp:
     33        (WebCore::MutationObserver::deliverAllMutations):
     34        * dom/Node.cpp:
     35        (WebCore::Node::unregisterMutationObserver):
     36        * html/LinkIconCollector.cpp:
     37        * inspector/InspectorIndexedDBAgent.cpp:
     38        (WebCore::InspectorIndexedDBAgent::requestDatabaseNames):
     39        * loader/ResourceLoader.cpp:
     40        (WebCore::ResourceLoader::loadDataURL):
     41        * page/CaptionUserPreferences.cpp:
     42        (WebCore::CaptionUserPreferences::sortedTrackListForMenu):
     43        * page/CaptionUserPreferencesMediaAF.cpp:
     44        (WebCore::CaptionUserPreferencesMediaAF::sortedTrackListForMenu):
     45        * page/animation/AnimationController.cpp:
     46        (WebCore::AnimationControllerPrivate::clear):
     47        * platform/graphics/FontCascade.cpp:
     48        (WebCore::pruneUnreferencedEntriesFromFontCascadeCache):
     49        * platform/graphics/FontCascadeFonts.cpp:
     50        (WebCore::FontCascadeFonts::pruneSystemFallbacks):
     51        * platform/graphics/PathUtilities.cpp:
     52        (WebCore::addIntersectionPoints):
     53        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
     54        (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::updateTracks):
     55        * platform/graphics/texmap/TextureMapperGL.cpp:
     56        (WebCore::TextureMapperGLData::SharedGLData::~SharedGLData):
     57        * platform/mac/HIDGamepad.cpp:
     58        (WebCore::HIDGamepad::initElements):
     59        * svg/SVGToOTFFontConversion.cpp:
     60        (WebCore::SVGToOTFFontConverter::appendLigatureSubtable):
     61        (WebCore::SVGToOTFFontConverter::finishAppendingKERNSubtable):
     62
    1632016-05-24  Antti Koivisto  <antti@apple.com>
    264

  • trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp

    r200943 r201333  
    142142std::unique_ptr<PlatformTimeRanges> MediaSource::buffered() const
    143143{
    144     if (m_buffered && m_activeSourceBuffers->length() && std::all_of(m_activeSourceBuffers->begin(), m_activeSourceBuffers->end(), [] (RefPtr<SourceBuffer>& buffer) { return !buffer->isBufferedDirty(); }))
     144    if (m_buffered && m_activeSourceBuffers->length() && std::all_of(m_activeSourceBuffers->begin(), m_activeSourceBuffers->end(), [](auto& buffer) { return !buffer->isBufferedDirty(); }))
    145145        return std::make_unique<PlatformTimeRanges>(*m_buffered);
    146146
    … …  
    265265    auto begin = m_activeSourceBuffers->begin();
    266266    auto end = m_activeSourceBuffers->end();
    267     if (std::all_of(begin, end, [](RefPtr<SourceBuffer>& sourceBuffer) {
     267    if (std::all_of(begin, end, [](auto& sourceBuffer) {
    268268        return !sourceBuffer->hasCurrentTime();
    269269    })) {
    … …  
    279279    // ↳ If buffered for all objects in activeSourceBuffers contain TimeRanges that include the current
    280280    // playback position and enough data to ensure uninterrupted playback:
    281     if (std::all_of(begin, end, [](RefPtr<SourceBuffer>& sourceBuffer) {
     281    if (std::all_of(begin, end, [](auto& sourceBuffer) {
    282282        return sourceBuffer->hasFutureTime() && sourceBuffer->canPlayThrough();
    283283    })) {
    … …  
    296296    // ↳ If buffered for all objects in activeSourceBuffers contain a TimeRange that includes
    297297    // the current playback position and some time beyond the current playback position, then run the following steps:
    298     if (std::all_of(begin, end, [](RefPtr<SourceBuffer>& sourceBuffer) {
     298    if (std::all_of(begin, end, [](auto& sourceBuffer) {
    299299        return sourceBuffer->hasFutureTime();
    300300    })) {
    … …  
    427427    // 2. If the updating attribute equals true on any SourceBuffer in sourceBuffers, then throw an
    428428    // INVALID_STATE_ERR exception and abort these steps.
    429     if (std::any_of(m_sourceBuffers->begin(), m_sourceBuffers->end(), [](RefPtr<SourceBuffer>& sourceBuffer) { return sourceBuffer->updating(); })) {
     429    if (std::any_of(m_sourceBuffers->begin(), m_sourceBuffers->end(), [](auto& sourceBuffer) { return sourceBuffer->updating(); })) {
    430430        ec = INVALID_STATE_ERR;
    431431        return;

  • trunk/Source/WebCore/Modules/mediasource/SampleMap.cpp

    r179956 r201333  
    245245PresentationOrderSampleMap::iterator_range PresentationOrderSampleMap::findSamplesWithinPresentationRangeFromEnd(const MediaTime& beginTime, const MediaTime& endTime)
    246246{
    247     reverse_iterator rangeEnd = std::find_if(rbegin(), rend(), [&beginTime] (PresentationOrderSampleMap::MapType::value_type value) {
     247    reverse_iterator rangeEnd = std::find_if(rbegin(), rend(), [&beginTime](auto& value) {
    248248        return value.second->presentationTime() <= beginTime;
    249249    });
    250250
    251     reverse_iterator rangeStart = std::find_if(rbegin(), rangeEnd, [&endTime] (PresentationOrderSampleMap::MapType::value_type value) {
     251    reverse_iterator rangeStart = std::find_if(rbegin(), rangeEnd, [&endTime](auto& value) {
    252252        return value.second->presentationTime() <= endTime;
    253253    });

  • trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

    r201205 r201333  
    32463246
    32473247    // Get all the rows.
    3248     auto rowsIteration = [&](const AccessibilityChildrenVector& rows) {
     3248    auto rowsIteration = [&](auto& rows) {
    32493249        for (auto& row : rows) {
    32503250            if (row->isSelected()) {

  • trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp

    r201302 r201333  
    28032803
    28042804    RefPtr<SerializedScriptValue> protectedThis(this);
    2805     blobRegistry().writeBlobsToTemporaryFiles(m_blobURLs, [completionHandler = WTFMove(completionHandler), this, protectedThis = WTFMove(protectedThis)](const Vector<String>& blobFilePaths) {
     2805    blobRegistry().writeBlobsToTemporaryFiles(m_blobURLs, [completionHandler = WTFMove(completionHandler), this, protectedThis = WTFMove(protectedThis)](auto& blobFilePaths) {
    28062806        ASSERT(isMainThread());
    28072807

  • trunk/Source/WebCore/css/CSSValueList.cpp

    r200626 r201333  
    6161        return false;
    6262
    63     return m_values.removeAllMatching([value] (const Ref<CSSValue>& current) {
     63    return m_values.removeAllMatching([value](auto& current) {
    6464        return current->equals(*value);
    6565    }) > 0;

  • trunk/Source/WebCore/css/MediaList.cpp

    r195452 r201333  
    187187        return false;
    188188   
    189     return m_queries.removeFirstMatching([&parsedQuery] (const std::unique_ptr<MediaQuery>& query) {
     189    return m_queries.removeFirstMatching([&parsedQuery](auto& query) {
    190190        return *query == *parsedQuery;
    191191    });

  • trunk/Source/WebCore/css/MediaQuery.cpp

    r195951 r201333  
    8484    }
    8585
    86     std::sort(m_expressions->begin(), m_expressions->end(), [](const std::unique_ptr<MediaQueryExp>& a, const std::unique_ptr<MediaQueryExp>& b) {
     86    std::sort(m_expressions->begin(), m_expressions->end(), [](auto& a, auto& b) {
    8787        return codePointCompare(a->serialize(), b->serialize()) < 0;
    8888    });

  • trunk/Source/WebCore/css/MediaQueryMatcher.cpp

    r199964 r201333  
    132132        return;
    133133
    134     m_listeners.removeFirstMatching([listener, query] (const std::unique_ptr<Listener>& current) {
     134    m_listeners.removeFirstMatching([listener, query](auto& current) {
    135135        return *current->listener() == *listener && current->query() == query;
    136136    });

  • trunk/Source/WebCore/dom/Document.cpp

    r201237 r201333  
    53005300        value->adjustNodeSizes();
    53015301    }
    5302     m_textAutoSizedNodes.removeIf([] (TextAutoSizingMap::KeyValuePairType& keyAndValue) {
     5302    m_textAutoSizedNodes.removeIf([](auto& keyAndValue) {
    53035303        return !keyAndValue.value->numNodes();
    53045304    });

  • trunk/Source/WebCore/dom/Element.cpp

    r201332 r201333  
    31953195
    31963196    auto& attrNodeList = *attrNodeListForElement(*this);
    3197     bool found = attrNodeList.removeFirstMatching([attrNode] (const RefPtr<Attr>& attribute) {
     3197    bool found = attrNodeList.removeFirstMatching([attrNode](auto& attribute) {
    31983198        return attribute->qualifiedName() == attrNode->qualifiedName();
    31993199    });

  • trunk/Source/WebCore/dom/MutationObserver.cpp

    r200552 r201333  
    245245        copyToVector(activeMutationObservers(), observers);
    246246        activeMutationObservers().clear();
    247         std::sort(observers.begin(), observers.end(), [](const RefPtr<MutationObserver>& lhs, const RefPtr<MutationObserver>& rhs) {
     247        std::sort(observers.begin(), observers.end(), [](auto& lhs, auto& rhs) {
    248248            return lhs->m_priority < rhs->m_priority;
    249249        });

  • trunk/Source/WebCore/dom/Node.cpp

    r201305 r201333  
    20872087        return;
    20882088
    2089     registry->removeFirstMatching([registration] (const std::unique_ptr<MutationObserverRegistration>& current) {
     2089    registry->removeFirstMatching([registration](auto& current) {
    20902090        return current.get() == registration;
    20912091    });

  • trunk/Source/WebCore/html/LinkIconCollector.cpp

    r200591 r201333  
    108108    }
    109109
    110     std::sort(icons.begin(), icons.end(), [](const LinkIconCollector::Icon& a, const LinkIconCollector::Icon& b) {
     110    std::sort(icons.begin(), icons.end(), [](auto& a, auto& b) {
    111111        return compareIcons(a, b) < 0;
    112112    });

  • trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp

    r201305 r201333  
    601601
    602602    RefPtr<RequestDatabaseNamesCallback> callback = WTFMove(requestCallback);
    603     idbFactory->getAllDatabaseNames(*topOrigin, *openingOrigin, [callback](const Vector<String>& databaseNames) {
     603    idbFactory->getAllDatabaseNames(*topOrigin, *openingOrigin, [callback](auto& databaseNames) {
    604604        if (!callback->isActive())
    605605            return;

  • trunk/Source/WebCore/loader/ResourceLoader.cpp

    r200895 r201333  
    254254        scheduleContext.scheduledPairs = *scheduledPairs;
    255255#endif
    256     DataURLDecoder::decode(url, scheduleContext, [protectedThis, url] (Optional<DataURLDecoder::Result> decodeResult) {
     256    DataURLDecoder::decode(url, scheduleContext, [protectedThis, url](auto decodeResult) {
    257257        if (protectedThis->reachedTerminalState())
    258258            return;

  • trunk/Source/WebCore/page/CaptionUserPreferences.cpp

    r200673 r201333  
    222222    }
    223223
    224     std::sort(tracksForMenu.begin(), tracksForMenu.end(), [](const RefPtr<TextTrack>& a, const RefPtr<TextTrack>& b) {
     224    std::sort(tracksForMenu.begin(), tracksForMenu.end(), [](auto& a, auto& b) {
    225225        return codePointCompare(trackDisplayName(a.get()), trackDisplayName(b.get())) < 0;
    226226    });
    … …  
    257257    }
    258258
    259     std::sort(tracksForMenu.begin(), tracksForMenu.end(), [](const RefPtr<AudioTrack>& a, const RefPtr<AudioTrack>& b) {
     259    std::sort(tracksForMenu.begin(), tracksForMenu.end(), [](auto& a, auto& b) {
    260260        return codePointCompare(trackDisplayName(a.get()), trackDisplayName(b.get())) < 0;
    261261    });

  • trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp

    r201038 r201333  
    839839    }
    840840   
    841     std::sort(tracksForMenu.begin(), tracksForMenu.end(), [](const RefPtr<AudioTrack>& a, const RefPtr<AudioTrack>& b) {
     841    std::sort(tracksForMenu.begin(), tracksForMenu.end(), [](auto& a, auto& b) {
    842842        return codePointCompare(trackDisplayName(a.get()), trackDisplayName(b.get())) < 0;
    843843    });

  • trunk/Source/WebCore/page/animation/AnimationController.cpp

    r200164 r201333  
    108108    });
    109109
    110     m_elementChangesToDispatch.removeAllMatching([element] (const Ref<Element>& currElement) {
    111         return &currElement.get() == element;
     110    m_elementChangesToDispatch.removeAllMatching([element](auto& currentElement) {
     111        return currentElement.ptr() == element;
    112112    });
    113113   

  • trunk/Source/WebCore/platform/graphics/FontCascade.cpp

    r199830 r201333  
    251251void pruneUnreferencedEntriesFromFontCascadeCache()
    252252{
    253     fontCascadeCache().removeIf([](FontCascadeCache::KeyValuePairType& entry) {
     253    fontCascadeCache().removeIf([](auto& entry) {
    254254        return entry.value->fonts.get().hasOneRef();
    255255    });

  • trunk/Source/WebCore/platform/graphics/FontCascadeFonts.cpp

    r200601 r201333  
    455455    if (m_cachedPageZero.isMixedFont())
    456456        m_cachedPageZero = { };
    457     m_cachedPages.removeIf([](decltype(m_cachedPages)::KeyValuePairType& keyAndValue) {
     457    m_cachedPages.removeIf([](auto& keyAndValue) {
    458458        return keyAndValue.value.isMixedFont();
    459459    });

  • trunk/Source/WebCore/platform/graphics/PathUtilities.cpp

    r198142 r201333  
    135135        }
    136136
    137         std::sort(intersectionPoints.begin(), intersectionPoints.end(), [edgeA] (FloatPointGraph::Node* a, FloatPointGraph::Node* b) {
     137        std::sort(intersectionPoints.begin(), intersectionPoints.end(), [edgeA](auto* a, auto* b) {
    138138            return FloatPoint(*edgeA.first - *b).lengthSquared() > FloatPoint(*edgeA.first - *a).lengthSquared();
    139139        });

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm

    r197807 r201333  
    532532    bool selectedVideoTrackChanged = false;
    533533
    534     std::function<void(RefPtr<AudioTrackPrivateMediaStream>, int)> enableAudioTrack = [this](RefPtr<AudioTrackPrivateMediaStream> track, int index)
     534    std::function<void(RefPtr<AudioTrackPrivateMediaStream>, int)> enableAudioTrack = [this](auto track, int index)
    535535    {
    536536        track->setTrackIndex(index);
    … …  
    539539    updateTracksOfType(m_audioTrackMap, RealtimeMediaSource::Audio, currentTracks, &AudioTrackPrivateMediaStream::create, m_player, &MediaPlayer::removeAudioTrack, &MediaPlayer::addAudioTrack, enableAudioTrack);
    540540
    541     std::function<void(RefPtr<VideoTrackPrivateMediaStream>, int)> enableVideoTrack = [this, &selectedVideoTrackChanged](RefPtr<VideoTrackPrivateMediaStream> track, int index)
     541    std::function<void(RefPtr<VideoTrackPrivateMediaStream>, int)> enableVideoTrack = [this, &selectedVideoTrackChanged](auto track, int index)
    542542    {
    543543        bool wasSelected = track->selected();

  • trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp

    r200812 r201333  
    8989        {
    9090            ASSERT(std::any_of(contextDataMap().begin(), contextDataMap().end(),
    91                 [this](GLContextDataMap::KeyValuePairType& entry) { return entry.value == this; }));
    92             contextDataMap().removeIf([this] (GLContextDataMap::KeyValuePairType& entry) { return entry.value == this; });
     91                [this](auto& entry) { return entry.value == this; }));
     92            contextDataMap().removeIf([this](auto& entry) { return entry.value == this; });
    9393        }
    9494

  • trunk/Source/WebCore/platform/mac/HIDGamepad.cpp

    r170869 r201333  
    7575
    7676    // Buttons are specified to appear highest priority first in the array.
    77     std::sort(m_buttons.begin(), m_buttons.end(), [](const std::unique_ptr<HIDGamepadButton>& a, const std::unique_ptr<HIDGamepadButton>& b) {
     77    std::sort(m_buttons.begin(), m_buttons.end(), [](auto& a, auto& b) {
    7878        return a->priority < b->priority;
    7979    });

  • trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp

    r201228 r201333  
    755755    if (ligaturePairs.size() > std::numeric_limits<uint16_t>::max())
    756756        ligaturePairs.clear();
    757     std::sort(ligaturePairs.begin(), ligaturePairs.end(), [](const LigaturePair& lhs, const LigaturePair& rhs) {
     757    std::sort(ligaturePairs.begin(), ligaturePairs.end(), [](auto& lhs, auto& rhs) {
    758758        return lhs.first[0] < rhs.first[0];
    759759    });
    … …  
    10791079size_t SVGToOTFFontConverter::finishAppendingKERNSubtable(Vector<KerningData> kerningData, uint16_t coverage)
    10801080{
    1081     std::sort(kerningData.begin(), kerningData.end(), [](const KerningData& a, const KerningData& b) {
     1081    std::sort(kerningData.begin(), kerningData.end(), [](auto& a, auto& b) {
    10821082        return a.glyph1 < b.glyph1 || (a.glyph1 == b.glyph1 && a.glyph2 < b.glyph2);
    10831083    });

  • trunk/Source/WebKit2/ChangeLog

    r201322 r201333  
     12016-05-24  Chris Dumez  <cdumez@apple.com>
     2
     3        Use auto for some of our lambda function parameters
     4        https://bugs.webkit.org/show_bug.cgi?id=158001
     5
     6        Reviewed by Darin Adler.
     7
     8        Use auto for some of our lambda function parameters now that we build with c++14.
     9
     10        * DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp:
     11        (WebKit::WebIDBConnectionToClient::didGetRecord):
     12        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
     13        (WebKit::NetworkConnectionToWebProcess::writeBlobsToTemporaryFiles):
     14        * NetworkProcess/NetworkProcess.cpp:
     15        (WebKit::fetchDiskCacheEntries):
     16        (WebKit::NetworkProcess::fetchWebsiteData):
     17        (WebKit::clearDiskCacheEntries):
     18        * NetworkProcess/NetworkResourceLoader.cpp:
     19        (WebKit::NetworkResourceLoader::retrieveCacheEntry):
     20        (WebKit::NetworkResourceLoader::tryStoreAsCacheEntry):
     21        * NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:
     22        (WebKit::NetworkCache::SpeculativeLoad::didFinishLoading):
     23        * NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:
     24        (WebKit::NetworkCache::SpeculativeLoadManager::registerLoad):
     25        (WebKit::NetworkCache::SpeculativeLoadManager::retrieveEntryFromStorage):
     26        (WebKit::NetworkCache::SpeculativeLoadManager::revalidateEntry):
     27        (WebKit::NetworkCache::SpeculativeLoadManager::preloadEntry):
     28        (WebKit::NetworkCache::SpeculativeLoadManager::retrieveSubresourcesEntry):
     29        * NetworkProcess/cache/NetworkCacheStorage.cpp:
     30        (WebKit::NetworkCache::Storage::removeFromPendingWriteOperations):
     31        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
     32        (-[WKNetworkSessionDelegate URLSession:task:willPerformHTTPRedirection:newRequest:completionHandler:]):
     33        (-[WKNetworkSessionDelegate URLSession:task:_schemeUpgraded:completionHandler:]):
     34        * Shared/API/Cocoa/_WKRemoteObjectInterface.mm:
     35        (-[_WKRemoteObjectInterface debugDescription]):
     36        * UIProcess/API/C/WKApplicationCacheManager.cpp:
     37        (WKApplicationCacheManagerGetApplicationCacheOrigins):
     38        * UIProcess/API/C/WKKeyValueStorageManager.cpp:
     39        (WKKeyValueStorageManagerGetKeyValueStorageOrigins):
     40        (WKKeyValueStorageManagerGetStorageDetailsByOrigin):
     41        * UIProcess/API/C/WKResourceCacheManager.cpp:
     42        (WKResourceCacheManagerGetCacheOrigins):
     43        * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
     44        (-[WKWebsiteDataStore _fetchDataRecordsOfTypes:withOptions:completionHandler:]):
     45        * UIProcess/UserContent/WebUserContentControllerProxy.cpp:
     46        (WebKit::WebUserContentControllerProxy::removeAllUserScripts):
     47        (WebKit::WebUserContentControllerProxy::removeAllUserStyleSheets):
     48        (WebKit::WebUserContentControllerProxy::removeAllUserMessageHandlers):
     49        * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
     50        (WebKit::PlatformCALayerRemote::removeAnimationForKey):
     51
    1522016-05-23  Yusuke Suzuki  <utatane.tea@gmail.com>
    253

  • trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp

    r199732 r201333  
    318318        file->prepareForFileAccess();
    319319
    320     NetworkBlobRegistry::singleton().writeBlobsToTemporaryFiles(blobURLs, [this, protector, requestIdentifier, fileReferences](const Vector<String>& fileNames) {
     320    NetworkBlobRegistry::singleton().writeBlobsToTemporaryFiles(blobURLs, [this, protector, requestIdentifier, fileReferences](auto& fileNames) {
    321321        for (auto& file : fileReferences)
    322322            file->revokeFileAccess();

  • trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp

    r200142 r201333  
    315315        auto* originsAndSizes = new HashMap<RefPtr<SecurityOrigin>, uint64_t>();
    316316
    317         NetworkCache::singleton().traverse([fetchOptions, completionHandler, originsAndSizes](const NetworkCache::Cache::TraversalEntry *traversalEntry) {
     317        NetworkCache::singleton().traverse([fetchOptions, completionHandler, originsAndSizes](auto* traversalEntry) {
    318318            if (!traversalEntry) {
    319319                Vector<WebsiteData::Entry> entries;
    … …  
    380380    };
    381381
    382     RefPtr<CallbackAggregator> callbackAggregator = adoptRef(new CallbackAggregator([this, callbackID](WebsiteData websiteData) {
     382    RefPtr<CallbackAggregator> callbackAggregator = adoptRef(new CallbackAggregator([this, callbackID] (WebsiteData websiteData) {
    383383        parentProcessConnection()->send(Messages::NetworkProcessProxy::DidFetchWebsiteData(callbackID, websiteData), 0);
    384384    }));
    … …  
    390390
    391391    if (websiteDataTypes.contains(WebsiteDataType::DiskCache)) {
    392         fetchDiskCacheEntries(sessionID, fetchOptions, [callbackAggregator](Vector<WebsiteData::Entry> entries) {
     392        fetchDiskCacheEntries(sessionID, fetchOptions, [callbackAggregator](auto entries) {
    393393            callbackAggregator->m_websiteData.entries.appendVector(entries);
    394394        });
    … …  
    433433        auto* cacheKeysToDelete = new Vector<NetworkCache::Key>;
    434434
    435         NetworkCache::singleton().traverse([completionHandler, originsToDelete, cacheKeysToDelete](const NetworkCache::Cache::TraversalEntry *traversalEntry) {
    436 
     435        NetworkCache::singleton().traverse([completionHandler, originsToDelete, cacheKeysToDelete](auto* traversalEntry) {
    437436            if (traversalEntry) {
    438437                if (originsToDelete->contains(SecurityOrigin::create(traversalEntry->entry.response().url())))

  • trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp

    r201255 r201333  
    166166
    167167    RefPtr<NetworkResourceLoader> loader(this);
    168     NetworkCache::singleton().retrieve(request, { m_parameters.webPageID, m_parameters.webFrameID }, [loader, request](std::unique_ptr<NetworkCache::Entry> entry) {
     168    NetworkCache::singleton().retrieve(request, { m_parameters.webPageID, m_parameters.webFrameID }, [loader, request](auto entry) {
    169169        if (loader->hasOneRef()) {
    170170            // The loader has been aborted and is only held alive by this lambda.
    … …  
    517517    RefPtr<NetworkConnectionToWebProcess> connection(&connectionToWebProcess());
    518518    RefPtr<NetworkResourceLoader> loader(this);
    519     NetworkCache::singleton().store(m_networkLoad->currentRequest(), m_response, WTFMove(m_bufferedDataForCache), [loader, connection](NetworkCache::MappedBody& mappedBody) {
     519    NetworkCache::singleton().store(m_networkLoad->currentRequest(), m_response, WTFMove(m_bufferedDataForCache), [loader, connection](auto& mappedBody) {
    520520#if ENABLE(SHAREABLE_RESOURCE)
    521521        if (mappedBody.shareableResourceHandle.isNull())

  • trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp

    r199521 r201333  
    106106{
    107107    if (!m_cacheEntryForValidation && m_bufferedDataForCache)
    108         m_cacheEntryForValidation = NetworkCache::singleton().store(m_originalRequest, m_response, WTFMove(m_bufferedDataForCache), [](NetworkCache::MappedBody& mappedBody) { });
     108        m_cacheEntryForValidation = NetworkCache::singleton().store(m_originalRequest, m_response, WTFMove(m_bufferedDataForCache), [](auto& mappedBody) { });
    109109
    110110    didComplete();

  • trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp

    r201255 r201333  
    410410void SpeculativeLoadManager::retrieveEntryFromStorage(const Key& key, const RetrieveCompletionHandler& completionHandler)
    411411{
    412     m_storage.retrieve(key, static_cast<unsigned>(ResourceLoadPriority::Medium), [completionHandler](std::unique_ptr<Storage::Record> record) {
     412    m_storage.retrieve(key, static_cast<unsigned>(ResourceLoadPriority::Medium), [completionHandler](auto record) {
    413413        if (!record) {
    414414            completionHandler(nullptr);
    … …  
    538538    ASSERT(storageKey.type() == "resource");
    539539    auto subresourcesStorageKey = makeSubresourcesKey(storageKey);
    540     m_storage.retrieve(subresourcesStorageKey, static_cast<unsigned>(ResourceLoadPriority::Medium), [completionHandler](std::unique_ptr<Storage::Record> record) {
     540    m_storage.retrieve(subresourcesStorageKey, static_cast<unsigned>(ResourceLoadPriority::Medium), [completionHandler](auto record) {
    541541        if (!record) {
    542542            completionHandler(nullptr);

  • trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp

    r201255 r201333  
    527527{
    528528    while (true) {
    529         auto found = m_pendingWriteOperations.findIf([&key](const std::unique_ptr<WriteOperation>& operation) {
     529        auto found = m_pendingWriteOperations.findIf([&key](auto& operation) {
    530530            return operation->record.key == key;
    531531        });

  • trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm

    r201295 r201333  
    124124    if (auto* networkDataTask = _session->dataTaskForIdentifier(task.taskIdentifier, storedCredentials)) {
    125125        auto completionHandlerCopy = Block_copy(completionHandler);
    126         networkDataTask->willPerformHTTPRedirection(response, request, [completionHandlerCopy, taskIdentifier](const WebCore::ResourceRequest& request) {
     126        networkDataTask->willPerformHTTPRedirection(response, request, [completionHandlerCopy, taskIdentifier](auto& request) {
    127127            LOG(NetworkSession, "%llu willPerformHTTPRedirection completionHandler (%s)", taskIdentifier, request.url().string().utf8().data());
    128128            completionHandlerCopy(request.nsURLRequest(WebCore::UpdateHTTPBody));
    … …  
    143143    if (auto* networkDataTask = _session->dataTaskForIdentifier(taskIdentifier, storedCredentials)) {
    144144        auto completionHandlerCopy = Block_copy(completionHandler);
    145         networkDataTask->willPerformHTTPRedirection(WebCore::synthesizeRedirectResponseIfNecessary([task currentRequest], request, nil), request, [completionHandlerCopy, taskIdentifier](const WebCore::ResourceRequest& request) {
     145        networkDataTask->willPerformHTTPRedirection(WebCore::synthesizeRedirectResponseIfNecessary([task currentRequest], request, nil), request, [completionHandlerCopy, taskIdentifier](auto& request) {
    146146            LOG(NetworkSession, "%llu _schemeUpgraded completionHandler (%s)", taskIdentifier, request.url().string().utf8().data());
    147147            completionHandlerCopy(request.nsURLRequest(WebCore::UpdateHTTPBody));

  • trunk/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectInterface.mm

    r194496 r201333  
    211211    auto result = adoptNS([[NSMutableString alloc] initWithFormat:@"<%@: %p; protocol = \"%@\"; identifier = \"%@\"\n", NSStringFromClass(self.class), self, _identifier.get(), NSStringFromProtocol(_protocol)]);
    212212
    213     auto descriptionForClasses = [](const Vector<HashSet<Class>>& allowedClasses) {
     213    auto descriptionForClasses = [](auto& allowedClasses) {
    214214        auto result = adoptNS([[NSMutableString alloc] initWithString:@"["]);
    215215        bool needsComma = false;
    216216
    217         auto descriptionForArgument = [](const HashSet<Class>& allowedArgumentClasses) {
     217        auto descriptionForArgument = [](auto& allowedArgumentClasses) {
    218218            auto result = adoptNS([[NSMutableString alloc] initWithString:@"{"]);
    219219

  • trunk/Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.cpp

    r197203 r201333  
    4141{
    4242    auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(applicationCacheManager))->websiteDataStore();
    43     websiteDataStore.fetchData(WebsiteDataType::OfflineWebApplicationCache, { }, [context, callback](Vector<WebsiteDataRecord> dataRecords) {
     43    websiteDataStore.fetchData(WebsiteDataType::OfflineWebApplicationCache, { }, [context, callback](auto dataRecords) {
    4444        Vector<RefPtr<API::Object>> securityOrigins;
    4545        for (const auto& dataRecord : dataRecords) {

  • trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp

    r194496 r201333  
    7070    }
    7171
    72     storageManager->getLocalStorageOrigins([context, callback](HashSet<RefPtr<WebCore::SecurityOrigin>>&& securityOrigins) {
     72    storageManager->getLocalStorageOrigins([context, callback](auto&& securityOrigins) {
    7373        Vector<RefPtr<API::Object>> webSecurityOrigins;
    7474        webSecurityOrigins.reserveInitialCapacity(securityOrigins.size());
    … …  
    9090    }
    9191
    92     storageManager->getLocalStorageOriginDetails([context, callback](Vector<LocalStorageDatabaseTracker::OriginDetails> storageDetails) {
     92    storageManager->getLocalStorageOriginDetails([context, callback](auto storageDetails) {
    9393        HashMap<String, RefPtr<API::Object>> detailsMap;
    9494        Vector<RefPtr<API::Object>> result;

  • trunk/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp

    r197203 r201333  
    5353{
    5454    auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(cacheManager))->websiteDataStore();
    55     websiteDataStore.fetchData(toWebsiteDataTypes(WKResourceCachesToClearAll), { }, [context, callback](Vector<WebsiteDataRecord> dataRecords) {
     55    websiteDataStore.fetchData(toWebsiteDataTypes(WKResourceCachesToClearAll), { }, [context, callback](auto dataRecords) {
    5656        Vector<RefPtr<API::Object>> securityOrigins;
    5757        for (const auto& dataRecord : dataRecords) {

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm

    r197592 r201333  
    154154        fetchOptions |= WebKit::WebsiteDataFetchOption::ComputeSizes;
    155155
    156     _websiteDataStore->websiteDataStore().fetchData(WebKit::toWebsiteDataTypes(dataTypes), fetchOptions, [completionHandlerCopy](Vector<WebKit::WebsiteDataRecord> websiteDataRecords) {
     156    _websiteDataStore->websiteDataStore().fetchData(WebKit::toWebsiteDataTypes(dataTypes), fetchOptions, [completionHandlerCopy](auto websiteDataRecords) {
    157157        Vector<RefPtr<API::Object>> elements;
    158158        elements.reserveInitialCapacity(websiteDataRecords.size());

  • trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp

    r199020 r201333  
    190190        process->connection()->send(Messages::WebUserContentController::RemoveAllUserScripts({ world.identifier() }), m_identifier);
    191191
    192     unsigned userScriptsRemoved = m_userScripts->removeAllOfTypeMatching<API::UserScript>([&] (const RefPtr<API::UserScript>& userScript) -> bool {
     192    unsigned userScriptsRemoved = m_userScripts->removeAllOfTypeMatching<API::UserScript>([&](const auto& userScript) {
    193193        return &userScript->userContentWorld() == &world;
    194194    });
    … …  
    245245        process->connection()->send(Messages::WebUserContentController::RemoveAllUserStyleSheets({ world.identifier() }), m_identifier);
    246246
    247     unsigned userStyleSheetsRemoved = m_userStyleSheets->removeAllOfTypeMatching<API::UserStyleSheet>([&] (const RefPtr<API::UserStyleSheet>& userStyleSheet) -> bool {
     247    unsigned userStyleSheetsRemoved = m_userStyleSheets->removeAllOfTypeMatching<API::UserStyleSheet>([&](const auto& userStyleSheet) {
    248248        return &userStyleSheet->userContentWorld() == &world;
    249249    });
    … …  
    311311
    312312    unsigned numberRemoved = 0;
    313     m_scriptMessageHandlers.removeIf([&](HashMap<uint64_t, RefPtr<WebScriptMessageHandler>>::KeyValuePairType& entry) {
     313    m_scriptMessageHandlers.removeIf([&](auto& entry) {
    314314        if (&entry.value->userContentWorld() == &world) {
    315315            ++numberRemoved;

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp

    r200602 r201333  
    351351{
    352352    if (m_animations.remove(key)) {
    353         m_properties.addedAnimations.removeFirstMatching([&key] (const std::pair<String, PlatformCAAnimationRemote::Properties>& pair) {
     353        m_properties.addedAnimations.removeFirstMatching([&key](auto& pair) {
    354354            return pair.first == key;
    355355        });

  • trunk/Tools/ChangeLog

    r201288 r201333  
     12016-05-24  Chris Dumez  <cdumez@apple.com>
     2
     3        Use auto for some of our lambda function parameters
     4        https://bugs.webkit.org/show_bug.cgi?id=158001
     5
     6        Reviewed by Darin Adler.
     7
     8        Use auto for some of our lambda function parameters now that we build with c++14.
     9
     10        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
     11        (WTR::InjectedBundle::willDestroyPage):
     12
    1132016-05-23  Brady Eidson  <beidson@apple.com>
    214

  • trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py

    r201288 r201333  
    24342434          and line.count('(') == line.count(')')
    24352435          and not search(r'(\s*(if|for|while|switch|NS_ENUM|@synchronized)|} @catch)\b', line)
     2436          and line.find("](") < 0
    24362437          and not match(r'\s+[A-Z_][A-Z_0-9]+\b', line)):
    24372438        error(line_number, 'whitespace/braces', 4,

  • trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py

    r201288 r201333  
    17671767            'int foo() override\n'
    17681768            '{\n'
     1769            '}\n',
     1770            '')
     1771        self.assert_multi_line_lint(
     1772            '[]() {\n'
    17691773            '}\n',
    17701774            '')

  • trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp

    r200945 r201333  
    110110void InjectedBundle::willDestroyPage(WKBundlePageRef page)
    111111{
    112     m_pages.removeFirstMatching([page] (const std::unique_ptr<InjectedBundlePage>& current) {
     112    m_pages.removeFirstMatching([page](auto& current) {
    113113        return current->page() == page;
    114114    });
Note: See TracChangeset for help on using the changeset viewer.