cc/resources/resource_format.h - Issue 2273193002: Make compositor_frame.h NOT include base/trace_event/trace_event.h

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/resources/resource_format.h

Issue 2273193002: Make compositor_frame.h NOT include base/trace_event/trace_event.h (Closed)

Patch Set: Fix Created 4 years, 4 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/resources/resource_format.h

diff --git a/cc/resources/resource_format.h b/cc/resources/resource_format.h

index 275053f476cca49f29abcaf58ab1c68f32a614ce..518131114d919668237f88ff8faf5843f598519a 100644

--- a/cc/resources/resource_format.h

+++ b/cc/resources/resource_format.h

@@ -7,7 +7,7 @@

#include "base/logging.h"

#include "cc/base/cc_export.h"

-#include "ui/gfx/gpu_memory_buffer.h"

+#include "ui/gfx/buffer_types.h"

// TODO(prashant.n): Including third_party/khronos/GLES2/gl2.h causes

// redefinition errors as macros/functions defined in it conflict with