| OLD | NEW |
| 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 <utility> | 10 #include <utility> |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 #include "media/renderers/gpu_video_accelerator_factories.h" | 139 #include "media/renderers/gpu_video_accelerator_factories.h" |
| 140 #include "mojo/common/common_type_converters.h" | 140 #include "mojo/common/common_type_converters.h" |
| 141 #include "mojo/public/cpp/bindings/strong_binding.h" | 141 #include "mojo/public/cpp/bindings/strong_binding.h" |
| 142 #include "net/base/net_errors.h" | 142 #include "net/base/net_errors.h" |
| 143 #include "net/base/port_util.h" | 143 #include "net/base/port_util.h" |
| 144 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" | 144 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" |
| 145 #include "net/base/url_util.h" | 145 #include "net/base/url_util.h" |
| 146 #include "skia/ext/event_tracer_impl.h" | 146 #include "skia/ext/event_tracer_impl.h" |
| 147 #include "skia/ext/skia_memory_dump_provider.h" | 147 #include "skia/ext/skia_memory_dump_provider.h" |
| 148 #include "third_party/WebKit/public/platform/WebImageGenerator.h" | 148 #include "third_party/WebKit/public/platform/WebImageGenerator.h" |
| 149 #include "third_party/WebKit/public/platform/WebRuntimeFeatures.h" |
| 149 #include "third_party/WebKit/public/platform/WebString.h" | 150 #include "third_party/WebKit/public/platform/WebString.h" |
| 150 #include "third_party/WebKit/public/platform/WebThread.h" | 151 #include "third_party/WebKit/public/platform/WebThread.h" |
| 151 #include "third_party/WebKit/public/web/WebCache.h" | 152 #include "third_party/WebKit/public/web/WebCache.h" |
| 152 #include "third_party/WebKit/public/web/WebDatabase.h" | 153 #include "third_party/WebKit/public/web/WebDatabase.h" |
| 153 #include "third_party/WebKit/public/web/WebDocument.h" | 154 #include "third_party/WebKit/public/web/WebDocument.h" |
| 154 #include "third_party/WebKit/public/web/WebFrame.h" | 155 #include "third_party/WebKit/public/web/WebFrame.h" |
| 155 #include "third_party/WebKit/public/web/WebKit.h" | 156 #include "third_party/WebKit/public/web/WebKit.h" |
| 156 #include "third_party/WebKit/public/web/WebMemoryPressureListener.h" | 157 #include "third_party/WebKit/public/web/WebMemoryPressureListener.h" |
| 157 #include "third_party/WebKit/public/web/WebNetworkStateNotifier.h" | 158 #include "third_party/WebKit/public/web/WebNetworkStateNotifier.h" |
| 158 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" | |
| 159 #include "third_party/WebKit/public/web/WebScriptController.h" | 159 #include "third_party/WebKit/public/web/WebScriptController.h" |
| 160 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" | 160 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" |
| 161 #include "third_party/WebKit/public/web/WebView.h" | 161 #include "third_party/WebKit/public/web/WebView.h" |
| 162 #include "third_party/icu/source/i18n/unicode/timezone.h" | 162 #include "third_party/icu/source/i18n/unicode/timezone.h" |
| 163 #include "third_party/skia/include/core/SkGraphics.h" | 163 #include "third_party/skia/include/core/SkGraphics.h" |
| 164 #include "ui/base/layout.h" | 164 #include "ui/base/layout.h" |
| 165 #include "ui/base/ui_base_switches.h" | 165 #include "ui/base/ui_base_switches.h" |
| 166 #include "v8/include/v8.h" | 166 #include "v8/include/v8.h" |
| 167 | 167 |
| 168 #if defined(OS_ANDROID) | 168 #if defined(OS_ANDROID) |
| (...skipping 2005 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2174 } | 2174 } |
| 2175 | 2175 |
| 2176 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 2176 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
| 2177 size_t erased = | 2177 size_t erased = |
| 2178 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 2178 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
| 2179 routing_id_); | 2179 routing_id_); |
| 2180 DCHECK_EQ(1u, erased); | 2180 DCHECK_EQ(1u, erased); |
| 2181 } | 2181 } |
| 2182 | 2182 |
| 2183 } // namespace content | 2183 } // namespace content |
| OLD | NEW |