[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
alex at webkit.org
alex at webkit.org
Mon Feb 21 00:09:02 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 5b48ab52ff457d32fd5510ce040d0d312c7d44d7
Author: alex at webkit.org <alex at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 28 14:34:37 2011 +0000
2011-01-28 Alejandro G. Castro <alex at igalia.com>
Reviewed by Xan Lopez.
[GTK] Fix compilation warning
https://bugs.webkit.org/show_bug.cgi?id=53292
* webkit/webkitwebframe.cpp:
(draw_page_callback): Cast the pageCount from size_t to int, it
should be safe considering page_nr is the number of pages,
0-based.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76940 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit/gtk/ChangeLog b/Source/WebKit/gtk/ChangeLog
index afdc375..327cb48 100644
--- a/Source/WebKit/gtk/ChangeLog
+++ b/Source/WebKit/gtk/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-28 Alejandro G. Castro <alex at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] Fix compilation warning
+ https://bugs.webkit.org/show_bug.cgi?id=53292
+
+ * webkit/webkitwebframe.cpp:
+ (draw_page_callback): Cast the pageCount from size_t to int, it
+ should be safe considering page_nr is the number of pages,
+ 0-based.
+
2011-01-27 Nate Chapin <japhet at chromium.org>
Reviewed by Adam Barth.
diff --git a/Source/WebKit/gtk/webkit/webkitwebframe.cpp b/Source/WebKit/gtk/webkit/webkitwebframe.cpp
index d0ea875..5ab2654 100644
--- a/Source/WebKit/gtk/webkit/webkitwebframe.cpp
+++ b/Source/WebKit/gtk/webkit/webkitwebframe.cpp
@@ -768,7 +768,7 @@ static void draw_page_callback(GtkPrintOperation* op, GtkPrintContext* context,
{
PrintContext* printContext = reinterpret_cast<PrintContext*>(user_data);
- if (page_nr >= printContext->pageCount())
+ if (page_nr >= static_cast<gint>(printContext->pageCount()))
return;
cairo_t* cr = gtk_print_context_get_cairo_context(context);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list