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> |
11 #include <vector> | 11 #include <vector> |
12 | 12 |
13 #include "base/allocator/allocator_extension.h" | 13 #include "base/allocator/allocator_extension.h" |
14 #include "base/command_line.h" | 14 #include "base/command_line.h" |
| 15 #include "base/debug/crash_logging.h" |
15 #include "base/lazy_instance.h" | 16 #include "base/lazy_instance.h" |
16 #include "base/location.h" | 17 #include "base/location.h" |
17 #include "base/logging.h" | 18 #include "base/logging.h" |
18 #include "base/macros.h" | 19 #include "base/macros.h" |
19 #include "base/memory/discardable_memory_allocator.h" | 20 #include "base/memory/discardable_memory_allocator.h" |
20 #include "base/memory/shared_memory.h" | 21 #include "base/memory/shared_memory.h" |
21 #include "base/metrics/field_trial.h" | 22 #include "base/metrics/field_trial.h" |
22 #include "base/metrics/histogram.h" | 23 #include "base/metrics/histogram.h" |
23 #include "base/path_service.h" | 24 #include "base/path_service.h" |
24 #include "base/single_thread_task_runner.h" | 25 #include "base/single_thread_task_runner.h" |
(...skipping 1732 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1757 params.replication_state, compositor_deps, params.widget_params, | 1758 params.replication_state, compositor_deps, params.widget_params, |
1758 params.frame_owner_properties); | 1759 params.frame_owner_properties); |
1759 } | 1760 } |
1760 | 1761 |
1761 void RenderThreadImpl::OnCreateNewFrameProxy( | 1762 void RenderThreadImpl::OnCreateNewFrameProxy( |
1762 int routing_id, | 1763 int routing_id, |
1763 int render_view_routing_id, | 1764 int render_view_routing_id, |
1764 int opener_routing_id, | 1765 int opener_routing_id, |
1765 int parent_routing_id, | 1766 int parent_routing_id, |
1766 const FrameReplicationState& replicated_state) { | 1767 const FrameReplicationState& replicated_state) { |
| 1768 // Debug cases of https://crbug.com/575245. |
| 1769 base::debug::SetCrashKeyValue("newproxy_proxy_id", |
| 1770 base::IntToString(routing_id)); |
| 1771 base::debug::SetCrashKeyValue("newproxy_view_id", |
| 1772 base::IntToString(render_view_routing_id)); |
| 1773 base::debug::SetCrashKeyValue("newproxy_opener_id", |
| 1774 base::IntToString(opener_routing_id)); |
| 1775 base::debug::SetCrashKeyValue("newproxy_parent_id", |
| 1776 base::IntToString(parent_routing_id)); |
1767 RenderFrameProxy::CreateFrameProxy(routing_id, render_view_routing_id, | 1777 RenderFrameProxy::CreateFrameProxy(routing_id, render_view_routing_id, |
1768 opener_routing_id, parent_routing_id, | 1778 opener_routing_id, parent_routing_id, |
1769 replicated_state); | 1779 replicated_state); |
1770 } | 1780 } |
1771 | 1781 |
1772 void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& scheme, | 1782 void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& scheme, |
1773 const std::string& host, | 1783 const std::string& host, |
1774 double zoom_level) { | 1784 double zoom_level) { |
1775 RenderViewZoomer zoomer(scheme, host, zoom_level); | 1785 RenderViewZoomer zoomer(scheme, host, zoom_level); |
1776 RenderView::ForEach(&zoomer); | 1786 RenderView::ForEach(&zoomer); |
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2114 } | 2124 } |
2115 | 2125 |
2116 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 2126 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
2117 size_t erased = | 2127 size_t erased = |
2118 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 2128 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
2119 routing_id_); | 2129 routing_id_); |
2120 DCHECK_EQ(1u, erased); | 2130 DCHECK_EQ(1u, erased); |
2121 } | 2131 } |
2122 | 2132 |
2123 } // namespace content | 2133 } // namespace content |
OLD | NEW |