content/browser/renderer_host/compositor_impl_android.cc - Issue 12472028: Part 1 of cc/ directory shuffles: base

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12472028: Part 1 of cc/ directory shuffles: base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 9 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:

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 f2aa4c466772d91e94cec074afe6253b0d83e1c7..98ea024ad36615b283003ea8b92b3d23f1fe54bc 100644

--- a/content/browser/renderer_host/compositor_impl_android.cc

+++ b/content/browser/renderer_host/compositor_impl_android.cc

@@ -15,12 +15,12 @@

#include "base/lazy_instance.h"

#include "base/logging.h"

#include "base/synchronization/lock.h"

+#include "cc/base/thread_impl.h"

#include "cc/context_provider.h"

#include "cc/input_handler.h"

#include "cc/layer.h"

#include "cc/layer_tree_host.h"

#include "cc/output_surface.h"

-#include "cc/thread_impl.h"

#include "content/browser/gpu/browser_gpu_channel_host_factory.h"

#include "content/browser/gpu/gpu_surface_tracker.h"

#include "content/browser/renderer_host/image_transport_factory_android.h"

@@ -29,9 +29,9 @@

#include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"

#include "content/common/gpu/gpu_process_launch_causes.h"

#include "content/public/common/content_switches.h"

+#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"

#include "third_party/khronos/GLES2/gl2.h"

#include "third_party/khronos/GLES2/gl2ext.h"

-#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"

#include "ui/gfx/android/java_bitmap.h"

#include "webkit/glue/webthread_impl.h"

#include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"