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.

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

[WinCairo] Search inputs do not show icons #1672

Conversation

donny-dont
Copy link
Contributor

@donny-dont donny-dont commented Jun 22, 2022

810eb19

[WinCairo] Search inputs do not show icons
https://bugs.webkit.org/show_bug.cgi?id=188175

Reviewed by NOBODY (OOPS!).

Move Windows resources from WebKitLegacy into WebCore so it can be shared with WebKit.

* Source/WebCore/PlatformWin.cmake:
* Source/WebCore/platform/graphics/win/ImageWin.cpp:
* Source/WebCore/platform/win/WebCore.resources/WebCore.rc: Copied from Source/WebKitLegacy/win/WebKit.resources/WebKit.rc.
* Source/WebCore/platform/win/WebCore.resources/deleteButton.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/deleteButton.png.
* Source/WebCore/platform/win/WebCore.resources/deleteButtonPressed.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/deleteButtonPressed.png.
* Source/WebCore/platform/win/WebCore.resources/fsVideoAudioVolumeHigh.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/fsVideoAudioVolumeHigh.png.
* Source/WebCore/platform/win/WebCore.resources/fsVideoAudioVolumeLow.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/fsVideoAudioVolumeLow.png.
* Source/WebCore/platform/win/WebCore.resources/fsVideoExitFullscreen.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/fsVideoExitFullscreen.png.
* Source/WebCore/platform/win/WebCore.resources/fsVideoPause.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/fsVideoPause.png.
* Source/WebCore/platform/win/WebCore.resources/fsVideoPlay.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/fsVideoPlay.png.
* Source/WebCore/platform/win/WebCore.resources/missingImage.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/missingImage.png.
* Source/WebCore/platform/win/WebCore.resources/nullplugin.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/nullplugin.png.
* Source/WebCore/platform/win/WebCore.resources/panEastCursor.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/panEastCursor.png.
* Source/WebCore/platform/win/WebCore.resources/panIcon.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/panIcon.png.
* Source/WebCore/platform/win/WebCore.resources/panNorthCursor.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/panNorthCursor.png.
* Source/WebCore/platform/win/WebCore.resources/panNorthEastCursor.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/panNorthEastCursor.png.
* Source/WebCore/platform/win/WebCore.resources/panNorthWestCursor.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/panNorthWestCursor.png.
* Source/WebCore/platform/win/WebCore.resources/panSouthCursor.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/panSouthCursor.png.
* Source/WebCore/platform/win/WebCore.resources/panSouthEastCursor.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/panSouthEastCursor.png.
* Source/WebCore/platform/win/WebCore.resources/panSouthWestCursor.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/panSouthWestCursor.png.
* Source/WebCore/platform/win/WebCore.resources/panWestCursor.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/panWestCursor.png.
* Source/WebCore/platform/win/WebCore.resources/searchCancel.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/searchCancel.png.
* Source/WebCore/platform/win/WebCore.resources/searchCancelPressed.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/searchCancelPressed.png.
* Source/WebCore/platform/win/WebCore.resources/searchMagnifier.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/searchMagnifier.png.
* Source/WebCore/platform/win/WebCore.resources/searchMagnifierResults.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/searchMagnifierResults.png.
* Source/WebCore/platform/win/WebCore.resources/textAreaResizeCorner.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/textAreaResizeCorner.png.
* Source/WebCore/platform/win/WebCore.resources/verticalTextCursor.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/verticalTextCursor.png.
* Source/WebCore/platform/win/WebCore.resources/zoomInCursor.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/zoomInCursor.png.
* Source/WebCore/platform/win/WebCore.resources/zoomOutCursor.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/zoomOutCursor.png.
* Source/WebCore/platform/win/resource.h: Copied from Source/WebKitLegacy/win/resource.h.
* Source/WebKitLegacy/win/WebKit.resources/WebKit.rc:
* Source/WebKitLegacy/win/WebKitDLL.cpp:
* Source/WebKitLegacy/win/resource.h:
* Tools/TestWebKitAPI/PlatformWin.cmake:
* Tools/TestWebKitAPI/win/TestWebCoreStubs.cpp: Removed.

810eb19

