Changeset 159992 in webkit

Timestamp:

Dec 2, 2013 9:53:32 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Add ability to iterate over API::Array
​https://bugs.webkit.org/show_bug.cgi?id=124533

Patch by Martin Hock <​mhock@apple.com> on 2013-12-02
Reviewed by Sam Weinig.

• GNUmakefile.list.am:
• Shared/APIArray.h:
• Shared/FilterIterator.h:
• Shared/IteratorPair.h:
• WebKit2.xcodeproj/project.pbxproj:
• WebProcess/InjectedBundle/InjectedBundle.cpp:

(WebKit::toStringVector):

• WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp:

(WebKit::InjectedBundlePageEditorClient::getPasteboardDataForRange):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.list.am (modified) (2 diffs)
• Shared/APIArray.h (modified) (5 diffs)
• Shared/FilterIterator.h (copied) (copied from trunk/Source/WebKit2/Shared/APIArray.h) (3 diffs)
• Shared/IteratorPair.h (copied) (copied from trunk/Source/WebKit2/Shared/APIArray.h) (2 diffs)
• WebKit2.xcodeproj/project.pbxproj (modified) (8 diffs)
• WebProcess/InjectedBundle/InjectedBundle.cpp (modified) (1 diff)
• WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-02  Martin Hock  <mhock@apple.com>
+
+        Add ability to iterate over API::Array
+        https://bugs.webkit.org/show_bug.cgi?id=124533
+
+        Reviewed by Sam Weinig.
+
+        * GNUmakefile.list.am:
+        * Shared/APIArray.h:
+        * Shared/FilterIterator.h:
+        * Shared/IteratorPair.h:
+        * WebKit2.xcodeproj/project.pbxproj:
+        * WebProcess/InjectedBundle/InjectedBundle.cpp:
+        (WebKit::toStringVector):
+        * WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp:
+        (WebKit::InjectedBundlePageEditorClient::getPasteboardDataForRange):
+
 2013-12-02  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/GNUmakefile.list.am

@@ -423 +423 @@
         Source/WebKit2/Shared/EditorState.cpp \
         Source/WebKit2/Shared/EditorState.h \
+        Source/WebKit2/Shared/FilterIterator.h \
         Source/WebKit2/Shared/FontSmoothingLevel.h \
         Source/WebKit2/Shared/ProcessExecutablePath.h \
@@ -439 +440 @@
         Source/WebKit2/Shared/ImmutableDictionary.cpp \
         Source/WebKit2/Shared/ImmutableDictionary.h \
+        Source/WebKit2/Shared/IteratorPair.h \
         Source/WebKit2/Shared/LayerTreeContext.h \
         Source/WebKit2/Shared/MutableDictionary.cpp \

trunk/Source/WebKit2/Shared/APIArray.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2010, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28 +28 @@
 
 #include "APIObject.h"
+#include "FilterIterator.h"
+#include "IteratorPair.h"
 #include <wtf/Forward.h>
 #include <wtf/PassRefPtr.h>
