PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
master
cromite/build/patches/Multi-Screen-Window-Placement-API-fix.patch
T

163 lines
7.2 KiB
Diff
Raw Permalink Blame History

From: uazo <uazo@users.noreply.github.com>
Date: Thu, 20 Apr 2023 07:45:37 +0000
Subject: Multi-Screen Window Placement API fix
Links the use of screen.isExtended to WINDOW_MANAGEMENT permission
granted by user
License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
---
.../renderer_host/render_frame_host_impl.cc | 3 +-
.../core/frame/cached_permission_status.cc | 6 ++--
.../core/frame/cached_permission_status.h | 1 +
.../blink/renderer/core/frame/screen.cc | 35 +++++++++++++++++--
.../blink/renderer/core/frame/screen.h | 17 ++++++++-
5 files changed, 55 insertions(+), 7 deletions(-)
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -20004,7 +20004,8 @@ RenderFrameHostImpl::GetCachedPermissionStatuses() {
{PermissionName::WEB_APP_INSTALLATION,
PermissionType::WEB_APP_INSTALLATION},
#endif
- {PermissionName::GEOLOCATION, PermissionType::GEOLOCATION}});
+ {PermissionName::GEOLOCATION, PermissionType::GEOLOCATION},
+ {PermissionName::WINDOW_MANAGEMENT, PermissionType::WINDOW_MANAGEMENT}});
base::flat_map<PermissionName, PermissionStatus> permission_map;
for (const auto& permission : kPermissions) {
diff --git a/third_party/blink/renderer/core/frame/cached_permission_status.cc b/third_party/blink/renderer/core/frame/cached_permission_status.cc
--- a/third_party/blink/renderer/core/frame/cached_permission_status.cc
+++ b/third_party/blink/renderer/core/frame/cached_permission_status.cc
@@ -38,9 +38,9 @@ CachedPermissionStatus::CachedPermissionStatus(ExecutionContext* context)
permission_service_(context),
permission_observer_receivers_(this, context) {
CHECK(context);
- CHECK(RuntimeEnabledFeatures::GeolocationElementEnabled(context) ||
- RuntimeEnabledFeatures::UserMediaElementEnabled(context) ||
- RuntimeEnabledFeatures::InstallElementEnabled(context));
+ // CHECK(RuntimeEnabledFeatures::GeolocationElementEnabled(context) ||
+ // RuntimeEnabledFeatures::UserMediaElementEnabled(context) ||
+ // RuntimeEnabledFeatures::InstallElementEnabled(context)); see https://source.chromium.org/chromium/chromium/src/+/81a9e9b66a03e12cb438eef0834f5e5f7a0506ee
}
void CachedPermissionStatus::Trace(Visitor* visitor) const {
diff --git a/third_party/blink/renderer/core/frame/cached_permission_status.h b/third_party/blink/renderer/core/frame/cached_permission_status.h
--- a/third_party/blink/renderer/core/frame/cached_permission_status.h
+++ b/third_party/blink/renderer/core/frame/cached_permission_status.h
@@ -73,6 +73,7 @@ class CORE_EXPORT CachedPermissionStatus final
private:
friend class HTMLCapabilityElementBase;
+ friend class Screen;
friend class DocumentLoader;
friend class CachedPermissionStatusTest;
diff --git a/third_party/blink/renderer/core/frame/screen.cc b/third_party/blink/renderer/core/frame/screen.cc
--- a/third_party/blink/renderer/core/frame/screen.cc
+++ b/third_party/blink/renderer/core/frame/screen.cc
@@ -41,7 +41,18 @@
namespace blink {
Screen::Screen(LocalDOMWindow* window, int64_t display_id)
- : ExecutionContextClient(window), display_id_(display_id) {}
+ : ExecutionContextClient(window), display_id_(display_id) {
+ if (DomWindow() &&
+ DomWindow()->IsFeatureEnabled(
+ network::mojom::PermissionsPolicyFeature::kWindowManagement)) {
+ auto descriptor = mojom::blink::PermissionDescriptor::New();
+ descriptor->name = mojom::blink::PermissionName::WINDOW_MANAGEMENT;
+ Vector<mojom::blink::PermissionDescriptorPtr> descriptors;
+ descriptors.push_back(std::move(descriptor));
+ CachedPermissionStatus::From(DomWindow())
+ ->RegisterClient(this, std::move(descriptors));
+ }
+}
// static
bool Screen::AreWebExposedScreenPropertiesEqual(
@@ -157,7 +168,7 @@ bool Screen::isExtended() const {
return false;
}
- return GetScreenInfo().is_extended;
+ return GetScreenInfo().is_extended && window_management_permission_granted_;
}
gfx::Rect Screen::GetRect(bool available) const {
@@ -184,4 +195,24 @@ const display::ScreenInfo& Screen::GetScreenInfo() const {
return kEmptyScreenInfo;
}
+void Screen::OnPermissionStatusChange(mojom::blink::PermissionName name,
+ mojom::blink::PermissionStatus status) {
+ CHECK(name == mojom::blink::PermissionName::WINDOW_MANAGEMENT);
+ window_management_permission_granted_ =
+ status == mojom::blink::PermissionStatus::GRANTED;
+}
+
+void Screen::OnPermissionStatusInitialized(
+ CachedPermissionStatus::PermissionStatusMap map) {
+ // Window management permission is granted if the map we're given has entries,
+ // and they're all GRANTED:
+ window_management_permission_granted_ =
+ map.size() > 0U && std::ranges::all_of(map, [](const auto& status) {
+ return status.value == mojom::blink::PermissionStatus::GRANTED;
+ });
+
+ // If the permission is granted, it should be the only item in the map:
+ CHECK(!window_management_permission_granted_ || map.size() == 1U);
+}
+
} // namespace blink
diff --git a/third_party/blink/renderer/core/frame/screen.h b/third_party/blink/renderer/core/frame/screen.h
--- a/third_party/blink/renderer/core/frame/screen.h
+++ b/third_party/blink/renderer/core/frame/screen.h
@@ -32,11 +32,16 @@
#include "third_party/blink/renderer/core/core_export.h"
#include "third_party/blink/renderer/core/dom/events/event_target.h"
#include "third_party/blink/renderer/core/execution_context/execution_context_lifecycle_observer.h"
+#include "third_party/blink/renderer/core/frame/cached_permission_status.h"
#include "third_party/blink/renderer/platform/heap/garbage_collected.h"
+#include "third_party/blink/public/mojom/permissions/permission.mojom-blink.h"
+#include "third_party/blink/renderer/platform/mojo/heap_mojo_remote.h"
#include "third_party/blink/renderer/platform/supplementable.h"
#include "third_party/blink/renderer/platform/wtf/text/atomic_string.h"
#include "ui/gfx/geometry/rect.h"
+#include "third_party/blink/public/mojom/permissions/permission.mojom-blink.h"
+
namespace display {
struct ScreenInfo;
}
@@ -45,7 +50,7 @@ namespace blink {
class LocalDOMWindow;
-class CORE_EXPORT Screen : public EventTarget,
+class CORE_EXPORT Screen : public EventTarget, public CachedPermissionStatus::Client,
public ExecutionContextClient,
public Supplementable<Screen> {
DEFINE_WRAPPERTYPEINFO();
@@ -89,8 +94,18 @@ class CORE_EXPORT Screen : public EventTarget,
gfx::Rect GetRect(bool available) const;
const display::ScreenInfo& GetScreenInfo() const;
+ // CachedPermissionStatus::Client overrides:
+ void OnPermissionStatusChange(mojom::blink::PermissionName,
+ mojom::blink::PermissionStatus) override;
+
+ void OnPermissionStatusInitialized(
+ CachedPermissionStatus::PermissionStatusMap) override;
+
// The internal id of the underlying display, to support multi-screen devices.
int64_t display_id_;
+
+ private:
+ bool window_management_permission_granted_ = false;
};
} // namespace blink
--
Reference in New Issue View Git Blame Copy Permalink