[GPU Process] [FormControls] Add a ControlPart for TextField #7841

shallawa · 2022-12-19T09:41:28Z

`8209e22`

[GPU Process] [FormControls] Add a ControlPart for TextField
https://bugs.webkit.org/show_bug.cgi?id=249573
rdar://103508637

Reviewed by Simon Fraser and Aditya Keerthi.

NSTextFieldCell is used draw a border around the text field. CoreUI is used to
draw a list button if the text field has a data list.

* Source/WebCore/Headers.cmake:
* Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj:
* Source/WebCore/PAL/pal/spi/mac/NSTextFieldCellSPI.h: Added.
* Source/WebCore/SourcesCocoa.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/platform/graphics/controls/ControlFactory.h:
* Source/WebCore/platform/graphics/controls/ControlPart.h:
* Source/WebCore/platform/graphics/controls/ControlStyle.cpp:
(WebCore::operator<<):
* Source/WebCore/platform/graphics/controls/ControlStyle.h:
* Source/WebCore/platform/graphics/controls/TextFieldPart.h: Copied from Source/WebCore/platform/graphics/controls/ControlFactory.h.
(WebCore::TextFieldPart::create):
(WebCore::TextFieldPart::TextFieldPart):
* Source/WebCore/platform/graphics/mac/controls/ControlFactoryMac.h:
* Source/WebCore/platform/graphics/mac/controls/ControlFactoryMac.mm:
(WebCore::ControlFactoryMac::levelIndicatorCell const):
(WebCore::ControlFactoryMac::textFieldCell const):
(WebCore::ControlFactoryMac::createPlatformTextField):
* Source/WebCore/platform/graphics/mac/controls/ControlMac.h:
* Source/WebCore/platform/graphics/mac/controls/ControlMac.mm:
(WebCore::ControlMac::userPrefersContrast):
(WebCore::drawCellOrFocusRing):
(WebCore::ControlMac::drawCell):
(WebCore::ControlMac::drawListButton):
(WebCore::ControlMac::draw): Deleted.
* Source/WebCore/platform/graphics/mac/controls/MeterMac.mm:
(WebCore::MeterMac::draw):
* Source/WebCore/platform/graphics/mac/controls/TextFieldMac.h: Copied from Source/WebCore/platform/graphics/controls/ControlFactory.h.
* Source/WebCore/platform/graphics/mac/controls/TextFieldMac.mm: Added.
(WebCore::TextFieldMac::TextFieldMac):
(WebCore::TextFieldMac::shouldPaintCustomTextField):
(WebCore::TextFieldMac::draw):
* Source/WebCore/platform/graphics/mac/controls/WebControlView.h:
* Source/WebCore/platform/graphics/mac/controls/WebControlView.mm:
(-[WebControlTextFieldCell _adjustedCoreUIDrawOptionsForDrawingBordersOnly:]):
(-[WebControlTextFieldCell _coreUIDrawOptionsWithFrame:inView:includeFocus:]):
(-[WebControlTextFieldCell _coreUIDrawOptionsWithFrame:inView:includeFocus:maskOnly:]):
* Source/WebCore/rendering/RenderBox.cpp:
(WebCore::RenderBox::ensureControlPartForRenderer):
(WebCore::RenderBox::ensureControlPartForBorderOnly):
(WebCore::RenderBox::paintBoxDecorations):
(WebCore::RenderBox::ensureControlPart): Deleted.
* Source/WebCore/rendering/RenderBox.h:
* Source/WebCore/rendering/RenderTheme.cpp:
(WebCore::RenderTheme::createControlPart const):
(WebCore::RenderTheme::extractControlStyleStatesForRenderer const):
(WebCore::RenderTheme::hasListButton const):
(WebCore::RenderTheme::hasListButtonPressed const):
(WebCore::RenderTheme::createControlPartForRenderer const): Deleted.
* Source/WebCore/rendering/RenderTheme.h:
(WebCore::RenderTheme::canCreateControlPartForBorderOnly const):
* Source/WebCore/rendering/RenderThemeMac.h:
* Source/WebCore/rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::canPaint const):
(WebCore::RenderThemeMac::canCreateControlPartForBorderOnly const):
(WebCore::RenderThemeMac::meterSizeForBounds const):
(WebCore::RenderThemeMac::shouldPaintCustomTextField const): Deleted.
(WebCore::RenderThemeMac::paintTextField): Deleted.
(WebCore::RenderThemeMac::textField const): Deleted.
* Source/WebKit/Shared/WebCoreArgumentCoders.cpp:
(IPC::ArgumentCoder<ControlPart>::decode):
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:

