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

Unified 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: 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 side-by-side diff with in-line comments
Download patch
Index: android_webview/native/aw_contents.cc
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index b6ef6d89f69e98203b7d5d690c1400597b1633ba..62efc4794084f2442ebf16b3a9c1018445942183 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -13,12 +13,10 @@
#include "android_webview/browser/deferred_gpu_command_service.h"
#include "android_webview/browser/gpu_memory_buffer_factory_impl.h"
#include "android_webview/browser/hardware_renderer.h"
-#include "android_webview/browser/hardware_renderer_legacy.h"
#include "android_webview/browser/net_disk_cache_remover.h"
#include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
#include "android_webview/browser/scoped_app_gl_state_restore.h"
#include "android_webview/common/aw_hit_test_data.h"
-#include "android_webview/common/aw_switches.h"
#include "android_webview/common/devtools_instrumentation.h"
#include "android_webview/native/aw_autofill_client.h"
#include "android_webview/native/aw_browser_dependency_factory.h"
@@ -362,25 +360,14 @@ void AwContents::DrawGL(AwDrawGLInfo* draw_info) {
if (!hardware_renderer_) {
DCHECK(!shared_renderer_state_.IsHardwareInitialized());
- if (switches::UbercompEnabled()) {
- hardware_renderer_.reset(new HardwareRenderer(&shared_renderer_state_));
- } else {
- hardware_renderer_.reset(
- new HardwareRendererLegacy(&shared_renderer_state_));
- }
+ hardware_renderer_.reset(new HardwareRenderer(&shared_renderer_state_));
shared_renderer_state_.SetHardwareInitialized(true);
}
- scoped_ptr<DrawGLResult> result(new DrawGLResult);
if (hardware_renderer_->DrawGL(state_restore.stencil_enabled(),
state_restore.framebuffer_binding_ext(),
- draw_info,
- result.get())) {
- if (switches::UbercompEnabled()) {
- browser_view_renderer_.DidDrawDelegated(result.Pass());
- } else {
- browser_view_renderer_.DidDrawGL(result.Pass());
- }
+ draw_info)) {
+ browser_view_renderer_.DidDrawDelegated();
}
}

Powered by Google App Engine
This is Rietveld 408576698