Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit c7e04c56 authored by Carmelo Messina's avatar Carmelo Messina
Browse files

also overrides the window.visualViewport results

parent fa95631f
Loading
Loading
Loading
Loading
+17 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ Subject: Viewport Protection
 .../renderer/content_settings_agent_impl.h    |  1 +
 .../platform/web_content_settings_client.h    |  2 +
 .../blink/renderer/core/css/media_values.cc   | 10 +++
 .../core/frame/dom_visual_viewport.cc         |  4 +-
 .../renderer/core/frame/local_frame_view.cc   |  3 +
 .../blink/renderer/core/frame/screen.cc       | 17 +++-
 .../renderer/core/frame/visual_viewport.cc    |  4 +
@@ -31,7 +32,7 @@ Subject: Viewport Protection
 third_party/blink/renderer/core/page/page.cc  |  8 ++
 third_party/blink/renderer/core/page/page.h   |  3 +
 .../screen_enumeration/screen_detailed.cc     | 15 ++++
 28 files changed, 247 insertions(+), 12 deletions(-)
 29 files changed, 250 insertions(+), 13 deletions(-)
 create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteViewportContentSetting.java
 create mode 100644 components/browser_ui/strings/android/viewport.grdp

@@ -406,6 +407,21 @@ diff --git a/third_party/blink/renderer/core/css/media_values.cc b/third_party/b
   return device_height;
 }
 
diff --git a/third_party/blink/renderer/core/frame/dom_visual_viewport.cc b/third_party/blink/renderer/core/frame/dom_visual_viewport.cc
--- a/third_party/blink/renderer/core/frame/dom_visual_viewport.cc
+++ b/third_party/blink/renderer/core/frame/dom_visual_viewport.cc
@@ -177,8 +177,10 @@ double DOMVisualViewport::scale() const {
   if (!frame->IsOutermostMainFrame())
     return 1;
 
-  if (Page* page = window_->GetFrame()->GetPage())
+  if (Page* page = window_->GetFrame()->GetPage()) {
+    if (page->PageWidthOverride() != 0) return 1;
     return page->GetVisualViewport().ScaleForVisualViewport();
+  }
 
   return 0;
 }
diff --git a/third_party/blink/renderer/core/frame/local_frame_view.cc b/third_party/blink/renderer/core/frame/local_frame_view.cc
--- a/third_party/blink/renderer/core/frame/local_frame_view.cc
+++ b/third_party/blink/renderer/core/frame/local_frame_view.cc