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

Side by Side Diff: android_webview/native/aw_contents.cc

Issue 331103002: aw: Remove legacy rendering path (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 6 years, 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 "android_webview/native/aw_contents.h" 5 #include "android_webview/native/aw_contents.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "android_webview/browser/aw_browser_context.h" 9 #include "android_webview/browser/aw_browser_context.h"
10 #include "android_webview/browser/aw_browser_main_parts.h" 10 #include "android_webview/browser/aw_browser_main_parts.h"
11 #include "android_webview/browser/aw_resource_context.h" 11 #include "android_webview/browser/aw_resource_context.h"
12 #include "android_webview/browser/browser_view_renderer.h" 12 #include "android_webview/browser/browser_view_renderer.h"
13 #include "android_webview/browser/deferred_gpu_command_service.h" 13 #include "android_webview/browser/deferred_gpu_command_service.h"
14 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h" 14 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h"
15 #include "android_webview/browser/hardware_renderer.h" 15 #include "android_webview/browser/hardware_renderer.h"
16 #include "android_webview/browser/hardware_renderer_legacy.h"
17 #include "android_webview/browser/net_disk_cache_remover.h" 16 #include "android_webview/browser/net_disk_cache_remover.h"
18 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_dele gate.h" 17 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_dele gate.h"
19 #include "android_webview/browser/scoped_app_gl_state_restore.h" 18 #include "android_webview/browser/scoped_app_gl_state_restore.h"
20 #include "android_webview/common/aw_hit_test_data.h" 19 #include "android_webview/common/aw_hit_test_data.h"
21 #include "android_webview/common/aw_switches.h"
22 #include "android_webview/common/devtools_instrumentation.h" 20 #include "android_webview/common/devtools_instrumentation.h"
23 #include "android_webview/native/aw_autofill_client.h" 21 #include "android_webview/native/aw_autofill_client.h"
24 #include "android_webview/native/aw_browser_dependency_factory.h" 22 #include "android_webview/native/aw_browser_dependency_factory.h"
25 #include "android_webview/native/aw_contents_client_bridge.h" 23 #include "android_webview/native/aw_contents_client_bridge.h"
26 #include "android_webview/native/aw_contents_io_thread_client_impl.h" 24 #include "android_webview/native/aw_contents_io_thread_client_impl.h"
27 #include "android_webview/native/aw_pdf_exporter.h" 25 #include "android_webview/native/aw_pdf_exporter.h"
28 #include "android_webview/native/aw_picture.h" 26 #include "android_webview/native/aw_picture.h"
29 #include "android_webview/native/aw_web_contents_delegate.h" 27 #include "android_webview/native/aw_web_contents_delegate.h"
30 #include "android_webview/native/java_browser_view_renderer_helper.h" 28 #include "android_webview/native/java_browser_view_renderer_helper.h"
31 #include "android_webview/native/permission/aw_permission_request.h" 29 #include "android_webview/native/permission/aw_permission_request.h"
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 hardware_renderer_.reset(); 353 hardware_renderer_.reset();
356 shared_renderer_state_.SetHardwareInitialized(false); 354 shared_renderer_state_.SetHardwareInitialized(false);
357 return; 355 return;
358 } 356 }
359 357
360 if (draw_info->mode != AwDrawGLInfo::kModeDraw) 358 if (draw_info->mode != AwDrawGLInfo::kModeDraw)
361 return; 359 return;
362 360
363 if (!hardware_renderer_) { 361 if (!hardware_renderer_) {
364 DCHECK(!shared_renderer_state_.IsHardwareInitialized()); 362 DCHECK(!shared_renderer_state_.IsHardwareInitialized());
365 if (switches::UbercompEnabled()) { 363 hardware_renderer_.reset(new HardwareRenderer(&shared_renderer_state_));
366 hardware_renderer_.reset(new HardwareRenderer(&shared_renderer_state_));
367 } else {
368 hardware_renderer_.reset(
369 new HardwareRendererLegacy(&shared_renderer_state_));
370 }
371 shared_renderer_state_.SetHardwareInitialized(true); 364 shared_renderer_state_.SetHardwareInitialized(true);
372 } 365 }
373 366
374 scoped_ptr<DrawGLResult> result(new DrawGLResult);
375 if (hardware_renderer_->DrawGL(state_restore.stencil_enabled(), 367 if (hardware_renderer_->DrawGL(state_restore.stencil_enabled(),
376 state_restore.framebuffer_binding_ext(), 368 state_restore.framebuffer_binding_ext(),
377 draw_info, 369 draw_info)) {
378 result.get())) { 370 browser_view_renderer_.DidDrawDelegated();
379 if (switches::UbercompEnabled()) {
380 browser_view_renderer_.DidDrawDelegated(result.Pass());
381 } else {
382 browser_view_renderer_.DidDrawGL(result.Pass());
383 }
384 } 371 }
385 } 372 }
386 373
387 namespace { 374 namespace {
388 void DocumentHasImagesCallback(const ScopedJavaGlobalRef<jobject>& message, 375 void DocumentHasImagesCallback(const ScopedJavaGlobalRef<jobject>& message,
389 bool has_images) { 376 bool has_images) {
390 Java_AwContents_onDocumentHasImagesResponse(AttachCurrentThread(), 377 Java_AwContents_onDocumentHasImagesResponse(AttachCurrentThread(),
391 has_images, 378 has_images,
392 message.obj()); 379 message.obj());
393 } 380 }
(...skipping 724 matching lines...) Expand 10 before | Expand all | Expand 10 after
1118 return; 1105 return;
1119 1106
1120 browser_view_renderer_.TrimMemory(level, visible); 1107 browser_view_renderer_.TrimMemory(level, visible);
1121 } 1108 }
1122 1109
1123 void SetShouldDownloadFavicons(JNIEnv* env, jclass jclazz) { 1110 void SetShouldDownloadFavicons(JNIEnv* env, jclass jclazz) {
1124 g_should_download_favicons = true; 1111 g_should_download_favicons = true;
1125 } 1112 }
1126 1113
1127 } // namespace android_webview 1114 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698