Diff
Modified: trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp (294463 => 294464)
--- trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp 2022-05-19 03:05:09 UTC (rev 294463)
+++ trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp 2022-05-19 03:50:47 UTC (rev 294464)
@@ -985,7 +985,7 @@
// If the deletion is occurring in a text field, and we're not deleting to replace the selection, then let the frame call across the bridge to notify the form delegate.
if (!m_replace) {
if (RefPtr textControl = enclosingTextFormControl(m_selectionToDelete.start()); textControl && textControl->focused())
- document().editor().textWillBeDeletedInTextField(textControl.get());
+ document().editor().textWillBeDeletedInTextField(*textControl);
}
// save this to later make the selection with
Modified: trunk/Source/WebCore/editing/Editor.cpp (294463 => 294464)
--- trunk/Source/WebCore/editing/Editor.cpp 2022-05-19 03:05:09 UTC (rev 294463)
+++ trunk/Source/WebCore/editing/Editor.cpp 2022-05-19 03:50:47 UTC (rev 294464)
@@ -3462,13 +3462,13 @@
return computeAndSetTypingStyle(EditingStyle::create(&properties), editingAction);
}
-void Editor::textFieldDidBeginEditing(Element* e)
+void Editor::textFieldDidBeginEditing(Element& e)
{
if (client())
client()->textFieldDidBeginEditing(e);
}
-void Editor::textFieldDidEndEditing(Element* e)
+void Editor::textFieldDidEndEditing(Element& e)
{
dismissCorrectionPanelAsIgnored();
if (client())
@@ -3475,13 +3475,13 @@
client()->textFieldDidEndEditing(e);
}
-void Editor::textDidChangeInTextField(Element* e)
+void Editor::textDidChangeInTextField(Element& e)
{
if (client())
client()->textDidChangeInTextField(e);
}
-bool Editor::doTextFieldCommandFromEvent(Element* e, KeyboardEvent* ke)
+bool Editor::doTextFieldCommandFromEvent(Element& e, KeyboardEvent* ke)
{
if (client())
return client()->doTextFieldCommandFromEvent(e, ke);
@@ -3489,13 +3489,13 @@
return false;
}
-void Editor::textWillBeDeletedInTextField(Element* input)
+void Editor::textWillBeDeletedInTextField(Element& input)
{
if (client())
client()->textWillBeDeletedInTextField(input);
}
-void Editor::textDidChangeInTextArea(Element* e)
+void Editor::textDidChangeInTextArea(Element& e)
{
if (client())
client()->textDidChangeInTextArea(e);
Modified: trunk/Source/WebCore/editing/Editor.h (294463 => 294464)
--- trunk/Source/WebCore/editing/Editor.h 2022-05-19 03:05:09 UTC (rev 294463)
+++ trunk/Source/WebCore/editing/Editor.h 2022-05-19 03:50:47 UTC (rev 294464)
@@ -485,12 +485,12 @@
bool markedTextMatchesAreHighlighted() const;
WEBCORE_EXPORT void setMarkedTextMatchesAreHighlighted(bool);
- void textFieldDidBeginEditing(Element*);
- void textFieldDidEndEditing(Element*);
- void textDidChangeInTextField(Element*);
- bool doTextFieldCommandFromEvent(Element*, KeyboardEvent*);
- void textWillBeDeletedInTextField(Element* input);
- void textDidChangeInTextArea(Element*);
+ void textFieldDidBeginEditing(Element&);
+ void textFieldDidEndEditing(Element&);
+ void textDidChangeInTextField(Element&);
+ bool doTextFieldCommandFromEvent(Element&, KeyboardEvent*);
+ void textWillBeDeletedInTextField(Element& input);
+ void textDidChangeInTextArea(Element&);
WEBCORE_EXPORT WritingDirection baseWritingDirectionForSelectionStart() const;
enum class SelectReplacement : bool { No, Yes };
Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (294463 => 294464)
--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2022-05-19 03:05:09 UTC (rev 294463)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2022-05-19 03:50:47 UTC (rev 294464)
@@ -470,7 +470,7 @@
return;
if (RefPtr frame = document().frame())
- frame->editor().textFieldDidEndEditing(this);
+ frame->editor().textFieldDidEndEditing(*this);
}
bool HTMLInputElement::shouldUseInputMethod()
Modified: trunk/Source/WebCore/html/HTMLTextAreaElement.cpp (294463 => 294464)
--- trunk/Source/WebCore/html/HTMLTextAreaElement.cpp 2022-05-19 03:05:09 UTC (rev 294463)
+++ trunk/Source/WebCore/html/HTMLTextAreaElement.cpp 2022-05-19 03:50:47 UTC (rev 294464)
@@ -297,8 +297,8 @@
setChangedSinceLastFormControlChangeEvent(true);
- if (RefPtr<Frame> frame = document().frame())
- frame->editor().textDidChangeInTextArea(this);
+ if (RefPtr frame = document().frame())
+ frame->editor().textDidChangeInTextArea(*this);
// When typing in a textarea, childrenChanged is not called, so we need to force the directionality check.
calculateAndAdjustDirectionality();
}
Modified: trunk/Source/WebCore/html/TextFieldInputType.cpp (294463 => 294464)
--- trunk/Source/WebCore/html/TextFieldInputType.cpp 2022-05-19 03:05:09 UTC (rev 294463)
+++ trunk/Source/WebCore/html/TextFieldInputType.cpp 2022-05-19 03:50:47 UTC (rev 294464)
@@ -201,8 +201,8 @@
event.setDefaultHandled();
}
#endif
- RefPtr<Frame> frame = element()->document().frame();
- if (frame && frame->editor().doTextFieldCommandFromEvent(element(), &event))
+ RefPtr frame = element()->document().frame();
+ if (frame && frame->editor().doTextFieldCommandFromEvent(*element(), &event))
event.setDefaultHandled();
return ShouldCallBaseEventHandler::Yes;
}
@@ -275,8 +275,8 @@
{
ASSERT(element());
ASSERT_UNUSED(oldFocusedNode, oldFocusedNode != element());
- if (RefPtr<Frame> frame = element()->document().frame()) {
- frame->editor().textFieldDidBeginEditing(element());
+ if (RefPtr frame = element()->document().frame()) {
+ frame->editor().textFieldDidBeginEditing(*element());
#if ENABLE(DATALIST_ELEMENT)
if (shouldOnlyShowDataListDropdownButtonWhenFocusedOrEdited() && element()->list() && m_dataListDropdownIndicator)
m_dataListDropdownIndicator->setInlineStyleProperty(CSSPropertyDisplay, suggestions().size() ? CSSValueBlock : CSSValueNone, true);
@@ -712,8 +712,8 @@
ASSERT(element());
if (!element()->focused())
return;
- if (RefPtr<Frame> frame = element()->document().frame())
- frame->editor().textDidChangeInTextField(element());
+ if (RefPtr frame = element()->document().frame())
+ frame->editor().textDidChangeInTextField(*element());
#if ENABLE(DATALIST_ELEMENT)
if (shouldOnlyShowDataListDropdownButtonWhenFocusedOrEdited() && element()->list() && m_dataListDropdownIndicator)
m_dataListDropdownIndicator->setInlineStyleProperty(CSSPropertyDisplay, suggestions().size() ? CSSValueBlock : CSSValueNone, true);
Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (294463 => 294464)
--- trunk/Source/WebCore/loader/EmptyClients.cpp 2022-05-19 03:05:09 UTC (rev 294463)
+++ trunk/Source/WebCore/loader/EmptyClients.cpp 2022-05-19 03:50:47 UTC (rev 294464)
@@ -305,12 +305,12 @@
void handleKeyboardEvent(KeyboardEvent&) final { }
void handleInputMethodKeydown(KeyboardEvent&) final { }
- void textFieldDidBeginEditing(Element*) final { }
- void textFieldDidEndEditing(Element*) final { }
- void textDidChangeInTextField(Element*) final { }
- bool doTextFieldCommandFromEvent(Element*, KeyboardEvent*) final { return false; }
- void textWillBeDeletedInTextField(Element*) final { }
- void textDidChangeInTextArea(Element*) final { }
+ void textFieldDidBeginEditing(Element&) final { }
+ void textFieldDidEndEditing(Element&) final { }
+ void textDidChangeInTextField(Element&) final { }
+ bool doTextFieldCommandFromEvent(Element&, KeyboardEvent*) final { return false; }
+ void textWillBeDeletedInTextField(Element&) final { }
+ void textDidChangeInTextArea(Element&) final { }
void overflowScrollPositionChanged() final { }
void subFrameScrollPositionChanged() final { }
Modified: trunk/Source/WebCore/page/EditorClient.h (294463 => 294464)
--- trunk/Source/WebCore/page/EditorClient.h 2022-05-19 03:05:09 UTC (rev 294463)
+++ trunk/Source/WebCore/page/EditorClient.h 2022-05-19 03:50:47 UTC (rev 294464)
@@ -127,12 +127,12 @@
virtual void handleInputMethodKeydown(KeyboardEvent&) = 0;
virtual void didDispatchInputMethodKeydown(KeyboardEvent&) { }
- virtual void textFieldDidBeginEditing(Element*) = 0;
- virtual void textFieldDidEndEditing(Element*) = 0;
- virtual void textDidChangeInTextField(Element*) = 0;
- virtual bool doTextFieldCommandFromEvent(Element*, KeyboardEvent*) = 0;
- virtual void textWillBeDeletedInTextField(Element*) = 0;
- virtual void textDidChangeInTextArea(Element*) = 0;
+ virtual void textFieldDidBeginEditing(Element&) = 0;
+ virtual void textFieldDidEndEditing(Element&) = 0;
+ virtual void textDidChangeInTextField(Element&) = 0;
+ virtual bool doTextFieldCommandFromEvent(Element&, KeyboardEvent*) = 0;
+ virtual void textWillBeDeletedInTextField(Element&) = 0;
+ virtual void textDidChangeInTextArea(Element&) = 0;
virtual void overflowScrollPositionChanged() = 0;
virtual void subFrameScrollPositionChanged() = 0;
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm (294463 => 294464)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2022-05-19 03:05:09 UTC (rev 294463)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2022-05-19 03:50:47 UTC (rev 294464)
@@ -465,11 +465,11 @@
{
}
- void didFocusTextField(WebKit::WebPage*, WebCore::HTMLInputElement* inputElement, WebKit::WebFrame* frame) final
+ void didFocusTextField(WebKit::WebPage*, WebCore::HTMLInputElement& inputElement, WebKit::WebFrame* frame) final
{
auto formDelegate = m_controller->_formDelegate.get();
if ([formDelegate respondsToSelector:@selector(_webProcessPlugInBrowserContextController:didFocusTextField:inFrame:)])
- [formDelegate _webProcessPlugInBrowserContextController:m_controller didFocusTextField:wrapper(*WebKit::InjectedBundleNodeHandle::getOrCreate(inputElement).get()) inFrame:wrapper(*frame)];
+ [formDelegate _webProcessPlugInBrowserContextController:m_controller didFocusTextField:wrapper(WebKit::InjectedBundleNodeHandle::getOrCreate(inputElement)) inFrame:wrapper(*frame)];
}
void willSendSubmitEvent(WebKit::WebPage*, WebCore::HTMLFormElement* formElement, WebKit::WebFrame* targetFrame, WebKit::WebFrame* sourceFrame, const Vector<std::pair<String, String>>& values) final
@@ -510,11 +510,11 @@
}
}
- void textDidChangeInTextField(WebKit::WebPage*, WebCore::HTMLInputElement* inputElement, WebKit::WebFrame* frame, bool initiatedByUserTyping) final
+ void textDidChangeInTextField(WebKit::WebPage*, WebCore::HTMLInputElement& inputElement, WebKit::WebFrame* frame, bool initiatedByUserTyping) final
{
auto formDelegate = m_controller->_formDelegate.get();
if ([formDelegate respondsToSelector:@selector(_webProcessPlugInBrowserContextController:textDidChangeInTextField:inFrame:initiatedByUserTyping:)])
- [formDelegate _webProcessPlugInBrowserContextController:m_controller textDidChangeInTextField:wrapper(*WebKit::InjectedBundleNodeHandle::getOrCreate(inputElement)) inFrame:wrapper(*frame) initiatedByUserTyping:initiatedByUserTyping];
+ [formDelegate _webProcessPlugInBrowserContextController:m_controller textDidChangeInTextField:wrapper(WebKit::InjectedBundleNodeHandle::getOrCreate(inputElement)) inFrame:wrapper(*frame) initiatedByUserTyping:initiatedByUserTyping];
}
void willBeginInputSession(WebKit::WebPage*, WebCore::Element* element, WebKit::WebFrame* frame, bool userIsInteracting, RefPtr<API::Object>& userData) final
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/APIInjectedBundleFormClient.h (294463 => 294464)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/APIInjectedBundleFormClient.h 2022-05-19 03:05:09 UTC (rev 294463)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/APIInjectedBundleFormClient.h 2022-05-19 03:50:47 UTC (rev 294464)
@@ -51,11 +51,11 @@
public:
virtual ~FormClient() { }
- virtual void didFocusTextField(WebKit::WebPage*, WebCore::HTMLInputElement*, WebKit::WebFrame*) { }
- virtual void textFieldDidBeginEditing(WebKit::WebPage*, WebCore::HTMLInputElement*, WebKit::WebFrame*) { }
- virtual void textFieldDidEndEditing(WebKit::WebPage*, WebCore::HTMLInputElement*, WebKit::WebFrame*) { }
- virtual void textDidChangeInTextField(WebKit::WebPage*, WebCore::HTMLInputElement*, WebKit::WebFrame*, bool) { }
- virtual void textDidChangeInTextArea(WebKit::WebPage*, WebCore::HTMLTextAreaElement*, WebKit::WebFrame*) { }
+ virtual void didFocusTextField(WebKit::WebPage*, WebCore::HTMLInputElement&, WebKit::WebFrame*) { }
+ virtual void textFieldDidBeginEditing(WebKit::WebPage*, WebCore::HTMLInputElement&, WebKit::WebFrame*) { }
+ virtual void textFieldDidEndEditing(WebKit::WebPage*, WebCore::HTMLInputElement&, WebKit::WebFrame*) { }
+ virtual void textDidChangeInTextField(WebKit::WebPage*, WebCore::HTMLInputElement&, WebKit::WebFrame*, bool) { }
+ virtual void textDidChangeInTextArea(WebKit::WebPage*, WebCore::HTMLTextAreaElement&, WebKit::WebFrame*) { }
enum class InputFieldAction {
MoveUp,
@@ -67,7 +67,7 @@
InsertDelete,
};
- virtual bool shouldPerformActionInTextField(WebKit::WebPage*, WebCore::HTMLInputElement*, InputFieldAction, WebKit::WebFrame*) { return false; }
+ virtual bool shouldPerformActionInTextField(WebKit::WebPage*, WebCore::HTMLInputElement&, InputFieldAction, WebKit::WebFrame*) { return false; }
virtual void willSubmitForm(WebKit::WebPage*, WebCore::HTMLFormElement*, WebKit::WebFrame*, WebKit::WebFrame*, const Vector<std::pair<WTF::String, WTF::String>>&, RefPtr<API::Object>& userData) { UNUSED_PARAM(userData); }
virtual void willSendSubmitEvent(WebKit::WebPage*, WebCore::HTMLFormElement*, WebKit::WebFrame*, WebKit::WebFrame*, const Vector<std::pair<WTF::String, WTF::String>>&) { }
virtual void didAssociateFormControls(WebKit::WebPage*, const Vector<RefPtr<WebCore::Element>>&, WebKit::WebFrame*) { }
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp (294463 => 294464)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp 2022-05-19 03:05:09 UTC (rev 294463)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp 2022-05-19 03:50:47 UTC (rev 294464)
@@ -45,16 +45,16 @@
initialize(client);
}
-void InjectedBundlePageFormClient::didFocusTextField(WebPage* page, HTMLInputElement* inputElement, WebFrame* frame)
+void InjectedBundlePageFormClient::didFocusTextField(WebPage* page, HTMLInputElement& inputElement, WebFrame* frame)
{
if (!m_client.didFocusTextField)
return;
- RefPtr<InjectedBundleNodeHandle> nodeHandle = InjectedBundleNodeHandle::getOrCreate(inputElement);
+ auto nodeHandle = InjectedBundleNodeHandle::getOrCreate(inputElement);
m_client.didFocusTextField(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), m_client.base.clientInfo);
}
-void InjectedBundlePageFormClient::textFieldDidBeginEditing(WebPage* page, HTMLInputElement* inputElement, WebFrame* frame)
+void InjectedBundlePageFormClient::textFieldDidBeginEditing(WebPage* page, HTMLInputElement& inputElement, WebFrame* frame)
{
if (!m_client.textFieldDidBeginEditing)
return;
@@ -63,7 +63,7 @@
m_client.textFieldDidBeginEditing(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), m_client.base.clientInfo);
}
-void InjectedBundlePageFormClient::textFieldDidEndEditing(WebPage* page, HTMLInputElement* inputElement, WebFrame* frame)
+void InjectedBundlePageFormClient::textFieldDidEndEditing(WebPage* page, HTMLInputElement& inputElement, WebFrame* frame)
{
if (!m_client.textFieldDidEndEditing)
return;
@@ -72,7 +72,7 @@
m_client.textFieldDidEndEditing(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), m_client.base.clientInfo);
}
-void InjectedBundlePageFormClient::textDidChangeInTextField(WebPage* page, HTMLInputElement* inputElement, WebFrame* frame, bool initiatedByUserTyping)
+void InjectedBundlePageFormClient::textDidChangeInTextField(WebPage* page, HTMLInputElement& inputElement, WebFrame* frame, bool initiatedByUserTyping)
{
if (!m_client.textDidChangeInTextField)
return;
@@ -84,7 +84,7 @@
m_client.textDidChangeInTextField(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), m_client.base.clientInfo);
}
-void InjectedBundlePageFormClient::textDidChangeInTextArea(WebPage* page, HTMLTextAreaElement* textAreaElement, WebFrame* frame)
+void InjectedBundlePageFormClient::textDidChangeInTextArea(WebPage* page, HTMLTextAreaElement& textAreaElement, WebFrame* frame)
{
if (!m_client.textDidChangeInTextArea)
return;
@@ -116,7 +116,7 @@
return WKInputFieldActionTypeCancel;
}
-bool InjectedBundlePageFormClient::shouldPerformActionInTextField(WebPage* page, HTMLInputElement* inputElement, API::InjectedBundle::FormClient::InputFieldAction actionType, WebFrame* frame)
+bool InjectedBundlePageFormClient::shouldPerformActionInTextField(WebPage* page, HTMLInputElement& inputElement, API::InjectedBundle::FormClient::InputFieldAction actionType, WebFrame* frame)
{
if (!m_client.shouldPerformActionInTextField)
return false;
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageFormClient.h (294463 => 294464)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageFormClient.h 2022-05-19 03:05:09 UTC (rev 294463)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageFormClient.h 2022-05-19 03:50:47 UTC (rev 294464)
@@ -43,12 +43,12 @@
public:
explicit InjectedBundlePageFormClient(const WKBundlePageFormClientBase*);
- void didFocusTextField(WebPage*, WebCore::HTMLInputElement*, WebFrame*) override;
- void textFieldDidBeginEditing(WebPage*, WebCore::HTMLInputElement*, WebFrame*) override;
- void textFieldDidEndEditing(WebPage*, WebCore::HTMLInputElement*, WebFrame*) override;
- void textDidChangeInTextField(WebPage*, WebCore::HTMLInputElement*, WebFrame*, bool initiatedByUserTyping) override;
- void textDidChangeInTextArea(WebPage*, WebCore::HTMLTextAreaElement*, WebFrame*) override;
- bool shouldPerformActionInTextField(WebPage*, WebCore::HTMLInputElement*, InputFieldAction, WebFrame*) override;
+ void didFocusTextField(WebPage*, WebCore::HTMLInputElement&, WebFrame*) override;
+ void textFieldDidBeginEditing(WebPage*, WebCore::HTMLInputElement&, WebFrame*) override;
+ void textFieldDidEndEditing(WebPage*, WebCore::HTMLInputElement&, WebFrame*) override;
+ void textDidChangeInTextField(WebPage*, WebCore::HTMLInputElement&, WebFrame*, bool initiatedByUserTyping) override;
+ void textDidChangeInTextArea(WebPage*, WebCore::HTMLTextAreaElement&, WebFrame*) override;
+ bool shouldPerformActionInTextField(WebPage*, WebCore::HTMLInputElement&, InputFieldAction, WebFrame*) override;
void willSubmitForm(WebPage*, WebCore::HTMLFormElement*, WebFrame*, WebFrame* sourceFrame, const Vector<std::pair<String, String>>&, RefPtr<API::Object>& userData) override;
void willSendSubmitEvent(WebPage*, WebCore::HTMLFormElement*, WebFrame*, WebFrame* sourceFrame, const Vector<std::pair<String, String>>&) override;
void didAssociateFormControls(WebPage*, const Vector<RefPtr<WebCore::Element>>&, WebFrame*) override;
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp (294463 => 294464)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp 2022-05-19 03:05:09 UTC (rev 294463)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp 2022-05-19 03:50:47 UTC (rev 294464)
@@ -260,16 +260,13 @@
void WebChromeClient::focusedElementChanged(Element* element)
{
- if (!is<HTMLInputElement>(element))
+ auto* inputElement = dynamicDowncast<HTMLInputElement>(element);
+ if (!inputElement || !inputElement->isText())
return;
- HTMLInputElement& inputElement = downcast<HTMLInputElement>(*element);
- if (!inputElement.isText())
- return;
-
WebFrame* webFrame = WebFrame::fromCoreFrame(*element->document().frame());
ASSERT(webFrame);
- m_page.injectedBundleFormClient().didFocusTextField(&m_page, &inputElement, webFrame);
+ m_page.injectedBundleFormClient().didFocusTextField(&m_page, *inputElement, webFrame);
}
void WebChromeClient::focusedFrameChanged(Frame* frame)
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebEditorClient.cpp (294463 => 294464)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebEditorClient.cpp 2022-05-19 03:05:09 UTC (rev 294463)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebEditorClient.cpp 2022-05-19 03:50:47 UTC (rev 294464)
@@ -352,50 +352,54 @@
#endif // !PLATFORM(COCOA) && !USE(GLIB)
-void WebEditorClient::textFieldDidBeginEditing(Element* element)
+void WebEditorClient::textFieldDidBeginEditing(Element& element)
{
- if (!is<HTMLInputElement>(*element))
+ auto* inputElement = dynamicDowncast<HTMLInputElement>(element);
+ if (!inputElement)
return;
- WebFrame* webFrame = WebFrame::fromCoreFrame(*element->document().frame());
+ auto* webFrame = WebFrame::fromCoreFrame(*element.document().frame());
ASSERT(webFrame);
- m_page->injectedBundleFormClient().textFieldDidBeginEditing(m_page, downcast<HTMLInputElement>(element), webFrame);
+ m_page->injectedBundleFormClient().textFieldDidBeginEditing(m_page, *inputElement, webFrame);
}
-void WebEditorClient::textFieldDidEndEditing(Element* element)
+void WebEditorClient::textFieldDidEndEditing(Element& element)
{
- if (!is<HTMLInputElement>(*element))
+ auto* inputElement = dynamicDowncast<HTMLInputElement>(element);
+ if (!inputElement)
return;
- WebFrame* webFrame = WebFrame::fromCoreFrame(*element->document().frame());
+ auto* webFrame = WebFrame::fromCoreFrame(*element.document().frame());
ASSERT(webFrame);
- m_page->injectedBundleFormClient().textFieldDidEndEditing(m_page, downcast<HTMLInputElement>(element), webFrame);
+ m_page->injectedBundleFormClient().textFieldDidEndEditing(m_page, *inputElement, webFrame);
}
-void WebEditorClient::textDidChangeInTextField(Element* element)
+void WebEditorClient::textDidChangeInTextField(Element& element)
{
- if (!is<HTMLInputElement>(*element))
+ auto* inputElement = dynamicDowncast<HTMLInputElement>(element);
+ if (!inputElement)
return;
- bool initiatedByUserTyping = UserTypingGestureIndicator::processingUserTypingGesture() && UserTypingGestureIndicator::focusedElementAtGestureStart() == element;
+ bool initiatedByUserTyping = UserTypingGestureIndicator::processingUserTypingGesture() && UserTypingGestureIndicator::focusedElementAtGestureStart() == inputElement;
- WebFrame* webFrame = WebFrame::fromCoreFrame(*element->document().frame());
+ auto* webFrame = WebFrame::fromCoreFrame(*element.document().frame());
ASSERT(webFrame);
- m_page->injectedBundleFormClient().textDidChangeInTextField(m_page, downcast<HTMLInputElement>(element), webFrame, initiatedByUserTyping);
+ m_page->injectedBundleFormClient().textDidChangeInTextField(m_page, *inputElement, webFrame, initiatedByUserTyping);
}
-void WebEditorClient::textDidChangeInTextArea(Element* element)
+void WebEditorClient::textDidChangeInTextArea(Element& element)
{
- if (!is<HTMLTextAreaElement>(*element))
+ auto* textAreaElement = dynamicDowncast<HTMLTextAreaElement>(element);
+ if (!textAreaElement)
return;
- WebFrame* webFrame = WebFrame::fromCoreFrame(*element->document().frame());
+ auto* webFrame = WebFrame::fromCoreFrame(*element.document().frame());
ASSERT(webFrame);
- m_page->injectedBundleFormClient().textDidChangeInTextArea(m_page, downcast<HTMLTextAreaElement>(element), webFrame);
+ m_page->injectedBundleFormClient().textDidChangeInTextArea(m_page, *textAreaElement, webFrame);
}
#if !PLATFORM(IOS_FAMILY)
@@ -455,9 +459,10 @@
return API::InjectedBundle::FormClient::InputFieldAction::Cancel;
}
-bool WebEditorClient::doTextFieldCommandFromEvent(Element* element, KeyboardEvent* event)
+bool WebEditorClient::doTextFieldCommandFromEvent(Element& element, KeyboardEvent* event)
{
- if (!is<HTMLInputElement>(*element))
+ auto* inputElement = dynamicDowncast<HTMLInputElement>(element);
+ if (!inputElement)
return false;
WKInputFieldActionType actionType = static_cast<WKInputFieldActionType>(0);
@@ -464,21 +469,22 @@
if (!getActionTypeForKeyEvent(event, actionType))
return false;
- WebFrame* webFrame = WebFrame::fromCoreFrame(*element->document().frame());
+ auto* webFrame = WebFrame::fromCoreFrame(*element.document().frame());
ASSERT(webFrame);
- return m_page->injectedBundleFormClient().shouldPerformActionInTextField(m_page, downcast<HTMLInputElement>(element), toInputFieldAction(actionType), webFrame);
+ return m_page->injectedBundleFormClient().shouldPerformActionInTextField(m_page, *inputElement, toInputFieldAction(actionType), webFrame);
}
-void WebEditorClient::textWillBeDeletedInTextField(Element* element)
+void WebEditorClient::textWillBeDeletedInTextField(Element& element)
{
- if (!is<HTMLInputElement>(*element))
+ auto* inputElement = dynamicDowncast<HTMLInputElement>(element);
+ if (!inputElement)
return;
- WebFrame* webFrame = WebFrame::fromCoreFrame(*element->document().frame());
+ auto* webFrame = WebFrame::fromCoreFrame(*element.document().frame());
ASSERT(webFrame);
- m_page->injectedBundleFormClient().shouldPerformActionInTextField(m_page, downcast<HTMLInputElement>(element), toInputFieldAction(WKInputFieldActionTypeInsertDelete), webFrame);
+ m_page->injectedBundleFormClient().shouldPerformActionInTextField(m_page, *inputElement, toInputFieldAction(WKInputFieldActionTypeInsertDelete), webFrame);
}
bool WebEditorClient::shouldEraseMarkersAfterChangeSelection(WebCore::TextCheckingType type) const
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebEditorClient.h (294463 => 294464)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebEditorClient.h 2022-05-19 03:05:09 UTC (rev 294463)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebEditorClient.h 2022-05-19 03:50:47 UTC (rev 294464)
@@ -107,12 +107,12 @@
void handleKeyboardEvent(WebCore::KeyboardEvent&) final;
void handleInputMethodKeydown(WebCore::KeyboardEvent&) final;
- void textFieldDidBeginEditing(WebCore::Element*) final;
- void textFieldDidEndEditing(WebCore::Element*) final;
- void textDidChangeInTextField(WebCore::Element*) final;
- bool doTextFieldCommandFromEvent(WebCore::Element*, WebCore::KeyboardEvent*) final;
- void textWillBeDeletedInTextField(WebCore::Element*) final;
- void textDidChangeInTextArea(WebCore::Element*) final;
+ void textFieldDidBeginEditing(WebCore::Element&) final;
+ void textFieldDidEndEditing(WebCore::Element&) final;
+ void textDidChangeInTextField(WebCore::Element&) final;
+ bool doTextFieldCommandFromEvent(WebCore::Element&, WebCore::KeyboardEvent*) final;
+ void textWillBeDeletedInTextField(WebCore::Element&) final;
+ void textDidChangeInTextArea(WebCore::Element&) final;
void overflowScrollPositionChanged() final;
void subFrameScrollPositionChanged() final;
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.h (294463 => 294464)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.h 2022-05-19 03:05:09 UTC (rev 294463)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.h 2022-05-19 03:50:47 UTC (rev 294464)
@@ -132,12 +132,12 @@
void handleKeyboardEvent(WebCore::KeyboardEvent&) final;
void handleInputMethodKeydown(WebCore::KeyboardEvent&) final;
- void textFieldDidBeginEditing(WebCore::Element*) final;
- void textFieldDidEndEditing(WebCore::Element*) final;
- void textDidChangeInTextField(WebCore::Element*) final;
- bool doTextFieldCommandFromEvent(WebCore::Element*, WebCore::KeyboardEvent*) final;
- void textWillBeDeletedInTextField(WebCore::Element*) final;
- void textDidChangeInTextArea(WebCore::Element*) final;
+ void textFieldDidBeginEditing(WebCore::Element&) final;
+ void textFieldDidEndEditing(WebCore::Element&) final;
+ void textDidChangeInTextField(WebCore::Element&) final;
+ bool doTextFieldCommandFromEvent(WebCore::Element&, WebCore::KeyboardEvent*) final;
+ void textWillBeDeletedInTextField(WebCore::Element&) final;
+ void textDidChangeInTextArea(WebCore::Element&) final;
void overflowScrollPositionChanged() final { };
void subFrameScrollPositionChanged() final { };
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm (294463 => 294464)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm 2022-05-19 03:05:09 UTC (rev 294463)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm 2022-05-19 03:50:47 UTC (rev 294464)
@@ -705,39 +705,49 @@
#define FormDelegateLog(ctrl) LOG(FormDelegate, "control=%@", ctrl)
-void WebEditorClient::textFieldDidBeginEditing(Element* element)
+template <typename T>
+static DOMElement *dynamicDowncastToKit(Element& element)
{
- if (!is<HTMLInputElement>(*element))
+ auto* coreInputElement = dynamicDowncast<T>(element);
+ if (!coreInputElement)
+ return nil;
+
+ return kit(coreInputElement);
+}
+
+void WebEditorClient::textFieldDidBeginEditing(Element& element)
+{
+ auto *inputElement = dynamicDowncastToKit<HTMLInputElement>(element);
+ if (!inputElement)
return;
- DOMHTMLInputElement* inputElement = kit(downcast<HTMLInputElement>(element));
FormDelegateLog(inputElement);
- CallFormDelegate(m_webView, @selector(textFieldDidBeginEditing:inFrame:), inputElement, kit(element->document().frame()));
+ CallFormDelegate(m_webView, @selector(textFieldDidBeginEditing:inFrame:), inputElement, kit(element.document().frame()));
}
-void WebEditorClient::textFieldDidEndEditing(Element* element)
+void WebEditorClient::textFieldDidEndEditing(Element& element)
{
- if (!is<HTMLInputElement>(*element))
+ auto *inputElement = dynamicDowncastToKit<HTMLInputElement>(element);
+ if (!inputElement)
return;
- DOMHTMLInputElement* inputElement = kit(downcast<HTMLInputElement>(element));
FormDelegateLog(inputElement);
- CallFormDelegate(m_webView, @selector(textFieldDidEndEditing:inFrame:), inputElement, kit(element->document().frame()));
+ CallFormDelegate(m_webView, @selector(textFieldDidEndEditing:inFrame:), inputElement, kit(element.document().frame()));
}
-void WebEditorClient::textDidChangeInTextField(Element* element)
+void WebEditorClient::textDidChangeInTextField(Element& element)
{
- if (!is<HTMLInputElement>(*element))
+ auto *inputElement = dynamicDowncastToKit<HTMLInputElement>(element);
+ if (!inputElement)
return;
#if !PLATFORM(IOS_FAMILY)
- if (!UserTypingGestureIndicator::processingUserTypingGesture() || UserTypingGestureIndicator::focusedElementAtGestureStart() != element)
+ if (!UserTypingGestureIndicator::processingUserTypingGesture() || UserTypingGestureIndicator::focusedElementAtGestureStart() != &element)
return;
#endif
- DOMHTMLInputElement* inputElement = kit(downcast<HTMLInputElement>(element));
FormDelegateLog(inputElement);
- CallFormDelegate(m_webView, @selector(textDidChangeInTextField:inFrame:), inputElement, kit(element->document().frame()));
+ CallFormDelegate(m_webView, @selector(textDidChangeInTextField:inFrame:), inputElement, kit(element.document().frame()));
}
static SEL selectorForKeyEvent(KeyboardEvent* event)
@@ -765,37 +775,37 @@
return 0;
}
-bool WebEditorClient::doTextFieldCommandFromEvent(Element* element, KeyboardEvent* event)
+bool WebEditorClient::doTextFieldCommandFromEvent(Element& element, KeyboardEvent* event)
{
- if (!is<HTMLInputElement>(*element))
+ auto *inputElement = dynamicDowncastToKit<HTMLInputElement>(element);
+ if (!inputElement)
return NO;
- DOMHTMLInputElement* inputElement = kit(downcast<HTMLInputElement>(element));
FormDelegateLog(inputElement);
if (SEL commandSelector = selectorForKeyEvent(event))
- return CallFormDelegateReturningBoolean(NO, m_webView, @selector(textField:doCommandBySelector:inFrame:), inputElement, commandSelector, kit(element->document().frame()));
+ return CallFormDelegateReturningBoolean(NO, m_webView, @selector(textField:doCommandBySelector:inFrame:), inputElement, commandSelector, kit(element.document().frame()));
return NO;
}
-void WebEditorClient::textWillBeDeletedInTextField(Element* element)
+void WebEditorClient::textWillBeDeletedInTextField(Element& element)
{
- if (!is<HTMLInputElement>(*element))
+ auto *inputElement = dynamicDowncastToKit<HTMLInputElement>(element);
+ if (!inputElement)
return;
- DOMHTMLInputElement* inputElement = kit(downcast<HTMLInputElement>(element));
FormDelegateLog(inputElement);
// We're using the deleteBackward selector for all deletion operations since the autofill code treats all deletions the same way.
- CallFormDelegateReturningBoolean(NO, m_webView, @selector(textField:doCommandBySelector:inFrame:), inputElement, @selector(deleteBackward:), kit(element->document().frame()));
+ CallFormDelegateReturningBoolean(NO, m_webView, @selector(textField:doCommandBySelector:inFrame:), inputElement, @selector(deleteBackward:), kit(element.document().frame()));
}
-void WebEditorClient::textDidChangeInTextArea(Element* element)
+void WebEditorClient::textDidChangeInTextArea(Element& element)
{
- if (!is<HTMLTextAreaElement>(*element))
+ auto *textAreaElement = dynamicDowncastToKit<HTMLTextAreaElement>(element);
+ if (!textAreaElement)
return;
- DOMHTMLTextAreaElement* textAreaElement = kit(downcast<HTMLTextAreaElement>(element));
FormDelegateLog(textAreaElement);
- CallFormDelegate(m_webView, @selector(textDidChangeInTextArea:inFrame:), textAreaElement, kit(element->document().frame()));
+ CallFormDelegate(m_webView, @selector(textDidChangeInTextArea:inFrame:), textAreaElement, kit(element.document().frame()));
}
#if PLATFORM(IOS_FAMILY)
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebEditorClient.cpp (294463 => 294464)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebEditorClient.cpp 2022-05-19 03:05:09 UTC (rev 294463)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebEditorClient.cpp 2022-05-19 03:50:47 UTC (rev 294464)
@@ -392,15 +392,15 @@
return page->settings().selectTrailingWhitespaceEnabled();
}
-void WebEditorClient::textFieldDidBeginEditing(Element* e)
+void WebEditorClient::textFieldDidBeginEditing(Element& e)
{
IWebFormDelegate* formDelegate;
if (SUCCEEDED(m_webView->formDelegate(&formDelegate)) && formDelegate) {
- IDOMElement* domElement = DOMElement::createInstance(e);
+ IDOMElement* domElement = DOMElement::createInstance(&e);
if (domElement) {
IDOMHTMLInputElement* domInputElement;
if (SUCCEEDED(domElement->QueryInterface(IID_IDOMHTMLInputElement, (void**)&domInputElement))) {
- formDelegate->textFieldDidBeginEditing(domInputElement, kit(e->document().frame()));
+ formDelegate->textFieldDidBeginEditing(domInputElement, kit(e.document().frame()));
domInputElement->Release();
}
domElement->Release();
@@ -409,15 +409,15 @@
}
}
-void WebEditorClient::textFieldDidEndEditing(Element* e)
+void WebEditorClient::textFieldDidEndEditing(Element& e)
{
IWebFormDelegate* formDelegate;
if (SUCCEEDED(m_webView->formDelegate(&formDelegate)) && formDelegate) {
- IDOMElement* domElement = DOMElement::createInstance(e);
+ IDOMElement* domElement = DOMElement::createInstance(&e);
if (domElement) {
IDOMHTMLInputElement* domInputElement;
if (SUCCEEDED(domElement->QueryInterface(IID_IDOMHTMLInputElement, (void**)&domInputElement))) {
- formDelegate->textFieldDidEndEditing(domInputElement, kit(e->document().frame()));
+ formDelegate->textFieldDidEndEditing(domInputElement, kit(e.document().frame()));
domInputElement->Release();
}
domElement->Release();
@@ -426,18 +426,18 @@
}
}
-void WebEditorClient::textDidChangeInTextField(Element* e)
+void WebEditorClient::textDidChangeInTextField(Element& e)
{
- if (!UserTypingGestureIndicator::processingUserTypingGesture() || UserTypingGestureIndicator::focusedElementAtGestureStart() != e)
+ if (!UserTypingGestureIndicator::processingUserTypingGesture() || UserTypingGestureIndicator::focusedElementAtGestureStart() != &e)
return;
IWebFormDelegate* formDelegate;
if (SUCCEEDED(m_webView->formDelegate(&formDelegate)) && formDelegate) {
- IDOMElement* domElement = DOMElement::createInstance(e);
+ IDOMElement* domElement = DOMElement::createInstance(&e);
if (domElement) {
IDOMHTMLInputElement* domInputElement;
if (SUCCEEDED(domElement->QueryInterface(IID_IDOMHTMLInputElement, (void**)&domInputElement))) {
- formDelegate->textDidChangeInTextField(domInputElement, kit(e->document().frame()));
+ formDelegate->textDidChangeInTextField(domInputElement, kit(e.document().frame()));
domInputElement->Release();
}
domElement->Release();
@@ -446,12 +446,12 @@
}
}
-bool WebEditorClient::doTextFieldCommandFromEvent(Element* e, KeyboardEvent* ke)
+bool WebEditorClient::doTextFieldCommandFromEvent(Element& e, KeyboardEvent* ke)
{
BOOL result = FALSE;
IWebFormDelegate* formDelegate;
if (SUCCEEDED(m_webView->formDelegate(&formDelegate)) && formDelegate) {
- IDOMElement* domElement = DOMElement::createInstance(e);
+ IDOMElement* domElement = DOMElement::createInstance(&e);
if (domElement) {
IDOMHTMLInputElement* domInputElement;
if (SUCCEEDED(domElement->QueryInterface(IID_IDOMHTMLInputElement, (void**)&domInputElement))) {
@@ -458,7 +458,7 @@
auto command = String::fromLatin1(m_webView->interpretKeyEvent(ke));
// We allow empty commands here because the app code actually depends on this being called for all key presses.
// We may want to revisit this later because it doesn't really make sense to send an empty command.
- formDelegate->doPlatformCommand(domInputElement, BString(command), kit(e->document().frame()), &result);
+ formDelegate->doPlatformCommand(domInputElement, BString(command), kit(e.document().frame()), &result);
domInputElement->Release();
}
domElement->Release();
@@ -468,17 +468,17 @@
return !!result;
}
-void WebEditorClient::textWillBeDeletedInTextField(Element* e)
+void WebEditorClient::textWillBeDeletedInTextField(Element& e)
{
// We're using the deleteBackward command for all deletion operations since the autofill code treats all deletions the same way.
IWebFormDelegate* formDelegate;
if (SUCCEEDED(m_webView->formDelegate(&formDelegate)) && formDelegate) {
- IDOMElement* domElement = DOMElement::createInstance(e);
+ IDOMElement* domElement = DOMElement::createInstance(&e);
if (domElement) {
IDOMHTMLInputElement* domInputElement;
if (SUCCEEDED(domElement->QueryInterface(IID_IDOMHTMLInputElement, (void**)&domInputElement))) {
BOOL result;
- formDelegate->doPlatformCommand(domInputElement, BString(L"DeleteBackward"), kit(e->document().frame()), &result);
+ formDelegate->doPlatformCommand(domInputElement, BString(L"DeleteBackward"), kit(e.document().frame()), &result);
domInputElement->Release();
}
domElement->Release();
@@ -487,15 +487,15 @@
}
}
-void WebEditorClient::textDidChangeInTextArea(Element* e)
+void WebEditorClient::textDidChangeInTextArea(Element& e)
{
IWebFormDelegate* formDelegate;
if (SUCCEEDED(m_webView->formDelegate(&formDelegate)) && formDelegate) {
- IDOMElement* domElement = DOMElement::createInstance(e);
+ IDOMElement* domElement = DOMElement::createInstance(&e);
if (domElement) {
IDOMHTMLTextAreaElement* domTextAreaElement;
if (SUCCEEDED(domElement->QueryInterface(IID_IDOMHTMLTextAreaElement, (void**)&domTextAreaElement))) {
- formDelegate->textDidChangeInTextArea(domTextAreaElement, kit(e->document().frame()));
+ formDelegate->textDidChangeInTextArea(domTextAreaElement, kit(e.document().frame()));
domTextAreaElement->Release();
}
domElement->Release();
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebEditorClient.h (294463 => 294464)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebEditorClient.h 2022-05-19 03:05:09 UTC (rev 294463)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebEditorClient.h 2022-05-19 03:50:47 UTC (rev 294464)
@@ -88,12 +88,12 @@
void redo() final;
bool shouldChangeSelectedRange(const std::optional<WebCore::SimpleRange>& fromRange, const std::optional<WebCore::SimpleRange>& toRange, WebCore::Affinity, bool stillSelecting) final;
- void textFieldDidBeginEditing(WebCore::Element*) final;
- void textFieldDidEndEditing(WebCore::Element*) final;
- void textDidChangeInTextField(WebCore::Element*) final;
- bool doTextFieldCommandFromEvent(WebCore::Element*, WebCore::KeyboardEvent*) final;
- void textWillBeDeletedInTextField(WebCore::Element* input) final;
- void textDidChangeInTextArea(WebCore::Element*) final;
+ void textFieldDidBeginEditing(WebCore::Element&) final;
+ void textFieldDidEndEditing(WebCore::Element&) final;
+ void textDidChangeInTextField(WebCore::Element&) final;
+ bool doTextFieldCommandFromEvent(WebCore::Element&, WebCore::KeyboardEvent*) final;
+ void textWillBeDeletedInTextField(WebCore::Element& input) final;
+ void textDidChangeInTextArea(WebCore::Element&) final;
void overflowScrollPositionChanged() final { }
void subFrameScrollPositionChanged() final { }