Candidate fix for PointerEvent-OOPIF combination not working.

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

 /*
  * Copyright (C) 2013 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 45 matching lines @@
 #include "public/web/WebWidgetClient.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "web/WebFrameImplBase.h"
 #include "web/WebViewImpl.h"
 #include "web/tests/FrameTestHelpers.h"
 
 using blink::testing::runPendingTasks;
 
 namespace blink {
 
-class TouchActionTrackingWebViewClient
-    : public FrameTestHelpers::TestWebViewClient {
+class TouchActionTrackingWebWidgetClient
+    : public FrameTestHelpers::TestWebWidgetClient {
  public:
-  TouchActionTrackingWebViewClient()
+  TouchActionTrackingWebWidgetClient()
       : m_actionSetCount(0), m_action(WebTouchActionAuto) {}
 
   // WebWidgetClient methods
   void setTouchAction(WebTouchAction touchAction) override {
     m_actionSetCount++;
     m_action = touchAction;
   }
 
   // Local methods
   void reset() {
@@ skipping 26 matching lines @@
   void TearDown() override {
     Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
     WebCache::clear();
   }
 
  protected:
   void runTouchActionTest(std::string file);
   void runShadowDOMTest(std::string file);
   void runIFrameTest(std::string file);
   void sendTouchEvent(WebView*, WebInputEvent::Type, IntPoint clientPoint);
-  WebView* setupTest(std::string file, TouchActionTrackingWebViewClient&);
+  WebView* setupTest(std::string file, TouchActionTrackingWebWidgetClient&);
   void runTestOnTree(ContainerNode* root,
                      WebView*,
-                     TouchActionTrackingWebViewClient&);
+                     TouchActionTrackingWebWidgetClient&);
 
   std::string m_baseURL;
   FrameTestHelpers::WebViewHelper m_webViewHelper;
 };
 
 void TouchActionTest::runTouchActionTest(std::string file) {
-  TouchActionTrackingWebViewClient client;
+  TouchActionTrackingWebWidgetClient client;
 
   // runTouchActionTest() loads a document in a frame, setting up a
   // nested message loop. Should any Oilpan GC happen while it is in
   // effect, the implicit assumption that we're outside any event
   // loop (=> there being no pointers on the stack needing scanning)
   // when that GC strikes will no longer hold.
   //
   // To ensure that the references on the stack are also traced, we
   // turn them into persistent, stack allocated references. This
   // workaround is sufficient to handle this artificial test
   // scenario.
   WebView* webView = setupTest(file, client);
 
   Persistent<Document> document =
       static_cast<Document*>(webView->mainFrame()->document());
   runTestOnTree(document.get(), webView, client);
 
   // Explicitly reset to break dependency on locally scoped client.
   m_webViewHelper.reset();
 }
 
 void TouchActionTest::runShadowDOMTest(std::string file) {
-  TouchActionTrackingWebViewClient client;
+  TouchActionTrackingWebWidgetClient client;
 
   WebView* webView = setupTest(file, client);
 
   DummyExceptionStateForTesting es;
 
   // Oilpan: see runTouchActionTest() comment why these are persistent
   // references.
   Persistent<Document> document =
       static_cast<Document*>(webView->mainFrame()->document());
   Persistent<StaticElementList> hostNodes =
       document->querySelectorAll("[shadow-host]", es);
   ASSERT_FALSE(es.hadException());
   ASSERT_GE(hostNodes->length(), 1u);
 
   for (unsigned index = 0; index < hostNodes->length(); index++) {
     ShadowRoot* shadowRoot = hostNodes->item(index)->openShadowRoot();
     runTestOnTree(shadowRoot, webView, client);
   }
 
   // Projections show up in the main document.
   runTestOnTree(document.get(), webView, client);
 
   // Explicitly reset to break dependency on locally scoped client.
   m_webViewHelper.reset();
 }
 
 void TouchActionTest::runIFrameTest(std::string file) {
-  TouchActionTrackingWebViewClient client;
+  TouchActionTrackingWebWidgetClient client;
 
   WebView* webView = setupTest(file, client);
   WebFrame* curFrame = webView->mainFrame()->firstChild();
   ASSERT_TRUE(curFrame);
 
   for (; curFrame; curFrame = curFrame->nextSibling()) {
     // Oilpan: see runTouchActionTest() comment why these are persistent
     // references.
     Persistent<Document> contentDoc =
         static_cast<Document*>(curFrame->document());
     runTestOnTree(contentDoc.get(), webView, client);
   }
 
   // Explicitly reset to break dependency on locally scoped client.
   m_webViewHelper.reset();
 }
 
-WebView* TouchActionTest::setupTest(std::string file,
-                                    TouchActionTrackingWebViewClient& client) {
+WebView* TouchActionTest::setupTest(
+    std::string file,
+    TouchActionTrackingWebWidgetClient& client) {
   URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL),
                                                WebString::fromUTF8(file));
   // Note that JavaScript must be enabled for shadow DOM tests.
   WebView* webView =
-      m_webViewHelper.initializeAndLoad(m_baseURL + file, true, 0, &client);
+      m_webViewHelper.initializeAndLoad(m_baseURL + file, true, 0, 0, &client);
 
   // Set size to enable hit testing, and avoid line wrapping for consistency
   // with browser.
   webView->resize(WebSize(800, 1200));
 
   // Scroll to verify the code properly transforms windows to client co-ords.
   const int kScrollOffset = 100;
   Document* document = static_cast<Document*>(webView->mainFrame()->document());
   document->frame()->view()->layoutViewportScrollableArea()->setScrollOffset(
       ScrollOffset(0, kScrollOffset), ProgrammaticScroll);
 
   return webView;
 }
 
 IntRect windowClipRect(const FrameView& frameView) {
   LayoutRect clipRect(
       LayoutPoint(),
       LayoutSize(frameView.visibleContentSize(ExcludeScrollbars)));
   frameView.layoutViewItem().mapToVisualRectInAncestorSpace(
       &frameView.layoutView()->containerForPaintInvalidation(), clipRect);
   return enclosingIntRect(clipRect);
 }
 
-void TouchActionTest::runTestOnTree(ContainerNode* root,
-                                    WebView* webView,
-                                    TouchActionTrackingWebViewClient& client) {
+void TouchActionTest::runTestOnTree(
+    ContainerNode* root,
+    WebView* webView,
+    TouchActionTrackingWebWidgetClient& client) {
   // Find all elements to test the touch-action of in the document.
   DummyExceptionStateForTesting es;
 
   // Oilpan: see runTouchActionTest() comment why these are persistent
   // references.
   Persistent<StaticElementList> elements =
       root->querySelectorAll("[expected-action]", es);
   ASSERT_FALSE(es.hadException());
 
   for (unsigned index = 0; index < elements->length(); index++) {
@@ skipping 168 matching lines @@
 
 TEST_F(TouchActionTest, ShadowDOM) {
   runShadowDOMTest("touch-action-shadow-dom.html");
 }
 
 TEST_F(TouchActionTest, Pan) {
   runTouchActionTest("touch-action-pan.html");
 }
 
 }  // namespace blink