Changeset 63521 in webkit

Timestamp:

Jul 15, 2010 11:25:48 PM (14 years ago)

Author:

hamaji@chromium.org

Message:

2010-07-15 Shinichiro Hamaji <​hamaji@chromium.org>

Reviewed by Darin Adler.

Printing test results differ between machines, we should use ImageDiff instead
​https://bugs.webkit.org/show_bug.cgi?id=20011

Added printing/setPrinting.html to check there is the page boundary.

Enabled printing/composite-layer-printing.html with setPrinting.

The result of printing/media-queries-print.html shrunk because of
PrintingMinimumShrinkFactor in PrintContext::begin().

• platform/mac/Skipped:
• platform/mac/printing/compositing-layer-printing-expected.checksum: Added.
• platform/mac/printing/compositing-layer-printing-expected.png: Added.
• platform/mac/printing/compositing-layer-printing-expected.txt: Added.
• platform/mac/printing/media-queries-print-expected.checksum:
• platform/mac/printing/media-queries-print-expected.png:
• platform/mac/printing/setPrinting-expected.checksum: Added.
• platform/mac/printing/setPrinting-expected.png: Added.
• platform/mac/printing/setPrinting-expected.txt: Added.
• printing/compositing-layer-printing.html:
• printing/setPrinting.html: Added.

2010-07-15 Shinichiro Hamaji <​hamaji@chromium.org>

Reviewed by Darin Adler.

Printing test results differ between machines, we should use ImageDiff instead
​https://bugs.webkit.org/show_bug.cgi?id=20011

Added spoolAllPagesWithBoundaries into PrintContext.

Test: printing/setPrinting.html

• WebCore.base.exp:
• page/PrintContext.cpp: (WebCore::PrintContext::spoolAllPagesWithBoundaries):
• page/PrintContext.h:

2010-07-15 Shinichiro Hamaji <​hamaji@chromium.org>

Reviewed by Darin Adler.

Printing test results differ between machines, we should use ImageDiff instead
​https://bugs.webkit.org/show_bug.cgi?id=20011

• Misc/WebCoreStatistics.h:
• Misc/WebCoreStatistics.mm: (-[WebFrame printToCGContext:cgContext:pageWidthInPixels:]):

2010-07-15 Shinichiro Hamaji <​hamaji@chromium.org>

Reviewed by Darin Adler.

Printing test results differ between machines, we should use ImageDiff instead
​https://bugs.webkit.org/show_bug.cgi?id=20011

