| 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 1539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1550 void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& scheme, | 1550 void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& scheme, |
| 1551 const std::string& host, | 1551 const std::string& host, |
| 1552 double zoom_level) { | 1552 double zoom_level) { |
| 1553 RenderViewZoomer zoomer(scheme, host, zoom_level); | 1553 RenderViewZoomer zoomer(scheme, host, zoom_level); |
| 1554 RenderView::ForEach(&zoomer); | 1554 RenderView::ForEach(&zoomer); |
| 1555 } | 1555 } |
| 1556 | 1556 |
| 1557 void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) { | 1557 void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) { |
| 1558 EnsureWebKitInitialized(); | 1558 EnsureWebKitInitialized(); |
| 1559 CompositorDependencies* compositor_deps = this; | 1559 CompositorDependencies* compositor_deps = this; |
| 1560 LOG(ERROR) << "RenderThreadImpl[" << this << "]::OnCreateNewView:" |
| 1561 << " process:" << getpid() |
| 1562 << " routing_id:" << params.view_id; |
| 1563 |
| 1560 // When bringing in render_view, also bring in webkit's glue and jsbindings. | 1564 // When bringing in render_view, also bring in webkit's glue and jsbindings. |
| 1561 RenderViewImpl::Create(params, compositor_deps, false); | 1565 RenderViewImpl::Create(params, compositor_deps, false); |
| 1562 } | 1566 } |
| 1563 | 1567 |
| 1564 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( | 1568 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( |
| 1565 CauseForGpuLaunch cause_for_gpu_launch) { | 1569 CauseForGpuLaunch cause_for_gpu_launch) { |
| 1566 TRACE_EVENT0("gpu", "RenderThreadImpl::EstablishGpuChannelSync"); | 1570 TRACE_EVENT0("gpu", "RenderThreadImpl::EstablishGpuChannelSync"); |
| 1567 | 1571 |
| 1568 if (gpu_channel_.get()) { | 1572 if (gpu_channel_.get()) { |
| 1569 // Do nothing if we already have a GPU channel or are already | 1573 // Do nothing if we already have a GPU channel or are already |
| (...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1822 mojo::InterfaceRequest<mojo::ServiceProvider> services, | 1826 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
| 1823 mojo::ServiceProviderPtr exposed_services) | 1827 mojo::ServiceProviderPtr exposed_services) |
| 1824 : services(services.Pass()), | 1828 : services(services.Pass()), |
| 1825 exposed_services(exposed_services.Pass()) { | 1829 exposed_services(exposed_services.Pass()) { |
| 1826 } | 1830 } |
| 1827 | 1831 |
| 1828 RenderThreadImpl::PendingRenderFrameConnect::~PendingRenderFrameConnect() { | 1832 RenderThreadImpl::PendingRenderFrameConnect::~PendingRenderFrameConnect() { |
| 1829 } | 1833 } |
| 1830 | 1834 |
| 1831 } // namespace content | 1835 } // namespace content |
| OLD | NEW |