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

Side by Side 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: rebased Created 7 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/compositor_impl_android.h" 5 #include "content/browser/renderer_host/compositor_impl_android.h"
6 6
7 #include <android/bitmap.h> 7 #include <android/bitmap.h>
8 #include <android/native_window_jni.h> 8 #include <android/native_window_jni.h>
9 #include <map> 9 #include <map>
10 10
11 #include "base/android/jni_android.h" 11 #include "base/android/jni_android.h"
12 #include "base/android/scoped_java_ref.h" 12 #include "base/android/scoped_java_ref.h"
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/lazy_instance.h" 15 #include "base/lazy_instance.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/single_thread_task_runner.h" 17 #include "base/single_thread_task_runner.h"
18 #include "base/synchronization/lock.h" 18 #include "base/synchronization/lock.h"
19 #include "base/threading/thread.h" 19 #include "base/threading/thread.h"
20 #include "cc/input/input_handler.h" 20 #include "cc/input/input_handler.h"
21 #include "cc/layers/layer.h" 21 #include "cc/layers/layer.h"
22 #include "cc/output/compositor_frame.h" 22 #include "cc/output/compositor_frame.h"
23 #include "cc/output/context_provider.h" 23 #include "cc/output/context_provider.h"
24 #include "cc/output/output_surface.h" 24 #include "cc/output/output_surface.h"
25 #include "cc/resources/scoped_ui_resource.h"
26 #include "cc/resources/ui_resource_bitmap.h"
25 #include "cc/trees/layer_tree_host.h" 27 #include "cc/trees/layer_tree_host.h"
26 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" 28 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
27 #include "content/browser/gpu/gpu_surface_tracker.h" 29 #include "content/browser/gpu/gpu_surface_tracker.h"
28 #include "content/common/gpu/client/command_buffer_proxy_impl.h" 30 #include "content/common/gpu/client/command_buffer_proxy_impl.h"
29 #include "content/common/gpu/client/context_provider_command_buffer.h" 31 #include "content/common/gpu/client/context_provider_command_buffer.h"
30 #include "content/common/gpu/client/gl_helper.h" 32 #include "content/common/gpu/client/gl_helper.h"
31 #include "content/common/gpu/client/gpu_channel_host.h" 33 #include "content/common/gpu/client/gpu_channel_host.h"
32 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" 34 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
33 #include "content/common/gpu/gpu_process_launch_causes.h" 35 #include "content/common/gpu/gpu_process_launch_causes.h"
34 #include "content/public/browser/android/compositor_client.h" 36 #include "content/public/browser/android/compositor_client.h"
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 ANativeWindow_release(window); 228 ANativeWindow_release(window);
227 { 229 {
228 base::AutoLock lock(g_surface_map_lock.Get()); 230 base::AutoLock lock(g_surface_map_lock.Get());
229 g_surface_map.Get().insert(std::make_pair(surface_id_, j_surface)); 231 g_surface_map.Get().insert(std::make_pair(surface_id_, j_surface));
230 } 232 }
231 } 233 }
232 } 234 }
233 235
234 void CompositorImpl::SetVisible(bool visible) { 236 void CompositorImpl::SetVisible(bool visible) {
235 if (!visible) { 237 if (!visible) {
238 ui_resource_map_.clear();
236 host_.reset(); 239 host_.reset();
240 client_->UIResourcesAreInvalid();
237 } else if (!host_) { 241 } else if (!host_) {
238 cc::LayerTreeSettings settings; 242 cc::LayerTreeSettings settings;
239 settings.refresh_rate = 60.0; 243 settings.refresh_rate = 60.0;
240 settings.impl_side_painting = false; 244 settings.impl_side_painting = false;
241 settings.allow_antialiasing = false; 245 settings.allow_antialiasing = false;
242 settings.calculate_top_controls_position = false; 246 settings.calculate_top_controls_position = false;
243 settings.top_controls_height = 0.f; 247 settings.top_controls_height = 0.f;
244 settings.use_memory_management = false; 248 settings.use_memory_management = false;
245 settings.highp_threshold_min = 2048; 249 settings.highp_threshold_min = 2048;
246 250
247 // Do not clear the framebuffer when rendering into external GL contexts 251 // Do not clear the framebuffer when rendering into external GL contexts
248 // like Android View System's. 252 // like Android View System's.
249 if (UsesDirectGL()) 253 if (UsesDirectGL())
250 settings.should_clear_root_render_pass = false; 254 settings.should_clear_root_render_pass = false;
251 255
252 scoped_refptr<base::SingleThreadTaskRunner> impl_thread_task_runner = 256 scoped_refptr<base::SingleThreadTaskRunner> impl_thread_task_runner =
253 g_impl_thread ? g_impl_thread->message_loop()->message_loop_proxy() 257 g_impl_thread ? g_impl_thread->message_loop()->message_loop_proxy()
254 : NULL; 258 : NULL;
255 259
256 host_ = cc::LayerTreeHost::Create(this, settings, impl_thread_task_runner); 260 host_ = cc::LayerTreeHost::Create(this, settings, impl_thread_task_runner);
257 host_->SetRootLayer(root_layer_); 261 host_->SetRootLayer(root_layer_);
258 262
259 host_->SetVisible(true); 263 host_->SetVisible(true);
260 host_->SetLayerTreeHostClientReady(); 264 host_->SetLayerTreeHostClientReady();
261 host_->SetViewportSize(size_); 265 host_->SetViewportSize(size_);
262 host_->set_has_transparent_background(has_transparent_background_); 266 host_->set_has_transparent_background(has_transparent_background_);
267 // Need to recreate the UI resources because a new LayerTreeHost has been
268 // created.
269 client_->DidLoseUIResources();
263 } 270 }
264 } 271 }
265 272
266 void CompositorImpl::setDeviceScaleFactor(float factor) { 273 void CompositorImpl::setDeviceScaleFactor(float factor) {
267 if (host_) 274 if (host_)
268 host_->SetDeviceScaleFactor(factor); 275 host_->SetDeviceScaleFactor(factor);
269 } 276 }
270 277
271 void CompositorImpl::SetWindowBounds(const gfx::Size& size) { 278 void CompositorImpl::SetWindowBounds(const gfx::Size& size) {
272 if (size_ == size) 279 if (size_ == size)
(...skipping 11 matching lines...) Expand all
284 host_->set_has_transparent_background(flag); 291 host_->set_has_transparent_background(flag);
285 } 292 }
286 293
287 bool CompositorImpl::CompositeAndReadback(void *pixels, const gfx::Rect& rect) { 294 bool CompositorImpl::CompositeAndReadback(void *pixels, const gfx::Rect& rect) {
288 if (host_) 295 if (host_)
289 return host_->CompositeAndReadback(pixels, rect); 296 return host_->CompositeAndReadback(pixels, rect);
290 else 297 else
291 return false; 298 return false;
292 } 299 }
293 300
301 cc::UIResourceId CompositorImpl::GenerateUIResource(
302 const cc::UIResourceBitmap& bitmap) {
303 if (!host_)
304 return 0;
305 scoped_ptr<cc::ScopedUIResource> ui_resource =
306 cc::ScopedUIResource::Create(host_.get(), bitmap);
307 cc::UIResourceId id = ui_resource->id();
308 ui_resource_map_.set(id, ui_resource.Pass());
309 return id;
310 }
311
312 void CompositorImpl::DeleteUIResource(cc::UIResourceId resource_id) {
313 UIResourceMap::iterator it = ui_resource_map_.find(resource_id);
314 if (it != ui_resource_map_.end())
315 ui_resource_map_.erase(it);
316 }
317
294 WebKit::WebGLId CompositorImpl::GenerateTexture(gfx::JavaBitmap& bitmap) { 318 WebKit::WebGLId CompositorImpl::GenerateTexture(gfx::JavaBitmap& bitmap) {
295 unsigned int texture_id = BuildBasicTexture(); 319 unsigned int texture_id = BuildBasicTexture();
296 WebKit::WebGraphicsContext3D* context = 320 WebKit::WebGraphicsContext3D* context =
297 ImageTransportFactoryAndroid::GetInstance()->GetContext3D(); 321 ImageTransportFactoryAndroid::GetInstance()->GetContext3D();
298 if (texture_id == 0 || context->isContextLost() || 322 if (texture_id == 0 || context->isContextLost() ||
299 !context->makeContextCurrent()) 323 !context->makeContextCurrent())
300 return 0; 324 return 0;
301 WebKit::WebGLId format = GetGLFormatForBitmap(bitmap); 325 WebKit::WebGLId format = GetGLFormatForBitmap(bitmap);
302 WebKit::WebGLId type = GetGLTypeForBitmap(bitmap); 326 WebKit::WebGLId type = GetGLTypeForBitmap(bitmap);
303 327
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 case ANDROID_BITMAP_FORMAT_RGBA_8888: 549 case ANDROID_BITMAP_FORMAT_RGBA_8888:
526 return GL_UNSIGNED_BYTE; 550 return GL_UNSIGNED_BYTE;
527 break; 551 break;
528 case ANDROID_BITMAP_FORMAT_RGB_565: 552 case ANDROID_BITMAP_FORMAT_RGB_565:
529 default: 553 default:
530 return GL_UNSIGNED_SHORT_5_6_5; 554 return GL_UNSIGNED_SHORT_5_6_5;
531 } 555 }
532 } 556 }
533 557
534 } // namespace content 558 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/compositor_impl_android.h ('k') | content/public/browser/android/compositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698