|
Make compositor_frame.h NOT include base/trace_event/trace_event.h
This is a prepartory CL to bring compositor_frame.typemap to Blink. There is no
change in behavior except the include paths for compositor_frame.h is trimmed.
Currently, compositor_frame.h indirectly include base/trace_event/trace_event.h
via latency_info.h and resource_format.h (Note that resource_format.h indirectly
include trace_event.h via gpu_memory_buffer.h). Once the compositor_frame.h is
brought to Blink mojom file (which I'm going to do in future CLs), the
trace_event.h will have conflicting macro definition with
third_party/WebKit/Source/platform/TraceEvent.h.
By analyzing latency_info.h and resource_format.h, I find that the trace_event.h
was previously over-included. Therefore, I shifted the problematic included
file from these two header files to their respective cc files. All the rest of
changes in this CL are just results due to this shift to make Chrome compiled.
BUG= 629566
TBR=dtrainor@chromium.org
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel
Committed: https://crrev.com/180af792f3687b88d9634836e022d86879b8ac73
Cr-Commit-Position: refs/heads/master@{#414828}
Total comments: 3
Total comments: 3
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+34 lines, -2 lines) |
Patch |
 |
M |
blimp/client/core/compositor/delegated_output_surface_unittest.cc
|
View
|
1
2
3
4
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
cc/output/output_surface.h
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
cc/output/output_surface.cc
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
cc/resources/resource_format.h
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
cc/resources/resource_format.cc
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
cc/test/ordered_texture_map.cc
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
M |
cc/tiles/gpu_image_decode_controller.cc
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
cc/tiles/software_image_decode_controller.h
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
content/browser/renderer_host/input/mouse_wheel_event_queue.h
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
content/renderer/render_widget.h
|
View
|
1
2
3
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
services/ui/service.cc
|
View
|
1
2
3
4
5
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
services/ui/ws/server_window_surface.cc
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
services/ui/ws/test_utils.h
|
View
|
1
2
3
4
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
ui/android/delegated_frame_host_android.cc
|
View
|
1
2
3
4
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
ui/base/ime/input_method_auralinux.cc
|
View
|
1
2
3
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
ui/base/ime/input_method_win.cc
|
View
|
1
2
3
4
5
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
ui/events/blink/web_input_event_unittest.cc
|
View
|
1
2
3
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
ui/events/event.h
|
View
|
1
2
3
4
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
ui/events/ipc/OWNERS
|
View
|
1
2
3
4
5
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
 |
M |
ui/events/ipc/latency_info_param_traits.h
|
View
|
1
2
3
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
ui/events/keycodes/platform_key_map_win.cc
|
View
|
1
2
3
4
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
ui/events/latency_info.h
|
View
|
1
2
3
|
2 chunks |
+6 lines, -1 line |
0 comments
|
Download
|
 |
M |
ui/events/latency_info.cc
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
ui/platform_window/win/win_window.cc
|
View
|
1
2
3
4
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
ui/platform_window/x11/x11_window_ozone.cc
|
View
|
1
2
3
4
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
ui/views/mus/os_exchange_data_provider_mus.cc
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
Total messages: 46 (32 generated)
|