- Revision
- 225853
- Author
- [email protected]
- Date
- 2017-12-13 10:35:14 -0800 (Wed, 13 Dec 2017)
Log Message
Move out-parameter in API::FormClient::willBeginInputSession() to the end of the parameter list
https://bugs.webkit.org/show_bug.cgi?id=180754
Reviewed by Wenson Hsieh.
Group all in-parameters in the signature of API::FormClient::willBeginInputSession() at
the front of the parameter list instead of interspersing in- and out- parameters.
No functionality changed. So, no new tests.
* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
(-[WKWebProcessPlugInBrowserContextController _setFormDelegate:]):
* WebProcess/InjectedBundle/APIInjectedBundleFormClient.h:
(API::InjectedBundle::FormClient::willBeginInputSession):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::elementDidFocus):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (225852 => 225853)
--- trunk/Source/WebKit/ChangeLog 2017-12-13 18:26:41 UTC (rev 225852)
+++ trunk/Source/WebKit/ChangeLog 2017-12-13 18:35:14 UTC (rev 225853)
@@ -1,3 +1,22 @@
+2017-12-13 Daniel Bates <[email protected]>
+
+ Move out-parameter in API::FormClient::willBeginInputSession() to the end of the parameter list
+ https://bugs.webkit.org/show_bug.cgi?id=180754
+
+ Reviewed by Wenson Hsieh.
+
+ Group all in-parameters in the signature of API::FormClient::willBeginInputSession() at
+ the front of the parameter list instead of interspersing in- and out- parameters.
+
+ No functionality changed. So, no new tests.
+
+ * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
+ (-[WKWebProcessPlugInBrowserContextController _setFormDelegate:]):
+ * WebProcess/InjectedBundle/APIInjectedBundleFormClient.h:
+ (API::InjectedBundle::FormClient::willBeginInputSession):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::elementDidFocus):
+
2017-12-13 Chris Dumez <[email protected]>
[iOS] Take process assertion to prevent the service worker process from getting suspended
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm (225852 => 225853)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2017-12-13 18:26:41 UTC (rev 225852)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2017-12-13 18:35:14 UTC (rev 225853)
@@ -528,7 +528,7 @@
[formDelegate _webProcessPlugInBrowserContextController:m_controller textDidChangeInTextField:wrapper(*WebKit::InjectedBundleNodeHandle::getOrCreate(inputElement)) inFrame:wrapper(*frame) initiatedByUserTyping:initiatedByUserTyping];
}
- void willBeginInputSession(WebPage*, Element* element, WebFrame* frame, RefPtr<API::Object>& userData, bool userIsInteracting) override
+ void willBeginInputSession(WebPage*, Element* element, WebFrame* frame, bool userIsInteracting, RefPtr<API::Object>& userData) override
{
auto formDelegate = m_controller->_formDelegate.get();
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/APIInjectedBundleFormClient.h (225852 => 225853)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/APIInjectedBundleFormClient.h 2017-12-13 18:26:41 UTC (rev 225852)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/APIInjectedBundleFormClient.h 2017-12-13 18:35:14 UTC (rev 225853)
@@ -71,7 +71,7 @@
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>>&) { }
virtual bool shouldNotifyOnFormChanges(WebKit::WebPage*) { return false; }
- virtual void willBeginInputSession(WebKit::WebPage*, WebCore::Element*, WebKit::WebFrame*, RefPtr<API::Object>& userData, bool userIsInteracting) { UNUSED_PARAM(userData); }
+ virtual void willBeginInputSession(WebKit::WebPage*, WebCore::Element*, WebKit::WebFrame*, bool userIsInteracting, RefPtr<API::Object>& userData) { UNUSED_PARAM(userData); }
};
} // namespace InjectedBundle
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (225852 => 225853)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2017-12-13 18:26:41 UTC (rev 225852)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2017-12-13 18:35:14 UTC (rev 225853)
@@ -4857,7 +4857,7 @@
getAssistedNodeInformation(information);
RefPtr<API::Object> userData;
- m_formClient->willBeginInputSession(this, downcast<Element>(node), WebFrame::fromCoreFrame(*node->document().frame()), userData, m_userIsInteracting);
+ m_formClient->willBeginInputSession(this, downcast<Element>(node), WebFrame::fromCoreFrame(*node->document().frame()), m_userIsInteracting, userData);
send(Messages::WebPageProxy::StartAssistingNode(information, m_userIsInteracting, m_hasPendingBlurNotification, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
#elif PLATFORM(MAC)
