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 1276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1287 IPC_MESSAGE_HANDLER(ViewMsg_UpdateScrollbarTheme, OnUpdateScrollbarTheme) | 1287 IPC_MESSAGE_HANDLER(ViewMsg_UpdateScrollbarTheme, OnUpdateScrollbarTheme) |
1288 #endif | 1288 #endif |
1289 #if defined(ENABLE_PLUGINS) | 1289 #if defined(ENABLE_PLUGINS) |
1290 IPC_MESSAGE_HANDLER(ViewMsg_PurgePluginListCache, OnPurgePluginListCache) | 1290 IPC_MESSAGE_HANDLER(ViewMsg_PurgePluginListCache, OnPurgePluginListCache) |
1291 #endif | 1291 #endif |
1292 IPC_MESSAGE_UNHANDLED(handled = false) | 1292 IPC_MESSAGE_UNHANDLED(handled = false) |
1293 IPC_END_MESSAGE_MAP() | 1293 IPC_END_MESSAGE_MAP() |
1294 return handled; | 1294 return handled; |
1295 } | 1295 } |
1296 | 1296 |
1297 void RenderThreadImpl::OnCreateNewFrame(int routing_id, int parent_routing_id) { | 1297 void RenderThreadImpl::OnCreateNewFrame(int routing_id, |
1298 RenderFrameImpl::CreateFrame(routing_id, parent_routing_id); | 1298 int parent_routing_id, |
| 1299 int proxy_routing_id) { |
| 1300 RenderFrameImpl::CreateFrame(routing_id, parent_routing_id, proxy_routing_id); |
1299 } | 1301 } |
1300 | 1302 |
1301 void RenderThreadImpl::OnCreateNewFrameProxy(int routing_id, | 1303 void RenderThreadImpl::OnCreateNewFrameProxy(int routing_id, |
1302 int parent_routing_id, | 1304 int parent_routing_id, |
1303 int render_view_routing_id) { | 1305 int render_view_routing_id) { |
1304 RenderFrameProxy::CreateFrameProxy( | 1306 RenderFrameProxy::CreateFrameProxy( |
1305 routing_id, parent_routing_id, render_view_routing_id); | 1307 routing_id, parent_routing_id, render_view_routing_id); |
1306 } | 1308 } |
1307 | 1309 |
1308 void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& scheme, | 1310 void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& scheme, |
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1578 hidden_widget_count_--; | 1580 hidden_widget_count_--; |
1579 | 1581 |
1580 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { | 1582 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { |
1581 return; | 1583 return; |
1582 } | 1584 } |
1583 | 1585 |
1584 ScheduleIdleHandler(kLongIdleHandlerDelayMs); | 1586 ScheduleIdleHandler(kLongIdleHandlerDelayMs); |
1585 } | 1587 } |
1586 | 1588 |
1587 } // namespace content | 1589 } // namespace content |
OLD | NEW |