Changeset 164847 in webkit

Timestamp:

Feb 27, 2014 6:05:28 PM (10 years ago)

Author:

ap@apple.com

Message:

[Mac] Stop using some deprecated functions in WKView.mm
​https://bugs.webkit.org/show_bug.cgi?id=129455

Reviewed by Anders Carlsson.

• UIProcess/API/mac/WKView.mm:

(-[WKView firstRectForCharacterRange:actualRange:]): Use convertRectToScreen,
which is a replacement for convertBaseToScreen. Don't check for window being null,
because isn't that crazy talk?
(-[WKView _postFakeMouseMovedEventForFlagsChangedEvent:]): Use event's location
in window instead of current mouse location. Using location that is not synced to
event stream rarely makes sense, and it doesn't look like this is one of those cases.
(-[WKView performDictionaryLookupAtCurrentMouseLocation]): Ditto.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-27  Alexey Proskuryakov  <ap@apple.com>
+
+        [Mac] Stop using some deprecated functions in WKView.mm
+        https://bugs.webkit.org/show_bug.cgi?id=129455
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView firstRectForCharacterRange:actualRange:]): Use convertRectToScreen,
+        which is a replacement for convertBaseToScreen. Don't check for window being null,
+        because isn't that crazy talk?
+        (-[WKView _postFakeMouseMovedEventForFlagsChangedEvent:]): Use event's location
+        in window instead of current mouse location. Using location that is not synced to
+        event stream rarely makes sense, and it doesn't look like this is one of those cases.
+        (-[WKView performDictionaryLookupAtCurrentMouseLocation]): Ditto.
+
 2014-02-27  Jaehun Lim  <ljaehun.lim@samsung.com>
 

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -1672 +1672 @@
     NSRect resultRect = _data->_page->firstRectForCharacterRange(theRange.location, theRange.length);
     resultRect = [self convertRect:resultRect toView:nil];
-    
-    NSWindow *window = [self window];
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    if (window)
-        resultRect.origin = [window convertBaseToScreen:resultRect.origin];
-#pragma clang diagnostic pop
+    resultRect = [self.window convertRectToScreen:resultRect];
 
     if (actualRange) {
@@ -2152 +2146 @@
 - (void)_postFakeMouseMovedEventForFlagsChangedEvent:(NSEvent *)flagsChangedEvent
 {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    NSEvent *fakeEvent = [NSEvent mouseEventWithType:NSMouseMoved location:[[flagsChangedEvent window] convertScreenToBase:[NSEvent mouseLocation]]
+    NSEvent *fakeEvent = [NSEvent mouseEventWithType:NSMouseMoved location:flagsChangedEvent.locationInWindow
         modifierFlags:[flagsChangedEvent modifierFlags] timestamp:[flagsChangedEvent timestamp] windowNumber:[flagsChangedEvent windowNumber]
         context:[flagsChangedEvent context] eventNumber:0 clickCount:0 pressure:0];
-#pragma clang diagnostic pop
     NativeWebMouseEvent webEvent(fakeEvent, self);
     _data->_page->handleMouseEvent(webEvent);
@@ -3094 +3085 @@
 - (void)performDictionaryLookupAtCurrentMouseLocation
 {
-    NSPoint thePoint = [NSEvent mouseLocation];
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    thePoint = [[self window] convertScreenToBase:thePoint];
-#pragma clang diagnostic pop
-    thePoint = [self convertPoint:thePoint fromView:nil];
-
-    _data->_page->performDictionaryLookupAtLocation(FloatPoint(thePoint.x, thePoint.y));
+    _data->_page->performDictionaryLookupAtLocation([self convertPoint:[[NSApp currentEvent] locationInWindow] fromView:nil]);
 }