• DumpRenderTree/PixelDumpSupport.cpp: (dumpWebViewAsPixelsAndCompareWithExpected):
• DumpRenderTree/PixelDumpSupport.h:
• DumpRenderTree/mac/PixelDumpSupportMac.mm: (createBitmapContext): This function was added to share bitmap context creation code. (createBitmapContextFromWebView): (createPagedBitmapContext):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• LayoutTests/platform/mac/Skipped (modified) (1 diff)
• LayoutTests/platform/mac/printing/compositing-layer-printing-expected.checksum (added)
• LayoutTests/platform/mac/printing/compositing-layer-printing-expected.png (added)
• LayoutTests/platform/mac/printing/compositing-layer-printing-expected.txt (added)
• LayoutTests/platform/mac/printing/media-queries-print-expected.checksum (modified) (1 diff)
• LayoutTests/platform/mac/printing/media-queries-print-expected.png (modified) (previous)
• LayoutTests/platform/mac/printing/setPrinting-expected.checksum (added)
• LayoutTests/platform/mac/printing/setPrinting-expected.png (added)
• LayoutTests/platform/mac/printing/setPrinting-expected.txt (added)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• LayoutTests/platform/win/Skipped (modified) (1 diff)
• LayoutTests/printing/compositing-layer-printing.html (modified) (1 diff)
• LayoutTests/printing/setPrinting.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/page/PrintContext.cpp (modified) (1 diff)
• WebCore/page/PrintContext.h (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/Misc/WebCoreStatistics.h (modified) (1 diff)
• WebKit/mac/Misc/WebCoreStatistics.mm (modified) (2 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/PixelDumpSupport.cpp (modified) (1 diff)
• WebKitTools/DumpRenderTree/PixelDumpSupport.h (modified) (1 diff)
• WebKitTools/DumpRenderTree/mac/PixelDumpSupportMac.mm (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-07-15  Shinichiro Hamaji  <hamaji@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Printing test results differ between machines, we should use ImageDiff instead
+        https://bugs.webkit.org/show_bug.cgi?id=20011
+
+        Added printing/setPrinting.html to check there is the page boundary.
+
+        Enabled printing/composite-layer-printing.html with setPrinting.
+
+        The result of printing/media-queries-print.html shrunk because of
+        PrintingMinimumShrinkFactor in PrintContext::begin().
+
+        * platform/mac/Skipped:
+        * platform/mac/printing/compositing-layer-printing-expected.checksum: Added.
+        * platform/mac/printing/compositing-layer-printing-expected.png: Added.
+        * platform/mac/printing/compositing-layer-printing-expected.txt: Added.
+        * platform/mac/printing/media-queries-print-expected.checksum:
+        * platform/mac/printing/media-queries-print-expected.png:
+        * platform/mac/printing/setPrinting-expected.checksum: Added.
+        * platform/mac/printing/setPrinting-expected.png: Added.
+        * platform/mac/printing/setPrinting-expected.txt: Added.
+        * printing/compositing-layer-printing.html:
+        * printing/setPrinting.html: Added.
+
 2010-07-15  MORITA Hajime  <morrita@google.com>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -5862 +5862 @@
 # Directory upload is not enabled.
 fast/forms/input-file-directory-upload.html
+
+# Need setPrinting. See https://bugs.webkit.org/show_bug.cgi?id=20011
+printing/setPrinting.html

trunk/LayoutTests/platform/mac/Skipped

@@ -35 +35 @@
 # see bug <rdar://problem/5646437> REGRESSION (r28015): svg/batik/text/smallFonts fails
 svg/batik/text/smallFonts.svg
-
-# see bug https://bugs.webkit.org/show_bug.cgi?id=20011 -- Printing tests should use ImageDiff
-printing/compositing-layer-printing.html
 
 # Skip because fix for https://bugs.webkit.org/show_bug.cgi?id=26770 was reverted

trunk/LayoutTests/platform/mac/printing/media-queries-print-expected.checksum

@@ -1 @@
-6090d2b0a19649aba8a379f982a345d3
+9ea3bf56e7033cfee8a2beb3a800d85f

trunk/LayoutTests/platform/qt/Skipped

@@ -5464 +5464 @@
 # Directory upload is not enabled.
 fast/forms/input-file-directory-upload.html
+
+# Need setPrinting. See https://bugs.webkit.org/show_bug.cgi?id=20011
+printing/setPrinting.html

trunk/LayoutTests/platform/win/Skipped

@@ -957 +957 @@
 # Directory upload is not enabled.
 fast/forms/input-file-directory-upload.html
+
+# Need setPrinting. See https://bugs.webkit.org/show_bug.cgi?id=20011
+printing/setPrinting.html

trunk/LayoutTests/printing/compositing-layer-printing.html

@@ -14 +14 @@
   <script>
     if (window.layoutTestController)
-      layoutTestController.printToPDF();
+      layoutTestController.setPrinting();
   </script>
 </head>

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-15  Shinichiro Hamaji  <hamaji@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Printing test results differ between machines, we should use ImageDiff instead
+        https://bugs.webkit.org/show_bug.cgi?id=20011
+
+        Added spoolAllPagesWithBoundaries into PrintContext.
+
+        Test: printing/setPrinting.html
+
+        * WebCore.base.exp:
+        * page/PrintContext.cpp:
+        (WebCore::PrintContext::spoolAllPagesWithBoundaries):
+        * page/PrintContext.h:
+
 2010-07-15  Kent Tamura  <tkent@chromium.org>
 

trunk/WebCore/WebCore.exp.in

@@ -256 +256 @@
 __ZN7WebCore12PrintContext20pageNumberForElementEPNS_7ElementERKNS_9FloatSizeE
 __ZN7WebCore12PrintContext26pageSizeAndMarginsInPixelsEPNS_5FrameEiiiiiii
+__ZN7WebCore12PrintContext27spoolAllPagesWithBoundariesEPNS_5FrameERNS_15GraphicsContextERKNS_9FloatSizeE
 __ZN7WebCore12PrintContext28computePageRectsWithPageSizeERKNS_9FloatSizeEb
 __ZN7WebCore12PrintContextC1EPNS_5FrameE

trunk/WebCore/page/PrintContext.cpp

@@ -245 +245 @@
 }
 
-}
+void PrintContext::spoolAllPagesWithBoundaries(Frame* frame, GraphicsContext& graphicsContext, const FloatSize& pageSizeInPixels)
+{
+    if (!frame->document() || !frame->view() || !frame->document()->renderer())
+        return;
+
+    frame->document()->updateLayout();
+
+    PrintContext printContext(frame);
+    printContext.begin(pageSizeInPixels.width());
+
+    float pageHeight;
+    printContext.computePageRects(FloatRect(FloatPoint(0, 0), pageSizeInPixels), 0, 0, 1, pageHeight);
+
+    const float pageWidth = pageSizeInPixels.width();
+    const Vector<IntRect>& pageRects = printContext.pageRects();
+    int totalHeight = pageRects.size() * (pageSizeInPixels.height() + 1) - 1;
+
+    // Fill the whole background by white.
+    graphicsContext.setFillColor(Color(255, 255, 255), DeviceColorSpace);
+    graphicsContext.fillRect(FloatRect(0, 0, pageWidth, totalHeight));
+
+    graphicsContext.save();
+    graphicsContext.translate(0, totalHeight);
+    graphicsContext.scale(FloatSize(1, -1));
+
+    int currentHeight = 0;
+    for (size_t pageIndex = 0; pageIndex < pageRects.size(); pageIndex++) {
+        // Draw a line for a page boundary if this isn't the first page.
+        if (pageIndex > 0) {
+            graphicsContext.save();
+            graphicsContext.setStrokeColor(Color(0, 0, 255), DeviceColorSpace);
+            graphicsContext.setFillColor(Color(0, 0, 255), DeviceColorSpace);
+            graphicsContext.drawLine(IntPoint(0, currentHeight),
+                                     IntPoint(pageWidth, currentHeight));
+            graphicsContext.restore();
+        }
+
+        graphicsContext.save();
+        graphicsContext.translate(0, currentHeight);
+        printContext.spoolPage(graphicsContext, pageIndex, pageWidth);
+        graphicsContext.restore();
+
+        currentHeight += pageSizeInPixels.height() + 1;
+    }
+
+    graphicsContext.restore();
+}
+
+}

