| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <cmath> | 9 #include <cmath> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 1260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1271 | 1271 |
| 1272 // Create a proxy in top-level RenderFrameHostManager, pointing to the | 1272 // Create a proxy in top-level RenderFrameHostManager, pointing to the |
| 1273 // SiteInstance of the outer WebContents. The proxy will be used to send | 1273 // SiteInstance of the outer WebContents. The proxy will be used to send |
| 1274 // postMessage to the inner WebContents. | 1274 // postMessage to the inner WebContents. |
| 1275 GetRenderManager()->CreateOuterDelegateProxy( | 1275 GetRenderManager()->CreateOuterDelegateProxy( |
| 1276 outer_contents_frame->GetSiteInstance(), | 1276 outer_contents_frame->GetSiteInstance(), |
| 1277 static_cast<RenderFrameHostImpl*>(outer_contents_frame)); | 1277 static_cast<RenderFrameHostImpl*>(outer_contents_frame)); |
| 1278 | 1278 |
| 1279 GetRenderManager()->SetRWHViewForInnerContents( | 1279 GetRenderManager()->SetRWHViewForInnerContents( |
| 1280 GetRenderManager()->GetRenderWidgetHostView()); | 1280 GetRenderManager()->GetRenderWidgetHostView()); |
| 1281 |
| 1282 static_cast<RenderWidgetHostViewChildFrame*>( |
| 1283 GetRenderManager()->GetRenderWidgetHostView()) |
| 1284 ->RegisterSurfaceNamespaceId(); |
| 1281 } | 1285 } |
| 1282 | 1286 |
| 1283 void WebContentsImpl::Stop() { | 1287 void WebContentsImpl::Stop() { |
| 1284 for (FrameTreeNode* node : frame_tree_.Nodes()) | 1288 for (FrameTreeNode* node : frame_tree_.Nodes()) |
| 1285 node->StopLoading(); | 1289 node->StopLoading(); |
| 1286 FOR_EACH_OBSERVER(WebContentsObserver, observers_, NavigationStopped()); | 1290 FOR_EACH_OBSERVER(WebContentsObserver, observers_, NavigationStopped()); |
| 1287 } | 1291 } |
| 1288 | 1292 |
| 1289 WebContents* WebContentsImpl::Clone() { | 1293 WebContents* WebContentsImpl::Clone() { |
| 1290 // We use our current SiteInstance since the cloned entry will use it anyway. | 1294 // We use our current SiteInstance since the cloned entry will use it anyway. |
| (...skipping 3524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4815 else | 4819 else |
| 4816 WasHidden(); | 4820 WasHidden(); |
| 4817 } | 4821 } |
| 4818 | 4822 |
| 4819 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( | 4823 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( |
| 4820 JavaScriptDialogManager* dialog_manager) { | 4824 JavaScriptDialogManager* dialog_manager) { |
| 4821 dialog_manager_ = dialog_manager; | 4825 dialog_manager_ = dialog_manager; |
| 4822 } | 4826 } |
| 4823 | 4827 |
| 4824 } // namespace content | 4828 } // namespace content |
| OLD | NEW |