Misc iOS, tvOS & watchOS macOS Linux Windows
❌ πŸ§ͺ style βœ… πŸ›  ios βœ… πŸ›  mac βœ… πŸ›  wpe βœ… πŸ›  wincairo
βœ… πŸ§ͺ bindings βœ… πŸ›  ios-sim βœ… πŸ›  mac-AS-debug βœ… πŸ›  gtk
βœ… πŸ§ͺ webkitperl βœ… πŸ§ͺ ios-wk2 βœ… πŸ§ͺ api-mac βœ… πŸ§ͺ gtk-wk2
βœ… πŸ§ͺ api-ios βœ… πŸ§ͺ mac-wk1 βœ… πŸ§ͺ api-gtk
βœ… πŸ›  tv βœ… πŸ§ͺ mac-wk2
βœ… πŸ›  tv-sim ❌ πŸ§ͺ mac-AS-debug-wk2
βœ… πŸ›  watch βœ… πŸ§ͺ mac-wk2-stress
βœ… πŸ›  watch-sim

@donny-dont donny-dont self-assigned this Jun 22, 2022
@donny-dont donny-dont added WebKit Misc. For miscellaneous bugs in the WebKit framework (and not JavaScriptCore or WebCore). WebKit Nightly Build labels Jun 22, 2022
@donny-dont donny-dont force-pushed the eng/WinCairo-Search-inputs-do-not-show-icons branch from 3451da8 to 732929f Compare June 22, 2022 05:11
@donny-dont
Copy link
Contributor Author

Rebase of @foopoiuyt ’s patch at https://bugs.webkit.org/show_bug.cgi?id=188175#c7

@donny-dont donny-dont force-pushed the eng/WinCairo-Search-inputs-do-not-show-icons branch from 732929f to 7a132be Compare June 22, 2022 05:39
@webkit-early-warning-system webkit-early-warning-system added the merging-blocked Applied to prevent a change from being merged label Jun 22, 2022
@fujii
Copy link
Contributor

fujii commented Jun 22, 2022

Win EWS failures seems to be true-positive. WebCore module is not a DLL. We should copy the resource images to WK2, or make WebCore module a DLL.

editing/execCommand/insertImage.html [ Failure ]
fast/images/inline-image-box-with-no-alt-should-collapse-no-quirks.html [ Failure ]
fast/images/inline-image-box-with-no-alt-should-collapse-quirks.html [ Failure ]

@donny-dont
Copy link
Contributor Author

Yea the AppleWin failure is legit @fujii . I just want to try a couple things to see if I can get this working without just copying resources.

@donny-dont donny-dont force-pushed the eng/WinCairo-Search-inputs-do-not-show-icons branch from 7a132be to 3498343 Compare June 23, 2022 04:46
@donny-dont
Copy link
Contributor Author

So my working theory is that WebCore_LIBRARY_TYPE being STATIC is causing the issue. A local WinCairo is able to load the resource in a WebKit and WebKitLegacy window within MiniBrowser and WebCore_LIBRARY_TYPE is OBJECT for them.

So if this works I think the way to go is to make a WebCoreResources library whose type is OBJECT and just contains the .rc file for its source. Not sure how this would work with the internal build but I think this would be the way.

@donny-dont donny-dont force-pushed the eng/WinCairo-Search-inputs-do-not-show-icons branch from 3498343 to 15a8007 Compare June 23, 2022 20:57
@donny-dont donny-dont removed the merging-blocked Applied to prevent a change from being merged label Nov 8, 2022
@donny-dont donny-dont force-pushed the eng/WinCairo-Search-inputs-do-not-show-icons branch from b7e26d4 to 4e5eeea Compare November 8, 2022 19:13
@donny-dont donny-dont force-pushed the eng/WinCairo-Search-inputs-do-not-show-icons branch from 4e5eeea to 24412fb Compare February 3, 2023 18:44
@donny-dont donny-dont force-pushed the eng/WinCairo-Search-inputs-do-not-show-icons branch from 24412fb to 3ad31f8 Compare February 13, 2023 22:46
@donny-dont donny-dont force-pushed the eng/WinCairo-Search-inputs-do-not-show-icons branch from 3ad31f8 to 6862096 Compare February 13, 2023 22:52
https://bugs.webkit.org/show_bug.cgi?id=188175

Reviewed by NOBODY (OOPS!).

Move Windows resources from WebKitLegacy into WebCore so it can be shared with WebKit.

