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 1282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1293 IPC_MESSAGE_HANDLER(ViewMsg_UpdateScrollbarTheme, OnUpdateScrollbarTheme) | 1293 IPC_MESSAGE_HANDLER(ViewMsg_UpdateScrollbarTheme, OnUpdateScrollbarTheme) |
1294 #endif | 1294 #endif |
1295 #if defined(ENABLE_PLUGINS) | 1295 #if defined(ENABLE_PLUGINS) |
1296 IPC_MESSAGE_HANDLER(ViewMsg_PurgePluginListCache, OnPurgePluginListCache) | 1296 IPC_MESSAGE_HANDLER(ViewMsg_PurgePluginListCache, OnPurgePluginListCache) |
1297 #endif | 1297 #endif |
1298 IPC_MESSAGE_UNHANDLED(handled = false) | 1298 IPC_MESSAGE_UNHANDLED(handled = false) |
1299 IPC_END_MESSAGE_MAP() | 1299 IPC_END_MESSAGE_MAP() |
1300 return handled; | 1300 return handled; |
1301 } | 1301 } |
1302 | 1302 |
1303 void RenderThreadImpl::OnCreateNewFrame(int routing_id, int parent_routing_id) { | 1303 void RenderThreadImpl::OnCreateNewFrame(int routing_id, |
1304 RenderFrameImpl::CreateFrame(routing_id, parent_routing_id); | 1304 int parent_routing_id, |
| 1305 int proxy_routing_id) { |
| 1306 RenderFrameImpl::CreateFrame(routing_id, parent_routing_id, proxy_routing_id); |
1305 } | 1307 } |
1306 | 1308 |
1307 void RenderThreadImpl::OnCreateNewFrameProxy(int routing_id, | 1309 void RenderThreadImpl::OnCreateNewFrameProxy(int routing_id, |
1308 int parent_routing_id, | 1310 int parent_routing_id, |
1309 int render_view_routing_id) { | 1311 int render_view_routing_id) { |
1310 RenderFrameProxy::CreateFrameProxy( | 1312 RenderFrameProxy::CreateFrameProxy( |
1311 routing_id, parent_routing_id, render_view_routing_id); | 1313 routing_id, parent_routing_id, render_view_routing_id); |
1312 } | 1314 } |
1313 | 1315 |
1314 void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& scheme, | 1316 void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& scheme, |
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1584 hidden_widget_count_--; | 1586 hidden_widget_count_--; |
1585 | 1587 |
1586 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { | 1588 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { |
1587 return; | 1589 return; |
1588 } | 1590 } |
1589 | 1591 |
1590 ScheduleIdleHandler(kLongIdleHandlerDelayMs); | 1592 ScheduleIdleHandler(kLongIdleHandlerDelayMs); |
1591 } | 1593 } |
1592 | 1594 |
1593 } // namespace content | 1595 } // namespace content |
OLD | NEW |