Use FastVector in angle::Subject.

src/libANGLE/Observer.cpp

@@ -42,70 +42,36 @@ Subject::~Subject()
 
 bool Subject::hasObservers() const
 {
-    return !mFastObservers.empty();
+    return !mObservers.empty();
 }
 
 ANGLE_INLINE void Subject::addObserver(ObserverBinding *observer)
 {
-    ASSERT(!IsInContainer(mFastObservers, observer) && !IsInContainer(mSlowObservers, observer));
-
-    if (!mFastObservers.full())
-    {
-        mFastObservers.push_back(observer);
-    }
-    else
-    {
-        mSlowObservers.push_back(observer);
-    }
+    ASSERT(!IsInContainer(mObservers, observer));
+    mObservers.push_back(observer);
 }
 
 ANGLE_INLINE void Subject::removeObserver(ObserverBinding *observer)
 {
-    // TODO(jmadill): De-duplicate remove code. http://anglebug.com/2763
-    if (mSlowObservers.empty())
+    ASSERT(IsInContainer(mObservers, observer));
+    size_t len = mObservers.size() - 1;
+    for (size_t index = 0; index < len; ++index)
     {
-        size_t fastLen = mFastObservers.size();
-        for (size_t index = 0; index < fastLen; ++index)
+        if (mObservers[index] == observer)
         {
-            if (mFastObservers[index] == observer)
-            {
-                mFastObservers[index] = mFastObservers[fastLen - 1];
-                mFastObservers.pop_back();
-            }
-        }
-    }
-    else
-    {
-        auto iter = std::find(mFastObservers.begin(), mFastObservers.end(), observer);
-        if (iter != mFastObservers.end())
-        {
-            size_t index = iter - mFastObservers.begin();
-            std::swap(mFastObservers[index], mFastObservers[mFastObservers.size() - 1]);
-            mFastObservers.resize(mFastObservers.size() - 1);
-            mFastObservers.push_back(mSlowObservers.back());
-            mSlowObservers.pop_back();
-            ASSERT(mFastObservers.full());
-        }
-        else
-        {
-            auto slowIter = std::find(mSlowObservers.begin(), mSlowObservers.end(), observer);
-            ASSERT(slowIter != mSlowObservers.end());
-            mSlowObservers.erase(slowIter);
+            mObservers[index] = mObservers[len];
+            break;
         }
     }
+    mObservers.pop_back();
 }
 
 void Subject::onStateChange(const gl::Context *context, SubjectMessage message) const
 {
-    if (mFastObservers.empty())
+    if (mObservers.empty())
         return;
 
-    for (const angle::ObserverBinding *receiver : mFastObservers)
-    {
-        receiver->onStateChange(context, message);
-    }
-
-    for (const angle::ObserverBinding *receiver : mSlowObservers)
+    for (const angle::ObserverBinding *receiver : mObservers)
     {
         receiver->onStateChange(context, message);
     }
@@ -113,17 +79,11 @@ void Subject::onStateChange(const gl::Context *context, SubjectMessage message)
 
 void Subject::resetObservers()
 {
-    for (angle::ObserverBinding *observer : mFastObservers)
-    {
-        observer->onSubjectReset();
-    }
-    mFastObservers.clear();
-
-    for (angle::ObserverBinding *observer : mSlowObservers)
+    for (angle::ObserverBinding *observer : mObservers)
     {
         observer->onSubjectReset();
     }
-    mSlowObservers.clear();
+    mObservers.clear();
 }
 
 // ObserverBinding implementation.

src/libANGLE/Observer.h

@@ -13,7 +13,7 @@
 #ifndef LIBANGLE_OBSERVER_H_
 #define LIBANGLE_OBSERVER_H_
 
-#include "common/FixedVector.h"
+#include "common/FastVector.h"
 #include "common/angleutils.h"
 
 namespace gl
@@ -68,8 +68,7 @@ class Subject : NonCopyable
     // Keep a short list of observers so we can allocate/free them quickly. But since we support
     // unlimited bindings, have a spill-over list of that uses dynamic allocation.
     static constexpr size_t kMaxFixedObservers = 8;
-    angle::FixedVector<ObserverBinding *, kMaxFixedObservers> mFastObservers;
-    std::vector<ObserverBinding *> mSlowObservers;
+    angle::FastVector<ObserverBinding *, kMaxFixedObservers> mObservers;
 };
 
 // Keeps a binding between a Subject and Observer, with a specific subject index.

src/libANGLE/renderer/vulkan/vk_cache_utils.h

@@ -12,6 +12,7 @@
 #define LIBANGLE_RENDERER_VULKAN_VK_CACHE_UTILS_H_
 
 #include "common/Color.h"
+#include "common/FixedVector.h"
 #include "libANGLE/renderer/vulkan/vk_utils.h"
 
 namespace rx