[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 8bf00953a092c3e178ece973f293ece72c369919
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 1 03:59:53 2010 +0000

    2010-11-30  Nicolas Dufresne  <nicolas.dufresne at collabora.co.uk>
    
            Reviewed by Martin Robinson.
    
            [GTK] Fix wrong type in assert return value
            https://bugs.webkit.org/show_bug.cgi?id=50208
    
            Use appropriate return type in different g_return_val_if_fail(). This
            removes some compiler warning.
    
            * webkit/webkitwebdatasource.cpp:
            (webkit_web_data_source_is_loading):
            * webkit/webkitwebframe.cpp:
            (webkit_web_frame_page_number_for_element_by_id):
            (webkit_web_frame_number_of_pages):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73006 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 62af57f..ade99ea 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,19 @@
+2010-11-30  Nicolas Dufresne  <nicolas.dufresne at collabora.co.uk>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Fix wrong type in assert return value
+        https://bugs.webkit.org/show_bug.cgi?id=50208
+
+        Use appropriate return type in different g_return_val_if_fail(). This
+        removes some compiler warning.
+
+        * webkit/webkitwebdatasource.cpp:
+        (webkit_web_data_source_is_loading):
+        * webkit/webkitwebframe.cpp:
+        (webkit_web_frame_page_number_for_element_by_id):
+        (webkit_web_frame_number_of_pages):
+
 2010-11-30  Mario Sanchez Prada  <msanchez at igalia.com>
 
         Reviewed by Chris Fleizach.
diff --git a/WebKit/gtk/webkit/webkitwebdatasource.cpp b/WebKit/gtk/webkit/webkitwebdatasource.cpp
index 38c9c48..3673a99 100644
--- a/WebKit/gtk/webkit/webkitwebdatasource.cpp
+++ b/WebKit/gtk/webkit/webkitwebdatasource.cpp
@@ -318,7 +318,7 @@ G_CONST_RETURN gchar* webkit_web_data_source_get_encoding(WebKitWebDataSource* w
  */
 gboolean webkit_web_data_source_is_loading(WebKitWebDataSource* webDataSource)
 {
-    g_return_val_if_fail(WEBKIT_IS_WEB_DATA_SOURCE(webDataSource), NULL);
+    g_return_val_if_fail(WEBKIT_IS_WEB_DATA_SOURCE(webDataSource), FALSE);
 
     WebKitWebDataSourcePrivate* priv = webDataSource->priv;
 
diff --git a/WebKit/gtk/webkit/webkitwebframe.cpp b/WebKit/gtk/webkit/webkitwebframe.cpp
index fcb5197..0e0c3c6 100644
--- a/WebKit/gtk/webkit/webkitwebframe.cpp
+++ b/WebKit/gtk/webkit/webkitwebframe.cpp
@@ -847,7 +847,7 @@ gchar* webkit_web_frame_counter_value_for_element_by_id(WebKitWebFrame* frame, c
  */
 int webkit_web_frame_page_number_for_element_by_id(WebKitWebFrame* frame, const gchar* id, float pageWidth, float pageHeight)
 {
-    g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL);
+    g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), 0);
 
     Frame* coreFrame = core(frame);
     if (!coreFrame)
@@ -869,7 +869,7 @@ int webkit_web_frame_page_number_for_element_by_id(WebKitWebFrame* frame, const
  */
 int webkit_web_frame_number_of_pages(WebKitWebFrame* frame, float pageWidth, float pageHeight)
 {
-    g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL);
+    g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), 0);
 
     Frame* coreFrame = core(frame);
     if (!coreFrame)

-- 
WebKit Debian packaging