Rewrite the while loop in DrawingBuffer::createOrRecycleBitmap

third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp

 /*
  * Copyright (c) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 231 matching lines @@
 void DrawingBuffer::freeRecycledMailboxes()
 {
     while (!m_recycledMailboxQueue.isEmpty()) {
         RefPtr<RecycledMailbox> recycled = m_recycledMailboxQueue.takeLast();
         deleteMailbox(recycled->mailbox, recycled->syncToken);
     }
 }
 
 std::unique_ptr<cc::SharedBitmap> DrawingBuffer::createOrRecycleBitmap()
 {
-    size_t i = 0;
-    while (i < m_recycledBitmaps.size()) {
-        if (m_recycledBitmaps[i].size != m_size)
-            m_recycledBitmaps.remove(i); // Removed this position so iterate on it again.
-        else
-            ++i;
-    }
+    auto it = std::remove_if(m_recycledBitmaps.begin(), m_recycledBitmaps.end(),
+        [this](const RecycledBitmap& bitmap)
+        {
+            return bitmap.size != m_size;
+        });
+    m_recycledBitmaps.shrink(it - m_recycledBitmaps.begin());
+
     if (!m_recycledBitmaps.isEmpty()) {
         RecycledBitmap recycled = std::move(m_recycledBitmaps.last());
         m_recycledBitmaps.removeLast();
         DCHECK(recycled.size == m_size);
         return std::move(recycled.bitmap);
     }
 
     return Platform::current()->allocateSharedBitmap(m_size);
 }
 
@@ skipping 979 matching lines @@
     // the public interface for WebGL does not support GL_TEXTURE_RECTANGLE.
     m_gl->BindTexture(GL_TEXTURE_2D, m_texture2DBinding);
 }
 
 bool DrawingBuffer::shouldUseChromiumImage()
 {
     return RuntimeEnabledFeatures::webGLImageChromiumEnabled() && m_chromiumImageUsage == AllowChromiumImage;
 }
 
 } // namespace blink