Changeset 173297 in webkit

Timestamp:

Sep 4, 2014 5:55:10 PM (10 years ago)

Author:

Simon Fraser

Message:

Add some logging to help diagnose assertions in dumpWebViewAsPixelsAndCompareWithExpected() on bots
​https://bugs.webkit.org/show_bug.cgi?id=136561

Reviewed by Tim Horton.

Log for calloc() and CGBitmapContextCreate() failures.

• DumpRenderTree/mac/PixelDumpSupportMac.mm:

(createBitmapContext):
(createBitmapContextFromWebView):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/mac/PixelDumpSupportMac.mm (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-09-04  Simon Fraser  <simon.fraser@apple.com>
+
+        Add some logging to help diagnose assertions in dumpWebViewAsPixelsAndCompareWithExpected() on bots
+        https://bugs.webkit.org/show_bug.cgi?id=136561
+
+        Reviewed by Tim Horton.
+        
+        Log for calloc() and CGBitmapContextCreate() failures.
+
+        * DumpRenderTree/mac/PixelDumpSupportMac.mm:
+        (createBitmapContext):
+        (createBitmapContextFromWebView):
+
 2014-09-04  Andy Estes  <aestes@apple.com>
 

trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm

@@ -55 +55 @@
 
     buffer = calloc(pixelsHigh, rowBytes);
-    if (!buffer)
-        return 0;
+    if (!buffer) {
+        WTFLogAlways("DumpRenderTree: calloc(%llu, %llu) failed\n", pixelsHigh, rowBytes);
+        return nullptr;
+    }
     
     // Creating this bitmap in the device color space prevents any color conversion when the image of the web view is drawn into it.
@@ -63 +65 @@
     if (!context) {
         free(buffer);
-        return 0;
+        WTFLogAlways("DumpRenderTree: CGBitmapContextCreate(%p, %llu, %llu, 8, %llu, %p, 0x%x) failed\n", buffer, pixelsHigh, pixelsWide, rowBytes, colorSpace.get(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host);
+        return nullptr;
     }
 
@@ -116 +119 @@
     size_t pixelsHigh = static_cast<size_t>(webViewSize.height * deviceScaleFactor);
     size_t rowBytes = 0;
-    void* buffer = 0;
+    void* buffer = nullptr;
     RefPtr<BitmapContext> bitmapContext = createBitmapContext(pixelsWide, pixelsHigh, rowBytes, buffer);
     if (!bitmapContext)
-        return 0;
+        return nullptr;
     CGContextRef context = bitmapContext->cgContext();
     // The final scaling gets doubled on the screen capture surface when we use the hidpi backingScaleFactor value for CTM.