@@ -35 +37 @@
 
 class Array FINAL : public TypedObject<Object::Type::Array> {
+private:
+    template<typename T>
+    static inline const T* getObject(const RefPtr<Object>& object) { return static_cast<const T*>(object.get()); }
+
+    template<typename T>
+    static inline bool isType(const RefPtr<Object>& object) { return object->type() == T::APIType; }
+
 public:
     static PassRefPtr<Array> create();
@@ -46 +55 @@
     T* at(size_t i) const
     {
-        if (m_elements[i]->type() != T::APIType)
+        if (!isType<T>(m_elements[i]))
             return nullptr;
 
@@ -58 +67 @@
     Vector<RefPtr<Object>>& elements() { return m_elements; }
 
+    template<typename T>
+    IteratorPair<FilterIterator<decltype(&isType<T>), decltype(&getObject<T>), Vector<RefPtr<Object>>::const_iterator>> elementsOfType()
+    {
+        return IteratorPair<FilterIterator<decltype(&isType<T>), decltype(&getObject<T>), Vector<RefPtr<Object>>::const_iterator>>(FilterIterator<decltype(&isType<T>), decltype(&getObject<T>), Vector<RefPtr<Object>>::const_iterator>(isType<T>, getObject<T>, m_elements.begin(), m_elements.end()), FilterIterator<decltype(&isType<T>), decltype(&getObject<T>), Vector<RefPtr<Object>>::const_iterator>(isType<T>, getObject<T>, m_elements.end(), m_elements.end()));
+    }
+
 private:
     explicit Array(Vector<RefPtr<Object>> elements);

trunk/Source/WebKit2/Shared/FilterIterator.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24 +24 @@
  */
 
-#ifndef APIArray_h
-#define APIArray_h
+#ifndef FilterIterator_h
+#define FilterIterator_h
 
 #include "APIObject.h"
@@ -34 +34 @@
 namespace API {
 
-class Array FINAL : public TypedObject<Object::Type::Array> {
+template<typename Predicate, typename Cast, typename Iterator>
+class FilterIterator {
 public:
-    static PassRefPtr<Array> create();
-    static PassRefPtr<Array> create(Vector<RefPtr<Object>> elements);
-
-    static PassRefPtr<Array> createStringArray(const Vector<String>&);
-
-    virtual ~Array();
-
-    template<typename T>
-    T* at(size_t i) const
+    FilterIterator(Predicate pred, Cast cast, Iterator begin, Iterator end)
+        : m_pred(std::move(pred))
+        , m_cast(std::move(cast))
+        , m_iter(std::move(begin))
+        , m_end(std::move(end))
     {
-        if (m_elements[i]->type() != T::APIType)
-            return nullptr;
-
-        return static_cast<T*>(m_elements[i].get());
+        while (m_iter != m_end && !m_pred(*m_iter))
+            ++m_iter;
     }
 
-    Object* at(size_t i) const { return m_elements[i].get(); }
-    size_t size() const { return m_elements.size(); }
+    FilterIterator& operator++()
+    {
+        while (m_iter != m_end) {
+            ++m_iter;
+            if (m_iter == m_end || m_pred(*m_iter))
+                break;
+        }
+        return *this;
+    }
 
-    const Vector<RefPtr<Object>>& elements() const { return m_elements; }
-    Vector<RefPtr<Object>>& elements() { return m_elements; }
+    const decltype(std::declval<Cast>()(*std::declval<Iterator>())) operator*() const
+    {
+        ASSERT(m_iter != m_end);
+        ASSERT(m_pred(*m_iter));
+        return m_cast(*m_iter);
+    }
+
+    inline bool operator==(FilterIterator& other) const { return m_iter == other.m_iter; }
+    inline bool operator!=(FilterIterator& other) const { return m_iter != other.m_iter; }
 
 private:
-    explicit Array(Vector<RefPtr<Object>> elements);
-
-    Vector<RefPtr<Object>> m_elements;
+    const Predicate m_pred;
+    const Cast m_cast;
+    Iterator m_iter;
+    Iterator m_end;
 };
 
 } // namespace API
 
-#endif // APIArray_h
+#endif // FilterIterator_h

trunk/Source/WebKit2/Shared/IteratorPair.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24 +24 @@
  */
 
-#ifndef APIArray_h
-#define APIArray_h
-
-#include "APIObject.h"
-#include <wtf/Forward.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/Vector.h>
-
-namespace API {
-
-class Array FINAL : public TypedObject<Object::Type::Array> {
+template<typename Iterator> class IteratorPair {
 public:
-    static PassRefPtr<Array> create();
-    static PassRefPtr<Array> create(Vector<RefPtr<Object>> elements);
-
-    static PassRefPtr<Array> createStringArray(const Vector<String>&);
-
-    virtual ~Array();
-
-    template<typename T>
-    T* at(size_t i) const
+    IteratorPair(Iterator begin, Iterator end)
+        : m_begin(std::move(begin))
+        , m_end(std::move(end))
     {
-        if (m_elements[i]->type() != T::APIType)
-            return nullptr;
-
-        return static_cast<T*>(m_elements[i].get());
     }
 
-    Object* at(size_t i) const { return m_elements[i].get(); }
-    size_t size() const { return m_elements.size(); }
-
-    const Vector<RefPtr<Object>>& elements() const { return m_elements; }
-    Vector<RefPtr<Object>>& elements() { return m_elements; }
+    Iterator begin() { return m_begin; }
+    Iterator end() { return m_end; }
 
 private:
-    explicit Array(Vector<RefPtr<Object>> elements);
-
-    Vector<RefPtr<Object>> m_elements;
+    Iterator m_begin, m_end;
 };
-
-} // namespace API
-
-#endif // APIArray_h

trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

@@ -685 +685 @@
                 728E86F11795188C0087879E /* WebColorPickerMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 728E86EF1795188C0087879E /* WebColorPickerMac.h */; };
                 728E86F21795188C0087879E /* WebColorPickerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 728E86F01795188C0087879E /* WebColorPickerMac.mm */; };
+                752A8077183D6DA7003D659E /* FilterIterator.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 752A8076183D6DA7003D659E /* FilterIterator.h */; };
                 755422BB18062B9C0046F6A8 /* WKOriginDataManager.cpp in Copy Files */ = {isa = PBXBuildFile; fileRef = 755422B918062B9C0046F6A8 /* WKOriginDataManager.cpp */; };
                 755422BC18062B9C0046F6A8 /* WKOriginDataManager.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 755422BA18062B9C0046F6A8 /* WKOriginDataManager.h */; };
@@ -692 +693 @@
                 755422CB180650020046F6A8 /* WebOriginDataManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 755422C618064FFC0046F6A8 /* WebOriginDataManager.cpp */; };
                 755422CC180773CE0046F6A8 /* WebOriginDataManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 755422C718064FFC0046F6A8 /* WebOriginDataManager.h */; };
+                757AF978184D131400E6316E /* IteratorPair.h in Headers */ = {isa = PBXBuildFile; fileRef = 757AF976184D130500E6316E /* IteratorPair.h */; };
                 759CCD581808F1640078E8A8 /* WebOriginDataManagerProxyChangeClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 759CCD541808F1600078E8A8 /* WebOriginDataManagerProxyChangeClient.cpp */; };
                 759CCD591808F1690078E8A8 /* WebOriginDataManagerProxyChangeClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 759CCD551808F1600078E8A8 /* WebOriginDataManagerProxyChangeClient.h */; };
