Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 1245863003: Initialize CompositorDependencies in RenderWidget's constructor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1709 matching lines...) Expand 10 before | Expand all | Expand 10 after
1720 const std::string& host, 1720 const std::string& host,
1721 double zoom_level) { 1721 double zoom_level) {
1722 RenderViewZoomer zoomer(scheme, host, zoom_level); 1722 RenderViewZoomer zoomer(scheme, host, zoom_level);
1723 RenderView::ForEach(&zoomer); 1723 RenderView::ForEach(&zoomer);
1724 } 1724 }
1725 1725
1726 void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) { 1726 void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) {
1727 EnsureWebKitInitialized(); 1727 EnsureWebKitInitialized();
1728 CompositorDependencies* compositor_deps = this; 1728 CompositorDependencies* compositor_deps = this;
1729 // When bringing in render_view, also bring in webkit's glue and jsbindings. 1729 // When bringing in render_view, also bring in webkit's glue and jsbindings.
1730 RenderViewImpl::Create(params, compositor_deps, false); 1730 RenderViewImpl::Create(compositor_deps, params, false);
1731 } 1731 }
1732 1732
1733 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( 1733 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync(
1734 CauseForGpuLaunch cause_for_gpu_launch) { 1734 CauseForGpuLaunch cause_for_gpu_launch) {
1735 TRACE_EVENT0("gpu", "RenderThreadImpl::EstablishGpuChannelSync"); 1735 TRACE_EVENT0("gpu", "RenderThreadImpl::EstablishGpuChannelSync");
1736 1736
1737 if (gpu_channel_.get()) { 1737 if (gpu_channel_.get()) {
1738 // Do nothing if we already have a GPU channel or are already 1738 // Do nothing if we already have a GPU channel or are already
1739 // establishing one. 1739 // establishing one.
1740 if (!gpu_channel_->IsLost()) 1740 if (!gpu_channel_->IsLost())
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
2035 } 2035 }
2036 2036
2037 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { 2037 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
2038 size_t erased = 2038 size_t erased =
2039 RenderThreadImpl::current()->pending_render_frame_connects_.erase( 2039 RenderThreadImpl::current()->pending_render_frame_connects_.erase(
2040 routing_id_); 2040 routing_id_);
2041 DCHECK_EQ(1u, erased); 2041 DCHECK_EQ(1u, erased);
2042 } 2042 }
2043 2043
2044 } // namespace content 2044 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698