Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[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
- Loading branch information
Showing
27 changed files
with
499 additions
and
102 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /* | ||
| * Copyright (C) 2022 Apple Inc. All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * 1. Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, | ||
| * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS | ||
| * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | ||
| * THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #import <AppKit/NSTextFieldCell.h> | ||
|
|
||
| @interface NSTextFieldCell () | ||
| - (CFDictionaryRef)_coreUIDrawOptionsWithFrame:(NSRect)cellFrame inView:(NSView *)controlView includeFocus:(BOOL)includeFocus; | ||
| - (CFDictionaryRef)_coreUIDrawOptionsWithFrame:(NSRect)cellFrame inView:(NSView *)controlView includeFocus:(BOOL)includeFocus maskOnly:(BOOL)maskOnly; | ||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| /* | ||
| * Copyright (C) 2022 Apple Inc. All Rights Reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * 1. Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY | ||
| * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR | ||
| * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | ||
| * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | ||
| * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | ||
| * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | ||
| * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include "ControlFactory.h" | ||
| #include "ControlPart.h" | ||
|
|
||
| namespace WebCore { | ||
|
|
||
| class TextFieldPart : public ControlPart { | ||
| public: | ||
| static Ref<TextFieldPart> create() | ||
| { | ||
| return adoptRef(*new TextFieldPart()); | ||
| } | ||
|
|
||
| private: | ||
| TextFieldPart() | ||
| : ControlPart(ControlPartType::TextField) | ||
| { | ||
| } | ||
|
|
||
| std::unique_ptr<PlatformControl> createPlatformControl() override | ||
| { | ||
| return controlFactory().createPlatformTextField(*this); | ||
| } | ||
| }; | ||
|
|
||
| } // namespace WebCore |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.