Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2721)

Unified Diff: base/gfx/platform_canvas_win.cc

Issue 9459: Make canvas code a bit more resilient to crashes.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/gfx/platform_canvas_win.h ('k') | base/gfx/vector_canvas.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/gfx/platform_canvas_win.cc
===================================================================
--- base/gfx/platform_canvas_win.cc (revision 4621)
+++ base/gfx/platform_canvas_win.cc (working copy)
@@ -6,6 +6,7 @@
#include "base/gfx/bitmap_platform_device_win.h"
#include "base/logging.h"
+#include "base/process_util.h"
#ifdef ARCH_CPU_64_BITS
#error This code does not work on x64. Please make sure all the base unit tests\
@@ -14,12 +15,42 @@
namespace gfx {
+// 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);
+}
+
+
PlatformCanvasWin::PlatformCanvasWin() : SkCanvas() {
}
PlatformCanvasWin::PlatformCanvasWin(int width, int height, bool is_opaque)
: SkCanvas() {
- initialize(width, height, is_opaque, NULL);
+ bool initialized = initialize(width, height, is_opaque, NULL);
+ if (!initialized)
+ CrashForBitmapAllocationFailure(width, height);
}
PlatformCanvasWin::PlatformCanvasWin(int width,
@@ -27,20 +58,26 @@
bool is_opaque,
HANDLE shared_section)
: SkCanvas() {
- initialize(width, height, is_opaque, shared_section);
+ bool initialized = initialize(width, height, is_opaque, shared_section);
+ if (!initialized)
+ CrashForBitmapAllocationFailure(width, height);
}
PlatformCanvasWin::~PlatformCanvasWin() {
}
-void PlatformCanvasWin::initialize(int width,
- int height,
- bool is_opaque,
- HANDLE shared_section) {
+bool PlatformCanvasWin::initialize(int width,
+ int height,
+ bool is_opaque,
+ HANDLE shared_section) {
SkDevice* device =
createPlatformDevice(width, height, is_opaque, shared_section);
+ if (!device)
+ return false;
+
setDevice(device);
device->unref(); // was created with refcount 1, and setDevice also refs
+ return true;
}
HDC PlatformCanvasWin::beginPlatformPaint() {
« no previous file with comments | « base/gfx/platform_canvas_win.h ('k') | base/gfx/vector_canvas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698