cc: Remove wtf includes from resource provider

cc/throttled_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 "config.h"
 #include "cc/throttled_texture_uploader.h"
 
 #include "CCPrioritizedTexture.h"
 #include "CCProxy.h"
 #include "Extensions3DChromium.h"
@@ skipping 11 matching lines @@
 namespace {
 
 // How many previous uploads to use when predicting future throughput.
 static const size_t uploadHistorySize = 100;
 
 // Global estimated number of textures per second to maintain estimates across
 // subsequent instances of ThrottledTextureUploader.
 // More than one thread will not access this variable, so we do not need to synchronize access.
 static double estimatedTexturesPerSecondGlobal = 48.0 * 60.0;
 
-PassOwnPtr<SkCanvas> createAcceleratedCanvas(GrContext* grContext,
+scoped_ptr<SkCanvas> createAcceleratedCanvas(GrContext* grContext,
                                              cc::IntSize canvasSize,
                                              unsigned textureId)
 {
     GrPlatformTextureDesc textureDesc;
     textureDesc.fFlags = kRenderTarget_GrPlatformTextureFlag;
     textureDesc.fWidth = canvasSize.width();
     textureDesc.fHeight = canvasSize.height();
     textureDesc.fConfig = kSkia8888_GrPixelConfig;
     textureDesc.fTextureHandle = textureId;
     SkAutoTUnref<GrTexture> target(
         grContext->createPlatformTexture(textureDesc));
     SkAutoTUnref<SkDevice> device(new SkGpuDevice(grContext, target.get()));
-    return adoptPtr(new SkCanvas(device.get()));
+    return make_scoped_ptr(new SkCanvas(device.get()));
 }
 
 } // anonymous namespace
 
 namespace cc {
 
 ThrottledTextureUploader::Query::Query(WebKit::WebGraphicsContext3D* context)
     : m_context(context)
     , m_queryId(0)
     , m_value(0)
@@ skipping 160 matching lines @@
         // because the backing texture is created in one context while it is
         // being written to in another.
         resourceProvider->flush();
         CCResourceProvider::ScopedWriteLockGL lock(
             resourceProvider, texture->resourceId());
 
         // Make sure ganesh uses the correct GL context.
         paintContext->makeContextCurrent();
 
         // Create an accelerated canvas to draw on.
-        OwnPtr<SkCanvas> canvas = createAcceleratedCanvas(
+        scoped_ptr<SkCanvas> canvas = createAcceleratedCanvas(
             paintGrContext, texture->size(), lock.textureId());
 
         // The compositor expects the textures to be upside-down so it can flip
         // the final composited image. Ganesh renders the image upright so we
         // need to do a y-flip.
         canvas->translate(0.0, texture->size().height());
         canvas->scale(1.0, -1.0);
         // Clip to the destination on the texture that must be updated.
         canvas->clipRect(SkRect::MakeXYWH(destOffset.width(),
                                           destOffset.height(),
@@ skipping 34 matching lines @@
         // Remove the oldest values from our history and insert the new one
         double texturesPerSecond = 1.0 / (usElapsed * 1e-6);
         m_texturesPerSecondHistory.pop_back();
         m_texturesPerSecondHistory.push_front(texturesPerSecond);
 
         m_availableQueries.append(m_pendingQueries.takeFirst());
     }
 }
 
 }