Diff
Modified: trunk/Source/WebCore/ChangeLog (212375 => 212376)
--- 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)
@@ -1,3 +1,12 @@
+2017-02-15 Aakash Jain <aakash_j...@apple.com>
+
+ Remove WebIOSEvent interface
+ https://bugs.webkit.org/show_bug.cgi?id=168368
+
+ Reviewed by Tim Horton.
+
+ * platform/ios/WebEvent.h: Removed WebIOSEvent.
+
2017-02-15 Chris Dumez <cdu...@apple.com>
[iOS] Form Validation Bubble should be sensitive to Dynamic Type
Modified: trunk/Source/WebCore/platform/ios/WebEvent.h (212375 => 212376)
--- 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)
@@ -185,8 +185,5 @@
@end
-@interface WebIOSEvent : WebEvent
-@end
-
#endif // TARGET_OS_IPHONE
#endif // WebEventIOS_h
Modified: trunk/Source/WebKit2/ChangeLog (212375 => 212376)
--- 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)
@@ -1,3 +1,18 @@
+2017-02-15 Aakash Jain <aakash_j...@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.
+
2017-02-14 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Update cookie manager API to properly work with ephemeral sessions
Modified: trunk/Source/WebKit2/Shared/NativeWebKeyboardEvent.h (212375 => 212376)
--- 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)
@@ -52,7 +52,7 @@
#if PLATFORM(IOS)
#include <wtf/RetainPtr.h>
-OBJC_CLASS WebIOSEvent;
+OBJC_CLASS WebEvent;
#endif
namespace WebKit {
@@ -68,7 +68,7 @@
NativeWebKeyboardEvent(const Evas_Event_Key_Down*, bool);
NativeWebKeyboardEvent(const Evas_Event_Key_Up*);
#elif PLATFORM(IOS)
- NativeWebKeyboardEvent(WebIOSEvent *);
+ NativeWebKeyboardEvent(::WebEvent *);
#endif
#if USE(APPKIT)
@@ -81,7 +81,7 @@
const void* nativeEvent() const { return m_nativeEvent; }
bool isFiltered() const { return m_isFiltered; }
#elif PLATFORM(IOS)
- WebIOSEvent* nativeEvent() const { return m_nativeEvent.get(); }
+ ::WebEvent* nativeEvent() const { return m_nativeEvent.get(); }
#endif
private:
@@ -95,7 +95,7 @@
const void* m_nativeEvent;
bool m_isFiltered;
#elif PLATFORM(IOS)
- RetainPtr<WebIOSEvent> m_nativeEvent;
+ RetainPtr<::WebEvent> m_nativeEvent;
#endif
};
Modified: trunk/Source/WebKit2/Shared/ios/NativeWebKeyboardEventIOS.mm (212375 => 212376)
--- 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)
@@ -32,7 +32,7 @@
namespace WebKit {
-NativeWebKeyboardEvent::NativeWebKeyboardEvent(WebIOSEvent *event)
+NativeWebKeyboardEvent::NativeWebKeyboardEvent(::WebEvent *event)
: WebKeyboardEvent(WebIOSEventFactory::createWebKeyboardEvent(event))
, m_nativeEvent(event)
{
Modified: trunk/Source/WebKit2/Shared/ios/WebIOSEventFactory.h (212375 => 212376)
--- 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)
@@ -33,7 +33,7 @@
class WebIOSEventFactory {
public:
- static WebKit::WebKeyboardEvent createWebKeyboardEvent(WebIOSEvent *event);
+ static WebKit::WebKeyboardEvent createWebKeyboardEvent(::WebEvent *event);
};
#endif // PLATFORM(IOS)
Modified: trunk/Source/WebKit2/Shared/ios/WebIOSEventFactory.mm (212375 => 212376)
--- 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)
@@ -31,7 +31,7 @@
#import <WebCore/KeyEventCodesIOS.h>
#import <WebCore/PlatformEventFactoryIOS.h>
-static WebKit::WebEvent::Modifiers modifiersForEvent(WebIOSEvent *event)
+static WebKit::WebEvent::Modifiers modifiersForEvent(::WebEvent *event)
{
unsigned modifiers = 0;
WebEventFlags eventModifierFlags = event.modifierFlags;
@@ -50,7 +50,7 @@
return static_cast<WebKit::WebEvent::Modifiers>(modifiers);
}
-WebKit::WebKeyboardEvent WebIOSEventFactory::createWebKeyboardEvent(WebIOSEvent *event)
+WebKit::WebKeyboardEvent WebIOSEventFactory::createWebKeyboardEvent(::WebEvent *event)
{
WebKit::WebEvent::Type type = (event.type == WebEventKeyUp) ? WebKit::WebEvent::KeyUp : WebKit::WebEvent::KeyDown;
String text = event.characters;
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (212375 => 212376)
--- 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)
@@ -1900,7 +1900,7 @@
m_client.setStatusText(toAPI(page), toAPI(text.impl()), m_client.base.clientInfo);
}
- void mouseDidMoveOverElement(WebPageProxy* page, const WebHitTestResultData& data, WebEvent::Modifiers modifiers, API::Object* userData) override
+ void mouseDidMoveOverElement(WebPageProxy* page, const WebHitTestResultData& data, WebKit::WebEvent::Modifiers modifiers, API::Object* userData) override
{
if (!m_client.mouseDidMoveOverElement && !m_client.mouseDidMoveOverElement_deprecatedForUseWithV0)
return;
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (212375 => 212376)
--- 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)
@@ -69,7 +69,7 @@
@class WKActionSheetAssistant;
@class WKFormInputSession;
@class WKInspectorNodeSearchGestureRecognizer;
-@class WebIOSEvent;
+@class WebEvent;
@class _UIHighlightView;
@class _UIWebHighlightLongPressGestureRecognizer;
@@ -78,7 +78,7 @@
typedef void (^UIWKDictationContextHandler)(NSString *selectedText, NSString *beforeText, NSString *afterText);
typedef void (^UIWKSelectionCompletionHandler)(void);
typedef void (^UIWKSelectionWithDirectionCompletionHandler)(BOOL selectionEndIsMoving);
-typedef void (^UIWKKeyWebEventCompletionHandler)(WebIOSEvent *theEvent, BOOL wasHandled);
+typedef void (^UIWKKeyWebEventCompletionHandler)(::WebEvent *theEvent, BOOL wasHandled);
namespace WebKit {
@@ -243,7 +243,7 @@
- (void)_stopAssistingNode;
- (void)_selectionChanged;
- (void)_updateChangedSelection;
-- (BOOL)_interpretKeyEvent:(WebIOSEvent *)theEvent isCharEvent:(BOOL)isCharEvent;
+- (BOOL)_interpretKeyEvent:(::WebEvent *)theEvent isCharEvent:(BOOL)isCharEvent;
- (void)_positionInformationDidChange:(const WebKit::InteractionInformationAtPosition&)info;
- (void)_attemptClickAtLocation:(CGPoint)location;
- (void)_willStartScrollingOrZooming;
@@ -255,7 +255,7 @@
- (void)_showPlaybackTargetPicker:(BOOL)hasVideo fromRect:(const WebCore::IntRect&)elementRect;
- (void)_showRunOpenPanel:(API::OpenPanelParameters*)parameters resultListener:(WebKit::WebOpenPanelResultListenerProxy*)listener;
- (void)accessoryDone;
-- (void)_didHandleKeyEvent:(WebIOSEvent *)event eventWasHandled:(BOOL)eventWasHandled;
+- (void)_didHandleKeyEvent:(::WebEvent *)event eventWasHandled:(BOOL)eventWasHandled;
- (Vector<WebKit::OptionItem>&) assistedNodeSelectOptions;
- (void)_enableInspectorNodeSearch;
- (void)_disableInspectorNodeSearch;
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (212375 => 212376)
--- 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)
@@ -3340,18 +3340,18 @@
[self handleKeyWebEvent:webEvent];
}
-- (void)handleKeyWebEvent:(WebIOSEvent *)theEvent
+- (void)handleKeyWebEvent:(::WebEvent *)theEvent
{
_page->handleKeyboardEvent(NativeWebKeyboardEvent(theEvent));
}
-- (void)handleKeyWebEvent:(WebIOSEvent *)theEvent withCompletionHandler:(void (^)(WebIOSEvent *theEvent, BOOL wasHandled))completionHandler
+- (void)handleKeyWebEvent:(::WebEvent *)theEvent withCompletionHandler:(void (^)(::WebEvent *theEvent, BOOL wasHandled))completionHandler
{
_keyWebEventHandler = [completionHandler copy];
_page->handleKeyboardEvent(NativeWebKeyboardEvent(theEvent));
}
-- (void)_didHandleKeyEvent:(WebIOSEvent *)event eventWasHandled:(BOOL)eventWasHandled
+- (void)_didHandleKeyEvent:(::WebEvent *)event eventWasHandled:(BOOL)eventWasHandled
{
if (_keyWebEventHandler) {
_keyWebEventHandler(event, eventWasHandled);
@@ -3380,7 +3380,7 @@
_uiEventBeingResent = nil;
}
-- (std::optional<FloatPoint>)_scrollOffsetForEvent:(WebIOSEvent *)event
+- (std::optional<FloatPoint>)_scrollOffsetForEvent:(::WebEvent *)event
{
static const unsigned kWebSpaceKey = 0x20;
@@ -3444,7 +3444,7 @@
return std::nullopt;
}
-- (BOOL)_interpretKeyEvent:(WebIOSEvent *)event isCharEvent:(BOOL)isCharEvent
+- (BOOL)_interpretKeyEvent:(::WebEvent *)event isCharEvent:(BOOL)isCharEvent
{
static const unsigned kWebEnterKey = 0x0003;
static const unsigned kWebBackspaceKey = 0x0008;
