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/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/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
(...skipping 4208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4219 render_widget_host->WasResized(); | 4219 render_widget_host->WasResized(); |
4220 } | 4220 } |
4221 #endif | 4221 #endif |
4222 | 4222 |
4223 return true; | 4223 return true; |
4224 } | 4224 } |
4225 | 4225 |
4226 bool WebContentsImpl::CreateRenderFrameForRenderManager( | 4226 bool WebContentsImpl::CreateRenderFrameForRenderManager( |
4227 RenderFrameHost* render_frame_host, | 4227 RenderFrameHost* render_frame_host, |
4228 int parent_routing_id, | 4228 int parent_routing_id, |
| 4229 int previous_sibling_routing_id, |
4229 int proxy_routing_id) { | 4230 int proxy_routing_id) { |
4230 TRACE_EVENT0("browser,navigation", | 4231 TRACE_EVENT0("browser,navigation", |
4231 "WebContentsImpl::CreateRenderFrameForRenderManager"); | 4232 "WebContentsImpl::CreateRenderFrameForRenderManager"); |
4232 | 4233 |
4233 RenderFrameHostImpl* rfh = | 4234 RenderFrameHostImpl* rfh = |
4234 static_cast<RenderFrameHostImpl*>(render_frame_host); | 4235 static_cast<RenderFrameHostImpl*>(render_frame_host); |
4235 if (!rfh->CreateRenderFrame(parent_routing_id, proxy_routing_id)) | 4236 if (!rfh->CreateRenderFrame(parent_routing_id, previous_sibling_routing_id, |
| 4237 proxy_routing_id)) |
4236 return false; | 4238 return false; |
4237 | 4239 |
4238 // TODO(nasko): When RenderWidgetHost is owned by RenderFrameHost, the passed | 4240 // TODO(nasko): When RenderWidgetHost is owned by RenderFrameHost, the passed |
4239 // RenderFrameHost will have to be associated with the appropriate | 4241 // RenderFrameHost will have to be associated with the appropriate |
4240 // RenderWidgetHostView or a new one should be created here. | 4242 // RenderWidgetHostView or a new one should be created here. |
4241 | 4243 |
4242 return true; | 4244 return true; |
4243 } | 4245 } |
4244 | 4246 |
4245 #if defined(OS_ANDROID) | 4247 #if defined(OS_ANDROID) |
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4432 node->render_manager()->ResumeResponseDeferredAtStart(); | 4434 node->render_manager()->ResumeResponseDeferredAtStart(); |
4433 } | 4435 } |
4434 | 4436 |
4435 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { | 4437 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { |
4436 force_disable_overscroll_content_ = force_disable; | 4438 force_disable_overscroll_content_ = force_disable; |
4437 if (view_) | 4439 if (view_) |
4438 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); | 4440 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); |
4439 } | 4441 } |
4440 | 4442 |
4441 } // namespace content | 4443 } // namespace content |
OLD | NEW |