diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-02 10:43:26 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-02 10:44:03 +0200 |
| commit | bb91a70e24ac49fd21c1d7c8c91a216961da1e2d (patch) | |
| tree | 4c2497e0b093c7b0a25d48e72659dca21a50569a /chromium/content/child/webblobregistry_impl.cc | |
| parent | 1ec92e71bb67445775ce64cb081ed25c3d7481f1 (diff) | |
| parent | b92421879c003a0857b2074f7e05b3bbbb326569 (diff) | |
| download | qtwebengine-chromium-bb91a70e24ac49fd21c1d7c8c91a216961da1e2d.tar.gz | |
Merge branch 'upstream-master' into 51-based
Change-Id: I08d36e04494c3bb0c04641ad7c8e53bf418975db
Diffstat (limited to 'chromium/content/child/webblobregistry_impl.cc')
| -rw-r--r-- | chromium/content/child/webblobregistry_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/content/child/webblobregistry_impl.cc b/chromium/content/child/webblobregistry_impl.cc index afc7ae28a73..6ad76f2c93e 100644 --- a/chromium/content/child/webblobregistry_impl.cc +++ b/chromium/content/child/webblobregistry_impl.cc @@ -148,8 +148,8 @@ void WebBlobRegistryImpl::addDataToStream(const WebURL& url, size_t shared_memory_size = std::min(length, storage::kBlobStorageMaxSharedMemoryBytes); std::unique_ptr<base::SharedMemory> shared_memory( - ChildThreadImpl::AllocateSharedMemory(shared_memory_size, - sender_.get())); + ChildThreadImpl::AllocateSharedMemory(shared_memory_size, sender_.get(), + nullptr)); CHECK(shared_memory.get()); if (!shared_memory->Map(shared_memory_size)) CHECK(false); |