LibWeb: Add a shared WebViewHooks base class for both web view widgets

This will make it easier for Browser to share code between both views.

Applications/Browser/Tab.cpp

@@ -189,8 +189,8 @@ Tab::Tab()
         m_link_context_menu->popup(screen_position);
     };
 
-    m_page_view->on_link_middle_click = [this](auto& href) {
-        m_page_view->on_link_click(href, "_blank", 0);
+    hooks().on_link_middle_click = [this](auto& href, auto&, auto) {
+        hooks().on_link_click(href, "_blank", 0);
     };
 
     m_page_view->on_title_change = [this](auto& title) {

Libraries/LibWeb/PageView.cpp

@@ -213,10 +213,10 @@ void PageView::page_did_click_link(const URL& url, const String& target, unsigne
         on_link_click(url, target, modifiers);
 }
 
-void PageView::page_did_middle_click_link(const URL& url, [[maybe_unused]] const String& target, [[maybe_unused]] unsigned modifiers)
+void PageView::page_did_middle_click_link(const URL& url, const String& target, unsigned modifiers)
 {
     if (on_link_middle_click)
-        on_link_middle_click(url);
+        on_link_middle_click(url, target, modifiers);
 }
 
 void PageView::page_did_enter_tooltip_area(const Gfx::IntPoint& content_position, const String& title)

Libraries/LibWeb/PageView.h

@@ -30,11 +30,13 @@
 #include <LibGUI/ScrollableWidget.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/Page.h>
+#include <LibWeb/WebViewHooks.h>
 
 namespace Web {
 
 class PageView final
     : public GUI::ScrollableWidget
+    , public WebViewHooks
     , public PageClient {
     C_OBJECT(PageView);
 
@@ -59,17 +61,6 @@ public:
 
     void set_should_show_line_box_borders(bool value) { m_should_show_line_box_borders = value; }
 
-    Function<void(const Gfx::IntPoint& screen_position)> on_context_menu_request;
-    Function<void(const URL&, const String& target, unsigned modifiers)> on_link_click;
-    Function<void(const URL&, const Gfx::IntPoint& screen_position)> on_link_context_menu_request;
-    Function<void(const URL&)> on_link_middle_click;
-    Function<void(const URL&)> on_link_hover;
-    Function<void(const String&)> on_title_change;
-    Function<void(const URL&)> on_load_start;
-    Function<void(const Gfx::Bitmap&)> on_favicon_change;
-    Function<void(const URL&)> on_url_drop;
-    Function<void(Document*)> on_set_document;
-
     virtual bool accepts_focus() const override { return true; }
 
     GUI::Action& select_all_action() { return *m_select_all_action; }

Libraries/LibWeb/WebContentView.h

@@ -26,12 +26,16 @@
 
 #pragma once
 
+#include <AK/URL.h>
 #include <LibGUI/ScrollableWidget.h>
 #include <LibGUI/Widget.h>
+#include <LibWeb/WebViewHooks.h>
 
 class WebContentClient;
 
-class WebContentView final : public GUI::ScrollableWidget {
+class WebContentView final
+    : public GUI::ScrollableWidget
+    , public Web::WebViewHooks {
     C_OBJECT(WebContentView);
 
 public:
@@ -39,11 +43,6 @@ public:
 
     void load(const URL&);
 
-    Function<void(const String&)> on_title_change;
-    Function<void(const URL&)> on_link_hover;
-    Function<void(const URL&, const String& target, unsigned modifiers)> on_link_click;
-    Function<void(const URL&, const String& target, unsigned modifiers)> on_link_middle_click;
-
     void notify_server_did_layout(Badge<WebContentClient>, const Gfx::IntSize& content_size);
     void notify_server_did_paint(Badge<WebContentClient>, i32 shbuf_id);
     void notify_server_did_invalidate_content_rect(Badge<WebContentClient>, const Gfx::IntRect&);

Libraries/LibWeb/WebViewHooks.h

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <AK/Function.h>
+#include <LibGfx/Forward.h>
+#include <LibWeb/Forward.h>
+
+namespace Web {
+
+class WebViewHooks {
+public:
+    Function<void(const Gfx::IntPoint& screen_position)> on_context_menu_request;
+    Function<void(const URL&, const String& target, unsigned modifiers)> on_link_click;
+    Function<void(const URL&, const Gfx::IntPoint& screen_position)> on_link_context_menu_request;
+    Function<void(const URL&, const String& target, unsigned modifiers)> on_link_middle_click;
+    Function<void(const URL&)> on_link_hover;
+    Function<void(const String&)> on_title_change;
+    Function<void(const URL&)> on_load_start;
+    Function<void(const Gfx::Bitmap&)> on_favicon_change;
+    Function<void(const URL&)> on_url_drop;
+    Function<void(Document*)> on_set_document;
+};
+
+}