cc/output/output_surface.cc - Issue 895853003: Update from https://crrev.com/314320

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: cc/output/output_surface.cc

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 5 years, 11 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: cc/output/output_surface.cc

diff --git a/cc/output/output_surface.cc b/cc/output/output_surface.cc

index 3502927f84bca843af73820c4ea586cee73d73fa..b65887e960262262c0f514492f56a49ac0a0e7c3 100644

--- a/cc/output/output_surface.cc

+++ b/cc/output/output_surface.cc

@@ -5,8 +5,8 @@

#include "cc/output/output_surface.h"

#include "base/bind.h"

-#include "base/debug/trace_event.h"

#include "base/message_loop/message_loop.h"

+#include "base/trace_event/trace_event.h"

#include "cc/output/managed_memory_policy.h"

#include "cc/output/output_surface_client.h"

#include "gpu/GLES2/gl2extchromium.h"

« no previous file with comments | « cc/output/gl_renderer.cc ('k') | cc/output/program_binding.cc » ('j') | no next file with comments »