Uplift 16571, 17277, 17341 to 1.48.x

browser/farbling/brave_screen_farbling_browsertest.cc

@@ -26,17 +26,63 @@
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "third_party/blink/public/common/features.h"
+#include "ui/views/widget/widget.h"
+#include "ui/views/widget/widget_observer.h"
 
 using brave_shields::ControlType;
 
 namespace {
 
 const gfx::Rect kTestWindowBounds[] = {
     gfx::Rect(200, 100, 300, 200), gfx::Rect(50, 50, 200, 200),
-    gfx::Rect(50, 50, 555, 444), gfx::Rect(0, 0, 200, 200)};
+    gfx::Rect(50, 50, 475, 460), gfx::Rect(0, 0, 200, 200)};
 
 }  // namespace
 
+// A helper class to wait for widget bounds changes beyond given thresholds.
+class WidgetBoundsChangeWaiter final : public views::WidgetObserver {
+ public:
+  WidgetBoundsChangeWaiter(views::Widget* widget, int threshold)
+      : widget_(widget),
+        threshold_(threshold),
+        initial_bounds_(widget->GetWindowBoundsInScreen()) {
+    widget_->AddObserver(this);
+  }
+
+  WidgetBoundsChangeWaiter(const WidgetBoundsChangeWaiter&) = delete;
+  WidgetBoundsChangeWaiter& operator=(const WidgetBoundsChangeWaiter&) = delete;
+  ~WidgetBoundsChangeWaiter() final { widget_->RemoveObserver(this); }
+
+  // views::WidgetObserver:
+  void OnWidgetBoundsChanged(views::Widget* widget,
+                             const gfx::Rect& rect) final {
+    if (BoundsChangeMeetsThreshold(rect)) {
+      widget_->RemoveObserver(this);
+      run_loop_.Quit();
+    }
+  }
+
+  // Wait for changes to occur, or return immediately if they already have.
+  void Wait() {
+    if (!BoundsChangeMeetsThreshold(widget_->GetWindowBoundsInScreen())) {
+      run_loop_.Run();
+    }
+  }
+
+ 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_);
+  }
+
+  const raw_ptr<views::Widget> widget_;
+  const int threshold_;
+  const gfx::Rect initial_bounds_;
+  base::RunLoop run_loop_;
+};
+
 class BraveScreenFarblingBrowserTest : public InProcessBrowserTest {
  public:
   void SetUpOnMainThread() override {
@@ -57,8 +103,7 @@ class BraveScreenFarblingBrowserTest : public InProcessBrowserTest {
 
     ASSERT_TRUE(embedded_test_server()->Start());
 
-    top_level_page_url_ = embedded_test_server()->GetURL("a.com", "/");
-    farbling_url_ = embedded_test_server()->GetURL("a.com", "/iframe.html");
+    parent_url_ = embedded_test_server()->GetURL("a.com", "/iframe.html");
   }
 
   void TearDown() override {
@@ -81,7 +126,7 @@ class BraveScreenFarblingBrowserTest : public InProcessBrowserTest {
   void SetFingerprintingSetting(bool allow) {
     brave_shields::SetFingerprintingControlType(
         ContentSettings(), allow ? ControlType::ALLOW : ControlType::DEFAULT,
-        top_level_page_url_);
+        parent_url());
   }
 
   content::WebContents* Contents() const {
@@ -110,10 +155,9 @@ class BraveScreenFarblingBrowserTest : public InProcessBrowserTest {
 
   virtual bool IsFlagDisabled() const = 0;
 
-  const GURL& FarblingUrl() { return farbling_url_; }
-
   gfx::Rect SetBounds(const gfx::Rect& bounds) {
     browser()->window()->SetBounds(bounds);
+    content::RunAllPendingInMessageLoop();
     return browser()->window()->GetBounds();
   }
 
@@ -132,16 +176,20 @@ class BraveScreenFarblingBrowserTest : public InProcessBrowserTest {
             EXPECT_GE(8, EvalJs(host, "window.outerWidth - parent.innerWidth"));
             EXPECT_GE(8,
                       EvalJs(host, "window.outerHeight - parent.innerHeight"));
+            EXPECT_GE(8, EvalJs(host,
+                                "window.screen.availWidth - Math.max(450, "
+                                "parent.innerWidth)"));
+            EXPECT_GE(8, EvalJs(host,
+                                "window.screen.availHeight -  Math.max(450, "
+                                "parent.innerHeight)"));
             EXPECT_GE(
                 8,
-                EvalJs(host, "window.screen.availWidth - parent.innerWidth"));
-            EXPECT_GE(
-                8,
-                EvalJs(host, "window.screen.availHeight - parent.innerHeight"));
-            EXPECT_GE(8,
-                      EvalJs(host, "window.screen.width - parent.innerWidth"));
-            EXPECT_GE(
-                8, EvalJs(host, "window.screen.height - parent.innerHeight"));
+                EvalJs(
+                    host,
+                    "window.screen.width - Math.max(450, parent.innerWidth)"));
+            EXPECT_GE(8, EvalJs(host,
+                                "window.screen.height - Math.max(450, "
+                                "parent.innerHeight)"));
           } else {
             EXPECT_LE(0, EvalJs(host, "window.outerWidth - parent.innerWidth"));
             EXPECT_LT(8,
@@ -176,7 +224,7 @@ class BraveScreenFarblingBrowserTest : public InProcessBrowserTest {
       SetFingerprintingSetting(allow_fingerprinting);
       for (int i = 0; i < static_cast<int>(std::size(kTestWindowBounds)); ++i) {
         SetBounds(kTestWindowBounds[i]);
-        NavigateToURLUntilLoadStop(FarblingUrl());
+        NavigateToURLUntilLoadStop(parent_url());
         for (bool test_iframe : {false, true}) {
           content::RenderFrameHost* host = test_iframe ? Parent() : IFrame();
           if (!allow_fingerprinting && !IsFlagDisabled()) {
@@ -208,7 +256,7 @@ class BraveScreenFarblingBrowserTest : public InProcessBrowserTest {
       SetBounds(kTestWindowBounds[j]);
       for (bool allow_fingerprinting : {false, true}) {
         SetFingerprintingSetting(allow_fingerprinting);
-        NavigateToURLUntilLoadStop(FarblingUrl());
+        NavigateToURLUntilLoadStop(parent_url());
         for (bool test_iframe : {false, true}) {
           content::RenderFrameHost* host = test_iframe ? Parent() : IFrame();
           EXPECT_EQ(
@@ -227,20 +275,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(FarblingUrl());
+      NavigateToURLUntilLoadStop(parent_url());
       for (bool test_iframe : {false, true}) {
         const char* script =
-            "open('http://d.test/', '', `"
-            "left=10,"
-            "top=10,"
-            "width=${outerWidth + 200},"
-            "height=${outerHeight + 200}"
+            "open('/simple.html', '', `"
+            "left=30,"
+            "top=30,"
+            "width=${outerWidth + 20},"
+            "height=${outerHeight + 20}"
             "`);";
         Browser* popup = OpenPopup(script, test_iframe);
         auto* popup_contents = popup->tab_strip_model()->GetActiveWebContents();
@@ -249,24 +294,49 @@ class BraveScreenFarblingBrowserTest : public InProcessBrowserTest {
         if (!allow_fingerprinting && !IsFlagDisabled()) {
           EXPECT_GE(child_bounds.x(), parent_bounds.x());
           EXPECT_GE(child_bounds.y(), parent_bounds.y());
-          EXPECT_GE(10 + parent_bounds.width(), child_bounds.width());
-          EXPECT_GE(10 + parent_bounds.height(), child_bounds.height());
+          int maxWidth = 10 + std::max(450, parent_bounds.width());
+          int maxHeight = 10 + std::max(450, parent_bounds.width());
+          EXPECT_GE(maxWidth, child_bounds.width());
+          EXPECT_GE(maxHeight, child_bounds.height());
         } else {
           EXPECT_LE(child_bounds.x(), std::max(80, 10 + parent_bounds.x()));
           EXPECT_LE(child_bounds.y(), std::max(80, 10 + parent_bounds.y()));
           EXPECT_LE(parent_bounds.width(), child_bounds.width());
           EXPECT_LE(parent_bounds.height(), child_bounds.height());
         }
+        if (!test_iframe) {
+          auto* widget = views::Widget::GetWidgetForNativeWindow(
+              popup->window()->GetNativeWindow());
+
+          auto bounds_before = popup->window()->GetBounds();
+          auto waiter1 = WidgetBoundsChangeWaiter(widget, 10);
+          ASSERT_TRUE(ExecJs(popup_contents,
+                             "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());
+        }
       }
     }
   }
 
+  GURL& parent_url() { return parent_url_; }
+
  protected:
   base::test::ScopedFeatureList feature_list_;
 
  private:
-  GURL top_level_page_url_;
-  GURL farbling_url_;
+  GURL parent_url_;
   std::unique_ptr<ChromeContentClient> content_client_;
   std::unique_ptr<BraveContentBrowserClient> browser_content_client_;
 };
@@ -295,12 +365,12 @@ class BraveScreenFarblingBrowserTest_DisableFlag
 
 IN_PROC_BROWSER_TEST_F(BraveScreenFarblingBrowserTest_EnableFlag,
                        FarbleScreenSize_EnableFlag) {
-  FarbleScreenSize(FarblingUrl(), true);
+  FarbleScreenSize(parent_url(), true);
 }
 
 IN_PROC_BROWSER_TEST_F(BraveScreenFarblingBrowserTest_DisableFlag,
                        FarbleScreenSize_DisableFlag) {
-  FarbleScreenSize(FarblingUrl(), true);
+  FarbleScreenSize(parent_url(), true);
 }
 
 IN_PROC_BROWSER_TEST_F(BraveScreenFarblingBrowserTest_EnableFlag,

chromium_src/third_party/blink/renderer/core/frame/local_dom_window.cc

@@ -14,13 +14,17 @@
 #define outerWidth outerWidth_ChromiumImpl
 #define screenX screenX_ChromiumImpl
 #define screenY screenY_ChromiumImpl
+#define resizeTo resizeTo_ChromiumImpl
+#define moveTo moveTo_ChromiumImpl
 
 #include "src/third_party/blink/renderer/core/frame/local_dom_window.cc"
 
 #undef outerHeight
 #undef outerWidth
 #undef screenX
 #undef screenY
+#undef resizeTo
+#undef moveTo
 
 namespace blink {
 
@@ -90,4 +94,24 @@ int LocalDOMWindow::screenY() const {
              : screenY_ChromiumImpl();
 }
 
+void LocalDOMWindow::resizeTo(int width, int height) const {
+  ExecutionContext* context = GetExecutionContext();
+  if (BlockScreenFingerprinting(context)) {
+    resizeTo_ChromiumImpl(width + outerWidth_ChromiumImpl() - outerWidth(),
+                          height + outerHeight_ChromiumImpl() - outerHeight());
+  } else {
+    resizeTo_ChromiumImpl(width, height);
+  }
+}
+
+void LocalDOMWindow::moveTo(int x, int y) const {
+  ExecutionContext* context = GetExecutionContext();
+  if (BlockScreenFingerprinting(context)) {
+    moveTo_ChromiumImpl(x + screenX_ChromiumImpl() - screenX(),
+                        y + screenY_ChromiumImpl() - screenY());
+  } else {
+    moveTo_ChromiumImpl(x, y);
+  }
+}
+
 }  // namespace blink

chromium_src/third_party/blink/renderer/core/frame/local_dom_window.h

@@ -36,12 +36,22 @@
   screenY_ChromiumImpl() const; \
   int screenTop
 
+#define resizeTo                                      \
+  resizeTo_ChromiumImpl(int width, int height) const; \
+  void resizeTo
+
+#define moveTo                             \
+  moveTo_ChromiumImpl(int x, int y) const; \
+  void moveTo
+
 #include "src/third_party/blink/renderer/core/frame/local_dom_window.h"
 
 #undef SetStorageKey
 #undef outerHeight
 #undef outerWidth
 #undef screenLeft
 #undef screenTop
+#undef resizeTo
+#undef moveTo
 
 #endif  // BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_LOCAL_DOM_WINDOW_H_

chromium_src/third_party/blink/renderer/core/page/chrome_client_impl.cc

@@ -3,6 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include <algorithm>
+
 #include "src/third_party/blink/renderer/core/page/chrome_client_impl.cc"
 
 #include "brave/third_party/blink/renderer/core/farbling/brave_session_cache.h"
@@ -27,9 +29,15 @@ const display::ScreenInfos& ChromeClientImpl::BraveGetScreenInfos(
   if (!brave::BlockScreenFingerprinting(context)) {
     return GetScreenInfos(frame);
   }
-  gfx::Rect farbled_screen_rect(dom_window->screenX(), dom_window->screenY(),
-                                dom_window->outerWidth(),
-                                dom_window->outerHeight());
+  // Don't tell window screen is smaller than 450x450.
+  int min_width =
+      FarbleInteger(context, brave::FarbleKey::kWindowInnerWidth, 450, 0, 8);
+  int min_height =
+      FarbleInteger(context, brave::FarbleKey::kWindowInnerHeight, 450, 0, 8);
+  gfx::Rect farbled_screen_rect(
+      dom_window->screenX(), dom_window->screenY(),
+      std::max(min_width, dom_window->outerWidth()),
+      std::max(min_height, dom_window->outerHeight()));
   screen_info.rect = farbled_screen_rect;
   screen_info.available_rect = farbled_screen_rect;
   screen_info.is_extended = false;