diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-03 18:07:17 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-03 18:07:17 +0000 |
| commit | 155a094e696ad13ffdbc11607ff9085265f67c0a (patch) | |
| tree | 0de93c7b7d3d00d4ab514116c84a55a087836f02 /ppapi/proxy | |
| parent | e1ea51f00616a5768dcc2b9e2e3a7c9e287cecf1 (diff) | |
| download | chromium_src-155a094e696ad13ffdbc11607ff9085265f67c0a.zip chromium_src-155a094e696ad13ffdbc11607ff9085265f67c0a.tar.gz chromium_src-155a094e696ad13ffdbc11607ff9085265f67c0a.tar.bz2 | |
Fix bug introduced when moving image_data to its own file.
TEST=manual (paints on Linux)
BUG=none
Review URL: http://codereview.chromium.org/6073006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70394 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy')
| -rw-r--r-- | ppapi/proxy/image_data.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ppapi/proxy/image_data.cc b/ppapi/proxy/image_data.cc index 2af7026..65da4bb 100644 --- a/ppapi/proxy/image_data.cc +++ b/ppapi/proxy/image_data.cc @@ -45,7 +45,6 @@ void* ImageData::Map() { mapped_data_ = memory; return mapped_data_; #else - return NULL; int shmkey = handle_; void* address = shmat(shmkey, NULL, 0); // Mark for deletion in case we crash so the kernel will clean it up. |