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

Unified Diff: cc/resources/resource_update_controller.cc

Issue 16069004: cc: Remove legacy accelerated painting path (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Base files missing blahblahblah Created 7 years, 7 months 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/resources/resource_update.cc ('k') | cc/resources/skpicture_content_layer_updater.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/resource_update_controller.cc
diff --git a/cc/resources/resource_update_controller.cc b/cc/resources/resource_update_controller.cc
index 5e0a26cbf497cf70a3c6d944332ea219a6478031..81551b016f64ef755df2bfd7f49a0fa23181cc55 100644
--- a/cc/resources/resource_update_controller.cc
+++ b/cc/resources/resource_update_controller.cc
@@ -111,75 +111,14 @@ void ResourceUpdateController::DiscardUploadsToEvictedResources() {
}
void ResourceUpdateController::UpdateTexture(ResourceUpdate update) {
- if (update.picture) {
- PrioritizedResource* texture = update.texture;
- gfx::Rect picture_rect = update.content_rect;
- gfx::Rect source_rect = update.source_rect;
- gfx::Vector2d dest_offset = update.dest_offset;
-
- texture->AcquireBackingTexture(resource_provider_);
- DCHECK(texture->have_backing_texture());
-
- DCHECK_EQ(resource_provider_->GetResourceType(texture->resource_id()),
- ResourceProvider::GLTexture);
-
- cc::ContextProvider* offscreen_contexts =
- resource_provider_->offscreen_context_provider();
-
- ResourceProvider::ScopedWriteLockGL lock(
- resource_provider_, texture->resource_id());
-
- // Flush the compositor context to ensure that textures there are available
- // in the shared context. Do this after locking/creating the compositor
- // texture.
- resource_provider_->Flush();
-
- // Make sure skia uses the correct GL context.
- offscreen_contexts->Context3d()->makeContextCurrent();
-
- // Create an accelerated canvas to draw on.
- skia::RefPtr<SkCanvas> canvas = CreateAcceleratedCanvas(
- offscreen_contexts->GrContext(), texture->size(), lock.texture_id());
-
- // 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(dest_offset.x(),
- dest_offset.y(),
- source_rect.width(),
- source_rect.height()));
- // Translate the origin of picture_rect to dest_offset.
- // Note that dest_offset is defined relative to source_rect.
- canvas->translate(
- picture_rect.x() - source_rect.x() + dest_offset.x(),
- picture_rect.y() - source_rect.y() + dest_offset.y());
- canvas->drawPicture(*update.picture);
-
- // Flush skia context so that all the rendered stuff appears on the
- // texture.
- offscreen_contexts->GrContext()->flush();
-
- // Flush the GL context so rendering results from this context are
- // visible in the compositor's context.
- offscreen_contexts->Context3d()->flush();
-
- // Use the compositor's GL context again.
- resource_provider_->GraphicsContext3D()->makeContextCurrent();
- }
-
- if (update.bitmap) {
- update.bitmap->lockPixels();
- update.texture->SetPixels(
- resource_provider_,
- static_cast<const uint8_t*>(update.bitmap->getPixels()),
- update.content_rect,
- update.source_rect,
- update.dest_offset);
- update.bitmap->unlockPixels();
- }
+ update.bitmap->lockPixels();
+ update.texture->SetPixels(
+ resource_provider_,
+ static_cast<const uint8_t*>(update.bitmap->getPixels()),
+ update.content_rect,
+ update.source_rect,
+ update.dest_offset);
+ update.bitmap->unlockPixels();
}
void ResourceUpdateController::Finalize() {
« no previous file with comments | « cc/resources/resource_update.cc ('k') | cc/resources/skpicture_content_layer_updater.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698