diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-18 17:47:49 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-18 17:47:49 +0000 |
| commit | de9cfbce825a56e003bf0140ac83a3211c72ad9f (patch) | |
| tree | 5d04897da40a06dbaffdfce61493ce7193700b11 /app/surface/transport_dib.h | |
| parent | 377b4cc93ed0ca53988f5cc23026fb1ca3c6d838 (diff) | |
| download | chromium_src-de9cfbce825a56e003bf0140ac83a3211c72ad9f.zip chromium_src-de9cfbce825a56e003bf0140ac83a3211c72ad9f.tar.gz chromium_src-de9cfbce825a56e003bf0140ac83a3211c72ad9f.tar.bz2 | |
Pull latest ppapi for initial testing support, implement checks so the tests pass in Chrome. Mostly, this involves better error checking.
The most substantial change is that I made TransportDIB able to return NULL on failure to make a PlatformCanvas, which we run into when makeing too large of a canvas from a plugin. I checked all the callers of this function to make sure they all handled the problem (many already did).
TEST=pulls Pepper test
BUG=-none
Review URL: http://codereview.chromium.org/2101004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47526 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/surface/transport_dib.h')
| -rw-r--r-- | app/surface/transport_dib.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/surface/transport_dib.h b/app/surface/transport_dib.h index 44fb6a9..ffa10e4 100644 --- a/app/surface/transport_dib.h +++ b/app/surface/transport_dib.h @@ -131,6 +131,9 @@ class TransportDIB { // Returns a canvas using the memory of this TransportDIB. The returned // pointer will be owned by the caller. The bitmap will be of the given size, // which should fit inside this memory. + // + // Will return NULL on allocation failure. This could be because the image + // is too large to map into the current process' address space. skia::PlatformCanvas* GetPlatformCanvas(int w, int h); // Return a pointer to the shared memory |