trunk/WebCore/page/PrintContext.h

@@ -60 +60 @@
     static String pageSizeAndMarginsInPixels(Frame* frame, int pageNumber, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft);
     static int numberOfPages(Frame*, const FloatSize& pageSizeInPixels);
+    // Draw all pages into a graphics context with lines which mean page boundaries.
+    // The height of the graphics context should be
+    // (pageSizeInPixels.height() + 1) * number-of-pages - 1
+    static void spoolAllPagesWithBoundaries(Frame*, GraphicsContext&, const FloatSize& pageSizeInPixels);
 
 protected:

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2010-07-15  Shinichiro Hamaji  <hamaji@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Printing test results differ between machines, we should use ImageDiff instead
+        https://bugs.webkit.org/show_bug.cgi?id=20011
+
+        * Misc/WebCoreStatistics.h:
+        * Misc/WebCoreStatistics.mm:
+        (-[WebFrame printToCGContext:cgContext:pageWidthInPixels:]):
+
 2010-07-15  Daniel Bates  <dbates@rim.com>
 

trunk/WebKit/mac/Misc/WebCoreStatistics.h

@@ -91 +91 @@
 - (bool)isPageBoxVisible:(int)pageNumber;
 - (NSString *)pageSizeAndMarginsInPixels:(int)pageNumber:(int)width:(int)height:(int)marginTop:(int)marginRight:(int)marginBottom:(int)marginLeft;
+- (void)printToCGContext:(CGContextRef)cgContext:(float)pageWidthInPixels:(float)pageHeightInPixels;
 @end

trunk/WebKit/mac/Misc/WebCoreStatistics.mm

@@ -38 +38 @@
 #import <WebCore/GCController.h>
 #import <WebCore/GlyphPageTreeNode.h>
+#import <WebCore/GraphicsContext.h>
 #import <WebCore/IconDatabase.h>
 #import <WebCore/JSDOMWindow.h>
@@ -290 +291 @@
     return PrintContext::pageSizeAndMarginsInPixels(_private->coreFrame, pageNumber, width, height, marginTop, marginRight, marginBottom, marginLeft);
 }
+
+- (void)printToCGContext:(CGContextRef)cgContext:(float)pageWidthInPixels:(float)pageHeightInPixels
+{
+    Frame* coreFrame = _private->coreFrame;
+    if (!coreFrame)
+        return;
+
+    GraphicsContext graphicsContext(cgContext);
+    PrintContext::spoolAllPagesWithBoundaries(coreFrame, graphicsContext, FloatSize(pageWidthInPixels, pageHeightInPixels));
+}
+
 @end

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-07-15  Shinichiro Hamaji  <hamaji@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Printing test results differ between machines, we should use ImageDiff instead
+        https://bugs.webkit.org/show_bug.cgi?id=20011
+
+        * DumpRenderTree/PixelDumpSupport.cpp:
+        (dumpWebViewAsPixelsAndCompareWithExpected):
+        * DumpRenderTree/PixelDumpSupport.h:
+        * DumpRenderTree/mac/PixelDumpSupportMac.mm:
+        (createBitmapContext): This function was added to share bitmap context creation code.
+        (createBitmapContextFromWebView):
+        (createPagedBitmapContext):
+
 2010-07-15  Yuta Kitamura  <yutak@chromium.org>
 

