Make canvas code a bit more resilient to crashes....

base/gfx/bitmap_platform_device_win.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/gfx/bitmap_platform_device_win.h"
 
 #include "base/gfx/gdi_util.h"
 #include "base/logging.h"
-#include "base/process_util.h"
 #include "SkMatrix.h"
 #include "SkRegion.h"
 #include "SkUtils.h"
 
 namespace gfx {
 
 // When Windows draws text, is sets the fourth byte (which Skia uses for alpha)
 // to zero. This means that if we try compositing with text that Windows has
 // drawn, we get invalid color values (if the alpha is 0, the other channels
 // should be 0 since Skia uses premultiplied colors) and strange results.
@@ skipping 72 matching lines @@
 }
 
 // See the declaration of kMagicTransparencyColor at the top of the file.
 void FixupAlphaBeforeCompositing(uint32_t* pixel) {
   if (*pixel == kMagicTransparencyColor)
     *pixel = 0;
   else
     *pixel |= 0xFF000000;
 }
 
-// Crashes the process. This is called when a bitmap allocation fails, and this
-// function tries to determine why it might have failed, and crash on different
-// lines. This allows us to see in crash dumps the most likely reason for the
-// failure. It takes the size of the bitmap we were trying to allocate as its
-// arguments so we can check that as well.
-void CrashForBitmapAllocationFailure(int w, int h) {
-  // The maximum number of GDI objects per process is 10K. If we're very close
-  // to that, it's probably the problem.
-  const int kLotsOfGDIObjs = 9990;
-  CHECK(GetGuiResources(GetCurrentProcess(), GR_GDIOBJECTS) < kLotsOfGDIObjs);
-
-  // If the bitmap is ginormous, then we probably can't allocate it.
-  // We use 64M pixels = 256MB @ 4 bytes per pixel.
-  const int64 kGinormousBitmapPxl = 64000000;
-  CHECK(static_cast<int64>(w) * static_cast<int64>(h) < kGinormousBitmapPxl);
-
-  // If we're using a crazy amount of virtual address space, then maybe there
-  // isn't enough for our bitmap.
-  const int64 kLotsOfMem = 1500000000;  // 1.5GB.
-  scoped_ptr<process_util::ProcessMetrics> process_metrics(
-      process_util::ProcessMetrics::CreateProcessMetrics(GetCurrentProcess()));
-  CHECK(process_metrics->GetPagefileUsage() < kLotsOfMem);
-
-  // Everything else.
-  CHECK(0);
-}
-
 }  // namespace
 
 class BitmapPlatformDeviceWin::BitmapPlatformDeviceWinData
     : public base::RefCounted<BitmapPlatformDeviceWinData> {
  public:
   explicit BitmapPlatformDeviceWinData(HBITMAP hbitmap);
 
   // Create/destroy hdc_, which is the memory DC for our bitmap data.
   HDC GetBitmapDC();
   void ReleaseBitmapDC();
@@ skipping 117 matching lines @@
 // required so that we can call the base class' constructor with the pixel
 // data.
 BitmapPlatformDeviceWin* BitmapPlatformDeviceWin::create(HDC screen_dc,
                                                    int width,
                                                    int height,
                                                    bool is_opaque,
                                                    HANDLE shared_section) {
   SkBitmap bitmap;
 
   // CreateDIBSection appears to get unhappy if we create an empty bitmap, so
-  // we just expand it here.
-  if (width == 0)
+  // just create a minimal bitmap
+  if ((width == 0) || (height == 0)) {
     width = 1;
-  if (height == 0)
     height = 1;
+  }
 
-  BITMAPINFOHEADER hdr;
+  BITMAPINFOHEADER hdr = {0};
   CreateBitmapHeader(width, height, &hdr);
 
-  void* data;
+  void* data = NULL;
   HBITMAP hbitmap = CreateDIBSection(screen_dc,
                                      reinterpret_cast<BITMAPINFO*>(&hdr), 0,
                                      &data,
                                      shared_section, 0);
 
   // If we run out of GDI objects or some other error occurs, we won't get a
   // bitmap here. This will cause us to crash later because the data pointer is
   // NULL. To make sure that we can assign blame for those crashes to this code,
   // we deliberately crash here, even in release mode.
-  if (!hbitmap)
-    CrashForBitmapAllocationFailure(width, height);
+  if (!hbitmap) {
+    DWORD error = GetLastError();
+    NOTREACHED() << "CreateDIBSection Failed. Error: " << error << "\n";
+    return NULL;
+  }
 
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
   bitmap.setPixels(data);
   bitmap.setIsOpaque(is_opaque);
 
   if (is_opaque) {
 #ifndef NDEBUG
     // To aid in finding bugs, we set the background color to something
     // obviously wrong so it will be noticable when it is not cleared
     bitmap.eraseARGB(255, 0, 255, 128);  // bright bluish green
@@ skipping 165 matching lines @@
       for (int j = 0; j < width; j++) {
         adjustor(data + j);
       }
       data += row_words;
     }
   }
 }
 
 }  // namespace gfx