Commit 3f60737e authored by Maksim Ivanov's avatar Maksim Ivanov Committed by Commit Bot

Fix use-after-move in //ash/

Fix use-after-move (potential) bugs found by the
"bugprone-use-after-move" clang-tidy check.

Bug: 1122844
Change-Id: Ic709538aa5638abf3b1f37dd0a0b619eed54b726
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2549243
Commit-Queue: Ahmed Fakhry <afakhry@chromium.org>
Auto-Submit: Maksim Ivanov <emaxx@chromium.org>
Reviewed-by: default avatarAhmed Fakhry <afakhry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#829544}
parent 7e47fa7f
......@@ -203,6 +203,7 @@ class AmbientURLLoaderImpl : public AmbientURLLoader {
auto simple_loader = CreateSimpleURLLoader(url);
auto loader_factory = AmbientClient::Get()->GetURLLoaderFactory();
auto* loader_ptr = simple_loader.get();
auto* loader_factory_ptr = loader_factory.get();
// Create a temporary file path as target for download to guard against race
// conditions in reading.
......@@ -212,7 +213,7 @@ class AmbientURLLoaderImpl : public AmbientURLLoader {
// Download to temp file first to guarantee entire image is written without
// errors before attempting to read it.
loader_ptr->DownloadToFile(
loader_factory.get(),
loader_factory_ptr,
base::BindOnce(&AmbientURLLoaderImpl::OnUrlDownloadedToFile,
weak_factory_.GetWeakPtr(), std::move(callback),
std::move(simple_loader), std::move(loader_factory),
......
......@@ -182,7 +182,7 @@ class SearchResultTileItemListViewTest
result->set_title(base::ASCIIToUTF16("RecommendedApp ") +
base::NumberToString16(i));
result->SetRating(1 + i);
results->AddAt(result->display_index(), std::move(result));
results->AddAt(display_indexes[i], std::move(result));
}
}
......
......@@ -621,8 +621,9 @@ void DockedMagnifierControllerImpl::CreateMagnifierViewport() {
params.accept_events = false;
params.bounds = viewport_bounds;
params.opacity = views::Widget::InitParams::WindowOpacity::kOpaque;
params.parent =
aura::Window* const parent =
GetViewportParentContainerForRoot(current_source_root_window_);
params.parent = parent;
params.name = kDockedMagnifierViewportWindowName;
viewport_widget_->Init(std::move(params));
......@@ -632,7 +633,7 @@ void DockedMagnifierControllerImpl::CreateMagnifierViewport() {
separator_layer_->SetColor(SK_ColorBLACK);
separator_layer_->SetBounds(
SeparatorBoundsFromViewportBounds(viewport_bounds));
params.parent->layer()->Add(separator_layer_.get());
parent->layer()->Add(separator_layer_.get());
// 3- Create a background layer that will show a dark gray color behind the
// magnifier layer. It has the same bounds as the viewport.
......
......@@ -347,16 +347,17 @@ TEST_F(ShelfWidgetTest, ShelfEdgeOverlappingWindowHitTestMouse) {
const int kOverlapSize = 15;
const int kWindowHeight = 200;
const int kWindowWidth = 200;
const gfx::Rect bounds(shelf_bounds.height() - kOverlapSize,
shelf_bounds.y() - kWindowHeight + kOverlapSize,
kWindowWidth, kWindowHeight);
views::Widget* widget = new views::Widget;
views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
params.bounds = gfx::Rect(shelf_bounds.height() - kOverlapSize,
shelf_bounds.y() - kWindowHeight + kOverlapSize,
kWindowWidth, kWindowHeight);
params.bounds = bounds;
params.context = GetContext();
// Widget is now owned by the parent window.
widget->Init(std::move(params));
// Explicitly set the bounds which will allow the widget to overlap the shelf.
widget->SetBounds(params.bounds);
widget->SetBounds(bounds);
widget->Show();
gfx::Rect widget_bounds = widget->GetWindowBoundsInScreen();
EXPECT_TRUE(widget_bounds.Intersects(shelf_bounds));
......
......@@ -324,10 +324,9 @@ TEST_F(ShellTest, CreateModalWindow) {
}
TEST_F(ShellTest, CreateLockScreenModalWindow) {
// Create a normal window.
views::Widget::InitParams widget_params(
views::Widget::InitParams::TYPE_WINDOW);
// Create a normal window.
views::Widget* widget = CreateTestWindow(std::move(widget_params));
widget->Show();
EXPECT_TRUE(widget->GetNativeView()->HasFocus());
......@@ -338,7 +337,9 @@ TEST_F(ShellTest, CreateLockScreenModalWindow) {
GetSessionControllerClient()->LockScreen();
// Create a LockScreen window.
views::Widget* lock_widget = CreateTestWindow(std::move(widget_params));
views::Widget::InitParams lock_widget_params(
views::Widget::InitParams::TYPE_WINDOW);
views::Widget* lock_widget = CreateTestWindow(std::move(lock_widget_params));
Shell::GetContainer(Shell::GetPrimaryRootWindow(),
kShellWindowId_LockScreenContainer)
->AddChild(lock_widget->GetNativeView());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment