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

base/gfx/platform_canvas_win.h

 // 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.
 
 #ifndef BASE_GFX_PLATFORM_CANVAS_WIN_H_
 #define BASE_GFX_PLATFORM_CANVAS_WIN_H_
 
 #include "base/gfx/platform_device_win.h"
 #include "base/basictypes.h"
 
@@ skipping 11 matching lines @@
   // parameter is passed to gfx::PlatformDevice::create.  See it for details.
   //
   // If you use the version with no arguments, you MUST call initialize()
   PlatformCanvasWin();
   PlatformCanvasWin(int width, int height, bool is_opaque);
   PlatformCanvasWin(int width, int height, bool is_opaque,
                     HANDLE shared_section);
   virtual ~PlatformCanvasWin();
 
   // For two-part init, call if you use the no-argument constructor above
-  void initialize(int width, int height, bool is_opaque, HANDLE shared_section);
+  bool initialize(int width, int height, bool is_opaque, HANDLE shared_section);
 
   // These calls should surround calls to platform drawing routines, the DC
   // returned by beginPlatformPaint is the DC that can be used to draw into.
   // Call endPlatformPaint when you are done and want to use Skia operations
   // again; this will synchronize the bitmap to Windows.
   virtual HDC beginPlatformPaint();
   virtual void endPlatformPaint();
 
   // Returns the platform device pointer of the topmost rect with a non-empty
   // clip. In practice, this is usually either the top layer or nothing, since
@@ skipping 43 matching lines @@
 //   case WM_PAINT: {
 //     gfx::PlatformCanvasWinPaint canvas(hwnd);
 //     if (!canvas.isEmpty()) {
 //       ... paint to the canvas ...
 //     }
 //     return 0;
 //   }
 template <class T>
 class CanvasPaintT : public T {
  public:
-  CanvasPaintT(HWND hwnd) : hwnd_(hwnd), for_paint_(true) {
+  CanvasPaintT(HWND hwnd) : hwnd_(hwnd), paint_dc_(NULL), for_paint_(true) {
+    memset(&ps_, 0, sizeof(ps_));
     initPaint(true);
   }
 
-  CanvasPaintT(HWND hwnd, bool opaque) : hwnd_(hwnd), for_paint_(true) {
+  CanvasPaintT(HWND hwnd, bool opaque) : hwnd_(hwnd), paint_dc_(NULL),
+      for_paint_(true) {
+    memset(&ps_, 0, sizeof(ps_));
     initPaint(opaque);
   }
 
   // Creates a CanvasPaintT for the specified region that paints to the
   // specified dc. This does NOT do BeginPaint/EndPaint.
   CanvasPaintT(HDC dc, bool opaque, int x, int y, int w, int h)
       : hwnd_(NULL),
         paint_dc_(dc),
         for_paint_(false) {
     memset(&ps_, 0, sizeof(ps_));
@@ skipping 45 matching lines @@
     paint_dc_ = BeginPaint(hwnd_, &ps_);
 
     init(opaque);
   }
 
   void init(bool opaque) {
     // FIXME(brettw) for ClearType, we probably want to expand the bounds of
     // painting by one pixel so that the boundaries will be correct (ClearType
     // text can depend on the adjacent pixel). Then we would paint just the
     // inset pixels to the screen.
-    initialize(ps_.rcPaint.right - ps_.rcPaint.left,
-               ps_.rcPaint.bottom - ps_.rcPaint.top, opaque, NULL);
+    const int width = ps_.rcPaint.right - ps_.rcPaint.left;
+    const int height = ps_.rcPaint.bottom - ps_.rcPaint.top;
+    if (!initialize(width, height, opaque, NULL)) {
+      // Cause a deliberate crash;
+      *(char*) 0 = 0;
+    }
 
     // This will bring the canvas into the screen coordinate system for the
     // dirty rect
     translate(SkIntToScalar(-ps_.rcPaint.left),
               SkIntToScalar(-ps_.rcPaint.top));
   }
 
   // If true, this canvas was created for a BeginPaint.
   const bool for_paint_;
 
   DISALLOW_COPY_AND_ASSIGN(CanvasPaintT);
 };
 
 typedef CanvasPaintT<PlatformCanvasWin> PlatformCanvasWinPaint;
 
 }  // namespace gfx
 
 #endif  // BASE_GFX_PLATFORM_CANVAS_WIN_H_