Support compositing for active animations in SPv2.

third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 23 matching lines @@
 #include "core/events/KeyboardEvent.h"
 #include "core/frame/EventHandlerRegistry.h"
 #include "core/frame/FrameHost.h"
 #include "core/layout/LayoutObject.h"
 #include "core/page/Page.h"
 #include "platform/PlatformEvent.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/CullRect.h"
 #include "platform/graphics/paint/ForeignLayerDisplayItem.h"
 #include "platform/graphics/paint/PaintController.h"
+#include "platform/testing/RuntimeEnabledFeaturesTestHelpers.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebClipboard.h"
 #include "public/platform/WebCompositorSupport.h"
 #include "public/platform/WebLayer.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/web/WebCache.h"
 #include "public/web/WebDocument.h"
@@ skipping 639 matching lines @@
 
   void destroy() override {
     container()->setWebLayer(nullptr);
     FakeWebPlugin::destroy();
   }
 
  private:
   std::unique_ptr<WebLayer> m_layer;
 };
 
-class ScopedSPv2 {
- public:
-  ScopedSPv2() { RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(true); }
-  ~ScopedSPv2() { m_featuresBackup.restore(); }
-
- private:
-  RuntimeEnabledFeatures::Backup m_featuresBackup;
-};
-
 }  // namespace
 
 TEST_F(WebPluginContainerTest, CompositedPluginSPv2) {
-  ScopedSPv2 enableSPv2;
+  ScopedSlimmingPaintV2ForTest enableSPv2(true);
   URLTestHelpers::registerMockedURLFromBaseURL(
       WebString::fromUTF8(m_baseURL.c_str()),
       WebString::fromUTF8("plugin.html"));
   CustomPluginWebFrameClient<CompositedPlugin> webFrameClient;
   FrameTestHelpers::WebViewHelper webViewHelper;
   WebView* webView = webViewHelper.initializeAndLoad(m_baseURL + "plugin.html",
                                                      true, &webFrameClient);
   ASSERT_TRUE(webView);
   webView->settings()->setPluginsEnabled(true);
   webView->resize(WebSize(800, 600));
@@ skipping 47 matching lines @@
           WebString::fromUTF8("translated-plugin"));
   pluginContainerOneElement.pluginContainer()->setWantsWheelEvents(true);
 
   runPendingTasks();
   EXPECT_TRUE(
       webView->page()->frameHost().eventHandlerRegistry().hasEventHandlers(
           EventHandlerRegistry::WheelEventBlocking));
 }
 
 }  // namespace blink