<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[212376] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/212376">212376</a></dd>
<dt>Author</dt> <dd>aakash_jain@apple.com</dd>
<dt>Date</dt> <dd>2017-02-15 10:13:18 -0800 (Wed, 15 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove WebIOSEvent interface
https://bugs.webkit.org/show_bug.cgi?id=168368
Reviewed by Tim Horton.
Source/WebCore:
* platform/ios/WebEvent.h: Removed WebIOSEvent.
Source/WebKit2:
* Shared/NativeWebKeyboardEvent.h: Using WebEvent from WebCore instead of WebIOSEvent.
* Shared/ios/NativeWebKeyboardEventIOS.mm: Ditto.
* Shared/ios/WebIOSEventFactory.h: Ditto.
* Shared/ios/WebIOSEventFactory.mm: Ditto.
* UIProcess/ios/WKContentViewInteraction.h: Ditto.
* UIProcess/ios/WKContentViewInteraction.mm: Ditto.
* UIProcess/API/C/WKPage.cpp: Using WebEvent from WebKit.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebEventh">trunk/Source/WebCore/platform/ios/WebEvent.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedNativeWebKeyboardEventh">trunk/Source/WebKit2/Shared/NativeWebKeyboardEvent.h</a></li>
<li><a href="#trunkSourceWebKit2SharediosNativeWebKeyboardEventIOSmm">trunk/Source/WebKit2/Shared/ios/NativeWebKeyboardEventIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2SharediosWebIOSEventFactoryh">trunk/Source/WebKit2/Shared/ios/WebIOSEventFactory.h</a></li>
<li><a href="#trunkSourceWebKit2SharediosWebIOSEventFactorymm">trunk/Source/WebKit2/Shared/ios/WebIOSEventFactory.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionh">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212375 => 212376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-15 18:12:25 UTC (rev 212375)
+++ trunk/Source/WebCore/ChangeLog 2017-02-15 18:13:18 UTC (rev 212376)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2017-02-15 Aakash Jain <aakash_jain@apple.com>
+
+ Remove WebIOSEvent interface
+ https://bugs.webkit.org/show_bug.cgi?id=168368
+
+ Reviewed by Tim Horton.
+
+ * platform/ios/WebEvent.h: Removed WebIOSEvent.
+
</ins><span class="cx"> 2017-02-15 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Form Validation Bubble should be sensitive to Dynamic Type
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebEvent.h (212375 => 212376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebEvent.h 2017-02-15 18:12:25 UTC (rev 212375)
+++ trunk/Source/WebCore/platform/ios/WebEvent.h 2017-02-15 18:13:18 UTC (rev 212376)
</span><span class="lines">@@ -185,8 +185,5 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@interface WebIOSEvent : WebEvent
-@end
-
</del><span class="cx"> #endif // TARGET_OS_IPHONE
</span><span class="cx"> #endif // WebEventIOS_h
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (212375 => 212376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-15 18:12:25 UTC (rev 212375)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-15 18:13:18 UTC (rev 212376)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-02-15 Aakash Jain <aakash_jain@apple.com>
+
+ Remove WebIOSEvent interface
+ https://bugs.webkit.org/show_bug.cgi?id=168368
+
+ Reviewed by Tim Horton.
+
+ * Shared/NativeWebKeyboardEvent.h: Using WebEvent from WebCore instead of WebIOSEvent.
+ * Shared/ios/NativeWebKeyboardEventIOS.mm: Ditto.
+ * Shared/ios/WebIOSEventFactory.h: Ditto.
+ * Shared/ios/WebIOSEventFactory.mm: Ditto.
+ * UIProcess/ios/WKContentViewInteraction.h: Ditto.
+ * UIProcess/ios/WKContentViewInteraction.mm: Ditto.
+ * UIProcess/API/C/WKPage.cpp: Using WebEvent from WebKit.
+
</ins><span class="cx"> 2017-02-14 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Update cookie manager API to properly work with ephemeral sessions
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNativeWebKeyboardEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/NativeWebKeyboardEvent.h (212375 => 212376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/NativeWebKeyboardEvent.h 2017-02-15 18:12:25 UTC (rev 212375)
+++ trunk/Source/WebKit2/Shared/NativeWebKeyboardEvent.h 2017-02-15 18:13:18 UTC (rev 212376)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><del>-OBJC_CLASS WebIOSEvent;
</del><ins>+OBJC_CLASS WebEvent;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> NativeWebKeyboardEvent(const Evas_Event_Key_Down*, bool);
</span><span class="cx"> NativeWebKeyboardEvent(const Evas_Event_Key_Up*);
</span><span class="cx"> #elif PLATFORM(IOS)
</span><del>- NativeWebKeyboardEvent(WebIOSEvent *);
</del><ins>+ NativeWebKeyboardEvent(::WebEvent *);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(APPKIT)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> const void* nativeEvent() const { return m_nativeEvent; }
</span><span class="cx"> bool isFiltered() const { return m_isFiltered; }
</span><span class="cx"> #elif PLATFORM(IOS)
</span><del>- WebIOSEvent* nativeEvent() const { return m_nativeEvent.get(); }
</del><ins>+ ::WebEvent* nativeEvent() const { return m_nativeEvent.get(); }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> const void* m_nativeEvent;
</span><span class="cx"> bool m_isFiltered;
</span><span class="cx"> #elif PLATFORM(IOS)
</span><del>- RetainPtr<WebIOSEvent> m_nativeEvent;
</del><ins>+ RetainPtr<::WebEvent> m_nativeEvent;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharediosNativeWebKeyboardEventIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ios/NativeWebKeyboardEventIOS.mm (212375 => 212376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ios/NativeWebKeyboardEventIOS.mm 2017-02-15 18:12:25 UTC (rev 212375)
+++ trunk/Source/WebKit2/Shared/ios/NativeWebKeyboardEventIOS.mm 2017-02-15 18:13:18 UTC (rev 212376)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-NativeWebKeyboardEvent::NativeWebKeyboardEvent(WebIOSEvent *event)
</del><ins>+NativeWebKeyboardEvent::NativeWebKeyboardEvent(::WebEvent *event)
</ins><span class="cx"> : WebKeyboardEvent(WebIOSEventFactory::createWebKeyboardEvent(event))
</span><span class="cx"> , m_nativeEvent(event)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharediosWebIOSEventFactoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ios/WebIOSEventFactory.h (212375 => 212376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ios/WebIOSEventFactory.h 2017-02-15 18:12:25 UTC (rev 212375)
+++ trunk/Source/WebKit2/Shared/ios/WebIOSEventFactory.h 2017-02-15 18:13:18 UTC (rev 212376)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> class WebIOSEventFactory {
</span><span class="cx"> public:
</span><del>- static WebKit::WebKeyboardEvent createWebKeyboardEvent(WebIOSEvent *event);
</del><ins>+ static WebKit::WebKeyboardEvent createWebKeyboardEvent(::WebEvent *event);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharediosWebIOSEventFactorymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ios/WebIOSEventFactory.mm (212375 => 212376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ios/WebIOSEventFactory.mm 2017-02-15 18:12:25 UTC (rev 212375)
+++ trunk/Source/WebKit2/Shared/ios/WebIOSEventFactory.mm 2017-02-15 18:13:18 UTC (rev 212376)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #import <WebCore/KeyEventCodesIOS.h>
</span><span class="cx"> #import <WebCore/PlatformEventFactoryIOS.h>
</span><span class="cx">
</span><del>-static WebKit::WebEvent::Modifiers modifiersForEvent(WebIOSEvent *event)
</del><ins>+static WebKit::WebEvent::Modifiers modifiersForEvent(::WebEvent *event)
</ins><span class="cx"> {
</span><span class="cx"> unsigned modifiers = 0;
</span><span class="cx"> WebEventFlags eventModifierFlags = event.modifierFlags;
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> return static_cast<WebKit::WebEvent::Modifiers>(modifiers);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebKit::WebKeyboardEvent WebIOSEventFactory::createWebKeyboardEvent(WebIOSEvent *event)
</del><ins>+WebKit::WebKeyboardEvent WebIOSEventFactory::createWebKeyboardEvent(::WebEvent *event)
</ins><span class="cx"> {
</span><span class="cx"> WebKit::WebEvent::Type type = (event.type == WebEventKeyUp) ? WebKit::WebEvent::KeyUp : WebKit::WebEvent::KeyDown;
</span><span class="cx"> String text = event.characters;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (212375 => 212376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2017-02-15 18:12:25 UTC (rev 212375)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2017-02-15 18:13:18 UTC (rev 212376)
</span><span class="lines">@@ -1900,7 +1900,7 @@
</span><span class="cx"> m_client.setStatusText(toAPI(page), toAPI(text.impl()), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void mouseDidMoveOverElement(WebPageProxy* page, const WebHitTestResultData& data, WebEvent::Modifiers modifiers, API::Object* userData) override
</del><ins>+ void mouseDidMoveOverElement(WebPageProxy* page, const WebHitTestResultData& data, WebKit::WebEvent::Modifiers modifiers, API::Object* userData) override
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.mouseDidMoveOverElement && !m_client.mouseDidMoveOverElement_deprecatedForUseWithV0)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (212375 => 212376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2017-02-15 18:12:25 UTC (rev 212375)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2017-02-15 18:13:18 UTC (rev 212376)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> @class WKActionSheetAssistant;
</span><span class="cx"> @class WKFormInputSession;
</span><span class="cx"> @class WKInspectorNodeSearchGestureRecognizer;
</span><del>-@class WebIOSEvent;
</del><ins>+@class WebEvent;
</ins><span class="cx"> @class _UIHighlightView;
</span><span class="cx"> @class _UIWebHighlightLongPressGestureRecognizer;
</span><span class="cx">
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> typedef void (^UIWKDictationContextHandler)(NSString *selectedText, NSString *beforeText, NSString *afterText);
</span><span class="cx"> typedef void (^UIWKSelectionCompletionHandler)(void);
</span><span class="cx"> typedef void (^UIWKSelectionWithDirectionCompletionHandler)(BOOL selectionEndIsMoving);
</span><del>-typedef void (^UIWKKeyWebEventCompletionHandler)(WebIOSEvent *theEvent, BOOL wasHandled);
</del><ins>+typedef void (^UIWKKeyWebEventCompletionHandler)(::WebEvent *theEvent, BOOL wasHandled);
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx"> - (void)_stopAssistingNode;
</span><span class="cx"> - (void)_selectionChanged;
</span><span class="cx"> - (void)_updateChangedSelection;
</span><del>-- (BOOL)_interpretKeyEvent:(WebIOSEvent *)theEvent isCharEvent:(BOOL)isCharEvent;
</del><ins>+- (BOOL)_interpretKeyEvent:(::WebEvent *)theEvent isCharEvent:(BOOL)isCharEvent;
</ins><span class="cx"> - (void)_positionInformationDidChange:(const WebKit::InteractionInformationAtPosition&)info;
</span><span class="cx"> - (void)_attemptClickAtLocation:(CGPoint)location;
</span><span class="cx"> - (void)_willStartScrollingOrZooming;
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx"> - (void)_showPlaybackTargetPicker:(BOOL)hasVideo fromRect:(const WebCore::IntRect&)elementRect;
</span><span class="cx"> - (void)_showRunOpenPanel:(API::OpenPanelParameters*)parameters resultListener:(WebKit::WebOpenPanelResultListenerProxy*)listener;
</span><span class="cx"> - (void)accessoryDone;
</span><del>-- (void)_didHandleKeyEvent:(WebIOSEvent *)event eventWasHandled:(BOOL)eventWasHandled;
</del><ins>+- (void)_didHandleKeyEvent:(::WebEvent *)event eventWasHandled:(BOOL)eventWasHandled;
</ins><span class="cx"> - (Vector<WebKit::OptionItem>&) assistedNodeSelectOptions;
</span><span class="cx"> - (void)_enableInspectorNodeSearch;
</span><span class="cx"> - (void)_disableInspectorNodeSearch;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (212375 => 212376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-02-15 18:12:25 UTC (rev 212375)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-02-15 18:13:18 UTC (rev 212376)
</span><span class="lines">@@ -3340,18 +3340,18 @@
</span><span class="cx"> [self handleKeyWebEvent:webEvent];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)handleKeyWebEvent:(WebIOSEvent *)theEvent
</del><ins>+- (void)handleKeyWebEvent:(::WebEvent *)theEvent
</ins><span class="cx"> {
</span><span class="cx"> _page->handleKeyboardEvent(NativeWebKeyboardEvent(theEvent));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)handleKeyWebEvent:(WebIOSEvent *)theEvent withCompletionHandler:(void (^)(WebIOSEvent *theEvent, BOOL wasHandled))completionHandler
</del><ins>+- (void)handleKeyWebEvent:(::WebEvent *)theEvent withCompletionHandler:(void (^)(::WebEvent *theEvent, BOOL wasHandled))completionHandler
</ins><span class="cx"> {
</span><span class="cx"> _keyWebEventHandler = [completionHandler copy];
</span><span class="cx"> _page->handleKeyboardEvent(NativeWebKeyboardEvent(theEvent));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_didHandleKeyEvent:(WebIOSEvent *)event eventWasHandled:(BOOL)eventWasHandled
</del><ins>+- (void)_didHandleKeyEvent:(::WebEvent *)event eventWasHandled:(BOOL)eventWasHandled
</ins><span class="cx"> {
</span><span class="cx"> if (_keyWebEventHandler) {
</span><span class="cx"> _keyWebEventHandler(event, eventWasHandled);
</span><span class="lines">@@ -3380,7 +3380,7 @@
</span><span class="cx"> _uiEventBeingResent = nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (std::optional<FloatPoint>)_scrollOffsetForEvent:(WebIOSEvent *)event
</del><ins>+- (std::optional<FloatPoint>)_scrollOffsetForEvent:(::WebEvent *)event
</ins><span class="cx"> {
</span><span class="cx"> static const unsigned kWebSpaceKey = 0x20;
</span><span class="cx">
</span><span class="lines">@@ -3444,7 +3444,7 @@
</span><span class="cx"> return std::nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)_interpretKeyEvent:(WebIOSEvent *)event isCharEvent:(BOOL)isCharEvent
</del><ins>+- (BOOL)_interpretKeyEvent:(::WebEvent *)event isCharEvent:(BOOL)isCharEvent
</ins><span class="cx"> {
</span><span class="cx"> static const unsigned kWebEnterKey = 0x0003;
</span><span class="cx"> static const unsigned kWebBackspaceKey = 0x0008;
</span></span></pre>
</div>
</div>
</body>
</html>