* Source/WebCore/PlatformWin.cmake:
* Source/WebCore/platform/graphics/win/ImageWin.cpp:
* Source/WebCore/platform/win/WebCore.resources/WebCore.rc: Copied from Source/WebKitLegacy/win/WebKit.resources/WebKit.rc.
* Source/WebCore/platform/win/WebCore.resources/deleteButton.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/deleteButton.png.
* Source/WebCore/platform/win/WebCore.resources/deleteButtonPressed.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/deleteButtonPressed.png.
* Source/WebCore/platform/win/WebCore.resources/fsVideoAudioVolumeHigh.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/fsVideoAudioVolumeHigh.png.
* Source/WebCore/platform/win/WebCore.resources/fsVideoAudioVolumeLow.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/fsVideoAudioVolumeLow.png.
* Source/WebCore/platform/win/WebCore.resources/fsVideoExitFullscreen.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/fsVideoExitFullscreen.png.
* Source/WebCore/platform/win/WebCore.resources/fsVideoPause.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/fsVideoPause.png.
* Source/WebCore/platform/win/WebCore.resources/fsVideoPlay.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/fsVideoPlay.png.
* Source/WebCore/platform/win/WebCore.resources/missingImage.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/missingImage.png.
* Source/WebCore/platform/win/WebCore.resources/nullplugin.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/nullplugin.png.
* Source/WebCore/platform/win/WebCore.resources/panEastCursor.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/panEastCursor.png.
* Source/WebCore/platform/win/WebCore.resources/panIcon.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/panIcon.png.
* Source/WebCore/platform/win/WebCore.resources/panNorthCursor.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/panNorthCursor.png.
* Source/WebCore/platform/win/WebCore.resources/panNorthEastCursor.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/panNorthEastCursor.png.
* Source/WebCore/platform/win/WebCore.resources/panNorthWestCursor.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/panNorthWestCursor.png.
* Source/WebCore/platform/win/WebCore.resources/panSouthCursor.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/panSouthCursor.png.
* Source/WebCore/platform/win/WebCore.resources/panSouthEastCursor.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/panSouthEastCursor.png.
* Source/WebCore/platform/win/WebCore.resources/panSouthWestCursor.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/panSouthWestCursor.png.
* Source/WebCore/platform/win/WebCore.resources/panWestCursor.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/panWestCursor.png.
* Source/WebCore/platform/win/WebCore.resources/searchCancel.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/searchCancel.png.
* Source/WebCore/platform/win/WebCore.resources/searchCancelPressed.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/searchCancelPressed.png.
* Source/WebCore/platform/win/WebCore.resources/searchMagnifier.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/searchMagnifier.png.
* Source/WebCore/platform/win/WebCore.resources/searchMagnifierResults.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/searchMagnifierResults.png.
* Source/WebCore/platform/win/WebCore.resources/textAreaResizeCorner.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/textAreaResizeCorner.png.
* Source/WebCore/platform/win/WebCore.resources/verticalTextCursor.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/verticalTextCursor.png.
* Source/WebCore/platform/win/WebCore.resources/zoomInCursor.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/zoomInCursor.png.
* Source/WebCore/platform/win/WebCore.resources/zoomOutCursor.png: Renamed from Source/WebKitLegacy/win/WebKit.resources/zoomOutCursor.png.
* Source/WebCore/platform/win/resource.h: Copied from Source/WebKitLegacy/win/resource.h.
* Source/WebKitLegacy/win/WebKit.resources/WebKit.rc:
* Source/WebKitLegacy/win/WebKitDLL.cpp:
* Source/WebKitLegacy/win/resource.h:
* Tools/TestWebKitAPI/PlatformWin.cmake:
* Tools/TestWebKitAPI/win/TestWebCoreStubs.cpp: Removed.
@donny-dont donny-dont force-pushed the eng/WinCairo-Search-inputs-do-not-show-icons branch from 6862096 to 810eb19 Compare February 13, 2023 22:56
@brentfulgham
Copy link
Contributor

I moved the resources from WebKitLegacy to WebCore in PR #10162.

@donny-dont
Copy link
Contributor Author

No longer relevant

@donny-dont donny-dont closed this Nov 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
WebKit Misc. For miscellaneous bugs in the WebKit framework (and not JavaScriptCore or WebCore).
Projects
None yet
5 participants