| 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 <vector> | 10 #include <vector> |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 #include "media/base/media.h" | 133 #include "media/base/media.h" |
| 134 #include "media/renderers/gpu_video_accelerator_factories.h" | 134 #include "media/renderers/gpu_video_accelerator_factories.h" |
| 135 #include "mojo/common/common_type_converters.h" | 135 #include "mojo/common/common_type_converters.h" |
| 136 #include "mojo/public/cpp/bindings/strong_binding.h" | 136 #include "mojo/public/cpp/bindings/strong_binding.h" |
| 137 #include "net/base/net_errors.h" | 137 #include "net/base/net_errors.h" |
| 138 #include "net/base/net_util.h" | 138 #include "net/base/net_util.h" |
| 139 #include "net/base/port_util.h" | 139 #include "net/base/port_util.h" |
| 140 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" | 140 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" |
| 141 #include "skia/ext/event_tracer_impl.h" | 141 #include "skia/ext/event_tracer_impl.h" |
| 142 #include "skia/ext/skia_memory_dump_provider.h" | 142 #include "skia/ext/skia_memory_dump_provider.h" |
| 143 #include "third_party/WebKit/public/platform/Platform.h" |
| 143 #include "third_party/WebKit/public/platform/WebImageGenerator.h" | 144 #include "third_party/WebKit/public/platform/WebImageGenerator.h" |
| 144 #include "third_party/WebKit/public/platform/WebString.h" | 145 #include "third_party/WebKit/public/platform/WebString.h" |
| 145 #include "third_party/WebKit/public/platform/WebThread.h" | 146 #include "third_party/WebKit/public/platform/WebThread.h" |
| 146 #include "third_party/WebKit/public/web/WebCache.h" | 147 #include "third_party/WebKit/public/web/WebCache.h" |
| 147 #include "third_party/WebKit/public/web/WebDatabase.h" | 148 #include "third_party/WebKit/public/web/WebDatabase.h" |
| 148 #include "third_party/WebKit/public/web/WebDocument.h" | 149 #include "third_party/WebKit/public/web/WebDocument.h" |
| 149 #include "third_party/WebKit/public/web/WebFrame.h" | 150 #include "third_party/WebKit/public/web/WebFrame.h" |
| 150 #include "third_party/WebKit/public/web/WebImageCache.h" | 151 #include "third_party/WebKit/public/web/WebImageCache.h" |
| 151 #include "third_party/WebKit/public/web/WebKit.h" | 152 #include "third_party/WebKit/public/web/WebKit.h" |
| 152 #include "third_party/WebKit/public/web/WebMemoryPressureListener.h" | 153 #include "third_party/WebKit/public/web/WebMemoryPressureListener.h" |
| (...skipping 1938 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2091 } | 2092 } |
| 2092 | 2093 |
| 2093 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 2094 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
| 2094 size_t erased = | 2095 size_t erased = |
| 2095 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 2096 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
| 2096 routing_id_); | 2097 routing_id_); |
| 2097 DCHECK_EQ(1u, erased); | 2098 DCHECK_EQ(1u, erased); |
| 2098 } | 2099 } |
| 2099 | 2100 |
| 2100 } // namespace content | 2101 } // namespace content |
| OLD | NEW |