Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix re-enable full FarbleScreenPopupPosition test #17277

Merged
merged 2 commits into from
Feb 22, 2023
+16 −13
Merged

fix re-enable full FarbleScreenPopupPosition test #17277

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc50559
fix re-enable full FarbleScreenPopupPosition test
arthuredelstein Feb 17, 2023
740f4d0
make window smaller before offseting it
arthuredelstein Feb 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions browser/farbling/brave_screen_farbling_browsertest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ class WidgetBoundsChangeWaiter final : public views::WidgetObserver {

private:
bool BoundsChangeMeetsThreshold(const gfx::Rect& rect) const {
return std::abs(rect.x() - initial_bounds_.x()) >= threshold_ &&
std::abs(rect.y() - initial_bounds_.y()) >= threshold_ &&
std::abs(rect.width() - initial_bounds_.width()) >= threshold_ &&
std::abs(rect.height() - initial_bounds_.height()) >= threshold_;
return (std::abs(rect.x() - initial_bounds_.x()) >= threshold_ &&
std::abs(rect.y() - initial_bounds_.y()) >= threshold_) ||
(std::abs(rect.width() - initial_bounds_.width()) >= threshold_ &&
std::abs(rect.height() - initial_bounds_.height()) >= threshold_);
}

const raw_ptr<views::Widget> widget_;
Expand Down Expand Up @@ -305,25 +305,28 @@ class BraveScreenFarblingBrowserTest : public InProcessBrowserTest {
EXPECT_LE(parent_bounds.width(), child_bounds.width());
EXPECT_LE(parent_bounds.height(), child_bounds.height());
}
/*
TODO(aedelstein): Fix intermittent failures here.
if (!test_iframe) {
auto bounds_before = popup->window()->GetBounds();
auto* widget = views::Widget::GetWidgetForNativeWindow(
popup->window()->GetNativeWindow());

auto bounds_before = popup->window()->GetBounds();
auto waiter2 = WidgetBoundsChangeWaiter(widget, 10);
ASSERT_TRUE(ExecJs(popup_contents,
"resizeTo(outerWidth - 13, outerHeight - 14)"));
waiter2.Wait();
auto bounds_after = popup->window()->GetBounds();
EXPECT_EQ(-13, bounds_after.width() - bounds_before.width());
EXPECT_EQ(-14, bounds_after.height() - bounds_before.height());

bounds_before = popup->window()->GetBounds();
auto waiter = WidgetBoundsChangeWaiter(widget, 10);
ASSERT_TRUE(
ExecJs(popup_contents, "moveTo(screenX + 11, screenY + 12)"));
ASSERT_TRUE(ExecJs(popup_contents,
"resizeTo(outerWidth + 13, outerHeight + 14)"));
waiter.Wait();
auto bounds_after = popup->window()->GetBounds();
bounds_after = popup->window()->GetBounds();
EXPECT_EQ(11, bounds_after.x() - bounds_before.x());
EXPECT_EQ(12, bounds_after.y() - bounds_before.y());
EXPECT_EQ(13, bounds_after.width() - bounds_before.width());
EXPECT_EQ(14, bounds_after.height() - bounds_before.height());
}
*/
}
}
}
Expand Down