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

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

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 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/renderer/render_frame_impl.cc ('k') | content/renderer/usb/type_converters.h » ('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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 #include "gin/public/debug.h" 123 #include "gin/public/debug.h"
124 #include "gpu/GLES2/gl2extchromium.h" 124 #include "gpu/GLES2/gl2extchromium.h"
125 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 125 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
126 #include "ipc/ipc_channel_handle.h" 126 #include "ipc/ipc_channel_handle.h"
127 #include "ipc/ipc_platform_file.h" 127 #include "ipc/ipc_platform_file.h"
128 #include "ipc/mojo/ipc_channel_mojo.h" 128 #include "ipc/mojo/ipc_channel_mojo.h"
129 #include "media/base/audio_hardware_config.h" 129 #include "media/base/audio_hardware_config.h"
130 #include "media/base/media.h" 130 #include "media/base/media.h"
131 #include "media/renderers/gpu_video_accelerator_factories.h" 131 #include "media/renderers/gpu_video_accelerator_factories.h"
132 #include "mojo/common/common_type_converters.h" 132 #include "mojo/common/common_type_converters.h"
133 #include "mojo/public/cpp/bindings/strong_binding.h"
133 #include "net/base/net_errors.h" 134 #include "net/base/net_errors.h"
134 #include "net/base/net_util.h" 135 #include "net/base/net_util.h"
135 #include "net/base/port_util.h" 136 #include "net/base/port_util.h"
136 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 137 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
137 #include "skia/ext/event_tracer_impl.h" 138 #include "skia/ext/event_tracer_impl.h"
138 #include "skia/ext/skia_memory_dump_provider.h" 139 #include "skia/ext/skia_memory_dump_provider.h"
139 #include "third_party/WebKit/public/platform/WebImageGenerator.h" 140 #include "third_party/WebKit/public/platform/WebImageGenerator.h"
140 #include "third_party/WebKit/public/platform/WebString.h" 141 #include "third_party/WebKit/public/platform/WebString.h"
141 #include "third_party/WebKit/public/platform/WebThread.h" 142 #include "third_party/WebKit/public/platform/WebThread.h"
142 #include "third_party/WebKit/public/web/WebCache.h" 143 #include "third_party/WebKit/public/web/WebCache.h"
143 #include "third_party/WebKit/public/web/WebColorName.h" 144 #include "third_party/WebKit/public/web/WebColorName.h"
144 #include "third_party/WebKit/public/web/WebDatabase.h" 145 #include "third_party/WebKit/public/web/WebDatabase.h"
145 #include "third_party/WebKit/public/web/WebDocument.h" 146 #include "third_party/WebKit/public/web/WebDocument.h"
146 #include "third_party/WebKit/public/web/WebFrame.h" 147 #include "third_party/WebKit/public/web/WebFrame.h"
147 #include "third_party/WebKit/public/web/WebImageCache.h" 148 #include "third_party/WebKit/public/web/WebImageCache.h"
148 #include "third_party/WebKit/public/web/WebKit.h" 149 #include "third_party/WebKit/public/web/WebKit.h"
149 #include "third_party/WebKit/public/web/WebNetworkStateNotifier.h" 150 #include "third_party/WebKit/public/web/WebNetworkStateNotifier.h"
150 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" 151 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
151 #include "third_party/WebKit/public/web/WebScriptController.h" 152 #include "third_party/WebKit/public/web/WebScriptController.h"
152 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" 153 #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
153 #include "third_party/WebKit/public/web/WebView.h" 154 #include "third_party/WebKit/public/web/WebView.h"
154 #include "third_party/icu/source/i18n/unicode/timezone.h" 155 #include "third_party/icu/source/i18n/unicode/timezone.h"
155 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
156 #include "third_party/skia/include/core/SkGraphics.h" 156 #include "third_party/skia/include/core/SkGraphics.h"
157 #include "ui/base/layout.h" 157 #include "ui/base/layout.h"
158 #include "ui/base/ui_base_switches.h" 158 #include "ui/base/ui_base_switches.h"
159 #include "v8/include/v8.h" 159 #include "v8/include/v8.h"
160 160
161 #if defined(OS_ANDROID) 161 #if defined(OS_ANDROID)
162 #include <cpu-features.h> 162 #include <cpu-features.h>
163 #include "content/renderer/android/synchronous_compositor_external_begin_frame_s ource.h" 163 #include "content/renderer/android/synchronous_compositor_external_begin_frame_s ource.h"
164 #include "content/renderer/android/synchronous_compositor_factory.h" 164 #include "content/renderer/android/synchronous_compositor_factory.h"
165 #include "content/renderer/android/synchronous_compositor_filter.h" 165 #include "content/renderer/android/synchronous_compositor_filter.h"
(...skipping 1877 matching lines...) Expand 10 before | Expand all | Expand 10 after
2043 } 2043 }
2044 2044
2045 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { 2045 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
2046 size_t erased = 2046 size_t erased =
2047 RenderThreadImpl::current()->pending_render_frame_connects_.erase( 2047 RenderThreadImpl::current()->pending_render_frame_connects_.erase(
2048 routing_id_); 2048 routing_id_);
2049 DCHECK_EQ(1u, erased); 2049 DCHECK_EQ(1u, erased);
2050 } 2050 }
2051 2051
2052 } // namespace content 2052 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/renderer/usb/type_converters.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698