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

Uplift 17277 and 17341 to 1.49.x #17351

Merged
merged 2 commits into from
Feb 27, 2023
Merged

Uplift 17277 and 17341 to 1.49.x #17351

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4783795
fix re-enable full FarbleScreenPopupPosition test (uplift to 1.49.x) …
arthuredelstein Feb 22, 2023
7e0cec1
fix broken screen farbling regression test (uplift to 1.49.x) (#17341)
arthuredelstein Feb 23, 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
47 changes: 24 additions & 23 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 @@ -156,6 +156,7 @@ class BraveScreenFarblingBrowserTest : public InProcessBrowserTest {

gfx::Rect SetBounds(const gfx::Rect& bounds) {
browser()->window()->SetBounds(bounds);
content::RunAllPendingInMessageLoop();
return browser()->window()->GetBounds();
}

Expand Down Expand Up @@ -273,20 +274,17 @@ class BraveScreenFarblingBrowserTest : public InProcessBrowserTest {

void FarbleScreenPopupPosition(int j) {
gfx::Rect parent_bounds;
// Make sure parent_bounds dimensions aren't unexpectedly large.
do {
parent_bounds = SetBounds(kTestWindowBounds[j]);
} while (parent_bounds.width() > 600 || parent_bounds.height() > 600);
parent_bounds = SetBounds(kTestWindowBounds[j]);
for (bool allow_fingerprinting : {false, true}) {
SetFingerprintingSetting(allow_fingerprinting);
NavigateToURLUntilLoadStop(parent_url());
for (bool test_iframe : {false, true}) {
const char* script =
"open('/simple.html', '', `"
"left=10,"
"top=10,"
"width=${outerWidth + 200},"
"height=${outerHeight + 200}"
"left=30,"
"top=30,"
"width=${outerWidth + 20},"
"height=${outerHeight + 20}"
"`);";
Browser* popup = OpenPopup(script, test_iframe);
auto* popup_contents = popup->tab_strip_model()->GetActiveWebContents();
Expand All @@ -305,25 +303,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 waiter = WidgetBoundsChangeWaiter(widget, 10);
ASSERT_TRUE(
ExecJs(popup_contents, "moveTo(screenX + 11, screenY + 12)"));

auto bounds_before = popup->window()->GetBounds();
auto waiter1 = WidgetBoundsChangeWaiter(widget, 10);
ASSERT_TRUE(ExecJs(popup_contents,
"resizeTo(outerWidth + 13, outerHeight + 14)"));
waiter.Wait();
"resizeTo(outerWidth - 13, outerHeight - 14)"));
waiter1.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 waiter2 = WidgetBoundsChangeWaiter(widget, 10);
ASSERT_TRUE(
ExecJs(popup_contents, "moveTo(screenX + 11, screenY + 12)"));
waiter2.Wait();
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