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

Unified Diff: content/browser/renderer_host/compositor_impl_android.cc

Issue 22870016: Update the nine patch layer to use UI resources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 4 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
Index: content/browser/renderer_host/compositor_impl_android.cc
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index 94ab1393c847f00e27463f931fdf3503a3250741..58d809d6ffafc7172da3c031516c58f2459dc36d 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -22,6 +22,8 @@
#include "cc/output/compositor_frame.h"
#include "cc/output/context_provider.h"
#include "cc/output/output_surface.h"
+#include "cc/resources/scoped_ui_resource.h"
+#include "cc/resources/ui_resource_bitmap.h"
#include "cc/trees/layer_tree_host.h"
#include "content/browser/gpu/browser_gpu_channel_host_factory.h"
#include "content/browser/gpu/gpu_surface_tracker.h"
@@ -227,6 +229,12 @@ void CompositorImpl::SetSurface(jobject surface) {
void CompositorImpl::SetVisible(bool visible) {
if (!visible) {
+ for(UIResourceMap::iterator iter = ui_resource_map_.begin();
+ iter != ui_resource_map_.end();
+ iter++) {
+ scoped_ptr<cc::ScopedUIResource> resource(iter->second);
+ }
+ ui_resource_map_.clear();
host_.reset();
} else if (!host_) {
cc::LayerTreeSettings settings;
@@ -255,6 +263,8 @@ void CompositorImpl::SetVisible(bool visible) {
host_->SetLayerTreeHostClientReady();
host_->SetViewportSize(size_);
host_->set_has_transparent_background(has_transparent_background_);
+ // Need to recreate the UI resources because a new LTH has been created.
+ client_->DidLoseUIResources();
}
}
@@ -286,6 +296,31 @@ bool CompositorImpl::CompositeAndReadback(void *pixels, const gfx::Rect& rect) {
return false;
}
+cc::UIResourceId CompositorImpl::GenerateUIResource(gfx::JavaBitmap& bitmap) {
+ if (!host_)
+ return 0;
+
+ void* src_pixels = bitmap.pixels();
+ gfx::Size size = bitmap.size();
+ uint8_t* dst_pixels = new uint8_t[size.GetArea() * 4];
+ memcpy(dst_pixels, src_pixels, size.GetArea() * 4);
+ scoped_ptr<cc::ScopedUIResource> ui_resource = cc::ScopedUIResource::Create(
+ host_.get(),
+ cc::UIResourceBitmap::Create(
+ dst_pixels, cc::UIResourceBitmap::RGBA8, size));
+ cc::UIResourceId id = ui_resource->id();
+ ui_resource_map_[id] = ui_resource.release();
+ return id;
+}
+
+void CompositorImpl::DeleteUIResource(cc::UIResourceId resource_id) {
+ UIResourceMap::iterator iter = ui_resource_map_.find(resource_id);
+ if (iter != ui_resource_map_.end()) {
+ scoped_ptr<cc::ScopedUIResource> resource(iter->second);
+ ui_resource_map_.erase(resource_id);
+ }
+}
+
WebKit::WebGLId CompositorImpl::GenerateTexture(gfx::JavaBitmap& bitmap) {
unsigned int texture_id = BuildBasicTexture();
WebKit::WebGraphicsContext3D* context =

Powered by Google App Engine
This is Rietveld 408576698