Skip to content
  • weinig@apple.com's avatar
    Clean up iterator filter / iterator range code · c3967736
    weinig@apple.com authored
    https://bugs.webkit.org/show_bug.cgi?id=126817
    
    Reviewed by Anders Carlsson.
    
    Source/WebKit2: 
    
    * Shared/APIArray.h:
    Update elementsOfType() to use combination of FilterIterator and TransformIterator
    (now that FilterIterator no longer has a transform predicate) and make use of the 
    makeFoo() helpers.
    
    Source/WTF: 
    
    - Renames IteratorPair to IteratorRange.
    - Splits FilterIterator into FilterIterator (which now only filters) and
      TransformIterator (which does the transform part of the old FilterIterator).
      Move both of these to IteratorAdaptors.h
    
    * GNUmakefile.list.am:
    * WTF.vcxproj/WTF.vcxproj:
    * WTF.vcxproj/WTF.vcxproj.filters:
    * WTF.xcodeproj/project.pbxproj:
    * wtf/CMakeLists.txt:
    * wtf/FilterIterator.h: Removed.
    Add/remove files.
    
    * wtf/HashMap.h:
    (WTF::HashMap::keys):
    (WTF::HashMap::values):
    * wtf/RefPtrHashMap.h:
    Update for rename to IteratorRange. Simplify by using makeIteratorRange().
    
    * wtf/IteratorAdaptors.h: Copied from wtf/FilterIterator.h.
    (WTF::FilterIterator::FilterIterator):
    (WTF::FilterIterator::operator*):
    (WTF::makeFilterIterator):
    (WTF::TransformIterator::TransformIterator):
    (WTF::TransformIterator::operator++):
    (WTF::TransformIterator::operator*):
    (WTF::TransformIterator::operator==):
    (WTF::TransformIterator::operator!=):
    (WTF::makeTransformIterator):
    Split up filtering and transforming. Add makeFilterIterator() and makeTransformIterator()
    helpers.
    
    * wtf/IteratorPair.h: Removed.
    * wtf/IteratorRange.h: Copied from wtf/IteratorPair.h.
    (WTF::IteratorRange::IteratorRange):
    (WTF::makeIteratorRange):
    Renamed to IteratorRange and adds makeIteratorRange() helper.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@161770 268f45cc-cd09-0410-ab3c-d52691b4dbfc
    c3967736