[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit da16521e43a0bf7abee1a4bf944512e7eb8c1c96
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 20 17:03:22 2009 +0000

    As we do not support rendering a QWebFrame without it being clipped
    the the frame as well as the viewport, we now set the viewport size
    to the size of the contents.
    
    Patch by Kenneth Rohde Christiansen <kenneth at webkit.org> on 2009-10-20
    Reviewed by Adam Barth.
    
    Rendering pure contents (no scrollbars etc) without clipping can be
    acomplished using QWebFrame::documentElement()->render(...)
    
    * tests/qwebelement/tst_qwebelement.cpp:
    (tst_QWebElement::render):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49865 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 700fc63..ec2c587 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,5 +1,19 @@
 2009-10-20  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
+        Rubberstamped by Adam Barth.
+
+        As we do not support rendering a QWebFrame without it being clipped
+        the the frame as well as the viewport, we now set the viewport size
+        to the size of the contents.
+
+        Rendering pure contents (no scrollbars etc) without clipping can be
+        acomplished using QWebFrame::documentElement()->render(...)
+
+        * tests/qwebelement/tst_qwebelement.cpp:
+        (tst_QWebElement::render):
+
+2009-10-20  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
         Reviewed by Tor Arne Vestbø.
 
         Add menu item to dump the plugin list to the console,
diff --git a/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp b/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
index db2f7d7..7353268 100644
--- a/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
+++ b/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
@@ -851,6 +851,9 @@ void tst_QWebElement::render()
     waitForSignal(&page, SIGNAL(loadFinished(bool)));
     QCOMPARE(loadSpy.count(), 1);
 
+    QSize size = page.mainFrame()->contentsSize();
+    page.setViewportSize(size);
+
     QList<QWebElement> imgs = page.mainFrame()->findAllElements("img");
     QCOMPARE(imgs.count(), 1);
 
@@ -893,7 +896,6 @@ void tst_QWebElement::render()
 
     QImage image4(300, 300, QImage::Format_ARGB32);
     QPainter painter4(&image4);
-    page.mainFrame()->setClipRenderToViewport(false);
     page.mainFrame()->render(&painter4, tableRect);
     painter4.end();
 

-- 
WebKit Debian packaging