Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422)

This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.

1 files changed, 116 insertions, 0 deletions

diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.h b/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.h
new file mode 100644
index 000000000..3a47f99d4
--- /dev/null
+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.h
@@ -0,0 +1,116 @@
+/*
+ * 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 Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2,1 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.
+ */
+
+#if !defined(__WEBKIT2_H_INSIDE__) && !defined(WEBKIT2_COMPILATION)
+#error "Only <webkit2/webkit2.h> can be included directly."
+#endif
+
+#ifndef WebKitFindController_h
+#define WebKitFindController_h
+
+#include <glib-object.h>
+#include <webkit2/WebKitDefines.h>
+
+G_BEGIN_DECLS
+
+#define WEBKIT_TYPE_FIND_CONTROLLER            (webkit_find_controller_get_type())
+#define WEBKIT_FIND_CONTROLLER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_FIND_CONTROLLER, WebKitFindController))
+#define WEBKIT_FIND_CONTROLLER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_FIND_CONTROLLER, WebKitFindControllerClass))
+#define WEBKIT_IS_FIND_CONTROLLER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_FIND_CONTROLLER))
+#define WEBKIT_IS_FIND_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_FIND_CONTROLLER))
+#define WEBKIT_FIND_CONTROLLER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_FIND_CONTROLLER, WebKitFindControllerClass))
+
+typedef struct _WebKitFindControllerPrivate WebKitFindControllerPrivate;
+typedef struct _WebKitFindControllerClass   WebKitFindControllerClass;
+
+/**
+ * WebKitFindOptions:
+ * @WEBKIT_FIND_OPTIONS_NONE: no search flags, this means a case
+ *   sensitive, no wrap, forward only search.
+ * @WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE: case insensitive search.
+ * @WEBKIT_FIND_OPTIONS_AT_WORD_STARTS: search text only at the
+ *   begining of the words.
+ * @WEBKIT_FIND_OPTIONS_TREAT_MEDIAL_CAPITAL_AS_WORD_START: treat
+ *   capital letters in the middle of words as word start.
+ * @WEBKIT_FIND_OPTIONS_BACKWARDS: search backwards.
+ * @WEBKIT_FIND_OPTIONS_WRAP_AROUND: if not present search will stop
+ *   at the end of the document.
+ *
+ * Enum values used to specify search options.
+ */
+typedef enum {
+  WEBKIT_FIND_OPTIONS_NONE,
+
+  WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE =                   1 << 0,
+  WEBKIT_FIND_OPTIONS_AT_WORD_STARTS =                     1 << 1,
+  WEBKIT_FIND_OPTIONS_TREAT_MEDIAL_CAPITAL_AS_WORD_START = 1 << 2,
+  WEBKIT_FIND_OPTIONS_BACKWARDS =                          1 << 3,
+  WEBKIT_FIND_OPTIONS_WRAP_AROUND =                        1 << 4,
+} WebKitFindOptions;
+
+struct _WebKitFindController {
+    GObject parent;
+
+  /*< private >*/
+  WebKitFindControllerPrivate *priv;
+};
+
+struct _WebKitFindControllerClass {
+    GObjectClass parent_class;
+};
+
+WEBKIT_API GType
+webkit_find_controller_get_type            (void);
+
+WEBKIT_API void
+webkit_find_controller_search              (WebKitFindController *find_controller,
+                                            const gchar          *search_text,
+                                            guint32               find_options,
+                                            guint                 max_match_count);
+
+WEBKIT_API void
+webkit_find_controller_search_finish       (WebKitFindController *find_controller);
+
+WEBKIT_API void
+webkit_find_controller_search_next         (WebKitFindController *find_controller);
+
+WEBKIT_API void
+webkit_find_controller_search_previous     (WebKitFindController *find_controller);
+
+WEBKIT_API void
+webkit_find_controller_count_matches       (WebKitFindController *find_controller,
+                                            const gchar          *search_text,
+                                            guint32               find_options,
+                                            guint                 max_match_count);
+
+WEBKIT_API const gchar *
+webkit_find_controller_get_search_text     (WebKitFindController *find_controller);
+
+WEBKIT_API guint32
+webkit_find_controller_get_options         (WebKitFindController *find_controller);
+
+WEBKIT_API guint
+webkit_find_controller_get_max_match_count (WebKitFindController *find_controller);
+
+WEBKIT_API WebKitWebView *
+webkit_find_controller_get_web_view        (WebKitFindController *find_controller);
+
+G_END_DECLS
+
+#endif