Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 0 insertions, 126 deletions

diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitScriptDialog.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitScriptDialog.cpp
deleted file mode 100644
index 863665d71..000000000
--- a/Source/WebKit2/UIProcess/API/gtk/WebKitScriptDialog.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2012 Igalia S.L.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "WebKitScriptDialog.h"
-
-#include "WebKitScriptDialogPrivate.h"
-
-static WebKitScriptDialog* webkitScriptDialogCopy(WebKitScriptDialog* dialog)
-{
-    WebKitScriptDialog* copy = g_slice_new0(WebKitScriptDialog);
-    new (copy) WebKitScriptDialog(dialog);
-    return copy;
-}
-
-static void webkitScriptDialogFree(WebKitScriptDialog* dialog)
-{
-    dialog->~WebKitScriptDialog();
-    g_slice_free(WebKitScriptDialog, dialog);
-}
-
-G_DEFINE_BOXED_TYPE(WebKitScriptDialog, webkit_script_dialog, webkitScriptDialogCopy, webkitScriptDialogFree)
-
-/**
- * webkit_script_dialog_get_dialog_type:
- * @dialog: a #WebKitScriptDialog
- *
- * Get the dialog type of a #WebKitScriptDialog.
- *
- * Returns: the #WebKitScriptDialogType of @dialog
- */
-WebKitScriptDialogType webkit_script_dialog_get_dialog_type(WebKitScriptDialog* dialog)
-{
-    g_return_val_if_fail(dialog, WEBKIT_SCRIPT_DIALOG_ALERT);
-
-    return static_cast<WebKitScriptDialogType>(dialog->type);
-}
-
-/**
- * webkit_script_dialog_get_message:
- * @dialog: a #WebKitScriptDialog
- *
- * Get the message of a #WebKitScriptDialog.
- *
- * Returns: the message of @dialog.
- */
-const char* webkit_script_dialog_get_message(WebKitScriptDialog* dialog)
-{
-    g_return_val_if_fail(dialog, 0);
-
-    return dialog->message.data();
-}
-
-/**
- * webkit_script_dialog_confirm_set_confirmed:
- * @dialog: a #WebKitScriptDialog
- * @confirmed: whether user confirmed the dialog
- *
- * This method is used for %WEBKIT_SCRIPT_DIALOG_CONFIRM dialogs when
- * #WebKitWebView::script-dialog signal is emitted to set whether the user
- * confirmed the dialog or not. The default implementation of #WebKitWebView::script-dialog
- * signal sets %TRUE when the OK button is clicked and %FALSE otherwise.
- * It's an error to use this method with a #WebKitScriptDialog that is not of type
- * %WEBKIT_SCRIPT_DIALOG_CONFIRM.
- */
-void webkit_script_dialog_confirm_set_confirmed(WebKitScriptDialog* dialog, gboolean confirmed)
-{
-    g_return_if_fail(dialog);
-    g_return_if_fail(dialog->type == WEBKIT_SCRIPT_DIALOG_CONFIRM);
-
-    dialog->confirmed = confirmed;
-}
-
-/**
- * webkit_script_dialog_prompt_get_default_text:
- * @dialog: a #WebKitScriptDialog
- *
- * Get the default text of a #WebKitScriptDialog of type %WEBKIT_SCRIPT_DIALOG_PROMPT.
- * It's an error to use this method with a #WebKitScriptDialog that is not of type
- * %WEBKIT_SCRIPT_DIALOG_PROMPT.
- *
- * Returns: the default text of @dialog
- */
-const char* webkit_script_dialog_prompt_get_default_text(WebKitScriptDialog* dialog)
-{
-    g_return_val_if_fail(dialog, 0);
-    g_return_val_if_fail(dialog->type == WEBKIT_SCRIPT_DIALOG_PROMPT, 0);
-
-    return dialog->defaultText.data();
-}
-
-/**
- * webkit_script_dialog_prompt_set_text:
- * @dialog: a #WebKitScriptDialog
- * @text: the text to set
- *
- * This method is used for %WEBKIT_SCRIPT_DIALOG_PROMPT dialogs when
- * #WebKitWebView::script-dialog signal is emitted to set the text
- * entered by the user. The default implementation of #WebKitWebView::script-dialog
- * signal sets the text of the entry form when OK button is clicked, otherwise %NULL is set.
- * It's an error to use this method with a #WebKitScriptDialog that is not of type
- * %WEBKIT_SCRIPT_DIALOG_PROMPT.
- */
-void webkit_script_dialog_prompt_set_text(WebKitScriptDialog* dialog, const char* text)
-{
-    g_return_if_fail(dialog);
-    g_return_if_fail(dialog->type == WEBKIT_SCRIPT_DIALOG_PROMPT);
-
-    dialog->text = text;
-}