| 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 1259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1270 | 1270 |
| 1271 // Create a proxy in top-level RenderFrameHostManager, pointing to the | 1271 // Create a proxy in top-level RenderFrameHostManager, pointing to the |
| 1272 // SiteInstance of the outer WebContents. The proxy will be used to send | 1272 // SiteInstance of the outer WebContents. The proxy will be used to send |
| 1273 // postMessage to the inner WebContents. | 1273 // postMessage to the inner WebContents. |
| 1274 GetRenderManager()->CreateOuterDelegateProxy( | 1274 GetRenderManager()->CreateOuterDelegateProxy( |
| 1275 outer_contents_frame->GetSiteInstance(), | 1275 outer_contents_frame->GetSiteInstance(), |
| 1276 static_cast<RenderFrameHostImpl*>(outer_contents_frame)); | 1276 static_cast<RenderFrameHostImpl*>(outer_contents_frame)); |
| 1277 | 1277 |
| 1278 GetRenderManager()->SetRWHViewForInnerContents( | 1278 GetRenderManager()->SetRWHViewForInnerContents( |
| 1279 GetRenderManager()->GetRenderWidgetHostView()); | 1279 GetRenderManager()->GetRenderWidgetHostView()); |
| 1280 |
| 1281 static_cast<RenderWidgetHostViewChildFrame*>( |
| 1282 GetRenderManager()->GetRenderWidgetHostView()) |
| 1283 ->RegisterSurfaceNamespaceId(); |
| 1280 } | 1284 } |
| 1281 | 1285 |
| 1282 void WebContentsImpl::Stop() { | 1286 void WebContentsImpl::Stop() { |
| 1283 for (FrameTreeNode* node : frame_tree_.Nodes()) | 1287 for (FrameTreeNode* node : frame_tree_.Nodes()) |
| 1284 node->StopLoading(); | 1288 node->StopLoading(); |
| 1285 FOR_EACH_OBSERVER(WebContentsObserver, observers_, NavigationStopped()); | 1289 FOR_EACH_OBSERVER(WebContentsObserver, observers_, NavigationStopped()); |
| 1286 } | 1290 } |
| 1287 | 1291 |
| 1288 WebContents* WebContentsImpl::Clone() { | 1292 WebContents* WebContentsImpl::Clone() { |
| 1289 // We use our current SiteInstance since the cloned entry will use it anyway. | 1293 // We use our current SiteInstance since the cloned entry will use it anyway. |
| (...skipping 3498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4788 const WebContentsObserver::MediaPlayerId& id) { | 4792 const WebContentsObserver::MediaPlayerId& id) { |
| 4789 FOR_EACH_OBSERVER(WebContentsObserver, observers_, MediaStoppedPlaying(id)); | 4793 FOR_EACH_OBSERVER(WebContentsObserver, observers_, MediaStoppedPlaying(id)); |
| 4790 } | 4794 } |
| 4791 | 4795 |
| 4792 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( | 4796 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( |
| 4793 JavaScriptDialogManager* dialog_manager) { | 4797 JavaScriptDialogManager* dialog_manager) { |
| 4794 dialog_manager_ = dialog_manager; | 4798 dialog_manager_ = dialog_manager; |
| 4795 } | 4799 } |
| 4796 | 4800 |
| 4797 } // namespace content | 4801 } // namespace content |
| OLD | NEW |