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

Side by Side Diff: ui/android/delegated_frame_host_android.cc

Issue 2273193002: Make compositor_frame.h NOT include base/trace_event/trace_event.h (Closed)
Patch Set: Rebase again + presubmit fix Created 4 years, 3 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:
View unified diff | Download patch
« no previous file with comments | « services/ui/ws/test_utils.h ('k') | ui/base/ime/input_method_auralinux.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/android/delegated_frame_host_android.h" 5 #include "ui/android/delegated_frame_host_android.h"
6 6
7 #include "base/bind.h"
7 #include "base/logging.h" 8 #include "base/logging.h"
8 #include "cc/layers/solid_color_layer.h" 9 #include "cc/layers/solid_color_layer.h"
9 #include "cc/layers/surface_layer.h" 10 #include "cc/layers/surface_layer.h"
10 #include "cc/output/compositor_frame.h" 11 #include "cc/output/compositor_frame.h"
11 #include "cc/output/copy_output_result.h" 12 #include "cc/output/copy_output_result.h"
12 #include "cc/surfaces/surface.h" 13 #include "cc/surfaces/surface.h"
13 #include "cc/surfaces/surface_id.h" 14 #include "cc/surfaces/surface_id.h"
14 #include "cc/surfaces/surface_id_allocator.h" 15 #include "cc/surfaces/surface_id_allocator.h"
15 #include "cc/surfaces/surface_manager.h" 16 #include "cc/surfaces/surface_manager.h"
16 #include "ui/android/context_provider_factory.h" 17 #include "ui/android/context_provider_factory.h"
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 content_size_in_dip.width() < container_size_in_dip_.width() || 245 content_size_in_dip.width() < container_size_in_dip_.width() ||
245 content_size_in_dip.height() < container_size_in_dip_.height(); 246 content_size_in_dip.height() < container_size_in_dip_.height();
246 } else { 247 } else {
247 background_is_drawable = true; 248 background_is_drawable = true;
248 } 249 }
249 250
250 background_layer_->SetIsDrawable(background_is_drawable); 251 background_layer_->SetIsDrawable(background_is_drawable);
251 } 252 }
252 253
253 } // namespace ui 254 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/ws/test_utils.h ('k') | ui/base/ime/input_method_auralinux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698