summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cc/gl_renderer_unittest.cc12
-rw-r--r--cc/layer_tree_host_impl.cc6
-rw-r--r--cc/layer_tree_host_impl.h2
-rw-r--r--cc/layer_tree_host_impl_unittest.cc12
-rw-r--r--cc/prioritized_texture_unittest.cc4
-rw-r--r--cc/resource_provider.cc38
-rw-r--r--cc/resource_provider.h31
-rw-r--r--cc/resource_provider_unittest.cc25
-rw-r--r--cc/scoped_texture_unittest.cc8
-rw-r--r--cc/software_renderer_unittest.cc2
-rw-r--r--cc/texture_copier.cc3
-rw-r--r--cc/texture_copier.h12
-rw-r--r--cc/texture_copier_unittest.cc4
-rw-r--r--cc/texture_update_controller_unittest.cc2
-rw-r--r--cc/throttled_texture_uploader.cc6
-rw-r--r--cc/throttled_texture_uploader.h5
-rw-r--r--cc/throttled_texture_uploader_unittest.cc4
-rw-r--r--cc/tiled_layer_unittest.cc5
-rw-r--r--cc/unthrottled_texture_uploader.h4
19 files changed, 92 insertions, 93 deletions
diff --git a/cc/gl_renderer_unittest.cc b/cc/gl_renderer_unittest.cc
index 1b64595..078c066 100644
--- a/cc/gl_renderer_unittest.cc
+++ b/cc/gl_renderer_unittest.cc
@@ -136,7 +136,7 @@ protected:
WebCompositorInitializer m_compositorInitializer;
scoped_ptr<CCGraphicsContext> m_context;
FakeCCRendererClient m_mockClient;
- OwnPtr<CCResourceProvider> m_resourceProvider;
+ scoped_ptr<CCResourceProvider> m_resourceProvider;
FakeCCRendererGL m_renderer;
CCScopedSettings m_scopedSettings;
};
@@ -298,7 +298,7 @@ TEST(CCRendererGLTest2, initializationDoesNotMakeSynchronousCalls)
CCScopedSettings scopedSettings;
FakeCCRendererClient mockClient;
scoped_ptr<CCGraphicsContext> context(FakeWebCompositorOutputSurface::create(adoptPtr(new ForbidSynchronousCallContext)));
- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
+ scoped_ptr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
FakeCCRendererGL renderer(&mockClient, resourceProvider.get());
EXPECT_TRUE(renderer.initialize());
@@ -342,7 +342,7 @@ TEST(CCRendererGLTest2, initializationWithQuicklyLostContextDoesNotAssert)
CCScopedSettings scopedSettings;
FakeCCRendererClient mockClient;
scoped_ptr<CCGraphicsContext> context(FakeWebCompositorOutputSurface::create(adoptPtr(new LoseContextOnFirstGetContext)));
- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
+ scoped_ptr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
FakeCCRendererGL renderer(&mockClient, resourceProvider.get());
renderer.initialize();
@@ -364,7 +364,7 @@ TEST(CCRendererGLTest2, initializationWithoutGpuMemoryManagerExtensionSupportSho
{
FakeCCRendererClient mockClient;
scoped_ptr<CCGraphicsContext> context(FakeWebCompositorOutputSurface::create(adoptPtr(new ContextThatDoesNotSupportMemoryManagmentExtensions)));
- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
+ scoped_ptr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
FakeCCRendererGL renderer(&mockClient, resourceProvider.get());
renderer.initialize();
@@ -392,7 +392,7 @@ TEST(CCRendererGLTest2, opaqueBackground)
FakeCCRendererClient mockClient;
scoped_ptr<CCGraphicsContext> ccContext(FakeWebCompositorOutputSurface::create(adoptPtr(new ClearCountingContext)));
ClearCountingContext* context = static_cast<ClearCountingContext*>(ccContext->context3D());
- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(ccContext.get()));
+ scoped_ptr<CCResourceProvider> resourceProvider(CCResourceProvider::create(ccContext.get()));
FakeCCRendererGL renderer(&mockClient, resourceProvider.get());
mockClient.rootRenderPass()->setHasTransparentBackground(false);
@@ -415,7 +415,7 @@ TEST(CCRendererGLTest2, transparentBackground)
FakeCCRendererClient mockClient;
scoped_ptr<CCGraphicsContext> ccContext(FakeWebCompositorOutputSurface::create(adoptPtr(new ClearCountingContext)));
ClearCountingContext* context = static_cast<ClearCountingContext*>(ccContext->context3D());
- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(ccContext.get()));
+ scoped_ptr<CCResourceProvider> resourceProvider(CCResourceProvider::create(ccContext.get()));
FakeCCRendererGL renderer(&mockClient, resourceProvider.get());
mockClient.rootRenderPass()->setHasTransparentBackground(true);
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
index 6b984a7..3da5b45 100644
--- a/cc/layer_tree_host_impl.cc
+++ b/cc/layer_tree_host_impl.cc
@@ -837,13 +837,13 @@ bool CCLayerTreeHostImpl::initializeRenderer(scoped_ptr<CCGraphicsContext> conte
}
// Note: order is important here.
m_renderer.reset();
- m_resourceProvider.clear();
+ m_resourceProvider.reset();
m_context.reset();
if (!context->bindToClient(this))
return false;
- OwnPtr<CCResourceProvider> resourceProvider = CCResourceProvider::create(context.get());
+ scoped_ptr<CCResourceProvider> resourceProvider = CCResourceProvider::create(context.get());
if (!resourceProvider)
return false;
@@ -854,7 +854,7 @@ bool CCLayerTreeHostImpl::initializeRenderer(scoped_ptr<CCGraphicsContext> conte
if (!m_renderer)
return false;
- m_resourceProvider = resourceProvider.release();
+ m_resourceProvider = resourceProvider.Pass();
m_context = context.Pass();
if (!m_visible)
diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h
index be31eb9..1a56c14 100644
--- a/cc/layer_tree_host_impl.h
+++ b/cc/layer_tree_host_impl.h
@@ -306,7 +306,7 @@ private:
void dumpRenderSurfaces(std::string*, int indent, const CCLayerImpl*) const;
scoped_ptr<CCGraphicsContext> m_context;
- OwnPtr<CCResourceProvider> m_resourceProvider;
+ scoped_ptr<CCResourceProvider> m_resourceProvider;
scoped_ptr<CCRenderer> m_renderer;
scoped_ptr<CCLayerImpl> m_rootLayerImpl;
CCLayerImpl* m_rootScrollLayerImpl;
diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc
index 9220e64..7305831 100644
--- a/cc/layer_tree_host_impl_unittest.cc
+++ b/cc/layer_tree_host_impl_unittest.cc
@@ -4020,13 +4020,13 @@ struct RenderPassRemovalTestData : public CCLayerTreeHostImpl::FrameData {
class CCTestRenderer : public CCRendererGL, public CCRendererClient {
public:
- static PassOwnPtr<CCTestRenderer> create(CCResourceProvider* resourceProvider)
+ static scoped_ptr<CCTestRenderer> create(CCResourceProvider* resourceProvider)
{
- OwnPtr<CCTestRenderer> renderer(adoptPtr(new CCTestRenderer(resourceProvider)));
+ scoped_ptr<CCTestRenderer> renderer(new CCTestRenderer(resourceProvider));
if (!renderer->initialize())
- return nullptr;
+ return scoped_ptr<CCTestRenderer>();
- return renderer.release();
+ return renderer.Pass();
}
void clearCachedTextures() { m_textures.clear(); }
@@ -4326,9 +4326,9 @@ TEST_P(CCLayerTreeHostImplTest, testRemoveRenderPasses)
{
scoped_ptr<CCGraphicsContext> context(createContext());
ASSERT_TRUE(context->context3D());
- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
+ scoped_ptr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
- OwnPtr<CCTestRenderer> renderer(CCTestRenderer::create(resourceProvider.get()));
+ scoped_ptr<CCTestRenderer> renderer(CCTestRenderer::create(resourceProvider.get()));
int testCaseIndex = 0;
while (removeRenderPassesCases[testCaseIndex].name) {
diff --git a/cc/prioritized_texture_unittest.cc b/cc/prioritized_texture_unittest.cc
index 25b677f..a3d8602 100644
--- a/cc/prioritized_texture_unittest.cc
+++ b/cc/prioritized_texture_unittest.cc
@@ -35,7 +35,7 @@ public:
virtual ~CCPrioritizedTextureTest()
{
DebugScopedSetImplThread implThread;
- m_resourceProvider.clear();
+ m_resourceProvider.reset();
}
size_t texturesMemorySize(size_t textureCount)
@@ -96,7 +96,7 @@ protected:
const GC3Denum m_textureFormat;
WebCompositorInitializer m_compositorInitializer;
scoped_ptr<CCGraphicsContext> m_context;
- OwnPtr<CCResourceProvider> m_resourceProvider;
+ scoped_ptr<CCResourceProvider> m_resourceProvider;
};
}
diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc
index 4b2326b..34b0aa6 100644
--- a/cc/resource_provider.cc
+++ b/cc/resource_provider.cc
@@ -112,12 +112,12 @@ CCResourceProvider::Child::~Child()
{
}
-PassOwnPtr<CCResourceProvider> CCResourceProvider::create(CCGraphicsContext* context)
+scoped_ptr<CCResourceProvider> CCResourceProvider::create(CCGraphicsContext* context)
{
- OwnPtr<CCResourceProvider> resourceProvider(adoptPtr(new CCResourceProvider(context)));
+ scoped_ptr<CCResourceProvider> resourceProvider(new CCResourceProvider(context));
if (!resourceProvider->initialize())
- return nullptr;
- return resourceProvider.release();
+ return scoped_ptr<CCResourceProvider>();
+ return resourceProvider.Pass();
}
CCResourceProvider::~CCResourceProvider()
@@ -125,8 +125,8 @@ CCResourceProvider::~CCResourceProvider()
WebGraphicsContext3D* context3d = m_context->context3D();
if (!context3d || !context3d->makeContextCurrent())
return;
- m_textureUploader.clear();
- m_textureCopier.clear();
+ m_textureUploader.reset();
+ m_textureCopier.reset();
}
WebGraphicsContext3D* CCResourceProvider::graphicsContext3D()
@@ -244,7 +244,7 @@ void CCResourceProvider::deleteOwnedResources(int pool)
ResourceIdArray toDelete;
for (ResourceMap::iterator it = m_resources.begin(); it != m_resources.end(); ++it) {
if (it->second.pool == pool && !it->second.external && !it->second.markedForDeletion)
- toDelete.append(it->first);
+ toDelete.push_back(it->first);
}
for (ResourceIdArray::iterator it = toDelete.begin(); it != toDelete.end(); ++it)
deleteResource(*it);
@@ -412,7 +412,7 @@ CCResourceProvider::ScopedWriteLockSoftware::ScopedWriteLockSoftware(CCResourceP
, m_resourceId(resourceId)
{
CCResourceProvider::populateSkBitmapWithResource(&m_skBitmap, resourceProvider->lockForWrite(resourceId));
- m_skCanvas = adoptPtr(new SkCanvas(m_skBitmap));
+ m_skCanvas.reset(new SkCanvas(m_skBitmap));
}
CCResourceProvider::ScopedWriteLockSoftware::~ScopedWriteLockSoftware()
@@ -462,7 +462,7 @@ bool CCResourceProvider::initialize()
useBindUniform = true;
}
- m_texSubImage = adoptPtr(new LayerTextureSubImage(useMapSub));
+ m_texSubImage.reset(new LayerTextureSubImage(useMapSub));
m_textureCopier = AcceleratedTextureCopier::create(context3d, useBindUniform);
m_textureUploader = ThrottledTextureUploader::create(context3d);
@@ -512,7 +512,7 @@ CCResourceProvider::TransferableResourceList CCResourceProvider::prepareSendToPa
TransferableResource resource;
if (transferResource(context3d, *it, &resource)) {
m_resources.find(*it)->second.exported = true;
- list.resources.append(resource);
+ list.resources.push_back(resource);
}
}
if (list.resources.size())
@@ -539,7 +539,7 @@ CCResourceProvider::TransferableResourceList CCResourceProvider::prepareSendToCh
resource.id = childInfo.parentToChildMap[*it];
childInfo.parentToChildMap.erase(*it);
childInfo.childToParentMap.erase(resource.id);
- list.resources.append(resource);
+ list.resources.push_back(resource);
deleteResource(*it);
}
if (list.resources.size())
@@ -565,7 +565,7 @@ void CCResourceProvider::receiveFromChild(int child, const TransferableResourceL
GLC(context3d, context3d->waitSyncPoint(resources.syncPoint));
}
Child& childInfo = m_children.find(child)->second;
- for (Vector<TransferableResource>::const_iterator it = resources.resources.begin(); it != resources.resources.end(); ++it) {
+ for (TransferableResourceArray::const_iterator it = resources.resources.begin(); it != resources.resources.end(); ++it) {
unsigned textureId;
GLC(context3d, textureId = context3d->createTexture());
GLC(context3d, context3d->bindTexture(GraphicsContext3D::TEXTURE_2D, textureId));
@@ -573,7 +573,7 @@ void CCResourceProvider::receiveFromChild(int child, const TransferableResourceL
ResourceId id = m_nextId++;
Resource resource(textureId, childInfo.pool, it->size, it->format);
m_resources[id] = resource;
- m_mailboxes.append(it->mailbox);
+ m_mailboxes.push_back(it->mailbox);
childInfo.parentToChildMap[id] = it->id;
childInfo.childToParentMap[it->id] = id;
}
@@ -589,7 +589,7 @@ void CCResourceProvider::receiveFromParent(const TransferableResourceList& resou
}
if (resources.syncPoint)
GLC(context3d, context3d->waitSyncPoint(resources.syncPoint));
- for (Vector<TransferableResource>::const_iterator it = resources.resources.begin(); it != resources.resources.end(); ++it) {
+ for (TransferableResourceArray::const_iterator it = resources.resources.begin(); it != resources.resources.end(); ++it) {
ResourceMap::iterator mapIterator = m_resources.find(it->id);
ASSERT(mapIterator != m_resources.end());
Resource* resource = &mapIterator->second;
@@ -597,7 +597,7 @@ void CCResourceProvider::receiveFromParent(const TransferableResourceList& resou
resource->exported = false;
GLC(context3d, context3d->bindTexture(GraphicsContext3D::TEXTURE_2D, resource->glId));
GLC(context3d, context3d->consumeTextureCHROMIUM(GraphicsContext3D::TEXTURE_2D, it->mailbox.name));
- m_mailboxes.append(it->mailbox);
+ m_mailboxes.push_back(it->mailbox);
if (resource->markedForDeletion)
deleteResourceInternal(mapIterator);
}
@@ -617,8 +617,10 @@ bool CCResourceProvider::transferResource(WebGraphicsContext3D* context, Resourc
resource->id = id;
resource->format = source->format;
resource->size = source->size;
- if (!m_mailboxes.isEmpty())
- resource->mailbox = m_mailboxes.takeFirst();
+ if (m_mailboxes.size()) {
+ resource->mailbox = m_mailboxes.front();
+ m_mailboxes.pop_front();
+ }
else
GLC(context, context->genMailboxCHROMIUM(resource->mailbox.name));
GLC(context, context->bindTexture(GraphicsContext3D::TEXTURE_2D, source->glId));
@@ -649,7 +651,7 @@ void CCResourceProvider::trimMailboxDeque()
}
}
while (m_mailboxes.size() > maxMailboxCount)
- m_mailboxes.removeFirst();
+ m_mailboxes.pop_front();
}
}
diff --git a/cc/resource_provider.h b/cc/resource_provider.h
index d6eae23..3c2ba50 100644
--- a/cc/resource_provider.h
+++ b/cc/resource_provider.h
@@ -5,20 +5,17 @@
#ifndef CCResourceProvider_h
#define CCResourceProvider_h
-#include "CCGraphicsContext.h"
-#include "GraphicsContext3D.h"
-#include "IntSize.h"
#include "base/basictypes.h"
#include "base/hash_tables.h"
+#include "base/memory/scoped_ptr.h"
+#include "CCGraphicsContext.h"
#include "cc/texture_copier.h"
+#include "GraphicsContext3D.h"
+#include "IntSize.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkCanvas.h"
-#include <wtf/Deque.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
-#include <wtf/Vector.h>
+#include <deque>
+#include <vector>
namespace WebKit {
class WebGraphicsContext3D;
@@ -36,7 +33,7 @@ class TextureUploader;
class CCResourceProvider {
public:
typedef unsigned ResourceId;
- typedef Vector<ResourceId> ResourceIdArray;
+ typedef std::vector<ResourceId> ResourceIdArray;
typedef base::hash_map<ResourceId, ResourceId> ResourceIdMap;
enum TextureUsageHint { TextureUsageAny, TextureUsageFramebuffer };
enum ResourceType {
@@ -52,7 +49,7 @@ public:
IntSize size;
Mailbox mailbox;
};
- typedef Vector<TransferableResource> TransferableResourceArray;
+ typedef std::vector<TransferableResource> TransferableResourceArray;
struct TransferableResourceList {
TransferableResourceList();
~TransferableResourceList();
@@ -61,7 +58,7 @@ public:
unsigned syncPoint;
};
- static PassOwnPtr<CCResourceProvider> create(CCGraphicsContext*);
+ static scoped_ptr<CCResourceProvider> create(CCGraphicsContext*);
virtual ~CCResourceProvider();
@@ -205,7 +202,7 @@ public:
CCResourceProvider* m_resourceProvider;
CCResourceProvider::ResourceId m_resourceId;
SkBitmap m_skBitmap;
- OwnPtr<SkCanvas> m_skCanvas;
+ scoped_ptr<SkCanvas> m_skCanvas;
DISALLOW_COPY_AND_ASSIGN(ScopedWriteLockSoftware);
};
@@ -258,15 +255,15 @@ private:
int m_nextChild;
ChildMap m_children;
- Deque<Mailbox> m_mailboxes;
+ std::deque<Mailbox> m_mailboxes;
ResourceType m_defaultResourceType;
bool m_useTextureStorageExt;
bool m_useTextureUsageHint;
bool m_useShallowFlush;
- OwnPtr<LayerTextureSubImage> m_texSubImage;
- OwnPtr<TextureUploader> m_textureUploader;
- OwnPtr<AcceleratedTextureCopier> m_textureCopier;
+ scoped_ptr<LayerTextureSubImage> m_texSubImage;
+ scoped_ptr<TextureUploader> m_textureUploader;
+ scoped_ptr<AcceleratedTextureCopier> m_textureCopier;
int m_maxTextureSize;
DISALLOW_COPY_AND_ASSIGN(CCResourceProvider);
diff --git a/cc/resource_provider_unittest.cc b/cc/resource_provider_unittest.cc
index 9b22a0a..446f55e 100644
--- a/cc/resource_provider_unittest.cc
+++ b/cc/resource_provider_unittest.cc
@@ -15,6 +15,7 @@
#include <public/WebGraphicsContext3D.h>
#include <wtf/HashMap.h>
#include <wtf/OwnPtr.h>
+#include <wtf/Deque.h>
using namespace cc;
using namespace WebKit;
@@ -301,7 +302,7 @@ protected:
DebugScopedSetImplThread implThread;
OwnPtr<ContextSharedData> m_sharedData;
scoped_ptr<CCGraphicsContext> m_context;
- OwnPtr<CCResourceProvider> m_resourceProvider;
+ scoped_ptr<CCResourceProvider> m_resourceProvider;
};
TEST_P(CCResourceProviderTest, Basic)
@@ -416,7 +417,7 @@ TEST_P(CCResourceProviderTest, TransferResources)
return;
scoped_ptr<CCGraphicsContext> childContext(FakeWebCompositorOutputSurface::create(ResourceProviderContext::create(m_sharedData.get())));
- OwnPtr<CCResourceProvider> childResourceProvider(CCResourceProvider::create(childContext.get()));
+ scoped_ptr<CCResourceProvider> childResourceProvider(CCResourceProvider::create(childContext.get()));
IntSize size(1, 1);
WGC3Denum format = GraphicsContext3D::RGBA;
@@ -439,8 +440,8 @@ TEST_P(CCResourceProviderTest, TransferResources)
{
// Transfer some resources to the parent.
CCResourceProvider::ResourceIdArray resourceIdsToTransfer;
- resourceIdsToTransfer.append(id1);
- resourceIdsToTransfer.append(id2);
+ resourceIdsToTransfer.push_back(id1);
+ resourceIdsToTransfer.push_back(id2);
CCResourceProvider::TransferableResourceList list = childResourceProvider->prepareSendToParent(resourceIdsToTransfer);
EXPECT_NE(0u, list.syncPoint);
EXPECT_EQ(2u, list.resources.size());
@@ -470,7 +471,7 @@ TEST_P(CCResourceProviderTest, TransferResources)
// Check that transfering again the same resource from the child to the
// parent is a noop.
CCResourceProvider::ResourceIdArray resourceIdsToTransfer;
- resourceIdsToTransfer.append(id1);
+ resourceIdsToTransfer.push_back(id1);
CCResourceProvider::TransferableResourceList list = childResourceProvider->prepareSendToParent(resourceIdsToTransfer);
EXPECT_EQ(0u, list.syncPoint);
EXPECT_EQ(0u, list.resources.size());
@@ -479,8 +480,8 @@ TEST_P(CCResourceProviderTest, TransferResources)
{
// Transfer resources back from the parent to the child.
CCResourceProvider::ResourceIdArray resourceIdsToTransfer;
- resourceIdsToTransfer.append(mappedId1);
- resourceIdsToTransfer.append(mappedId2);
+ resourceIdsToTransfer.push_back(mappedId1);
+ resourceIdsToTransfer.push_back(mappedId2);
CCResourceProvider::TransferableResourceList list = m_resourceProvider->prepareSendToChild(childId, resourceIdsToTransfer);
EXPECT_NE(0u, list.syncPoint);
EXPECT_EQ(2u, list.resources.size());
@@ -510,8 +511,8 @@ TEST_P(CCResourceProviderTest, TransferResources)
{
// Transfer resources to the parent again.
CCResourceProvider::ResourceIdArray resourceIdsToTransfer;
- resourceIdsToTransfer.append(id1);
- resourceIdsToTransfer.append(id2);
+ resourceIdsToTransfer.push_back(id1);
+ resourceIdsToTransfer.push_back(id2);
CCResourceProvider::TransferableResourceList list = childResourceProvider->prepareSendToParent(resourceIdsToTransfer);
EXPECT_NE(0u, list.syncPoint);
EXPECT_EQ(2u, list.resources.size());
@@ -533,7 +534,7 @@ TEST_P(CCResourceProviderTest, DeleteTransferredResources)
return;
scoped_ptr<CCGraphicsContext> childContext(FakeWebCompositorOutputSurface::create(ResourceProviderContext::create(m_sharedData.get())));
- OwnPtr<CCResourceProvider> childResourceProvider(CCResourceProvider::create(childContext.get()));
+ scoped_ptr<CCResourceProvider> childResourceProvider(CCResourceProvider::create(childContext.get()));
IntSize size(1, 1);
WGC3Denum format = GraphicsContext3D::RGBA;
@@ -552,7 +553,7 @@ TEST_P(CCResourceProviderTest, DeleteTransferredResources)
{
// Transfer some resource to the parent.
CCResourceProvider::ResourceIdArray resourceIdsToTransfer;
- resourceIdsToTransfer.append(id);
+ resourceIdsToTransfer.push_back(id);
CCResourceProvider::TransferableResourceList list = childResourceProvider->prepareSendToParent(resourceIdsToTransfer);
EXPECT_NE(0u, list.syncPoint);
EXPECT_EQ(1u, list.resources.size());
@@ -570,7 +571,7 @@ TEST_P(CCResourceProviderTest, DeleteTransferredResources)
CCResourceProvider::ResourceId mappedId = resourceMap[id];
EXPECT_NE(0u, mappedId);
CCResourceProvider::ResourceIdArray resourceIdsToTransfer;
- resourceIdsToTransfer.append(mappedId);
+ resourceIdsToTransfer.push_back(mappedId);
CCResourceProvider::TransferableResourceList list = m_resourceProvider->prepareSendToChild(childId, resourceIdsToTransfer);
EXPECT_NE(0u, list.syncPoint);
EXPECT_EQ(1u, list.resources.size());
diff --git a/cc/scoped_texture_unittest.cc b/cc/scoped_texture_unittest.cc
index a2b0c53..44260ac 100644
--- a/cc/scoped_texture_unittest.cc
+++ b/cc/scoped_texture_unittest.cc
@@ -23,7 +23,7 @@ TEST(CCScopedTextureTest, NewScopedTexture)
{
scoped_ptr<CCGraphicsContext> context(createFakeCCGraphicsContext());
DebugScopedSetImplThread implThread;
- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
+ scoped_ptr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
scoped_ptr<CCScopedTexture> texture = CCScopedTexture::create(resourceProvider.get());
// New scoped textures do not hold a texture yet.
@@ -38,7 +38,7 @@ TEST(CCScopedTextureTest, CreateScopedTexture)
{
scoped_ptr<CCGraphicsContext> context(createFakeCCGraphicsContext());
DebugScopedSetImplThread implThread;
- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
+ scoped_ptr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
scoped_ptr<CCScopedTexture> texture = CCScopedTexture::create(resourceProvider.get());
texture->allocate(CCRenderer::ImplPool, IntSize(30, 30), GraphicsContext3D::RGBA, CCResourceProvider::TextureUsageAny);
@@ -55,7 +55,7 @@ TEST(CCScopedTextureTest, ScopedTextureIsDeleted)
{
scoped_ptr<CCGraphicsContext> context(createFakeCCGraphicsContext());
DebugScopedSetImplThread implThread;
- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
+ scoped_ptr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
{
scoped_ptr<CCScopedTexture> texture = CCScopedTexture::create(resourceProvider.get());
@@ -83,7 +83,7 @@ TEST(CCScopedTextureTest, LeakScopedTexture)
{
scoped_ptr<CCGraphicsContext> context(createFakeCCGraphicsContext());
DebugScopedSetImplThread implThread;
- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
+ scoped_ptr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
{
scoped_ptr<CCScopedTexture> texture = CCScopedTexture::create(resourceProvider.get());
diff --git a/cc/software_renderer_unittest.cc b/cc/software_renderer_unittest.cc
index 7657572..d4618de 100644
--- a/cc/software_renderer_unittest.cc
+++ b/cc/software_renderer_unittest.cc
@@ -55,7 +55,7 @@ protected:
DebugScopedSetImplThread m_alwaysImplThread;
scoped_ptr<FakeWebCompositorOutputSurface> m_outputSurface;
- OwnPtr<CCResourceProvider> m_resourceProvider;
+ scoped_ptr<CCResourceProvider> m_resourceProvider;
scoped_ptr<CCRendererSoftware> m_renderer;
IntSize m_viewportSize;
CCLayerTreeSettings m_settings;
diff --git a/cc/texture_copier.cc b/cc/texture_copier.cc
index 73121b8..a4a5328 100644
--- a/cc/texture_copier.cc
+++ b/cc/texture_copier.cc
@@ -7,7 +7,6 @@
#include "cc/texture_copier.h"
#include "CCRendererGL.h" // For the GLC() macro.
-#include "GraphicsContext3D.h"
#include "TraceEvent.h"
#include <public/WebGraphicsContext3D.h>
@@ -32,7 +31,7 @@ AcceleratedTextureCopier::AcceleratedTextureCopier(WebKit::WebGraphicsContext3D*
GLC(m_context, m_context->bufferData(GraphicsContext3D::ARRAY_BUFFER, sizeof(kPositions), kPositions, GraphicsContext3D::STATIC_DRAW));
GLC(m_context, m_context->bindBuffer(GraphicsContext3D::ARRAY_BUFFER, 0));
- m_blitProgram = adoptPtr(new BlitProgram(m_context));
+ m_blitProgram.reset(new BlitProgram(m_context));
}
AcceleratedTextureCopier::~AcceleratedTextureCopier()
diff --git a/cc/texture_copier.h b/cc/texture_copier.h
index e679805..81feb9c 100644
--- a/cc/texture_copier.h
+++ b/cc/texture_copier.h
@@ -5,12 +5,12 @@
#ifndef TextureCopier_h
#define TextureCopier_h
-#include "GraphicsContext3D.h"
#include "base/basictypes.h"
+#include "base/memory/scoped_ptr.h"
#include "cc/program_binding.h"
#include "cc/shader.h"
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
+#include "GraphicsContext3D.h"
+#include "IntSize.h"
namespace WebKit {
class WebGraphicsContext3D;
@@ -37,9 +37,9 @@ public:
class AcceleratedTextureCopier : public TextureCopier {
public:
- static PassOwnPtr<AcceleratedTextureCopier> create(WebKit::WebGraphicsContext3D* context, bool usingBindUniforms)
+ static scoped_ptr<AcceleratedTextureCopier> create(WebKit::WebGraphicsContext3D* context, bool usingBindUniforms)
{
- return adoptPtr(new AcceleratedTextureCopier(context, usingBindUniforms));
+ return make_scoped_ptr(new AcceleratedTextureCopier(context, usingBindUniforms));
}
virtual ~AcceleratedTextureCopier();
@@ -55,7 +55,7 @@ private:
WebKit::WebGraphicsContext3D* m_context;
Platform3DObject m_fbo;
Platform3DObject m_positionBuffer;
- OwnPtr<BlitProgram> m_blitProgram;
+ scoped_ptr<BlitProgram> m_blitProgram;
bool m_usingBindUniforms;
DISALLOW_COPY_AND_ASSIGN(AcceleratedTextureCopier);
diff --git a/cc/texture_copier_unittest.cc b/cc/texture_copier_unittest.cc
index 5d0a58e..38009d0 100644
--- a/cc/texture_copier_unittest.cc
+++ b/cc/texture_copier_unittest.cc
@@ -28,7 +28,7 @@ public:
TEST(TextureCopierTest, testDrawArraysCopy)
{
- OwnPtr<MockContext> mockContext = adoptPtr(new MockContext);
+ scoped_ptr<MockContext> mockContext(new MockContext);
{
InSequence sequence;
@@ -53,7 +53,7 @@ TEST(TextureCopierTest, testDrawArraysCopy)
int sourceTextureId = 1;
int destTextureId = 2;
IntSize size(256, 128);
- OwnPtr<AcceleratedTextureCopier> copier(AcceleratedTextureCopier::create(mockContext.get(), false));
+ scoped_ptr<AcceleratedTextureCopier> copier(AcceleratedTextureCopier::create(mockContext.get(), false));
TextureCopier::Parameters copy = { sourceTextureId, destTextureId, size };
copier->copyTexture(copy);
}
diff --git a/cc/texture_update_controller_unittest.cc b/cc/texture_update_controller_unittest.cc
index 1805e9e..407730e 100644
--- a/cc/texture_update_controller_unittest.cc
+++ b/cc/texture_update_controller_unittest.cc
@@ -168,7 +168,7 @@ protected:
protected:
// Classes required to interact and test the CCTextureUpdateController
scoped_ptr<CCGraphicsContext> m_context;
- OwnPtr<CCResourceProvider> m_resourceProvider;
+ scoped_ptr<CCResourceProvider> m_resourceProvider;
scoped_ptr<CCTextureUpdateQueue> m_queue;
scoped_ptr<CCPrioritizedTexture> m_textures[4];
TextureUploaderForUploadTest m_uploader;
diff --git a/cc/throttled_texture_uploader.cc b/cc/throttled_texture_uploader.cc
index 2ad0309..81a5cf7 100644
--- a/cc/throttled_texture_uploader.cc
+++ b/cc/throttled_texture_uploader.cc
@@ -29,7 +29,7 @@ static const size_t uploadHistorySize = 100;
// 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)
{
@@ -42,7 +42,7 @@ PassOwnPtr<SkCanvas> createAcceleratedCanvas(GrContext* grContext,
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
@@ -223,7 +223,7 @@ void ThrottledTextureUploader::uploadTexture(CCResourceProvider* resourceProvide
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
diff --git a/cc/throttled_texture_uploader.h b/cc/throttled_texture_uploader.h
index 9036a8b..139890c 100644
--- a/cc/throttled_texture_uploader.h
+++ b/cc/throttled_texture_uploader.h
@@ -8,6 +8,7 @@
#include "cc/texture_uploader.h"
#include "base/basictypes.h"
+#include "base/memory/scoped_ptr.h"
#include <deque>
#include <wtf/Deque.h>
#include <wtf/PassOwnPtr.h>
@@ -20,9 +21,9 @@ namespace cc {
class ThrottledTextureUploader : public TextureUploader {
public:
- static PassOwnPtr<ThrottledTextureUploader> create(WebKit::WebGraphicsContext3D* context)
+ static scoped_ptr<ThrottledTextureUploader> create(WebKit::WebGraphicsContext3D* context)
{
- return adoptPtr(new ThrottledTextureUploader(context));
+ return make_scoped_ptr(new ThrottledTextureUploader(context));
}
virtual ~ThrottledTextureUploader();
diff --git a/cc/throttled_texture_uploader_unittest.cc b/cc/throttled_texture_uploader_unittest.cc
index 44bb5fb..5ed09f2 100644
--- a/cc/throttled_texture_uploader_unittest.cc
+++ b/cc/throttled_texture_uploader_unittest.cc
@@ -47,7 +47,7 @@ private:
TEST(ThrottledTextureUploaderTest, NumBlockingUploads)
{
OwnPtr<FakeWebGraphicsContext3DWithQueryTesting> fakeContext(adoptPtr(new FakeWebGraphicsContext3DWithQueryTesting));
- OwnPtr<ThrottledTextureUploader> uploader = ThrottledTextureUploader::create(fakeContext.get());
+ scoped_ptr<ThrottledTextureUploader> uploader = ThrottledTextureUploader::create(fakeContext.get());
scoped_ptr<CCPrioritizedTexture> texture =
CCPrioritizedTexture::create(NULL, IntSize(256, 256), GL_RGBA);
TextureUploader::Parameters upload;
@@ -77,7 +77,7 @@ TEST(ThrottledTextureUploaderTest, NumBlockingUploads)
TEST(ThrottledTextureUploaderTest, MarkPendingUploadsAsNonBlocking)
{
OwnPtr<FakeWebGraphicsContext3DWithQueryTesting> fakeContext(adoptPtr(new FakeWebGraphicsContext3DWithQueryTesting));
- OwnPtr<ThrottledTextureUploader> uploader = ThrottledTextureUploader::create(fakeContext.get());
+ scoped_ptr<ThrottledTextureUploader> uploader = ThrottledTextureUploader::create(fakeContext.get());
scoped_ptr<CCPrioritizedTexture> texture =
CCPrioritizedTexture::create(NULL, IntSize(256, 256), GL_RGBA);
TextureUploader::Parameters upload;
diff --git a/cc/tiled_layer_unittest.cc b/cc/tiled_layer_unittest.cc
index 11c4acc..0f45c5a 100644
--- a/cc/tiled_layer_unittest.cc
+++ b/cc/tiled_layer_unittest.cc
@@ -23,7 +23,6 @@
using namespace cc;
using namespace WebKitTests;
-using namespace WTF;
using WebKit::WebTransformationMatrix;
namespace {
@@ -64,7 +63,7 @@ public:
{
textureManagerClearAllMemory(m_textureManager.get(), m_resourceProvider.get());
DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
- m_resourceProvider.clear();
+ m_resourceProvider.reset();
}
// Helper classes and functions that set the current thread to be the impl thread
@@ -161,7 +160,7 @@ public:
public:
WebKitTests::WebCompositorInitializer m_compositorInitializer;
scoped_ptr<CCGraphicsContext> m_context;
- OwnPtr<CCResourceProvider> m_resourceProvider;
+ scoped_ptr<CCResourceProvider> m_resourceProvider;
scoped_ptr<CCTextureUpdateQueue> m_queue;
CCRenderingStats m_stats;
FakeTextureUploader m_uploader;
diff --git a/cc/unthrottled_texture_uploader.h b/cc/unthrottled_texture_uploader.h
index 7fa02e3..e7464b4 100644
--- a/cc/unthrottled_texture_uploader.h
+++ b/cc/unthrottled_texture_uploader.h
@@ -13,9 +13,9 @@ namespace cc {
class UnthrottledTextureUploader : public TextureUploader {
public:
- static PassOwnPtr<UnthrottledTextureUploader> create()
+ static scoped_ptr<UnthrottledTextureUploader> create()
{
- return adoptPtr(new UnthrottledTextureUploader());
+ return make_scoped_ptr(new UnthrottledTextureUploader());
}
virtual ~UnthrottledTextureUploader() { }
generated by cgit v1.1 at 2025-03-03 10:03:38 +0000