WebKit icon indicating copy to clipboard operation
WebKit copied to clipboard
verified publisher icon WebKit

[WPE] Rename WPEMonitor to WPEScreen

Open zhani opened this issue 1 year ago • 2 comments

46481465fc73fd9734c571ccbc255756e24ce180

[WPE] Rename WPEMonitor to WPEScreen
https://bugs.webkit.org/show_bug.cgi?id=281751

Reviewed by NOBODY (OOPS!).

The current naming of "WPEMonitor" in the WPE Platform doesn’t fit well across
all device form factors. "WPEMonitor" suggests an individual display screen,
but this naming feels out of place for devices with embedded screen such as
mobile phones.

Additionally, in WebKit, there are many "*Monitor" classes used to monitor
events, progress, and other functionalities. "WPEMonitor" could easily be
confused with these, leading to potential misunderstandings about its purpose.
Therefore, renaming WPEMonitor to WPEScreen would provide a clearer and more
appropriate representation of its function.

* Source/WebKit/UIProcess/API/wpe/WPEWebViewPlatform.cpp:
(WKWPE::ViewPlatform::ViewPlatform):
(WKWPE::ViewPlatform::updateDisplayID):
* Source/WebKit/UIProcess/glib/DisplayVBlankMonitorDRM.cpp:
(WebKit::findCrtc):
(WebKit::findDrmNodeWithCrtc):
(WebKit::DisplayVBlankMonitorDRM::create):
(WebKit::DisplayVBlankMonitorDRM::waitForVBlank const):
* Source/WebKit/UIProcess/glib/ScreenManager.cpp:
(WebKit::ScreenManager::displayID const):
(WebKit::ScreenManager::screen const):
(WebKit::ScreenManager::addScreen):
(WebKit::ScreenManager::removeScreen):
(WebKit::ScreenManager::monitor const): Deleted.
(WebKit::ScreenManager::addMonitor): Deleted.
(WebKit::ScreenManager::removeMonitor): Deleted.
* Source/WebKit/UIProcess/glib/ScreenManager.h:
* Source/WebKit/UIProcess/gtk/ScreenManagerGtk.cpp:
(WebKit::ScreenManager::ScreenManager):
* Source/WebKit/UIProcess/wpe/ScreenManagerWPE.cpp:
(WebKit::ScreenManager::generatePlatformDisplayID):
(WebKit::ScreenManager::ScreenManager):
(WebKit::ScreenManager::updatePrimaryDisplayID):
(WebKit::ScreenManager::collectScreenProperties const):
* Source/WebKit/WPEPlatform/CMakeLists.txt:
* Source/WebKit/WPEPlatform/wpe/WPEDisplay.cpp:
(wpe_display_class_init):
(wpe_display_get_n_screens):
(wpe_display_get_screen):
(wpe_display_screen_added):
(wpe_display_screen_removed):
(wpe_display_get_n_monitors): Deleted.
(wpe_display_get_monitor): Deleted.
(wpe_display_monitor_added): Deleted.
(wpe_display_monitor_removed): Deleted.
* Source/WebKit/WPEPlatform/wpe/WPEDisplay.h:
* Source/WebKit/WPEPlatform/wpe/WPEMonitor.cpp: Removed.
* Source/WebKit/WPEPlatform/wpe/WPEScreen.cpp: Added.
(wpeScreenGetProperty):
(wpe_screen_class_init):
(wpe_screen_get_id):
(wpe_screen_invalidate):
(wpe_screen_get_x):
(wpe_screen_get_y):
(wpe_screen_set_position):
(wpe_screen_get_width):
(wpe_screen_get_height):
(wpe_screen_set_size):
(wpe_screen_get_physical_width):
(wpe_screen_get_physical_height):
(wpe_screen_set_physical_size):
(wpe_screen_get_scale):
(wpe_screen_set_scale):
(wpe_screen_get_refresh_rate):
(wpe_screen_set_refresh_rate):
* Source/WebKit/WPEPlatform/wpe/WPEScreen.h: Renamed from Source/WebKit/WPEPlatform/wpe/WPEMonitor.h.
* Source/WebKit/WPEPlatform/wpe/WPEToplevel.cpp:
(wpe_toplevel_get_screen):
(wpe_toplevel_screen_changed):
(wpe_toplevel_get_monitor): Deleted.
(wpe_toplevel_monitor_changed): Deleted.
* Source/WebKit/WPEPlatform/wpe/WPEToplevel.h:
* Source/WebKit/WPEPlatform/wpe/WPEView.cpp:
(wpeViewGetProperty):
(wpe_view_class_init):
(wpeViewScreenChanged):
(wpe_view_set_toplevel):
(wpe_view_get_screen):
(wpeViewMonitorChanged): Deleted.
(wpe_view_get_monitor): Deleted.
* Source/WebKit/WPEPlatform/wpe/WPEView.h:
* Source/WebKit/WPEPlatform/wpe/WPEViewPrivate.h:
* Source/WebKit/WPEPlatform/wpe/drm/CMakeLists.txt:
* Source/WebKit/WPEPlatform/wpe/drm/WPEDisplayDRM.cpp:
(wpeDisplayDRMConnect):
(wpeDisplayDRMGetNScreens):
(wpeDisplayDRMGetScreen):
(wpe_display_drm_class_init):
(wpeDisplayDRMGetNMonitors): Deleted.
(wpeDisplayDRMGetMonitor): Deleted.
* Source/WebKit/WPEPlatform/wpe/drm/WPEDisplayDRMPrivate.h:
* Source/WebKit/WPEPlatform/wpe/drm/WPEScreenDRM.cpp: Renamed from Source/WebKit/WPEPlatform/wpe/drm/WPEMonitorDRM.cpp.
(wpeScreenDRMInvalidate):
(wpeScreenDRMDispose):
(wpe_screen_drm_class_init):
(wpeScreenDRMCreate):
(wpeScreenDRMGetMode):
(wpeScreenDRMGetCrtc):
(wpe_screen_drm_get_crtc_index):
* Source/WebKit/WPEPlatform/wpe/drm/WPEScreenDRM.h: Renamed from Source/WebKit/WPEPlatform/wpe/drm/WPEMonitorDRM.h.
* Source/WebKit/WPEPlatform/wpe/drm/WPEScreenDRMPrivate.h: Renamed from Source/WebKit/WPEPlatform/wpe/drm/WPEMonitorDRMPrivate.h.
* Source/WebKit/WPEPlatform/wpe/drm/WPEToplevelDRM.cpp:
(wpeToplevelDRMConstructed):
(wpeToplevelDRMGetScreen):
(wpe_toplevel_drm_class_init):
(wpeToplevelDRMGetMonitor): Deleted.
* Source/WebKit/WPEPlatform/wpe/drm/WPEViewDRM.cpp:
(wpeViewDRMConstructed):
(wpeViewDRMCommitAtomic):
(wpeViewDRMCommitLegacy):
(wpeViewDRMScheduleCursorUpdate):
* Source/WebKit/WPEPlatform/wpe/drm/wpe-drm.h:
* Source/WebKit/WPEPlatform/wpe/wayland/CMakeLists.txt:
* Source/WebKit/WPEPlatform/wpe/wayland/WPEDisplayWayland.cpp:
(wpeDisplayWaylandDispose):
(wpeDisplayWaylandGetNScreens):
(wpeDisplayWaylandGetScreen):
(wpeDisplayWaylandFindScreen):
(wpe_display_wayland_class_init):
(wpeDisplayWaylandGetNMonitors): Deleted.
(wpeDisplayWaylandGetMonitor): Deleted.
(wpeDisplayWaylandFindMonitor): Deleted.
* Source/WebKit/WPEPlatform/wpe/wayland/WPEDisplayWaylandPrivate.h:
* Source/WebKit/WPEPlatform/wpe/wayland/WPEScreenWayland.cpp: Renamed from Source/WebKit/WPEPlatform/wpe/wayland/WPEMonitorWayland.cpp.
(wpeScreenWaylandInvalidate):
(wpeScreenWaylandDispose):
(wpe_screen_wayland_class_init):
(wpe_screen_wayland_get_wl_output):
* Source/WebKit/WPEPlatform/wpe/wayland/WPEScreenWayland.h: Renamed from Source/WebKit/WPEPlatform/wpe/wayland/WPEMonitorWayland.h.
* Source/WebKit/WPEPlatform/wpe/wayland/WPEScreenWaylandPrivate.h: Renamed from Source/WebKit/WPEPlatform/wpe/wayland/WPEMonitorWaylandPrivate.h.
* Source/WebKit/WPEPlatform/wpe/wayland/WPEToplevelWayland.cpp:
(wpeToplevelWaylandConstructed):
(wpeToplevelWaylandDispose):
(wpeToplevelWaylandGetScreen):
(wpe_toplevel_wayland_class_init):
(wpeToplevelWaylandGetMonitor): Deleted.
* Source/WebKit/WPEPlatform/wpe/wayland/WPEViewWayland.cpp:
(wpeViewWaylandConstructed):
(wpeViewWaylandCanBeMapped):
* Source/WebKit/WPEPlatform/wpe/wayland/wpe-wayland.h:
* Source/WebKit/WPEPlatform/wpe/wpe-platform.h:

https://github.com/WebKit/WebKit/commit/ebacaf828daeaa04c027ab1dc7b4a74d8799292c

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ⏳ 🛠 wpe ⏳ 🛠 win
✅ 🛠 ios-sim ⏳ 🛠 mac-AS-debug ⏳ 🧪 wpe-wk2 ⏳ 🧪 win-tests
✅ 🧪 webkitperl ⏳ 🧪 ios-wk2 ⏳ 🧪 api-mac ⏳ 🧪 api-wpe
⏳ 🧪 ios-wk2-wpt ⏳ 🛠 wpe-cairo
⏳ 🧪 api-ios loading 🧪 mac-wk2 loading 🛠 gtk
⏳ 🛠 vision ⏳ 🧪 mac-AS-debug-wk2 loading 🧪 gtk-wk2
⏳ 🛠 vision-sim ✅ 🧪 mac-wk2-stress loading 🧪 api-gtk
⏳ 🧪 vision-wk2 ⏳ 🧪 mac-intel-wk2
⏳ 🛠 tv ⏳ 🛠 mac-safer-cpp
⏳ 🛠 tv-sim
⏳ 🛠 watch
⏳ 🛠 watch-sim

zhani avatar Oct 18 '24 15:10 zhani

EWS run on previous version of this PR (hash https://github.com/WebKit/WebKit/commit/46481465fc73fd9734c571ccbc255756e24ce180)

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
❌ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win
✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ✅ 🧪 win-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🛠 wpe-cairo
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 vision ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🧪 api-gtk
✅ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2
✅ 🛠 tv ✅ 🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

webkit-early-warning-system avatar Oct 18 '24 15:10 webkit-early-warning-system

EWS run on current version of this PR (hash https://github.com/WebKit/WebKit/commit/ebacaf828daeaa04c027ab1dc7b4a74d8799292c)

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win
✅ 🛠 ios-sim ⏳ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ✅ 🧪 win-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🛠 wpe-cairo
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
⏳ 🛠 vision ⏳ 🧪 mac-AS-debug-wk2 ✅ 🧪 gtk-wk2
⏳ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🧪 api-gtk
⏳ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2
✅ 🛠 🧪 unsafe-merge ⏳ 🛠 tv ✅ 🛠 mac-safer-cpp
⏳ 🛠 tv-sim
⏳ 🛠 watch
⏳ 🛠 watch-sim

webkit-early-warning-system avatar Oct 21 '24 20:10 webkit-early-warning-system

Committed 285586@main (ac17704df9a5): https://commits.webkit.org/285586@main

Reviewed commits have been landed. Closing PR #35433 and removing active labels.

webkit-commit-queue avatar Oct 23 '24 04:10 webkit-commit-queue

Backported into the 2.46 branch as commit 151de689862046c5317c55915a6249cf75c09915

aperezdc avatar Oct 30 '24 11:10 aperezdc