Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2649)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/resource_provider.cc

Issue 11348371: cc: Move WebCompositorOutputSurface and related classes into cc/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: forlanding6 Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/proxy.h ('k') | cc/resource_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resource_provider.cc
diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc
index 956f39096d33a7e37c052be0c05c6531234fbbfa..bf6bd8b1ae6258bdbdb2b38a653b697a0a4d0741 100644
--- a/cc/resource_provider.cc
+++ b/cc/resource_provider.cc
@@ -125,7 +125,7 @@ scoped_ptr<ResourceProvider> ResourceProvider::create(OutputSurface* context)
ResourceProvider::~ResourceProvider()
{
- WebGraphicsContext3D* context3d = m_outputSurface->context3D();
+ WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
if (!context3d || !context3d->makeContextCurrent())
return;
m_textureUploader.reset();
@@ -135,7 +135,7 @@ ResourceProvider::~ResourceProvider()
WebGraphicsContext3D* ResourceProvider::graphicsContext3D()
{
DCHECK(m_threadChecker.CalledOnValidThread());
- return m_outputSurface->context3D();
+ return m_outputSurface->Context3D();
}
bool ResourceProvider::inUseByConsumer(ResourceId id)
@@ -168,7 +168,7 @@ ResourceProvider::ResourceId ResourceProvider::createGLTexture(int pool, const g
DCHECK(m_threadChecker.CalledOnValidThread());
unsigned textureId = 0;
- WebGraphicsContext3D* context3d = m_outputSurface->context3D();
+ WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
DCHECK(context3d);
GLC(context3d, textureId = context3d->createTexture());
GLC(context3d, context3d->bindTexture(GL_TEXTURE_2D, textureId));
@@ -207,7 +207,7 @@ ResourceProvider::ResourceId ResourceProvider::createResourceFromExternalTexture
{
DCHECK(m_threadChecker.CalledOnValidThread());
- WebGraphicsContext3D* context3d = m_outputSurface->context3D();
+ WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
DCHECK(context3d);
GLC(context3d, context3d->bindTexture(GL_TEXTURE_2D, textureId));
GLC(context3d, context3d->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
@@ -243,17 +243,17 @@ void ResourceProvider::deleteResourceInternal(ResourceMap::iterator it)
{
Resource* resource = &it->second;
if (resource->glId && !resource->external) {
- WebGraphicsContext3D* context3d = m_outputSurface->context3D();
+ WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
DCHECK(context3d);
GLC(context3d, context3d->deleteTexture(resource->glId));
}
if (resource->glUploadQueryId) {
- WebGraphicsContext3D* context3d = m_outputSurface->context3D();
+ WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
DCHECK(context3d);
GLC(context3d, context3d->deleteQueryEXT(resource->glUploadQueryId));
}
if (resource->glPixelBufferId) {
- WebGraphicsContext3D* context3d = m_outputSurface->context3D();
+ WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
DCHECK(context3d);
GLC(context3d, context3d->deleteBuffer(resource->glPixelBufferId));
}
@@ -297,7 +297,7 @@ void ResourceProvider::setPixels(ResourceId id, const uint8_t* image, const gfx:
DCHECK(!resource->exported);
if (resource->glId) {
- WebGraphicsContext3D* context3d = m_outputSurface->context3D();
+ WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
DCHECK(context3d);
DCHECK(m_textureUploader.get());
context3d->bindTexture(GL_TEXTURE_2D, resource->glId);
@@ -360,7 +360,7 @@ void ResourceProvider::flushUploads()
void ResourceProvider::flush()
{
DCHECK(m_threadChecker.CalledOnValidThread());
- WebGraphicsContext3D* context3d = m_outputSurface->context3D();
+ WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
if (context3d)
context3d->flush();
}
@@ -368,7 +368,7 @@ void ResourceProvider::flush()
bool ResourceProvider::shallowFlushIfSupported()
{
DCHECK(m_threadChecker.CalledOnValidThread());
- WebGraphicsContext3D* context3d = m_outputSurface->context3D();
+ WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
if (!context3d || !m_useShallowFlush)
return false;
@@ -505,7 +505,7 @@ ResourceProvider::ResourceProvider(OutputSurface* context)
bool ResourceProvider::initialize()
{
DCHECK(m_threadChecker.CalledOnValidThread());
- WebGraphicsContext3D* context3d = m_outputSurface->context3D();
+ WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
if (!context3d) {
m_maxTextureSize = INT_MAX / 2;
return true;
@@ -570,7 +570,7 @@ void ResourceProvider::prepareSendToParent(const ResourceIdArray& resources, Tra
DCHECK(m_threadChecker.CalledOnValidThread());
list->sync_point = 0;
list->resources.clear();
- WebGraphicsContext3D* context3d = m_outputSurface->context3D();
+ WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
if (!context3d || !context3d->makeContextCurrent()) {
// FIXME: Implement this path for software compositing.
return;
@@ -591,7 +591,7 @@ void ResourceProvider::prepareSendToChild(int child, const ResourceIdArray& reso
DCHECK(m_threadChecker.CalledOnValidThread());
list->sync_point = 0;
list->resources.clear();
- WebGraphicsContext3D* context3d = m_outputSurface->context3D();
+ WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
if (!context3d || !context3d->makeContextCurrent()) {
// FIXME: Implement this path for software compositing.
return;
@@ -615,7 +615,7 @@ void ResourceProvider::prepareSendToChild(int child, const ResourceIdArray& reso
void ResourceProvider::receiveFromChild(int child, const TransferableResourceList& resources)
{
DCHECK(m_threadChecker.CalledOnValidThread());
- WebGraphicsContext3D* context3d = m_outputSurface->context3D();
+ WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
if (!context3d || !context3d->makeContextCurrent()) {
// FIXME: Implement this path for software compositing.
return;
@@ -647,7 +647,7 @@ void ResourceProvider::receiveFromChild(int child, const TransferableResourceLis
void ResourceProvider::receiveFromParent(const TransferableResourceList& resources)
{
DCHECK(m_threadChecker.CalledOnValidThread());
- WebGraphicsContext3D* context3d = m_outputSurface->context3D();
+ WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
if (!context3d || !context3d->makeContextCurrent()) {
// FIXME: Implement this path for software compositing.
return;
@@ -671,7 +671,7 @@ void ResourceProvider::receiveFromParent(const TransferableResourceList& resourc
bool ResourceProvider::transferResource(WebGraphicsContext3D* context, ResourceId id, TransferableResource* resource)
{
DCHECK(m_threadChecker.CalledOnValidThread());
- WebGraphicsContext3D* context3d = m_outputSurface->context3D();
+ WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
ResourceMap::iterator it = m_resources.find(id);
CHECK(it != m_resources.end());
Resource* source = &it->second;
@@ -707,7 +707,7 @@ void ResourceProvider::acquirePixelBuffer(ResourceId id)
DCHECK(!resource->exported);
if (resource->glId) {
- WebGraphicsContext3D* context3d = m_outputSurface->context3D();
+ WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
DCHECK(context3d);
if (!resource->glPixelBufferId)
resource->glPixelBufferId = context3d->createBuffer();
@@ -742,7 +742,7 @@ void ResourceProvider::releasePixelBuffer(ResourceId id)
if (resource->glId) {
DCHECK(resource->glPixelBufferId);
- WebGraphicsContext3D* context3d = m_outputSurface->context3D();
+ WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
DCHECK(context3d);
context3d->bindBuffer(
GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM,
@@ -773,7 +773,7 @@ uint8_t* ResourceProvider::mapPixelBuffer(ResourceId id)
DCHECK(!resource->exported);
if (resource->glId) {
- WebGraphicsContext3D* context3d = m_outputSurface->context3D();
+ WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
DCHECK(context3d);
DCHECK(resource->glPixelBufferId);
context3d->bindBuffer(
@@ -803,7 +803,7 @@ void ResourceProvider::unmapPixelBuffer(ResourceId id)
DCHECK(!resource->exported);
if (resource->glId) {
- WebGraphicsContext3D* context3d = m_outputSurface->context3D();
+ WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
DCHECK(context3d);
DCHECK(resource->glPixelBufferId);
context3d->bindBuffer(
@@ -827,7 +827,7 @@ void ResourceProvider::setPixelsFromBuffer(ResourceId id)
DCHECK(!resource->exported);
if (resource->glId) {
- WebGraphicsContext3D* context3d = m_outputSurface->context3D();
+ WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
DCHECK(context3d);
DCHECK(resource->glPixelBufferId);
context3d->bindTexture(GL_TEXTURE_2D, resource->glId);
@@ -864,7 +864,7 @@ void ResourceProvider::setPixelsFromBuffer(ResourceId id)
void ResourceProvider::bindForSampling(ResourceProvider::ResourceId resourceId, GLenum target, GLenum filter)
{
DCHECK(m_threadChecker.CalledOnValidThread());
- WebGraphicsContext3D* context3d = m_outputSurface->context3D();
+ WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
ResourceMap::iterator it = m_resources.find(resourceId);
DCHECK(it != m_resources.end());
Resource* resource = &it->second;
@@ -890,7 +890,7 @@ void ResourceProvider::beginSetPixels(ResourceId id)
lockForWrite(id);
if (resource->glId) {
- WebGraphicsContext3D* context3d = m_outputSurface->context3D();
+ WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
DCHECK(context3d);
DCHECK(resource->glPixelBufferId);
context3d->bindTexture(GL_TEXTURE_2D, resource->glId);
@@ -930,7 +930,7 @@ bool ResourceProvider::didSetPixelsComplete(ResourceId id) {
DCHECK(resource->pendingSetPixels);
if (resource->glId) {
- WebGraphicsContext3D* context3d = m_outputSurface->context3D();
+ WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
DCHECK(context3d);
DCHECK(resource->glUploadQueryId);
unsigned complete = 1;
« no previous file with comments | « cc/proxy.h ('k') | cc/resource_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698