Index: cc/resource_provider.cc |
diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc |
index 0e710da8cabf6a248d2203ec86416a03bcfddc97..7283285f4196de57bc09477f3e6c4f3da0689964 100644 |
--- a/cc/resource_provider.cc |
+++ b/cc/resource_provider.cc |
@@ -116,7 +116,7 @@ scoped_ptr<ResourceProvider> ResourceProvider::create(GraphicsContext* context) |
ResourceProvider::~ResourceProvider() |
{ |
- WebGraphicsContext3D* context3d = m_context->context3D(); |
+ WebGraphicsContext3D* context3d = m_context->Context3D(); |
if (!context3d || !context3d->makeContextCurrent()) |
return; |
m_textureUploader.reset(); |
@@ -126,7 +126,7 @@ ResourceProvider::~ResourceProvider() |
WebGraphicsContext3D* ResourceProvider::graphicsContext3D() |
{ |
DCHECK(m_threadChecker.CalledOnValidThread()); |
- return m_context->context3D(); |
+ return m_context->Context3D(); |
} |
bool ResourceProvider::inUseByConsumer(ResourceId id) |
@@ -159,7 +159,7 @@ ResourceProvider::ResourceId ResourceProvider::createGLTexture(int pool, const g |
DCHECK(m_threadChecker.CalledOnValidThread()); |
unsigned textureId = 0; |
- WebGraphicsContext3D* context3d = m_context->context3D(); |
+ WebGraphicsContext3D* context3d = m_context->Context3D(); |
DCHECK(context3d); |
GLC(context3d, textureId = context3d->createTexture()); |
GLC(context3d, context3d->bindTexture(GL_TEXTURE_2D, textureId)); |
@@ -198,7 +198,7 @@ ResourceProvider::ResourceId ResourceProvider::createResourceFromExternalTexture |
{ |
DCHECK(m_threadChecker.CalledOnValidThread()); |
- WebGraphicsContext3D* context3d = m_context->context3D(); |
+ WebGraphicsContext3D* context3d = m_context->Context3D(); |
DCHECK(context3d); |
GLC(context3d, context3d->bindTexture(GL_TEXTURE_2D, textureId)); |
GLC(context3d, context3d->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR)); |
@@ -234,12 +234,12 @@ void ResourceProvider::deleteResourceInternal(ResourceMap::iterator it) |
{ |
Resource* resource = &it->second; |
if (resource->glId && !resource->external) { |
- WebGraphicsContext3D* context3d = m_context->context3D(); |
+ WebGraphicsContext3D* context3d = m_context->Context3D(); |
DCHECK(context3d); |
GLC(context3d, context3d->deleteTexture(resource->glId)); |
} |
if (resource->glPixelBufferId) { |
- WebGraphicsContext3D* context3d = m_context->context3D(); |
+ WebGraphicsContext3D* context3d = m_context->Context3D(); |
DCHECK(context3d); |
GLC(context3d, context3d->deleteBuffer(resource->glPixelBufferId)); |
} |
@@ -283,7 +283,7 @@ void ResourceProvider::setPixels(ResourceId id, const uint8_t* image, const gfx: |
DCHECK(!resource->exported); |
if (resource->glId) { |
- WebGraphicsContext3D* context3d = m_context->context3D(); |
+ WebGraphicsContext3D* context3d = m_context->Context3D(); |
DCHECK(context3d); |
DCHECK(m_textureUploader.get()); |
context3d->bindTexture(GL_TEXTURE_2D, resource->glId); |
@@ -346,7 +346,7 @@ void ResourceProvider::flushUploads() |
void ResourceProvider::flush() |
{ |
DCHECK(m_threadChecker.CalledOnValidThread()); |
- WebGraphicsContext3D* context3d = m_context->context3D(); |
+ WebGraphicsContext3D* context3d = m_context->Context3D(); |
if (context3d) |
context3d->flush(); |
} |
@@ -354,7 +354,7 @@ void ResourceProvider::flush() |
bool ResourceProvider::shallowFlushIfSupported() |
{ |
DCHECK(m_threadChecker.CalledOnValidThread()); |
- WebGraphicsContext3D* context3d = m_context->context3D(); |
+ WebGraphicsContext3D* context3d = m_context->Context3D(); |
if (!context3d || !m_useShallowFlush) |
return false; |
@@ -485,7 +485,7 @@ ResourceProvider::ResourceProvider(GraphicsContext* context) |
bool ResourceProvider::initialize() |
{ |
DCHECK(m_threadChecker.CalledOnValidThread()); |
- WebGraphicsContext3D* context3d = m_context->context3D(); |
+ WebGraphicsContext3D* context3d = m_context->Context3D(); |
if (!context3d) { |
m_maxTextureSize = INT_MAX / 2; |
return true; |
@@ -550,7 +550,7 @@ void ResourceProvider::prepareSendToParent(const ResourceIdArray& resources, Tra |
DCHECK(m_threadChecker.CalledOnValidThread()); |
list->sync_point = 0; |
list->resources.clear(); |
- WebGraphicsContext3D* context3d = m_context->context3D(); |
+ WebGraphicsContext3D* context3d = m_context->Context3D(); |
if (!context3d || !context3d->makeContextCurrent()) { |
// FIXME: Implement this path for software compositing. |
return; |
@@ -571,7 +571,7 @@ void ResourceProvider::prepareSendToChild(int child, const ResourceIdArray& reso |
DCHECK(m_threadChecker.CalledOnValidThread()); |
list->sync_point = 0; |
list->resources.clear(); |
- WebGraphicsContext3D* context3d = m_context->context3D(); |
+ WebGraphicsContext3D* context3d = m_context->Context3D(); |
if (!context3d || !context3d->makeContextCurrent()) { |
// FIXME: Implement this path for software compositing. |
return; |
@@ -595,7 +595,7 @@ void ResourceProvider::prepareSendToChild(int child, const ResourceIdArray& reso |
void ResourceProvider::receiveFromChild(int child, const TransferableResourceList& resources) |
{ |
DCHECK(m_threadChecker.CalledOnValidThread()); |
- WebGraphicsContext3D* context3d = m_context->context3D(); |
+ WebGraphicsContext3D* context3d = m_context->Context3D(); |
if (!context3d || !context3d->makeContextCurrent()) { |
// FIXME: Implement this path for software compositing. |
return; |
@@ -627,7 +627,7 @@ void ResourceProvider::receiveFromChild(int child, const TransferableResourceLis |
void ResourceProvider::receiveFromParent(const TransferableResourceList& resources) |
{ |
DCHECK(m_threadChecker.CalledOnValidThread()); |
- WebGraphicsContext3D* context3d = m_context->context3D(); |
+ WebGraphicsContext3D* context3d = m_context->Context3D(); |
if (!context3d || !context3d->makeContextCurrent()) { |
// FIXME: Implement this path for software compositing. |
return; |
@@ -651,7 +651,7 @@ void ResourceProvider::receiveFromParent(const TransferableResourceList& resourc |
bool ResourceProvider::transferResource(WebGraphicsContext3D* context, ResourceId id, TransferableResource* resource) |
{ |
DCHECK(m_threadChecker.CalledOnValidThread()); |
- WebGraphicsContext3D* context3d = m_context->context3D(); |
+ WebGraphicsContext3D* context3d = m_context->Context3D(); |
ResourceMap::iterator it = m_resources.find(id); |
CHECK(it != m_resources.end()); |
Resource* source = &it->second; |
@@ -686,7 +686,7 @@ void ResourceProvider::acquirePixelBuffer(ResourceId id) |
DCHECK(!resource->exported); |
if (resource->glId) { |
- WebGraphicsContext3D* context3d = m_context->context3D(); |
+ WebGraphicsContext3D* context3d = m_context->Context3D(); |
DCHECK(context3d); |
if (!resource->glPixelBufferId) |
resource->glPixelBufferId = context3d->createBuffer(); |
@@ -721,7 +721,7 @@ void ResourceProvider::releasePixelBuffer(ResourceId id) |
if (resource->glId) { |
DCHECK(resource->glPixelBufferId); |
- WebGraphicsContext3D* context3d = m_context->context3D(); |
+ WebGraphicsContext3D* context3d = m_context->Context3D(); |
DCHECK(context3d); |
context3d->bindBuffer( |
GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM, |
@@ -752,7 +752,7 @@ uint8_t* ResourceProvider::mapPixelBuffer(ResourceId id) |
DCHECK(!resource->exported); |
if (resource->glId) { |
- WebGraphicsContext3D* context3d = m_context->context3D(); |
+ WebGraphicsContext3D* context3d = m_context->Context3D(); |
DCHECK(context3d); |
DCHECK(resource->glPixelBufferId); |
context3d->bindBuffer( |
@@ -782,7 +782,7 @@ void ResourceProvider::unmapPixelBuffer(ResourceId id) |
DCHECK(!resource->exported); |
if (resource->glId) { |
- WebGraphicsContext3D* context3d = m_context->context3D(); |
+ WebGraphicsContext3D* context3d = m_context->Context3D(); |
DCHECK(context3d); |
DCHECK(resource->glPixelBufferId); |
context3d->bindBuffer( |
@@ -806,7 +806,7 @@ void ResourceProvider::setPixelsFromBuffer(ResourceId id) |
DCHECK(!resource->exported); |
if (resource->glId) { |
- WebGraphicsContext3D* context3d = m_context->context3D(); |
+ WebGraphicsContext3D* context3d = m_context->Context3D(); |
DCHECK(context3d); |
DCHECK(resource->glPixelBufferId); |
context3d->bindTexture(GL_TEXTURE_2D, resource->glId); |