diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-20 11:56:59 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-20 11:56:59 +0000 |
| commit | 64436d35be38ab9a9dfd4e9ef956f983f48c34e1 (patch) | |
| tree | caf46a80ce5c537b348adc912cdfe51ea702707b /cc/resources/resource_update_controller.cc | |
| parent | 9982806f4cc9e515bffd3bba9f822186338f79e2 (diff) | |
| download | chromium_src-64436d35be38ab9a9dfd4e9ef956f983f48c34e1.zip chromium_src-64436d35be38ab9a9dfd4e9ef956f983f48c34e1.tar.gz chromium_src-64436d35be38ab9a9dfd4e9ef956f983f48c34e1.tar.bz2 | |
cc: Chromify PrioritizedResource
R=danakj@chromium.org
BUG=none
Review URL: https://chromiumcodereview.appspot.com/12906008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189241 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/resources/resource_update_controller.cc')
| -rw-r--r-- | cc/resources/resource_update_controller.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cc/resources/resource_update_controller.cc b/cc/resources/resource_update_controller.cc index 112ebe4..b568f5c 100644 --- a/cc/resources/resource_update_controller.cc +++ b/cc/resources/resource_update_controller.cc @@ -117,17 +117,17 @@ void ResourceUpdateController::UpdateTexture(ResourceUpdate update) { gfx::Rect source_rect = update.source_rect; gfx::Vector2d dest_offset = update.dest_offset; - texture->acquireBackingTexture(resource_provider_); - DCHECK(texture->haveBackingTexture()); + texture->AcquireBackingTexture(resource_provider_); + DCHECK(texture->have_backing_texture()); - DCHECK(resource_provider_->GetResourceType(texture->resourceId()) == + DCHECK(resource_provider_->GetResourceType(texture->ResourceId()) == ResourceProvider::GLTexture); cc::ContextProvider* offscreen_contexts = resource_provider_->offscreen_context_provider(); ResourceProvider::ScopedWriteLockGL lock( - resource_provider_, texture->resourceId()); + resource_provider_, texture->ResourceId()); // Flush the compositor context to ensure that textures there are available // in the shared context. Do this after locking/creating the compositor @@ -172,7 +172,7 @@ void ResourceUpdateController::UpdateTexture(ResourceUpdate update) { if (update.bitmap) { update.bitmap->lockPixels(); - update.texture->setPixels( + update.texture->SetPixels( resource_provider_, static_cast<const uint8_t*>(update.bitmap->getPixels()), update.content_rect, |