Refactor the way PaintArtifactCompositor is attached and used.

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 13 matching lines @@
 using testing::AnyNumber;
 
 namespace blink {
 namespace {
 
 class MockChromeClient : public EmptyChromeClient {
 public:
     MockChromeClient() : m_hasScheduledAnimation(false) { }
 
     // 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;
 };
 
 typedef bool TestParamRootLayerScrolling;
 class FrameViewTestBase
     : public testing::WithParamInterface<TestParamRootLayerScrolling>
@@ skipping 56 matching lines @@
         m_featuresBackup.restore();
     }
 
 private:
     RuntimeEnabledFeatures::Backup m_featuresBackup;
 };
 
 INSTANTIATE_TEST_CASE_P(All, FrameViewTest, ::testing::Bool());
 INSTANTIATE_TEST_CASE_P(All, FrameViewSlimmingPaintV2Test, ::testing::Bool());
 
-// 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_P(FrameViewSlimmingPaintV2Test, PaintOnce)
-{
-    EXPECT_CALL(chromeClient(), didPaint(_));
-    document().body()->setInnerHTML("Hello world", ASSERT_NO_EXCEPTION);
-    document().view()->updateAllLifecyclePhases();
-}
-
-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_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);
 }
 
@@ skipping 18 matching lines @@
 {
     document().body()->setInnerHTML("<div style='width:1000px;height:1000px'></div>", ASSERT_NO_EXCEPTION);
     document().view()->updateAllLifecyclePhases();
 
     EXPECT_CALL(chromeClient(), setToolTip(String(), _));
     document().view()->layoutViewportScrollableArea()->setScrollPosition(DoublePoint(1, 1), UserScroll);
 }
 
 } // namespace
 } // namespace blink