Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

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

Created:
4 years, 4 months ago by xlai (Olivia)
Modified:
4 years, 3 months ago
CC:
cc-bugs_chromium.org, chromium-reviews, darin-cc_chromium.org, dtapuska+chromiumwatch_chromium.org, jam, rjkroege, tdresser+watch_chromium.org, tfarina
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

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}

Patch Set 1 #

Patch Set 2 : Fix #

Patch Set 3 : Fix #

Total comments: 3

Patch Set 4 : Shift included files to those who immediately need them #

Total comments: 3

Patch Set 5 : Rebase + fix #

Patch Set 6 : Rebase again + presubmit fix #

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

Messages

Total messages: 46 (32 generated)
xlai (Olivia)
This CL does not cause behavior change; it just trims the #include so that compositor_frame.h ...
4 years, 3 months ago (2016-08-25 14:33:08 UTC) #15
weiliangc
cc/ LGTM.
4 years, 3 months ago (2016-08-25 16:51:44 UTC) #16
sadrul
https://codereview.chromium.org/2273193002/diff/40001/ui/events/latency_info.h File ui/events/latency_info.h (right): https://codereview.chromium.org/2273193002/diff/40001/ui/events/latency_info.h#newcode11 ui/events/latency_info.h:11: #include <queue> The code in here doesn't seem to ...
4 years, 3 months ago (2016-08-25 19:45:15 UTC) #17
xlai (Olivia)
nasko@chromium.org: Please review changes in ui/events/ipc/latency_info_param_traits.h and content/renderer. This CL just trims the #include path; ...
4 years, 3 months ago (2016-08-25 20:11:16 UTC) #19
xlai (Olivia)
+tsepez@chromium.org: Please review changes in latency_info_param_traits.h. +sievers@chromium.org: Please review changes in content/ Thanks! There is ...
4 years, 3 months ago (2016-08-25 21:07:52 UTC) #23
Tom Sepez
RS LGTM on adding include file.
4 years, 3 months ago (2016-08-25 21:11:49 UTC) #24
sadrul
lgtm https://codereview.chromium.org/2273193002/diff/60001/ui/events/event.h File ui/events/event.h (right): https://codereview.chromium.org/2273193002/diff/60001/ui/events/event.h#newcode17 ui/events/event.h:17: #include "base/strings/string16.h" This doesn't seem necessary.
4 years, 3 months ago (2016-08-26 00:23:10 UTC) #25
xlai (Olivia)
https://codereview.chromium.org/2273193002/diff/60001/ui/events/event.h File ui/events/event.h (right): https://codereview.chromium.org/2273193002/diff/60001/ui/events/event.h#newcode17 ui/events/event.h:17: #include "base/strings/string16.h" On 2016/08/26 00:23:10, sadrul wrote: > This ...
4 years, 3 months ago (2016-08-26 14:59:58 UTC) #26
sadrul
slgtm https://codereview.chromium.org/2273193002/diff/60001/ui/events/event.h File ui/events/event.h (right): https://codereview.chromium.org/2273193002/diff/60001/ui/events/event.h#newcode17 ui/events/event.h:17: #include "base/strings/string16.h" On 2016/08/26 14:59:58, xlai (Olivia) wrote: ...
4 years, 3 months ago (2016-08-26 15:01:13 UTC) #27
no sievers
content lgtm
4 years, 3 months ago (2016-08-26 17:17:34 UTC) #28
Elliot Glaysher
services/ui/ iwyu lgtm.
4 years, 3 months ago (2016-08-26 17:37:59 UTC) #33
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2273193002/100001
4 years, 3 months ago (2016-08-26 19:59:15 UTC) #42
commit-bot: I haz the power
Committed patchset #6 (id:100001)
4 years, 3 months ago (2016-08-26 22:08:05 UTC) #44
commit-bot: I haz the power
4 years, 3 months ago (2016-08-26 22:09:41 UTC) #46
Message was sent while issue was closed.
Patchset 6 (id:??) landed as
https://crrev.com/180af792f3687b88d9634836e022d86879b8ac73
Cr-Commit-Position: refs/heads/master@{#414828}

Powered by Google App Engine
This is Rietveld 408576698