[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 07eea9109da152e72a2b466fe0259be6b389525b
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 28 13:06:49 2010 +0000

    [Qt] Fix for endless print loop when printing web pages
    
    Patch by Trond Kjernåsen <trond at trolltech.com> on 2010-01-28
    Reviewed by Simon Hausmann.
    
    * Api/qwebframe.cpp:
    (QWebFrame::print):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53997 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index 43b80df..aeb7a22 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -1393,6 +1393,11 @@ void QWebFrame::print(QPrinter *printer) const
     // paranoia check
     fromPage = qMax(1, fromPage);
     toPage = qMin(printContext.pageCount(), toPage);
+    if (toPage < fromPage) {
+        // if the user entered a page range outside the actual number
+        // of printable pages, just return
+        return;
+    }
 
     if (printer->pageOrder() == QPrinter::LastPageFirst) {
         int tmp = fromPage;
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 0a9223b..d87a762 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-28  Trond Kjernåsen <trond at trolltech.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix for endless print loop when printing web pages
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::print):
+
 2010-01-27  Diego Gonzalez  <diego.gonzalez at openbossa.org>
 
         Reviewed by Kenneth Rohde Christiansen.

-- 
WebKit Debian packaging