diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/core/page/scrolling/root_scroller_test.cc')
| -rw-r--r-- | chromium/third_party/blink/renderer/core/page/scrolling/root_scroller_test.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/chromium/third_party/blink/renderer/core/page/scrolling/root_scroller_test.cc b/chromium/third_party/blink/renderer/core/page/scrolling/root_scroller_test.cc index b9b2d608815..15c6c3b6d56 100644 --- a/chromium/third_party/blink/renderer/core/page/scrolling/root_scroller_test.cc +++ b/chromium/third_party/blink/renderer/core/page/scrolling/root_scroller_test.cc @@ -11,8 +11,8 @@ #include "third_party/blink/public/web/web_remote_frame.h" #include "third_party/blink/public/web/web_script_source.h" #include "third_party/blink/public/web/web_settings.h" -#include "third_party/blink/renderer/bindings/core/v8/node_or_string_or_trusted_script.h" #include "third_party/blink/renderer/bindings/core/v8/v8_union_node_string_trustedscript.h" +#include "third_party/blink/renderer/core/css/css_style_declaration.h" #include "third_party/blink/renderer/core/frame/browser_controls.h" #include "third_party/blink/renderer/core/frame/dom_visual_viewport.h" #include "third_party/blink/renderer/core/frame/frame_test_helpers.h" @@ -218,14 +218,9 @@ TEST_F(RootScrollerTest, defaultEffectiveRootScrollerIsDocumentNode) { // Replace the documentElement with the iframe. The effectiveRootScroller // should remain the same. -#if defined(USE_BLINK_V8_BINDING_NEW_IDL_UNION) HeapVector<Member<V8UnionNodeOrStringOrTrustedScript>> nodes; nodes.push_back( MakeGarbageCollected<V8UnionNodeOrStringOrTrustedScript>(iframe)); -#else // defined(USE_BLINK_V8_BINDING_NEW_IDL_UNION) - HeapVector<NodeOrStringOrTrustedScript> nodes; - nodes.push_back(NodeOrStringOrTrustedScript::FromNode(iframe)); -#endif // defined(USE_BLINK_V8_BINDING_NEW_IDL_UNION) document->documentElement()->ReplaceWith(nodes, ASSERT_NO_EXCEPTION); UpdateAllLifecyclePhases(MainFrameView()); @@ -2854,7 +2849,7 @@ class RootScrollerHitTest : public ImplicitRootScrollerSimTest { .GlobalRootScroller(); ScrollableArea* scrollable_area = To<LayoutBox>(scroller->GetLayoutObject())->GetScrollableArea(); - scrollable_area->DidScroll(FloatPoint(0, 100000)); + scrollable_area->DidCompositorScroll(FloatPoint(0, 100000)); WebView().ResizeWithBrowserControls(gfx::Size(400, 450), 50, 50, false); |