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 "core/frame/FrameHost.h" | 5 #include "core/frame/FrameHost.h" |
6 #include "core/frame/FrameView.h" | 6 #include "core/frame/FrameView.h" |
7 #include "core/frame/TopControls.h" | 7 #include "core/frame/TopControls.h" |
8 #include "core/html/HTMLFrameOwnerElement.h" | 8 #include "core/html/HTMLFrameOwnerElement.h" |
9 #include "core/page/Page.h" | 9 #include "core/page/Page.h" |
10 #include "core/page/scrolling/RootScrollerController.h" | 10 #include "core/page/scrolling/RootScrollerController.h" |
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
589 } | 589 } |
590 } | 590 } |
591 | 591 |
592 TEST_F(RootScrollerTest, TestSetRootScrollerCausesViewportLayerChange) | 592 TEST_F(RootScrollerTest, TestSetRootScrollerCausesViewportLayerChange) |
593 { | 593 { |
594 // TODO(bokan): Need a test that changing root scrollers actually sets the | 594 // TODO(bokan): Need a test that changing root scrollers actually sets the |
595 // outer viewport layer on the compositor, even in the absence of other | 595 // outer viewport layer on the compositor, even in the absence of other |
596 // compositing changes. crbug.com/505516 | 596 // compositing changes. crbug.com/505516 |
597 } | 597 } |
598 | 598 |
599 | |
chrishtr
2016/09/01 23:42:57
spurious
bokan
2016/09/09 00:19:02
Done.
| |
600 // Tests that trying to set an element as the root scroller of a document inside | 599 // Tests that trying to set an element as the root scroller of a document inside |
601 // an iframe fails when that element belongs to the parent document. | 600 // an iframe fails when that element belongs to the parent document. |
602 // TODO(bokan): Recent changes mean this is now possible but should be fixed. | 601 // TODO(bokan): Recent changes mean this is now possible but should be fixed. |
603 TEST_F(RootScrollerTest, DISABLED_TestSetRootScrollerOnElementFromOutsideIframe) | 602 TEST_F(RootScrollerTest, DISABLED_TestSetRootScrollerOnElementFromOutsideIframe) |
604 { | 603 { |
605 initialize("root-scroller-iframe.html"); | 604 initialize("root-scroller-iframe.html"); |
606 | 605 |
607 ASSERT_EQ(nullptr, mainFrame()->document()->rootScroller()); | 606 ASSERT_EQ(nullptr, mainFrame()->document()->rootScroller()); |
608 { | 607 { |
609 // Try to set the the root scroller of the child document to be the | 608 // Try to set the the root scroller of the child document to be the |
(...skipping 19 matching lines...) Expand all Loading... | |
629 body, | 628 body, |
630 exceptionState); | 629 exceptionState); |
631 | 630 |
632 ASSERT_EQ(body, iframe->contentDocument()->rootScroller()); | 631 ASSERT_EQ(body, iframe->contentDocument()->rootScroller()); |
633 } | 632 } |
634 } | 633 } |
635 | 634 |
636 } // namespace | 635 } // namespace |
637 | 636 |
638 } // namespace blink | 637 } // namespace blink |
OLD | NEW |