Skip to content
This repository has been archived by the owner on Jan 4, 2019. It is now read-only.

Merge C68 into master #634

Merged
merged 75 commits into from
Aug 9, 2018
Merged

Merge C68 into master #634

merged 75 commits into from
Aug 9, 2018

Conversation

darkdh
Copy link
Member

@darkdh darkdh commented Jul 18, 2018

based C68 branch

@darkdh darkdh force-pushed the C68-master branch 4 times, most recently from b7f7800 to 7d335a0 Compare July 25, 2018 05:27
ltilve and others added 23 commits August 2, 2018 17:20
ltilve and others added 21 commits August 2, 2018 17:20
FAILED: obj/mojo/public/cpp/platform/platform/named_platform_channel_win.obj
../../mojo/public/cpp/platform/named_platform_channel_win.cc(58,8):  error: no member named 'unique_ptr' in namespace 'std'
  std::unique_ptr<void, decltype(::LocalFree)*> p(security_desc, ::LocalFree);
  ~~~~~^
../../mojo/public/cpp/platform/named_platform_channel_win.cc(58,23):  error: expected '(' for function-style cast or type construction
  std::unique_ptr<void, decltype(::LocalFree)*> p(security_desc, ::LocalFree);
                  ~~~~^
2 errors generated.
`ServiceWorkerProcessManager::AllocateWorkerProcess` can have
correct site instance set by `use_url_from_storage_partition`

fix brave/browser-laptop#14806

Auditor: @bridiver
@bridiver bridiver merged commit 7eccb60 into master Aug 9, 2018
@bridiver bridiver deleted the C68-master branch August 9, 2018 22:31
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants