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

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 1462613002: Move cc::LayerSettings to cc/layers/layer_settings.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cc_perftests Created 5 years, 1 month 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 | « content/browser/android/content_startup_flags.cc ('k') | ui/android/DEPS » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/renderer/render_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 19 matching lines...) Expand all
30 #include "base/threading/simple_thread.h" 30 #include "base/threading/simple_thread.h"
31 #include "base/threading/thread_local.h" 31 #include "base/threading/thread_local.h"
32 #include "base/threading/thread_restrictions.h" 32 #include "base/threading/thread_restrictions.h"
33 #include "base/trace_event/memory_dump_manager.h" 33 #include "base/trace_event/memory_dump_manager.h"
34 #include "base/trace_event/trace_event.h" 34 #include "base/trace_event/trace_event.h"
35 #include "base/values.h" 35 #include "base/values.h"
36 #include "cc/base/histograms.h" 36 #include "cc/base/histograms.h"
37 #include "cc/base/switches.h" 37 #include "cc/base/switches.h"
38 #include "cc/blink/web_external_bitmap_impl.h" 38 #include "cc/blink/web_external_bitmap_impl.h"
39 #include "cc/blink/web_layer_impl.h" 39 #include "cc/blink/web_layer_impl.h"
40 #include "cc/layers/layer_settings.h"
40 #include "cc/raster/task_graph_runner.h" 41 #include "cc/raster/task_graph_runner.h"
41 #include "cc/trees/layer_tree_settings.h" 42 #include "cc/trees/layer_tree_settings.h"
42 #include "components/scheduler/renderer/renderer_scheduler.h" 43 #include "components/scheduler/renderer/renderer_scheduler.h"
43 #include "content/child/appcache/appcache_dispatcher.h" 44 #include "content/child/appcache/appcache_dispatcher.h"
44 #include "content/child/appcache/appcache_frontend_impl.h" 45 #include "content/child/appcache/appcache_frontend_impl.h"
45 #include "content/child/child_discardable_shared_memory_manager.h" 46 #include "content/child/child_discardable_shared_memory_manager.h"
46 #include "content/child/child_gpu_memory_buffer_manager.h" 47 #include "content/child/child_gpu_memory_buffer_manager.h"
47 #include "content/child/child_histogram_message_filter.h" 48 #include "content/child/child_histogram_message_filter.h"
48 #include "content/child/child_resource_message_filter.h" 49 #include "content/child/child_resource_message_filter.h"
49 #include "content/child/child_shared_bitmap_manager.h" 50 #include "content/child/child_shared_bitmap_manager.h"
(...skipping 2018 matching lines...) Expand 10 before | Expand all | Expand 10 after
2068 } 2069 }
2069 2070
2070 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { 2071 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
2071 size_t erased = 2072 size_t erased =
2072 RenderThreadImpl::current()->pending_render_frame_connects_.erase( 2073 RenderThreadImpl::current()->pending_render_frame_connects_.erase(
2073 routing_id_); 2074 routing_id_);
2074 DCHECK_EQ(1u, erased); 2075 DCHECK_EQ(1u, erased);
2075 } 2076 }
2076 2077
2077 } // namespace content 2078 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/android/content_startup_flags.cc ('k') | ui/android/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698