diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 22:12:11 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 22:12:11 +0000 |
| commit | ab2ce4fd6d1a09fbbaa5ed96370876ecb7a6dfc3 (patch) | |
| tree | 95eeceb1da3e4b22325aba1b35a5be3e134485b3 | |
| parent | 6bb8b6cf1266334cafc39847abb06c9f7c35060c (diff) | |
| download | chromium_src-ab2ce4fd6d1a09fbbaa5ed96370876ecb7a6dfc3.zip chromium_src-ab2ce4fd6d1a09fbbaa5ed96370876ecb7a6dfc3.tar.gz chromium_src-ab2ce4fd6d1a09fbbaa5ed96370876ecb7a6dfc3.tar.bz2 | |
Fix bug introduced in r85773: PPB_Buffer_Impl::Init() never set size_!
BUG=83207
TEST=./ninja/chrome --enable-print-preview /path/to/file.pdf has working print preview again, instead of either DCHECK crash (dbg build) or blank preview (release build)
Review URL: http://codereview.chromium.org/7040019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85986 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/plugins/ppapi/ppb_buffer_impl.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/webkit/plugins/ppapi/ppb_buffer_impl.cc b/webkit/plugins/ppapi/ppb_buffer_impl.cc index 8db5d55..b834e41 100644 --- a/webkit/plugins/ppapi/ppb_buffer_impl.cc +++ b/webkit/plugins/ppapi/ppb_buffer_impl.cc @@ -89,6 +89,7 @@ PPB_Buffer_Impl* PPB_Buffer_Impl::AsPPB_Buffer_Impl() { bool PPB_Buffer_Impl::Init(uint32_t size) { if (size == 0 || !instance()) return false; + size_ = size; shared_memory_.reset( instance()->delegate()->CreateAnonymousSharedMemory(size)); return shared_memory_.get() != NULL; @@ -99,7 +100,9 @@ void PPB_Buffer_Impl::Describe(uint32_t* size_in_bytes) const { } void* PPB_Buffer_Impl::Map() { - if (!shared_memory_.get() || !shared_memory_->Map(size_)) + DCHECK(size_); + DCHECK(shared_memory_.get()); + if (!shared_memory_->Map(size_)) return NULL; return shared_memory_->memory(); } |