Chromium Code Reviews| 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 359a6e1a9435d7c5aaaead8cc6158246449735cb..5af62913abcf822164eaf56fb9c8905738a83c9b 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" |
| @@ -233,6 +235,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; |
| @@ -261,6 +269,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. |
|
danakj
2013/08/27 15:42:48
LTH -> LayerTreeHost
powei
2013/08/27 22:39:28
Done.
|
| + client_->DidLoseUIResources(); |
| } |
| } |
| @@ -292,6 +302,25 @@ bool CompositorImpl::CompositeAndReadback(void *pixels, const gfx::Rect& rect) { |
| return false; |
| } |
| +cc::UIResourceId CompositorImpl::GenerateUIResource( |
| + scoped_refptr<cc::UIResourceBitmap> bitmap) { |
| + if (!host_) |
| + return 0; |
| + scoped_ptr<cc::ScopedUIResource> ui_resource = |
| + cc::ScopedUIResource::Create(host_.get(), bitmap); |
| + 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 = |