Get rid of Quick's TestSupport API

- Moved TestInputContext and TestInputEvent APIs to tst_qmltests.
- Removed loadVisuallyCommitted and use Item.grabToImage to check if
  page is rendered.
- Removed windowCloseRejected signal and use a hidden callback instead.

Pick-to: 6.2
Change-Id: Ica6e4c6017426e0171d738a6a59afa557c786698
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

7 files changed, 0 insertions, 27 deletions

diff --git a/src/core/api/qwebenginepage_p.h b/src/core/api/qwebenginepage_p.h
index 811bec52e..d661fd442 100644
--- a/src/core/api/qwebenginepage_p.h
+++ b/src/core/api/qwebenginepage_p.h
@@ -134,7 +134,6 @@ public:
     QColor backgroundColor() const override;
     void loadStarted(QWebEngineLoadingInfo info) override;
     void loadCommitted() override { }
-    void didFirstVisuallyNonEmptyPaint() override { }
     void loadFinished(QWebEngineLoadingInfo info) override;
     void focusContainer() override;
     void unhandledKeyEvent(QKeyEvent *event) override;
diff --git a/src/core/common/qt_messages.h b/src/core/common/qt_messages.h
index ebf49e8c3..ef7ba7f8d 100644
--- a/src/core/common/qt_messages.h
+++ b/src/core/common/qt_messages.h
@@ -22,12 +22,6 @@ IPC_MESSAGE_ROUTED2(QtWebEngineMsg_RequestStorageAccessAsyncResponse,
                     bool /* allowed */)
 
 //-----------------------------------------------------------------------------
-// WebContents messages
-// These are messages sent from the renderer back to the browser process.
-
-IPC_MESSAGE_ROUTED0(RenderViewObserverHostQt_DidFirstVisuallyNonEmptyLayout)
-
-//-----------------------------------------------------------------------------
 // Misc messages
 // These are messages sent from the renderer to the browser process.
 
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 7f7d7bcaa..9d5744cbf 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -41,7 +41,6 @@
 #include "render_widget_host_view_qt.h"
 
 #include "browser_accessibility_manager_qt.h"
-#include "common/qt_messages.h"
 #include "qtwebenginecoreglobal_p.h"
 #include "render_widget_host_view_qt_delegate.h"
 #include "render_widget_host_view_qt_delegate_client.h"
@@ -820,11 +819,6 @@ void RenderWidgetHostViewQt::OnDidUpdateVisualPropertiesComplete(const cc::Rende
     synchronizeVisualProperties(metadata.local_surface_id);
 }
 
-void RenderWidgetHostViewQt::OnDidFirstVisuallyNonEmptyPaint()
-{
-    m_adapterClient->didFirstVisuallyNonEmptyPaint();
-}
-
 Compositor::Id RenderWidgetHostViewQt::compositorId()
 {
     return m_uiCompositor->frame_sink_id();
diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h
index 7f102547f..15ef4fa2a 100644
--- a/src/core/render_widget_host_view_qt.h
+++ b/src/core/render_widget_host_view_qt.h
@@ -188,9 +188,6 @@ public:
     void processMotionEvent(const ui::MotionEvent &motionEvent);
     void resetInputManagerState() { m_imState = 0; }
 
-    // Called from WebContentsDelegateQt.
-    void OnDidFirstVisuallyNonEmptyPaint();
-
     // Called from WebContentsAdapter.
     gfx::SizeF lastContentsSize() const { return m_lastContentsSize; }
     gfx::Vector2dF lastScrollOffset() const { return m_lastScrollOffset; }
diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
index 42a5a3ab0..2e81f21e8 100644
--- a/src/core/web_contents_adapter_client.h
+++ b/src/core/web_contents_adapter_client.h
@@ -195,7 +195,6 @@ public:
     virtual QColor backgroundColor() const = 0;
     virtual void loadStarted(QWebEngineLoadingInfo info) = 0;
     virtual void loadCommitted() = 0;
-    virtual void didFirstVisuallyNonEmptyPaint() = 0;
     virtual void loadFinished(QWebEngineLoadingInfo info) = 0;
     virtual void focusContainer() = 0;
     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
index 1fcef3274..5366e6a26 100644
--- a/src/core/web_contents_delegate_qt.cpp
+++ b/src/core/web_contents_delegate_qt.cpp
@@ -659,15 +659,6 @@ void WebContentsDelegateQt::OnVisibilityChanged(content::Visibility visibility)
         web_cache::WebCacheManager::GetInstance()->ObserveActivity(web_contents()->GetMainFrame()->GetProcess()->GetID());
 }
 
-void WebContentsDelegateQt::DidFirstVisuallyNonEmptyPaint()
-{
-    RenderWidgetHostViewQt *rwhv = static_cast<RenderWidgetHostViewQt*>(web_contents()->GetRenderWidgetHostView());
-    if (!rwhv)
-        return;
-
-    rwhv->OnDidFirstVisuallyNonEmptyPaint();
-}
-
 void WebContentsDelegateQt::ActivateContents(content::WebContents* contents)
 {
     QWebEngineSettings *settings = m_viewClient->webEngineSettings();
diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
index 9ddd1d192..4704f78fb 100644
--- a/src/core/web_contents_delegate_qt.h
+++ b/src/core/web_contents_delegate_qt.h
@@ -166,7 +166,6 @@ public:
     void DidFinishLoad(content::RenderFrameHost *render_frame_host, const GURL &validated_url) override;
     void BeforeUnloadFired(bool proceed, const base::TimeTicks& proceed_time) override;
     void OnVisibilityChanged(content::Visibility visibility) override;
-    void DidFirstVisuallyNonEmptyPaint() override;
     void ActivateContents(content::WebContents* contents) override;
     void ResourceLoadComplete(content::RenderFrameHost* render_frame_host,
                               const content::GlobalRequestID& request_id,