@@ -1468 +1470 @@
                                 755422C318062BE40046F6A8 /* WebOriginDataManagerProxy.messages.in in Copy Files */,
                                 1A50DB66110A3D57000D3FE5 /* WebProcess.app in Copy Files */,
+                                752A8077183D6DA7003D659E /* FilterIterator.h in Copy Files */,
                                 755422BB18062B9C0046F6A8 /* WKOriginDataManager.cpp in Copy Files */,
                         );
@@ -2253 +2256 @@
                 728E86EF1795188C0087879E /* WebColorPickerMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebColorPickerMac.h; sourceTree = "<group>"; };
                 728E86F01795188C0087879E /* WebColorPickerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebColorPickerMac.mm; sourceTree = "<group>"; };
+                752A8076183D6DA7003D659E /* FilterIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilterIterator.h; sourceTree = "<group>"; };
                 755422B918062B9C0046F6A8 /* WKOriginDataManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKOriginDataManager.cpp; sourceTree = "<group>"; };
                 755422BA18062B9C0046F6A8 /* WKOriginDataManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKOriginDataManager.h; sourceTree = "<group>"; };
@@ -2261 +2265 @@
                 755422C718064FFC0046F6A8 /* WebOriginDataManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebOriginDataManager.h; path = OriginData/WebOriginDataManager.h; sourceTree = "<group>"; };
                 755422C818064FFC0046F6A8 /* WebOriginDataManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebOriginDataManager.messages.in; path = OriginData/WebOriginDataManager.messages.in; sourceTree = "<group>"; };
+                757AF976184D130500E6316E /* IteratorPair.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IteratorPair.h; sourceTree = "<group>"; };
                 759CCD541808F1600078E8A8 /* WebOriginDataManagerProxyChangeClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebOriginDataManagerProxyChangeClient.cpp; sourceTree = "<group>"; };
                 759CCD551808F1600078E8A8 /* WebOriginDataManagerProxyChangeClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebOriginDataManagerProxyChangeClient.h; sourceTree = "<group>"; };
@@ -3426 +3431 @@
                                 8CFECE931490F140002AAA32 /* EditorState.cpp */,
                                 1AA41AB412C02EC4002BE67B /* EditorState.h */,
+                                752A8076183D6DA7003D659E /* FilterIterator.h */,
                                 BCE81D8A1319F7EF00241910 /* FontInfo.cpp */,
                                 BCE81D8B1319F7EF00241910 /* FontInfo.h */,
@@ -3433 +3439 @@
                                 BCBCB0CC1215E33A00DE59CA /* ImmutableDictionary.cpp */,
                                 BCBCB0CA1215E32100DE59CA /* ImmutableDictionary.h */,
+                                757AF976184D130500E6316E /* IteratorPair.h */,
                                 1A92DC1012F8BA460017AF65 /* LayerTreeContext.h */,
                                 BCB0AEE8122F53E300B1341E /* MutableDictionary.cpp */,
@@ -5797 +5804 @@
                                 E179088F169BAA6A006904C7 /* SecItemShim.h in Headers */,
                                 511F8A7B138B460900A95F44 /* SecItemShimLibrary.h in Headers */,
+                                757AF978184D131400E6316E /* IteratorPair.h in Headers */,
                                 E1790891169BAA82006904C7 /* SecItemShimMessages.h in Headers */,
                                 E18E690C169B563F009B6670 /* SecItemShimProxy.h in Headers */,

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp

@@ -486 +486 @@
 
     patternsVector.reserveInitialCapacity(size);
-    for (size_t i = 0; i < size; ++i) {
-        WebString* entry = patterns->at<WebString>(i);
-        if (entry)
-            patternsVector.uncheckedAppend(entry->string());
-    }
+    for (const auto& entry : patterns->elementsOfType<WebString>())
+        patternsVector.uncheckedAppend(entry->string());
     return patternsVector;
 }

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp

@@ -155 +155 @@
         ASSERT(typesArray->size() == dataArray->size());
 
-        size_t size = typesArray->size();
-        for (size_t i = 0; i < size; ++i) {
-            WebString* type = typesArray->at<WebString>(i);
-            if (type)
-                pasteboardTypes.append(type->string());
-        }
+        for (const auto& type : typesArray->elementsOfType<WebString>())
+            pasteboardTypes.append(type->string());
 
-        size = dataArray->size();
-        for (size_t i = 0; i < size; ++i) {
-            WebData* item = dataArray->at<WebData>(i);
-            if (item) {
-                RefPtr<SharedBuffer> buffer = SharedBuffer::create(item->bytes(), item->size());
-                pasteboardData.append(buffer);
-            }
+        for (const auto& item : dataArray->elementsOfType<WebData>()) {
+            RefPtr<SharedBuffer> buffer = SharedBuffer::create(item->bytes(), item->size());
+            pasteboardData.append(buffer);
         }
     }