cc: Make the ScopedPtrVector and ScopedPtrDeque containers act like STL vector and deque.

cc/texture_uploader.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/texture_uploader.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/debug/alias.h"
@@ skipping 123 matching lines @@
 
     // Use the median as our estimate.
     std::multiset<double>::iterator median = m_texturesPerSecondHistory.begin();
     std::advance(median, m_texturesPerSecondHistory.size() / 2);
     TRACE_COUNTER_ID1("cc", "EstimatedTexturesPerSecond", m_context, *median);
     return *median;
 }
 
 void TextureUploader::beginQuery()
 {
-    if (m_availableQueries.isEmpty())
-      m_availableQueries.append(Query::create(m_context));
+    if (m_availableQueries.empty())
+      m_availableQueries.push_back(Query::create(m_context));
 
-    m_availableQueries.first()->begin();
+    m_availableQueries.front()->begin();
 }
 
 void TextureUploader::endQuery()
 {
-    m_availableQueries.first()->end();
-    m_pendingQueries.append(m_availableQueries.takeFirst());
+    m_availableQueries.front()->end();
+    m_pendingQueries.push_back(m_availableQueries.take_front());
     m_numBlockingTextureUploads++;
 }
 
 void TextureUploader::upload(const uint8* image,
                              const gfx::Rect& image_rect,
                              const gfx::Rect& source_rect,
                              const gfx::Vector2d& dest_offset,
                              GLenum format,
                              const gfx::Size& size)
 {
@@ skipping 162 matching lines @@
                    &image[bytes_per_pixel * (offset.x() +
                           (offset.y() + row) * image_rect.width())],
                    source_rect.width() * bytes_per_pixel);
     }
 
     m_context->unmapTexSubImage2DCHROMIUM(pixel_dest);
 }
 
 void TextureUploader::processQueries()
 {
-    while (!m_pendingQueries.isEmpty()) {
-        if (m_pendingQueries.first()->isPending())
+    while (!m_pendingQueries.empty()) {
+        if (m_pendingQueries.front()->isPending())
             break;
 
-        unsigned usElapsed = m_pendingQueries.first()->value();
+        unsigned usElapsed = m_pendingQueries.front()->value();
         HISTOGRAM_CUSTOM_COUNTS("Renderer4.TextureGpuUploadTimeUS", usElapsed, 0, 100000, 50);
 
-        if (!m_pendingQueries.first()->isNonBlocking())
+        if (!m_pendingQueries.front()->isNonBlocking())
             m_numBlockingTextureUploads--;
 
         // Remove the min and max value from our history and insert the new one.
         double texturesPerSecond = 1.0 / (usElapsed * 1e-6);
         if (m_texturesPerSecondHistory.size() >= uploadHistorySizeMax) {
             m_texturesPerSecondHistory.erase(m_texturesPerSecondHistory.begin());
             m_texturesPerSecondHistory.erase(--m_texturesPerSecondHistory.end());
         }
         m_texturesPerSecondHistory.insert(texturesPerSecond);
 
-        m_availableQueries.append(m_pendingQueries.takeFirst());
+        m_availableQueries.push_back(m_pendingQueries.take_front());
     }
 }
 
 }  // namespace cc