diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-08-01 11:44:21 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-08-01 09:49:25 +0000 |
| commit | 9a05d0e4db172168e429f30bc8ed62b695006490 (patch) | |
| tree | 6a7a6b2f7e3410bb9ddc3ef9a200156f2bf623e1 /chromium/content/renderer/render_thread_impl.cc | |
| parent | 6ec7b8da05d21a3878bd21c691b41e675d74bb1c (diff) | |
| download | qtwebengine-chromium-9a05d0e4db172168e429f30bc8ed62b695006490.tar.gz | |
BASELINE: Update Chromium to 60.0.3112.78
Change-Id: I58f9d14bddb9104a666b6ef869944111ee7eadb8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/renderer/render_thread_impl.cc')
| -rw-r--r-- | chromium/content/renderer/render_thread_impl.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/chromium/content/renderer/render_thread_impl.cc b/chromium/content/renderer/render_thread_impl.cc index d7a0de4e48c..574acb32ff2 100644 --- a/chromium/content/renderer/render_thread_impl.cc +++ b/chromium/content/renderer/render_thread_impl.cc @@ -664,13 +664,15 @@ void RenderThreadImpl::Init( IsRunningInMash() ? ui::mojom::kServiceName : mojom::kBrowserServiceName, GetIOTaskRunner()); - cc::mojom::SharedBitmapManagerAssociatedPtr shared_bitmap_manager_ptr; - render_message_filter()->GetSharedBitmapManager( - mojo::MakeRequest(&shared_bitmap_manager_ptr)); - shared_bitmap_manager_.reset(new ui::ChildSharedBitmapManager( - cc::mojom::ThreadSafeSharedBitmapManagerAssociatedPtr::Create( - shared_bitmap_manager_ptr.PassInterface(), - GetChannel()->ipc_task_runner_refptr()))); + cc::mojom::SharedBitmapManagerPtr + shared_bitmap_allocation_notifier_ptr; + GetConnector()->BindInterface( + mojom::kBrowserServiceName, + mojo::MakeRequest(&shared_bitmap_allocation_notifier_ptr)); + shared_bitmap_manager_ = base::MakeUnique<ui::ChildSharedBitmapManager>( + cc::mojom::ThreadSafeSharedBitmapManagerPtr::Create( + shared_bitmap_allocation_notifier_ptr.PassInterface(), + GetChannel()->ipc_task_runner_refptr())); InitializeWebKit(resource_task_queue); |