Unreviewed, fix incorrect WPE build fix made in r236009

This isn't the right place to add the typedef. I failed to notice that the WebKitWebView
type is not actually used anywhere in this header. Actually, the problematic function is no
longer declared or used anywhere and was just missed when WebKitScriptDialog was refactored,
so remove it.

* UIProcess/API/wpe/WebKitScriptDialog.h:
* UIProcess/API/wpe/WebKitScriptDialogWPE.cpp:
(webkitScriptDialogRun): Deleted.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@236051 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 32732a2..9eecaf4 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2018-09-17  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Unreviewed, fix incorrect WPE build fix made in r236009
+
+        This isn't the right place to add the typedef. I failed to notice that the WebKitWebView
+        type is not actually used anywhere in this header. Actually, the problematic function is no
+        longer declared or used anywhere and was just missed when WebKitScriptDialog was refactored,
+        so remove it.
+
+        * UIProcess/API/wpe/WebKitScriptDialog.h:
+        * UIProcess/API/wpe/WebKitScriptDialogWPE.cpp:
+        (webkitScriptDialogRun): Deleted.
+
 2018-09-17  Sihui Liu  <sihui_liu@apple.com>
 
         Move IndexedDB to Network Process

diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitScriptDialog.h b/Source/WebKit/UIProcess/API/wpe/WebKitScriptDialog.h
index 26866bc..c960916 100644 (file)
--- a/Source/WebKit/UIProcess/API/wpe/WebKitScriptDialog.h
+++ b/Source/WebKit/UIProcess/API/wpe/WebKitScriptDialog.h
@@ -32,7 +32,6 @@ G_BEGIN_DECLS
 #define WEBKIT_TYPE_SCRIPT_DIALOG (webkit_script_dialog_get_type())
 
 typedef struct _WebKitScriptDialog WebKitScriptDialog;
-typedef struct _WebKitWebView WebKitWebView;
 
 /**
  * WebKitScriptDialogType:

diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitScriptDialogWPE.cpp b/Source/WebKit/UIProcess/API/wpe/WebKitScriptDialogWPE.cpp
index 424db91..3ad6e61 100644 (file)
--- a/Source/WebKit/UIProcess/API/wpe/WebKitScriptDialogWPE.cpp
+++ b/Source/WebKit/UIProcess/API/wpe/WebKitScriptDialogWPE.cpp
@@ -22,10 +22,6 @@
 
 #include "WebKitScriptDialogPrivate.h"
 
-void webkitScriptDialogRun(WebKitScriptDialog*, WebKitWebView*)
-{
-}
-
 void webkitScriptDialogAccept(WebKitScriptDialog*)
 {
 }