[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

hyatt at apple.com hyatt at apple.com
Mon Feb 21 00:31:58 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 45dd89a1dcc8f4bd3c0b2b8a65a0b246bf0f9125
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 1 18:49:59 2011 +0000

    Land Webpage.cpp for previous patch.  Change was lost after conflict resolution from a merge.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77259 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
index 61fd8e7..0d9eb34 100644
--- a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -1837,7 +1837,7 @@ void WebPage::computePagesForPrinting(uint64_t frameID, const PrintInfo& printIn
 
     if (m_printContext) {
         resultPageRects = m_printContext->pageRects();
-        resultTotalScaleFactorForPrinting = m_printContext->computeAutomaticScaleFactor(printInfo.availablePaperWidth) * printInfo.pageSetupScaleFactor;
+        resultTotalScaleFactorForPrinting = m_printContext->computeAutomaticScaleFactor(FloatSize(printInfo.availablePaperWidth, printInfo.availablePaperHeight)) * printInfo.pageSetupScaleFactor;
     }
 
     // If we're asked to print, we should actually print at least a blank page.

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list