Canonical link: https://commits.webkit.org/258125@main

b89ef51

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 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
✅ 🛠 🧪 merge	✅ 🛠 watch-sim

webkit-early-warning-system · 2022-12-19T09:44:35Z

EWS run on previous version of this PR (hash e39b77e)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	❌ 🛠 wpe	❌ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	❌ 🛠 gtk	❌ 🛠 wincairo
✅ 🧪 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

webkit-early-warning-system · 2022-12-19T20:13:03Z

EWS run on previous version of this PR (hash 3f35d9e)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	❌ 🛠 wpe	~~🛠 🧪 win~~
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	❌ 🛠 gtk	❌ 🛠 wincairo
✅ 🧪 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

webkit-early-warning-system · 2022-12-19T21:35:17Z

EWS run on previous version of this PR (hash db60c5e)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 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

Source/WebCore/platform/graphics/mac/controls/ControlFactoryMac.mm

smfr · 2022-12-20T00:40:53Z

Source/WebCore/platform/graphics/mac/controls/ControlMac.mm

@@ -43,6 +47,11 @@
 {
 }

+bool ControlMac::userPrefersContrast()
+{
+    return [[NSWorkspace sharedWorkspace] accessibilityDisplayShouldIncreaseContrast];


Which process does this run in? If it's in the GPU Process, we should feed it in from the web process.

I will address this issue in a separate patch.

Source/WebCore/platform/graphics/mac/controls/TextFieldMac.h

Source/WebCore/platform/graphics/mac/controls/WebControlView.h

Source/WebCore/rendering/RenderTheme.cpp

Source/WebCore/platform/graphics/mac/controls/TextFieldMac.h

Source/WebCore/rendering/RenderTheme.cpp

webkit-early-warning-system · 2022-12-20T02:06:43Z

EWS run on previous version of this PR (hash 7950cc4)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	⏳ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	~~🧪 api-mac~~	~~🧪 gtk-wk2~~
	~~🧪 api-ios~~	~~🧪 mac-wk1~~	~~🧪 api-gtk~~
⏳ 🛠 🧪 jsc	⏳ 🛠 tv	~~🧪 mac-wk2~~
	✅ 🛠 tv-sim	~~🧪 mac-AS-debug-wk2~~
	✅ 🛠 watch	✅ 🧪 mac-wk2-stress
	⏳ 🛠 watch-sim

webkit-early-warning-system · 2022-12-20T03:08:25Z

EWS run on current version of this PR (hash b89ef51)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 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
✅ 🛠 🧪 merge	✅ 🛠 watch-sim

pxlcoder · 2022-12-20T03:34:02Z

Source/WebCore/rendering/RenderTheme.cpp

+    if (!is<HTMLInputElement>(renderer.generatingNode()))
+        return false;
+
+    const auto& input = downcast<HTMLInputElement>(*(renderer.generatingNode()));


dynamicDowncast

pxlcoder · 2022-12-20T03:34:12Z

Source/WebCore/rendering/RenderTheme.cpp

+    const auto* input = downcast<HTMLInputElement>(renderer.generatingNode());
+    if (!input)
+        return false;


dynamicDowncast

https://bugs.webkit.org/show_bug.cgi?id=249573 rdar://103508637 Reviewed by Simon Fraser and Aditya Keerthi. NSTextFieldCell is used draw a border around the text field. CoreUI is used to draw a list button if the text field has a data list. * Source/WebCore/Headers.cmake: * Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj: * Source/WebCore/PAL/pal/spi/mac/NSTextFieldCellSPI.h: Added. * Source/WebCore/SourcesCocoa.txt: * Source/WebCore/WebCore.xcodeproj/project.pbxproj: * Source/WebCore/platform/graphics/controls/ControlFactory.h: * Source/WebCore/platform/graphics/controls/ControlPart.h: * Source/WebCore/platform/graphics/controls/ControlStyle.cpp: (WebCore::operator<<): * Source/WebCore/platform/graphics/controls/ControlStyle.h: * Source/WebCore/platform/graphics/controls/TextFieldPart.h: Copied from Source/WebCore/platform/graphics/controls/ControlFactory.h. (WebCore::TextFieldPart::create): (WebCore::TextFieldPart::TextFieldPart): * Source/WebCore/platform/graphics/mac/controls/ControlFactoryMac.h: * Source/WebCore/platform/graphics/mac/controls/ControlFactoryMac.mm: (WebCore::ControlFactoryMac::levelIndicatorCell const): (WebCore::ControlFactoryMac::textFieldCell const): (WebCore::ControlFactoryMac::createPlatformTextField): * Source/WebCore/platform/graphics/mac/controls/ControlMac.h: * Source/WebCore/platform/graphics/mac/controls/ControlMac.mm: (WebCore::ControlMac::userPrefersContrast): (WebCore::drawCellOrFocusRing): (WebCore::ControlMac::drawCell): (WebCore::ControlMac::drawListButton): (WebCore::ControlMac::draw): Deleted. * Source/WebCore/platform/graphics/mac/controls/MeterMac.mm: (WebCore::MeterMac::draw): * Source/WebCore/platform/graphics/mac/controls/TextFieldMac.h: Copied from Source/WebCore/platform/graphics/controls/ControlFactory.h. * Source/WebCore/platform/graphics/mac/controls/TextFieldMac.mm: Added. (WebCore::TextFieldMac::TextFieldMac): (WebCore::TextFieldMac::shouldPaintCustomTextField): (WebCore::TextFieldMac::draw): * Source/WebCore/platform/graphics/mac/controls/WebControlView.h: * Source/WebCore/platform/graphics/mac/controls/WebControlView.mm: (-[WebControlTextFieldCell _adjustedCoreUIDrawOptionsForDrawingBordersOnly:]): (-[WebControlTextFieldCell _coreUIDrawOptionsWithFrame:inView:includeFocus:]): (-[WebControlTextFieldCell _coreUIDrawOptionsWithFrame:inView:includeFocus:maskOnly:]): * Source/WebCore/rendering/RenderBox.cpp: (WebCore::RenderBox::ensureControlPartForRenderer): (WebCore::RenderBox::ensureControlPartForBorderOnly): (WebCore::RenderBox::paintBoxDecorations): (WebCore::RenderBox::ensureControlPart): Deleted. * Source/WebCore/rendering/RenderBox.h: * Source/WebCore/rendering/RenderTheme.cpp: (WebCore::RenderTheme::createControlPart const): (WebCore::RenderTheme::extractControlStyleStatesForRenderer const): (WebCore::RenderTheme::hasListButton const): (WebCore::RenderTheme::hasListButtonPressed const): (WebCore::RenderTheme::createControlPartForRenderer const): Deleted. * Source/WebCore/rendering/RenderTheme.h: (WebCore::RenderTheme::canCreateControlPartForBorderOnly const): * Source/WebCore/rendering/RenderThemeMac.h: * Source/WebCore/rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::canPaint const): (WebCore::RenderThemeMac::canCreateControlPartForBorderOnly const): (WebCore::RenderThemeMac::meterSizeForBounds const): (WebCore::RenderThemeMac::shouldPaintCustomTextField const): Deleted. (WebCore::RenderThemeMac::paintTextField): Deleted. (WebCore::RenderThemeMac::textField const): Deleted. * Source/WebKit/Shared/WebCoreArgumentCoders.cpp: (IPC::ArgumentCoder<ControlPart>::decode): * Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in: Canonical link: https://commits.webkit.org/258125@main

webkit-commit-queue · 2022-12-20T07:45:41Z

Committed 258125@main (8209e22): https://commits.webkit.org/258125@main

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

shallawa self-assigned this Dec 19, 2022

shallawa added the Layout and Rendering For bugs with layout and rendering of Web pages. label Dec 19, 2022

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Dec 19, 2022

shallawa removed the merging-blocked Applied to prevent a change from being merged label Dec 19, 2022

shallawa force-pushed the eng/GPU-Process-FormControls-Add-a-ControlPart-for-TextField branch from e39b77e to 3f35d9e Compare December 19, 2022 20:10

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Dec 19, 2022

shallawa removed the merging-blocked Applied to prevent a change from being merged label Dec 19, 2022

shallawa force-pushed the eng/GPU-Process-FormControls-Add-a-ControlPart-for-TextField branch from 3f35d9e to db60c5e Compare December 19, 2022 21:35

shallawa requested review from pxlcoder and smfr December 20, 2022 00:33

smfr approved these changes Dec 20, 2022

View reviewed changes

pxlcoder reviewed Dec 20, 2022

View reviewed changes

Source/WebCore/platform/graphics/mac/controls/TextFieldMac.h Outdated Show resolved Hide resolved

Source/WebCore/platform/graphics/mac/controls/TextFieldMac.h Outdated Show resolved Hide resolved

Source/WebCore/rendering/RenderTheme.cpp Outdated Show resolved Hide resolved

shallawa force-pushed the eng/GPU-Process-FormControls-Add-a-ControlPart-for-TextField branch from db60c5e to 7950cc4 Compare December 20, 2022 02:03

shallawa force-pushed the eng/GPU-Process-FormControls-Add-a-ControlPart-for-TextField branch from 7950cc4 to b89ef51 Compare December 20, 2022 03:08

pxlcoder approved these changes Dec 20, 2022

View reviewed changes

shallawa added the merge-queue Applied to send a pull request to merge-queue label Dec 20, 2022

webkit-early-warning-system force-pushed the eng/GPU-Process-FormControls-Add-a-ControlPart-for-TextField branch from b89ef51 to 8209e22 Compare December 20, 2022 07:45

webkit-early-warning-system merged commit 8209e22 into WebKit:main Dec 20, 2022

webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Dec 20, 2022

shallawa deleted the eng/GPU-Process-FormControls-Add-a-ControlPart-for-TextField branch May 10, 2023 01:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[GPU Process] [FormControls] Add a ControlPart for TextField #7841

[GPU Process] [FormControls] Add a ControlPart for TextField #7841

shallawa commented Dec 19, 2022 •

edited by webkit-early-warning-system

webkit-early-warning-system commented Dec 19, 2022 •

edited

webkit-early-warning-system commented Dec 19, 2022 •

edited

webkit-early-warning-system commented Dec 19, 2022 •

edited

smfr Dec 20, 2022

shallawa Dec 20, 2022

webkit-early-warning-system commented Dec 20, 2022 •

edited

webkit-early-warning-system commented Dec 20, 2022 •

edited

pxlcoder Dec 20, 2022

pxlcoder Dec 20, 2022

webkit-commit-queue commented Dec 20, 2022

[GPU Process] [FormControls] Add a ControlPart for TextField #7841

[GPU Process] [FormControls] Add a ControlPart for TextField #7841

Conversation

shallawa commented Dec 19, 2022 • edited by webkit-early-warning-system

8209e22

webkit-early-warning-system commented Dec 19, 2022 • edited

webkit-early-warning-system commented Dec 19, 2022 • edited

webkit-early-warning-system commented Dec 19, 2022 • edited

smfr Dec 20, 2022

Choose a reason for hiding this comment

shallawa Dec 20, 2022

Choose a reason for hiding this comment

webkit-early-warning-system commented Dec 20, 2022 • edited

webkit-early-warning-system commented Dec 20, 2022 • edited

pxlcoder Dec 20, 2022

Choose a reason for hiding this comment

pxlcoder Dec 20, 2022

Choose a reason for hiding this comment

webkit-commit-queue commented Dec 20, 2022

shallawa commented Dec 19, 2022 •

edited by webkit-early-warning-system

`8209e22`

webkit-early-warning-system commented Dec 19, 2022 •

edited

webkit-early-warning-system commented Dec 19, 2022 •

edited

webkit-early-warning-system commented Dec 19, 2022 •

edited

webkit-early-warning-system commented Dec 20, 2022 •

edited

webkit-early-warning-system commented Dec 20, 2022 •

edited