Dismiss tooltip on all scrolls, not just frame scrolls.

third_party/WebKit/Source/core/frame/FrameViewTest.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/frame/FrameView.h"
 
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLElement.h"
 #include "core/layout/LayoutObject.h"
@@ skipping 20 matching lines @@
 
     // ChromeClient
     MOCK_METHOD1(didPaint, void(const PaintArtifact&));
     MOCK_METHOD2(attachRootGraphicsLayer, void(GraphicsLayer*, LocalFrame* localRoot));
     MOCK_METHOD2(setToolTip, void(const String&, TextDirection));
 
     void scheduleAnimation(Widget*) override { m_hasScheduledAnimation = true; }
     bool m_hasScheduledAnimation;
 };
 
-class FrameViewTestBase : public testing::Test {
+class FrameViewTestBase
+    : public testing::Test
+    , public testing::WithParamInterface<FrameSettingOverrideFunction> {
 protected:
     FrameViewTestBase()
         : m_chromeClient(new MockChromeClient)
     { }
 
     ~FrameViewTestBase()
     {
         testing::Mock::VerifyAndClearExpectations(&chromeClient());
     }
 
     void SetUp() override
     {
         Page::PageClients clients;
         fillWithEmptyClients(clients);
         clients.chromeClient = m_chromeClient.get();
         m_pageHolder = DummyPageHolder::create(IntSize(800, 600), &clients);
         m_pageHolder->page().settings().setAcceleratedCompositingEnabled(true);
+        if (GetParam())
+            (*GetParam())(m_pageHolder->page().settings());
     }
 
     Document& document() { return m_pageHolder->document(); }
     MockChromeClient& chromeClient() { return *m_chromeClient; }
 
 private:
     Persistent<MockChromeClient> m_chromeClient;
     std::unique_ptr<DummyPageHolder> m_pageHolder;
 };
 
@@ skipping 24 matching lines @@
 
     void TearDown() override
     {
         m_featuresBackup.restore();
     }
 
 private:
     RuntimeEnabledFeatures::Backup m_featuresBackup;
 };
 
+INSTANTIATE_TEST_CASE_P(All, FrameViewTest, ::testing::Values(
+    nullptr,
+    &RootLayerScrollsFrameSettingOverride));
+
+INSTANTIATE_TEST_CASE_P(All, FrameViewSlimmingPaintV2Test, ::testing::Values(
+    nullptr,
+    &RootLayerScrollsFrameSettingOverride));

[tdresser, 2016/08/08 13:15:44]

Aren't these two instantiations identical?

[szager1, 2016/08/08 18:12:34]

No, the first one ("nullptr") will not apply any overrides.

[tdresser, 2016/08/08 18:21:28]

Whoops, sorry, I was forgetting how INSTANTIATE_TEST_CASE_P works.

+
 // These tests ensure that FrameView informs the ChromeClient of changes to the
 // paint artifact so that they can be shown to the user (e.g. via the
 // compositor).
-TEST_F(FrameViewSlimmingPaintV2Test, PaintOnce)
+TEST_P(FrameViewSlimmingPaintV2Test, PaintOnce)
 {
     EXPECT_CALL(chromeClient(), didPaint(_));
     document().body()->setInnerHTML("Hello world", ASSERT_NO_EXCEPTION);
     document().view()->updateAllLifecyclePhases();
 }
 
-TEST_F(FrameViewSlimmingPaintV2Test, PaintAndRepaint)
+TEST_P(FrameViewSlimmingPaintV2Test, PaintAndRepaint)
 {
     EXPECT_CALL(chromeClient(), didPaint(_)).Times(2);
     document().body()->setInnerHTML("Hello", ASSERT_NO_EXCEPTION);
     document().view()->updateAllLifecyclePhases();
     document().body()->setInnerHTML("Hello world", ASSERT_NO_EXCEPTION);
     document().view()->updateAllLifecyclePhases();
 }
 
-TEST_F(FrameViewTest, SetPaintInvalidationDuringUpdateAllLifecyclePhases)
+TEST_P(FrameViewTest, SetPaintInvalidationDuringUpdateAllLifecyclePhases)
 {
     document().body()->setInnerHTML("<div id='a' style='color: blue'>A</div>", ASSERT_NO_EXCEPTION);
     document().view()->updateAllLifecyclePhases();
     document().getElementById("a")->setAttribute(HTMLNames::styleAttr, "color: green");
     chromeClient().m_hasScheduledAnimation = false;
     document().view()->updateAllLifecyclePhases();
     EXPECT_FALSE(chromeClient().m_hasScheduledAnimation);
 }
 
-TEST_F(FrameViewTest, SetPaintInvalidationOutOfUpdateAllLifecyclePhases)
+TEST_P(FrameViewTest, SetPaintInvalidationOutOfUpdateAllLifecyclePhases)
 {
     document().body()->setInnerHTML("<div id='a' style='color: blue'>A</div>", ASSERT_NO_EXCEPTION);
     document().view()->updateAllLifecyclePhases();
     chromeClient().m_hasScheduledAnimation = false;
     document().getElementById("a")->layoutObject()->setShouldDoFullPaintInvalidation();
     EXPECT_TRUE(chromeClient().m_hasScheduledAnimation);
     chromeClient().m_hasScheduledAnimation = false;
     document().getElementById("a")->layoutObject()->setShouldDoFullPaintInvalidation();
     EXPECT_TRUE(chromeClient().m_hasScheduledAnimation);
     chromeClient().m_hasScheduledAnimation = false;
     document().view()->updateAllLifecyclePhases();
     EXPECT_FALSE(chromeClient().m_hasScheduledAnimation);
 }
 
 // If we don't hide the tooltip on scroll, it can negatively impact scrolling
 // performance. See crbug.com/586852 for details.
-TEST_F(FrameViewTest, HideTooltipWhenScrollPositionChanges)
+TEST_P(FrameViewTest, HideTooltipWhenScrollPositionChanges)
 {
     document().body()->setInnerHTML("<div style='width:1000px;height:1000px'></div>", ASSERT_NO_EXCEPTION);
     document().view()->updateAllLifecyclePhases();
 
     EXPECT_CALL(chromeClient(), setToolTip(String(), _));
-    document().view()->setScrollPosition(DoublePoint(1, 1), UserScroll);
+    document().view()->layoutViewportScrollableArea()->setScrollPosition(DoublePoint(1, 1), UserScroll);
 }
 
 } // namespace
 } // namespace blink