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

[hyatt at apple.com]

The following commit has been merged in the debian/experimental branch:
commit f2ada1edd469ce12492915d00dc7c3493e5a7e1d
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 21 15:58:27 2010 +0000

    https://bugs.webkit.org/show_bug.cgi?id=46188, make the cross-platform setPrinting method match the Mac version of the method.
    Specifically don't pass the page size down to subframes of the one you're printing.
    
    Reviewed by John Sullivan.
    
    * page/Frame.cpp:
    (WebCore::Frame::setPrinting):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67956 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index edb4e97..6ac3934 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-21  David Hyatt  <hyatt at apple.com>
+
+        Reviewed by John Sullivan.
+
+        https://bugs.webkit.org/show_bug.cgi?id=46188, make the cross-platform setPrinting method match the Mac version of the method.
+        Specifically don't pass the page size down to subframes of the one you're printing.
+
+        * page/Frame.cpp:
+        (WebCore::Frame::setPrinting):
+
 2010-09-21  Patrick Gansterer  <paroga at webkit.org>
 
         Reviewed by Adam Roben.
diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp
index f6b2ce0..e93fc5b 100755
--- a/WebCore/page/Frame.cpp
+++ b/WebCore/page/Frame.cpp
@@ -499,8 +499,9 @@ void Frame::setPrinting(bool printing, const FloatSize& pageSize, float maximumS
     m_doc->styleSelectorChanged(RecalcStyleImmediately);
     view()->forceLayoutForPagination(pageSize, maximumShrinkRatio, shouldAdjustViewSize);
 
+    // Subframes of the one we're printing don't lay out to the page size.
     for (Frame* child = tree()->firstChild(); child; child = child->tree()->nextSibling())
-        child->setPrinting(printing, pageSize, maximumShrinkRatio, shouldAdjustViewSize);
+        child->setPrinting(printing, IntSize(), 0, shouldAdjustViewSize);
 }
 
 void Frame::injectUserScripts(UserScriptInjectionTime injectionTime)

-- 
WebKit Debian packaging