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

[hamaji at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit cb02bd11925e05a0926fd9c5035f7b94414b8a8f
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 13 11:02:23 2010 +0000

    2010-11-13  Shinichiro Hamaji  <hamaji at chromium.org>
    
            Reviewed by Kent Tamura.
    
            [Chromium] print doesn't work on http://nodejs.org/api.html
            https://bugs.webkit.org/show_bug.cgi?id=49304
    
            * platform/chromium/test_expectations.txt:
    2010-11-13  Shinichiro Hamaji  <hamaji at chromium.org>
    
            Reviewed by Kent Tamura.
    
            [Chromium] print doesn't work on http://nodejs.org/api.html
            https://bugs.webkit.org/show_bug.cgi?id=49304
    
            * src/WebFrameImpl.cpp:
            (WebKit::ChromePrintContext::begin):
            (WebKit::WebFrameImpl::printBegin):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71964 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e5041d8..48b6276 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-13  Shinichiro Hamaji  <hamaji at chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [Chromium] print doesn't work on http://nodejs.org/api.html
+        https://bugs.webkit.org/show_bug.cgi?id=49304
+
+        * platform/chromium/test_expectations.txt:
+
 2010-11-12  Daniel Bates  <dbates at rim.com>
 
         Reviewed by Adam Barth.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 0687b7a..8d0f72f 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2929,12 +2929,6 @@ BUG60651 WIN : fast/canvas/webgl/glsl-conformance.html = TIMEOUT FAIL
 BUG60651 WIN : fast/canvas/webgl/uniform-location.html = TIMEOUT CRASH
 BUG60651 LINUX MAC : fast/canvas/webgl/uniform-location.html = TEXT
 
-// Regressions after r67771
-BUG56246 : printing/css2.1/page-break-after-000.html = TEXT
-BUG56246 : printing/css2.1/page-break-after-003.html = TEXT
-BUG56246 : printing/css2.1/page-break-after-004.html = TEXT
-BUG56246 : printing/css2.1/page-break-before-000.html = TEXT
-
 // This test needs enhanced eventSender.contextMenu() return value.
 // See https://bugs.webkit.org/show_bug.cgi?id=45021 for more info.
 BUGWK45021 : media/context-menu-actions.html = TIMEOUT
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 52e831a..c70f8fd 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-13  Shinichiro Hamaji  <hamaji at chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [Chromium] print doesn't work on http://nodejs.org/api.html
+        https://bugs.webkit.org/show_bug.cgi?id=49304
+
+        * src/WebFrameImpl.cpp:
+        (WebKit::ChromePrintContext::begin):
+        (WebKit::WebFrameImpl::printBegin):
+
 2010-11-12  James Simonsen  <simonjam at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/WebFrameImpl.cpp b/WebKit/chromium/src/WebFrameImpl.cpp
index 7dc1515..c5ac275 100644
--- a/WebKit/chromium/src/WebFrameImpl.cpp
+++ b/WebKit/chromium/src/WebFrameImpl.cpp
@@ -287,11 +287,11 @@ public:
     {
     }
 
-    virtual void begin(float width)
+    virtual void begin(float width, float height)
     {
         ASSERT(!m_printedPageWidth);
         m_printedPageWidth = width;
-        PrintContext::begin(m_printedPageWidth);
+        PrintContext::begin(m_printedPageWidth, height);
     }
 
     virtual void end()
@@ -1286,7 +1286,7 @@ int WebFrameImpl::printBegin(const WebSize& pageSize, int printerDPI, bool *useB
 
     FloatRect rect(0, 0, static_cast<float>(pageSize.width),
                          static_cast<float>(pageSize.height));
-    m_printContext->begin(rect.width());
+    m_printContext->begin(rect.width(), rect.height());
     float pageHeight;
     // We ignore the overlays calculation for now since they are generated in the
     // browser. pageHeight is actually an output parameter.

-- 
WebKit Debian packaging