content/browser/renderer_host/render_widget_host_view_android.cc - Issue 12912006: Part 4 of cc/ directory shuffles: output

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/render_widget_host_view_android.cc

Issue 12912006: Part 4 of cc/ directory shuffles: output (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/render_widget_host_view_android.cc

diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc

index ce705823df6f30f6f542adfdfbcf654c4facdddc..fd4740dc6120dfd48cee3843a0238ebd6f5594bf 100644

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

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

@@ -10,9 +10,9 @@

#include "base/logging.h"

#include "base/message_loop.h"

#include "base/utf_string_conversions.h"

-#include "cc/compositor_frame.h"

-#include "cc/compositor_frame_ack.h"

#include "cc/layer.h"

+#include "cc/output/compositor_frame.h"

+#include "cc/output/compositor_frame_ack.h"

#include "cc/texture_layer.h"

#include "content/browser/android/content_view_core_impl.h"

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

@@ -23,11 +23,11 @@

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

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

#include "content/common/view_messages.h"

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

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

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

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

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

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

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

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

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

#include "ui/gfx/display.h"