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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 577793002: Replace missing call to RenderFrameHostImpl::Init(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 1719 matching lines...) Expand 10 before | Expand all | Expand 10 after
1730 RemoveDestructionObserver(new_contents); 1730 RemoveDestructionObserver(new_contents);
1731 1731
1732 // Don't initialize the guest WebContents immediately. 1732 // Don't initialize the guest WebContents immediately.
1733 if (BrowserPluginGuest::IsGuest(new_contents)) 1733 if (BrowserPluginGuest::IsGuest(new_contents))
1734 return new_contents; 1734 return new_contents;
1735 1735
1736 if (!new_contents->GetRenderProcessHost()->HasConnection() || 1736 if (!new_contents->GetRenderProcessHost()->HasConnection() ||
1737 !new_contents->GetRenderViewHost()->GetView()) 1737 !new_contents->GetRenderViewHost()->GetView())
1738 return NULL; 1738 return NULL;
1739 1739
1740 // Resume blocked requests for both the RenderViewHost and RenderFrameHost.
1740 // TODO(brettw): It seems bogus to reach into here and initialize the host. 1741 // TODO(brettw): It seems bogus to reach into here and initialize the host.
1741 static_cast<RenderViewHostImpl*>(new_contents->GetRenderViewHost())->Init(); 1742 static_cast<RenderViewHostImpl*>(new_contents->GetRenderViewHost())->Init();
1743 static_cast<RenderFrameHostImpl*>(new_contents->GetMainFrame())->Init();
1744
1742 return new_contents; 1745 return new_contents;
1743 } 1746 }
1744 1747
1745 RenderWidgetHostView* WebContentsImpl::GetCreatedWidget(int route_id) { 1748 RenderWidgetHostView* WebContentsImpl::GetCreatedWidget(int route_id) {
1746 PendingWidgetViews::iterator iter = pending_widget_views_.find(route_id); 1749 PendingWidgetViews::iterator iter = pending_widget_views_.find(route_id);
1747 if (iter == pending_widget_views_.end()) { 1750 if (iter == pending_widget_views_.end()) {
1748 DCHECK(false); 1751 DCHECK(false);
1749 return NULL; 1752 return NULL;
1750 } 1753 }
1751 1754
(...skipping 2593 matching lines...) Expand 10 before | Expand all | Expand 10 after
4345 node->render_manager()->ResumeResponseDeferredAtStart(); 4348 node->render_manager()->ResumeResponseDeferredAtStart();
4346 } 4349 }
4347 4350
4348 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4351 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4349 force_disable_overscroll_content_ = force_disable; 4352 force_disable_overscroll_content_ = force_disable;
4350 if (view_) 4353 if (view_)
4351 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4354 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4352 } 4355 }
4353 4356
4354 } // namespace content 4357 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698