diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-23 15:08:59 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-23 15:09:20 +0100 |
| commit | 061d58bc0fa016cfeed744fd3e4663460635d69b (patch) | |
| tree | ad9b8b032c803e1c9054c23fa1b7a0f1976bf98f /Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp | |
| parent | 470286ecfe79d59df14944e5b5d34630fc739391 (diff) | |
| download | qtwebkit-061d58bc0fa016cfeed744fd3e4663460635d69b.tar.gz | |
Imported WebKit commit 8eb048315f36fa33731f28694630fe4a3c2cbc99 (http://svn.webkit.org/repository/webkit/trunk@135602)
New snapshot that fixes various bugs
Change-Id: Icb6ce541a26a9f500d087821ce4b83a8d8a5474a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp index be3f571d6..7e36a4ad5 100644 --- a/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp +++ b/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp @@ -62,7 +62,7 @@ struct _WebKitFindControllerPrivate { static guint signals[LAST_SIGNAL] = { 0, }; -G_DEFINE_TYPE(WebKitFindController, webkit_find_controller, G_TYPE_OBJECT) +WEBKIT_DEFINE_TYPE(WebKitFindController, webkit_find_controller, G_TYPE_OBJECT) COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE, FindOptionsCaseInsensitive); COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_FIND_OPTIONS_AT_WORD_STARTS, FindOptionsAtWordStarts); @@ -85,13 +85,6 @@ static void didCountStringMatches(WKPageRef page, WKStringRef string, unsigned m g_signal_emit(WEBKIT_FIND_CONTROLLER(clientInfo), signals[COUNTED_MATCHES], 0, matchCount); } -static void webkit_find_controller_init(WebKitFindController* findController) -{ - WebKitFindControllerPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(findController, WEBKIT_TYPE_FIND_CONTROLLER, WebKitFindControllerPrivate); - findController->priv = priv; - new (priv) WebKitFindControllerPrivate(); -} - static inline WebPageProxy* getPage(WebKitFindController* findController) { return webkitWebViewBaseGetPage(reinterpret_cast<WebKitWebViewBase*>(findController->priv->webView)); @@ -146,22 +139,12 @@ static void webkitFindControllerSetProperty(GObject* object, guint propId, const } } -static void webkitFindControllerFinalize(GObject* object) -{ - WEBKIT_FIND_CONTROLLER(object)->priv->~WebKitFindControllerPrivate(); - G_OBJECT_CLASS(webkit_find_controller_parent_class)->finalize(object); -} - static void webkit_find_controller_class_init(WebKitFindControllerClass* findClass) { GObjectClass* gObjectClass = G_OBJECT_CLASS(findClass); - gObjectClass->constructed = webkitFindControllerConstructed; gObjectClass->get_property = webkitFindControllerGetProperty; gObjectClass->set_property = webkitFindControllerSetProperty; - gObjectClass->finalize = webkitFindControllerFinalize; - - g_type_class_add_private(findClass, sizeof(WebKitFindControllerPrivate)); /** * WebKitFindController:text: |