trunk/WebKitTools/DumpRenderTree/PixelDumpSupport.cpp

@@ -43 +43 @@
 void dumpWebViewAsPixelsAndCompareWithExpected(const std::string& expectedHash)
 {
-    RefPtr<BitmapContext> context = createBitmapContextFromWebView(gLayoutTestController->testOnscreen(), gLayoutTestController->testRepaint(), gLayoutTestController->testRepaintSweepHorizontally(), gLayoutTestController->dumpSelectionRect());
+    RefPtr<BitmapContext> context;
+    if (gLayoutTestController->isPrinting())
+        context = createPagedBitmapContext();
+    else
+        context = createBitmapContextFromWebView(gLayoutTestController->testOnscreen(), gLayoutTestController->testRepaint(), gLayoutTestController->testRepaintSweepHorizontally(), gLayoutTestController->dumpSelectionRect());
     ASSERT(context);
     

trunk/WebKitTools/DumpRenderTree/PixelDumpSupport.h

@@ -37 +37 @@
 
 void computeMD5HashStringForBitmapContext(BitmapContext*, char hashString[33]);
+PassRefPtr<BitmapContext> createPagedBitmapContext();
 PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool onscreen, bool incrementalRepaint, bool sweepHorizontally, bool drawSelectionRect);
 void dumpBitmap(BitmapContext*);

trunk/WebKitTools/DumpRenderTree/mac/PixelDumpSupportMac.mm

@@ -39 +39 @@
 #include <wtf/RefPtr.h>
 
+#import <WebKit/WebCoreStatistics.h>
 #import <WebKit/WebDocumentPrivate.h>
 #import <WebKit/WebHTMLViewPrivate.h>
@@ -105 +106 @@
 }
 
-PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool onscreen, bool incrementalRepaint, bool sweepHorizontally, bool drawSelectionRect)
-{
-    WebView* view = [mainFrame webView];
-
-    // If the WebHTMLView uses accelerated compositing, we need for force the on-screen capture path
-    // and also force Core Animation to start its animations with -display since the DRT window has autodisplay disabled.
-    if ([view _isUsingAcceleratedCompositing])
-        onscreen = YES;
-
-    NSSize webViewSize = [view frame].size;
-    size_t pixelsWide = static_cast<size_t>(webViewSize.width);
-    size_t pixelsHigh = static_cast<size_t>(webViewSize.height);
+static PassRefPtr<BitmapContext> createBitmapContext(size_t pixelsWide, size_t pixelsHigh)
+{
     size_t rowBytes = (4 * pixelsWide + 63) & ~63; // Use a multiple of 64 bytes to improve CG performance
 
@@ -141 +132 @@
     }
 
-    // The BitmapContext keeps the CGContextRef and the pixel buffer alive
-    RefPtr<BitmapContext> bitmapContext = BitmapContext::createByAdoptingBitmapAndContext(buffer, context);
-    
+    return BitmapContext::createByAdoptingBitmapAndContext(buffer, context);
+}
+
+PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool onscreen, bool incrementalRepaint, bool sweepHorizontally, bool drawSelectionRect)
+{
+    WebView* view = [mainFrame webView];
+
+    // If the WebHTMLView uses accelerated compositing, we need for force the on-screen capture path
+    // and also force Core Animation to start its animations with -display since the DRT window has autodisplay disabled.
+    if ([view _isUsingAcceleratedCompositing])
+        onscreen = YES;
+
+    NSSize webViewSize = [view frame].size;
+    size_t pixelsWide = static_cast<size_t>(webViewSize.width);
+    size_t pixelsHigh = static_cast<size_t>(webViewSize.height);
+    RefPtr<BitmapContext> bitmapContext = createBitmapContext(pixelsWide, pixelsHigh);
+    if (!bitmapContext)
+        return 0;
+    CGContextRef context = bitmapContext->cgContext();
+
     NSGraphicsContext *nsContext = [NSGraphicsContext graphicsContextWithGraphicsPort:context flipped:NO];
     ASSERT(nsContext);
@@ -255 +263 @@
     return bitmapContext.release();
 }
+
+PassRefPtr<BitmapContext> createPagedBitmapContext()
+{
+    int pageWidthInPixels = LayoutTestController::maxViewWidth;
+    int pageHeightInPixels = LayoutTestController::maxViewHeight;
+    int numberOfPages = [mainFrame numberOfPages:pageWidthInPixels:pageHeightInPixels];
+
+    RefPtr<BitmapContext> bitmapContext = createBitmapContext(pageWidthInPixels, numberOfPages * (pageHeightInPixels + 1) - 1);
+    [mainFrame printToCGContext:bitmapContext->cgContext():pageWidthInPixels:pageHeightInPixels];
+    return bitmapContext.release();
+}