Reland "Add std::move() to local base::Callback instances in //content"
This reverts commit 9b4af06d02677a9629264b40042bd17b2062343f.
Reason for revert: This does not seem like the root cause.
Original change's description:
> Revert "Add std::move() to local base::Callback instances in //content"
>
> This reverts commit c55a5a47eec2b21fa371085771d8b1639a8d430e.
>
> Reason for revert: Speculative revert because of renderer crashes across
> the board on Android with:
> [FATAL:weak_ptr.cc(26)] Check failed: sequence_checker_.CalledOnValidSequence(). WeakPtrs must be checked on the same sequenced thread
>
> Original change's description:
> > Add std::move() to local base::Callback instances in //content
> >
> > This adds std::move() around base::Callback instances where it looks
> > relevant, by applying `base_bind_rewriters -rewriter=add_std_move`.
> > https://crrev.com/c/970143, plus manual fixes.
> >
> > Example:
> > // Before:
> > void set_callback(base::Closure cb) { g_cb = cb; }
> > void RunCallback(base::Callback<void(int)> cb) { cb.Run(42); }
> > void Post() {
> > base::Closure task = base::Bind(&Foo);
> > PostTask(FROM_HERE, task);
> > }
> >
> > // After:
> > void set_callback(base::Closure cb) { g_cb = std::move(cb); }
> > void RunCallback(base::Callback<void(int)> cb) { std::move(cb).Run(42); }
> > void Post() {
> > base::Closure task = base::Bind(&Foo);
> > PostTask(FROM_HERE, std::move(task));
> > }
> >
> > Specifically, it inserts std::move() if:
> > - it's a pass-by-value parameter or non-const local variable.
> > - the occurrence is the latest in its control flow.
> > - no pointer is taken for the variable.
> > - no capturing lambda exists for the variable.
> >
> > Change-Id: I53853f9b9c8604994e2065af66ed4607af9c12ed
> > Reviewed-on: https://chromium-review.googlesource.com/970056
> > Reviewed-by: Kinuko Yasuda <[email protected]>
> > Commit-Queue: Taiju Tsuiki <[email protected]>
> > Cr-Commit-Position: refs/heads/master@{#544356}
>
> [email protected],[email protected]
>
> Change-Id: Ie7392a2229e1ef0f740d8958f8fe43d99b0460e9
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://chromium-review.googlesource.com/972321
> Reviewed-by: Tommy Nyquist <[email protected]>
> Commit-Queue: Tommy Nyquist <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#544527}
[email protected],[email protected],[email protected]
Change-Id: I0aabd6032a070a28d0e5a4f796f37fe18f1e5cd4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/972302
Reviewed-by: Tommy Nyquist <[email protected]>
Commit-Queue: Tommy Nyquist <[email protected]>
Cr-Commit-Position: refs/heads/master@{#544536}diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index eef0c40..4bc49d3 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -486,7 +486,8 @@
task_runner, std::move(widget_channel_request)));
ShowCallback opener_callback =
base::Bind(&RenderViewImpl::ShowCreatedPopupWidget, opener->GetWeakPtr());
- widget->Init(opener_callback, RenderWidget::CreateWebWidget(widget.get()));
+ widget->Init(std::move(opener_callback),
+ RenderWidget::CreateWebWidget(widget.get()));
DCHECK(!widget->HasOneRef()); // RenderWidget::Init() adds a reference.
return widget.get();
}
