summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-31 10:11:33 +0000
committerjbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-31 10:11:33 +0000
commit81b87f9c8a0ea5f776668ba61f027c1556a4ebfd (patch)
tree894bf1a07d5c53abaa4d1acc986f51b815f90e08 /webkit
parent1a235bdafc4ba8480aafb78b1e290ffa9a1e8f43 (diff)
downloadchromium_src-81b87f9c8a0ea5f776668ba61f027c1556a4ebfd.zip
chromium_src-81b87f9c8a0ea5f776668ba61f027c1556a4ebfd.tar.gz
chromium_src-81b87f9c8a0ea5f776668ba61f027c1556a4ebfd.tar.bz2
Fix allocation of WebExternalBitmap
It needs to map the shared memory. BUG= TBR=jbauman@chromium.org Review URL: https://chromiumcodereview.appspot.com/21022011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214664 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/renderer/compositor_bindings/web_external_bitmap_impl.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/webkit/renderer/compositor_bindings/web_external_bitmap_impl.cc b/webkit/renderer/compositor_bindings/web_external_bitmap_impl.cc
index e450dc8f..f6561ba 100644
--- a/webkit/renderer/compositor_bindings/web_external_bitmap_impl.cc
+++ b/webkit/renderer/compositor_bindings/web_external_bitmap_impl.cc
@@ -25,7 +25,10 @@ WebExternalBitmapImpl::~WebExternalBitmapImpl() {}
void WebExternalBitmapImpl::setSize(WebKit::WebSize size) {
if (size != size_) {
- shared_memory_ = g_memory_allocator(size.width * size.height * 4);
+ size_t byte_size = size.width * size.height * 4;
+ shared_memory_ = g_memory_allocator(byte_size);
+ if (shared_memory_)
+ shared_memory_->Map(byte_size);
size_ = size;
}
}