| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "bindings/core/v8/NodeOrString.h" | 5 #include "bindings/core/v8/NodeOrString.h" |
| 6 #include "core/dom/ClientRect.h" | 6 #include "core/dom/ClientRect.h" |
| 7 #include "core/frame/BrowserControls.h" | 7 #include "core/frame/BrowserControls.h" |
| 8 #include "core/frame/FrameView.h" | 8 #include "core/frame/FrameView.h" |
| 9 #include "core/frame/RootFrameViewport.h" | 9 #include "core/frame/RootFrameViewport.h" |
| 10 #include "core/frame/VisualViewport.h" | 10 #include "core/frame/VisualViewport.h" |
| (...skipping 659 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 670 } | 670 } |
| 671 | 671 |
| 672 // Do a basic sanity check that the scrolling and root scroller machinery | 672 // Do a basic sanity check that the scrolling and root scroller machinery |
| 673 // doesn't fail catastrophically in site isolation when the main frame is | 673 // doesn't fail catastrophically in site isolation when the main frame is |
| 674 // remote. Setting a root scroller in OOPIF isn't implemented yet but we should | 674 // remote. Setting a root scroller in OOPIF isn't implemented yet but we should |
| 675 // still scroll as before and not crash. | 675 // still scroll as before and not crash. |
| 676 TEST_F(RootScrollerTest, RemoteMainFrame) { | 676 TEST_F(RootScrollerTest, RemoteMainFrame) { |
| 677 FrameTestHelpers::TestWebRemoteFrameClient remote_client; | 677 FrameTestHelpers::TestWebRemoteFrameClient remote_client; |
| 678 FrameTestHelpers::TestWebWidgetClient web_widget_client; | 678 FrameTestHelpers::TestWebWidgetClient web_widget_client; |
| 679 WebFrameWidget* widget; | 679 WebFrameWidget* widget; |
| 680 WebLocalFrameImpl* local_frame; | 680 WebLocalFrameBase* local_frame; |
| 681 | 681 |
| 682 Initialize("root-scroller-iframe.html"); | 682 Initialize("root-scroller-iframe.html"); |
| 683 | 683 |
| 684 // Initialization: Set the main frame to be a RemoteFrame and add a local | 684 // Initialization: Set the main frame to be a RemoteFrame and add a local |
| 685 // child. | 685 // child. |
| 686 { | 686 { |
| 687 GetWebView()->SetMainFrame(remote_client.GetFrame()); | 687 GetWebView()->SetMainFrame(remote_client.GetFrame()); |
| 688 WebRemoteFrame* root = GetWebView()->MainFrame()->ToWebRemoteFrame(); | 688 WebRemoteFrame* root = GetWebView()->MainFrame()->ToWebRemoteFrame(); |
| 689 root->SetReplicatedOrigin(SecurityOrigin::CreateUnique()); | 689 root->SetReplicatedOrigin(SecurityOrigin::CreateUnique()); |
| 690 WebFrameOwnerProperties properties; | 690 WebFrameOwnerProperties properties; |
| (...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1135 // Ensure the target and container weren't put into the same layer. | 1135 // Ensure the target and container weren't put into the same layer. |
| 1136 ASSERT_NE(ToLayoutBox(target->GetLayoutObject())->EnclosingLayer(), | 1136 ASSERT_NE(ToLayoutBox(target->GetLayoutObject())->EnclosingLayer(), |
| 1137 ToLayoutBox(container->GetLayoutObject())->Layer()); | 1137 ToLayoutBox(container->GetLayoutObject())->Layer()); |
| 1138 | 1138 |
| 1139 CheckHitTestAtBottomOfScreen(); | 1139 CheckHitTestAtBottomOfScreen(); |
| 1140 } | 1140 } |
| 1141 | 1141 |
| 1142 } // namespace | 1142 } // namespace |
| 1143 | 1143 |
| 1144 } // namespace blink | 1144 } // namespace blink |
| OLD | NEW |