[webkit-changes] [197791] trunk/Source/WebKit/mac

Tue, 08 Mar 2016 12:26:07 -0800

Title: [197791] trunk/Source/WebKit/mac
Revision
197791
Author
[email protected]
Date
2016-03-08 12:26:17 -0800 (Tue, 08 Mar 2016)

Log Message

Ignore deprecation warnings.

* Misc/WebNSEventExtras.m:
(-[NSEvent _web_isKeyEvent:]):
(-[NSEvent _web_isOptionTabKeyEvent]):
* Misc/WebNSViewExtras.m:
(-[NSView _web_dragShouldBeginFromMouseDown:withExpiration:xHysteresis:yHysteresis:]):
* Plugins/Hosted/NetscapePluginHostProxy.mm:
(WebKit::NetscapePluginHostProxy::beginModal):
* Plugins/Hosted/NetscapePluginInstanceProxy.mm:
(WebKit::NetscapePluginInstanceProxy::syntheticKeyDownWithCommandModifier):
* Plugins/Hosted/WebHostedNetscapePluginView.mm:
(-[WebHostedNetscapePluginView drawRect:]):
* Plugins/WebNetscapePluginEventHandlerCocoa.mm:
(WebNetscapePluginEventHandlerCocoa::syntheticKeyDownWithCommandModifier):
* WebCoreSupport/PopupMenuMac.mm:
(PopupMenuMac::populate):
(PopupMenuMac::show):
* WebCoreSupport/WebContextMenuClient.mm:
(WebContextMenuClient::showContextMenu):
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::actionDictionary):
* WebCoreSupport/WebInspectorClient.mm:
(WebInspectorFrontendClient::canAttach):
(-[WebInspectorWindowController window]):
* WebInspector/WebNodeHighlight.mm:
(-[WebNodeHighlight initWithTargetView:inspectorController:]):
* WebView/WebFrameView.mm:
(-[WebFrameView keyDown:keyDown:]):
* WebView/WebFullScreenController.mm:
(-[WebFullScreenController init]):
(createBackgroundFullscreenWindow):
* WebView/WebHTMLView.mm:
(-[WebHTMLView _postFakeMouseMovedEventForFlagsChangedEvent:]):
(-[WebHTMLView _setMouseDownEvent:_setMouseDownEvent:]):
(isQuickLookEvent):
(-[WebHTMLView hitTest:]):
(-[WebHTMLView _sendToolTipMouseExited]):
(-[WebHTMLView _sendToolTipMouseEntered]):
(mouseEventIsPartOfClickOrDrag):
(-[WebHTMLView _updateMouseoverWithEvent:]):
(-[WebHTMLView acceptsFirstResponder]):
(-[WebHTMLView viewDidMoveToWindow]):
(currentKeyboardEvent):
(-[WebHTMLView _handleStyleKeyEquivalent:]):
(-[WebHTMLView _interpretKeyEvent:savingCommands:]):
* WebView/WebPDFView.mm:
(-[WebPDFView hitTest:]):
(-[WebPDFView PDFViewWillClickOnLink:withURL:]):
(-[WebPDFView _fakeKeyEventWithFunctionKey:]):
* WebView/WebTextCompletionController.mm:
(-[WebTextCompletionController _buildUI]):
(-[WebTextCompletionController _placePopupWindow:]):
* WebView/WebView.mm:
(-[WebView applicationFlags:]):


Modified Paths

Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (197790 => 197791)


--- trunk/Source/WebKit/mac/ChangeLog	2016-03-08 20:18:51 UTC (rev 197790)
+++ trunk/Source/WebKit/mac/ChangeLog	2016-03-08 20:26:17 UTC (rev 197791)
@@ -1,3 +1,61 @@
+2016-03-08  Anders Carlsson  <[email protected]>
+
+        Ignore deprecation warnings.
+
+        * Misc/WebNSEventExtras.m:
+        (-[NSEvent _web_isKeyEvent:]):
+        (-[NSEvent _web_isOptionTabKeyEvent]):
+        * Misc/WebNSViewExtras.m:
+        (-[NSView _web_dragShouldBeginFromMouseDown:withExpiration:xHysteresis:yHysteresis:]):
+        * Plugins/Hosted/NetscapePluginHostProxy.mm:
+        (WebKit::NetscapePluginHostProxy::beginModal):
+        * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
+        (WebKit::NetscapePluginInstanceProxy::syntheticKeyDownWithCommandModifier):
+        * Plugins/Hosted/WebHostedNetscapePluginView.mm:
+        (-[WebHostedNetscapePluginView drawRect:]):
+        * Plugins/WebNetscapePluginEventHandlerCocoa.mm:
+        (WebNetscapePluginEventHandlerCocoa::syntheticKeyDownWithCommandModifier):
+        * WebCoreSupport/PopupMenuMac.mm:
+        (PopupMenuMac::populate):
+        (PopupMenuMac::show):
+        * WebCoreSupport/WebContextMenuClient.mm:
+        (WebContextMenuClient::showContextMenu):
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (WebFrameLoaderClient::actionDictionary):
+        * WebCoreSupport/WebInspectorClient.mm:
+        (WebInspectorFrontendClient::canAttach):
+        (-[WebInspectorWindowController window]):
+        * WebInspector/WebNodeHighlight.mm:
+        (-[WebNodeHighlight initWithTargetView:inspectorController:]):
+        * WebView/WebFrameView.mm:
+        (-[WebFrameView keyDown:keyDown:]):
+        * WebView/WebFullScreenController.mm:
+        (-[WebFullScreenController init]):
+        (createBackgroundFullscreenWindow):
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView _postFakeMouseMovedEventForFlagsChangedEvent:]):
+        (-[WebHTMLView _setMouseDownEvent:_setMouseDownEvent:]):
+        (isQuickLookEvent):
+        (-[WebHTMLView hitTest:]):
+        (-[WebHTMLView _sendToolTipMouseExited]):
+        (-[WebHTMLView _sendToolTipMouseEntered]):
+        (mouseEventIsPartOfClickOrDrag):
+        (-[WebHTMLView _updateMouseoverWithEvent:]):
+        (-[WebHTMLView acceptsFirstResponder]):
+        (-[WebHTMLView viewDidMoveToWindow]):
+        (currentKeyboardEvent):
+        (-[WebHTMLView _handleStyleKeyEquivalent:]):
+        (-[WebHTMLView _interpretKeyEvent:savingCommands:]):
+        * WebView/WebPDFView.mm:
+        (-[WebPDFView hitTest:]):
+        (-[WebPDFView PDFViewWillClickOnLink:withURL:]):
+        (-[WebPDFView _fakeKeyEventWithFunctionKey:]):
+        * WebView/WebTextCompletionController.mm:
+        (-[WebTextCompletionController _buildUI]):
+        (-[WebTextCompletionController _placePopupWindow:]):
+        * WebView/WebView.mm:
+        (-[WebView applicationFlags:]):
+
 2016-03-07  Brent Fulgham  <[email protected]>
 
         Reduce startup and shutdown cost of resource load statistics

Modified: trunk/Source/WebKit/mac/Misc/WebNSEventExtras.m (197790 => 197791)


--- trunk/Source/WebKit/mac/Misc/WebNSEventExtras.m	2016-03-08 20:18:51 UTC (rev 197790)
+++ trunk/Source/WebKit/mac/Misc/WebNSEventExtras.m	2016-03-08 20:26:17 UTC (rev 197791)
@@ -35,7 +35,10 @@
 -(BOOL)_web_isKeyEvent:(unichar)key
 {
     int type = [self type];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     if (type != NSKeyDown && type != NSKeyUp)
+#pragma clang diagnostic pop
         return NO;
     
     NSString *chars = [self charactersIgnoringModifiers];
@@ -64,7 +67,10 @@
 
 - (BOOL)_web_isOptionTabKeyEvent
 {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     return ([self modifierFlags] & NSAlternateKeyMask) && [self _web_isTabKeyEvent];
+#pragma clang diagnostic pop
 }
 
 - (BOOL)_web_isReturnOrEnterKeyEvent

Modified: trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m (197790 => 197791)


--- trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m	2016-03-08 20:18:51 UTC (rev 197790)
+++ trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m	2016-03-08 20:26:17 UTC (rev 197791)
@@ -82,9 +82,12 @@
     NSEvent *nextEvent, *firstEvent, *dragEvent, *mouseUp;
     BOOL dragIt;
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     if ([mouseDownEvent type] != NSLeftMouseDown) {
         return NO;
     }
+#pragma clang diagnostic pop
 
     nextEvent = nil;
     firstEvent = nil;
@@ -92,6 +95,8 @@
     mouseUp = nil;
     dragIt = NO;
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     while ((nextEvent = [[self window] nextEventMatchingMask:(NSLeftMouseUpMask | NSLeftMouseDraggedMask)
                                                    untilDate:expiration
                                                       inMode:NSEventTrackingRunLoopMode
@@ -119,6 +124,7 @@
             break;
         }
     }
+#pragma clang diagnostic pop
 
     // Since we've been dequeuing the events (If we don't, we'll never see the mouse up...),
     // we need to push some of the events back on.  It makes sense to put the first and last

Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm (197790 => 197791)


--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm	2016-03-08 20:18:51 UTC (rev 197790)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm	2016-03-08 20:26:17 UTC (rev 197791)
@@ -230,8 +230,11 @@
     ASSERT(!m_placeholderWindow);
     ASSERT(!m_activationObserver);
     
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     m_placeholderWindow = adoptNS([[WebPlaceholderModalWindow alloc] initWithContentRect:NSMakeRect(0, 0, 1, 1) styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES]);
-    
+#pragma clang diagnostic pop
+
     m_activationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationWillBecomeActiveNotification object:NSApp queue:nil
                                                                          usingBlock:^(NSNotification *){ applicationDidBecomeActive(); }];

Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm (197790 => 197791)


--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm	2016-03-08 20:18:51 UTC (rev 197790)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm	2016-03-08 20:26:17 UTC (rev 197791)
@@ -466,12 +466,15 @@
 {
     NSData *charactersData = [NSData dataWithBytes:&character length:1];
 
-    _WKPHPluginInstanceKeyboardEvent(m_pluginHostProxy->port(), m_pluginID, 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    _WKPHPluginInstanceKeyboardEvent(m_pluginHostProxy->port(), m_pluginID,
                                      [NSDate timeIntervalSinceReferenceDate], 
                                      NPCocoaEventKeyDown, NSCommandKeyMask,
                                      const_cast<char*>(reinterpret_cast<const char*>([charactersData bytes])), [charactersData length], 
                                      const_cast<char*>(reinterpret_cast<const char*>([charactersData bytes])), [charactersData length], 
                                      false, keyCode, character);
+#pragma clang diagnostic pop
 }
 
 void NetscapePluginInstanceProxy::flagsChanged(NSEvent *event)

Modified: trunk/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm (197790 => 197791)


--- trunk/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm	2016-03-08 20:18:51 UTC (rev 197790)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm	2016-03-08 20:26:17 UTC (rev 197791)
@@ -443,7 +443,10 @@
 {
     if (_cachedSnapshot) {
         NSRect sourceRect = { NSZeroPoint, [_cachedSnapshot.get() size] };
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
         [_cachedSnapshot.get() drawInRect:[self bounds] fromRect:sourceRect operation:NSCompositeSourceOver fraction:1];
+#pragma clang diagnostic pop
         return;
     }

Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginEventHandlerCocoa.mm (197790 => 197791)


--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginEventHandlerCocoa.mm	2016-03-08 20:18:51 UTC (rev 197790)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginEventHandlerCocoa.mm	2016-03-08 20:26:17 UTC (rev 197791)
@@ -161,7 +161,10 @@
     
     NPCocoaEvent event;
     initializeEvent(&event, NPCocoaEventKeyDown);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     event.data.key.modifierFlags = NSCommandKeyMask;
+#pragma clang diagnostic pop
     event.data.key.keyCode = keyCode;
     event.data.key.isARepeat = false;
     event.data.key.characters = (NPNSString *)characters.get();

Modified: trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm (197790 => 197791)


--- trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm	2016-03-08 20:18:51 UTC (rev 197790)
+++ trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm	2016-03-08 20:26:17 UTC (rev 197791)
@@ -90,7 +90,10 @@
         }
 
         RetainPtr<NSMutableParagraphStyle> paragraphStyle = adoptNS([[NSParagraphStyle defaultParagraphStyle] mutableCopy]);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
         [paragraphStyle setAlignment:menuTextDirection == LTR ? NSLeftTextAlignment : NSRightTextAlignment];
+#pragma clang diagnostic pop
         NSWritingDirection writingDirection = style.textDirection() == LTR ? NSWritingDirectionLeftToRight : NSWritingDirectionRightToLeft;
         [paragraphStyle setBaseWritingDirection:writingDirection];
         if (style.hasTextDirectionOverride()) {
@@ -191,6 +194,8 @@
 
     NSControlSize controlSize;
     switch (m_client->menuStyle().menuSize()) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     case PopupMenuStyle::PopupMenuSizeNormal:
         controlSize = NSRegularControlSize;
         break;
@@ -200,6 +205,7 @@
     case PopupMenuStyle::PopupMenuSizeMini:
         controlSize = NSMiniControlSize;
         break;
+#pragma clang diagnostic pop
     }
 
     WKPopupMenu(menu, location, roundf(NSWidth(r)), dummyView.get(), index, font, controlSize, !m_client->menuStyle().hasDefaultAppearance());

Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm (197790 => 197791)


--- trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm	2016-03-08 20:18:51 UTC (rev 197790)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm	2016-03-08 20:26:17 UTC (rev 197791)
@@ -267,7 +267,10 @@
 
     NSView* view = frameView->documentView();
     IntPoint point = frameView->contentsToWindow(page->contextMenuController().hitTestResult().roundedPointInInnerNodeFrame());
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     NSEvent* event = [NSEvent mouseEventWithType:NSRightMouseDown location:point modifierFlags:0 timestamp:0 windowNumber:[[view window] windowNumber] context:0 eventNumber:0 clickCount:1 pressure:1];
+#pragma clang diagnostic pop
 
     // Show the contextual menu for this event.
     bool isServicesMenu;

Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (197790 => 197791)


--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm	2016-03-08 20:18:51 UTC (rev 197790)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm	2016-03-08 20:26:17 UTC (rev 197791)
@@ -1563,6 +1563,8 @@
 #if !PLATFORM(IOS)
     const UIEventWithKeyState* keyStateEvent = findEventWithKeyState(const_cast<Event*>(event));
     if (keyStateEvent && keyStateEvent->isTrusted()) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
         if (keyStateEvent->ctrlKey())
             modifierFlags |= NSControlKeyMask;
         if (keyStateEvent->altKey())
@@ -1571,6 +1573,7 @@
             modifierFlags |= NSShiftKeyMask;
         if (keyStateEvent->metaKey())
             modifierFlags |= NSCommandKeyMask;
+#pragma clang diagnostic pop
     }
 #else
     // No modifier flags on iOS right now

Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm (197790 => 197791)


--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm	2016-03-08 20:18:51 UTC (rev 197790)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm	2016-03-08 20:26:17 UTC (rev 197791)
@@ -189,7 +189,10 @@
 
 bool WebInspectorFrontendClient::canAttach()
 {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     if ([[m_frontendWindowController window] styleMask] & NSFullScreenWindowMask)
+#pragma clang diagnostic pop
         return false;
 
     return canAttachWindow();
@@ -457,7 +460,10 @@
     if (window)
         return window;
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     NSUInteger styleMask = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask | NSFullSizeContentViewWindowMask;
+#pragma clang diagnostic pop
     window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, initialWindowWidth, initialWindowHeight) styleMask:styleMask backing:NSBackingStoreBuffered defer:NO];
     [window setDelegate:self];
     [window setMinSize:NSMakeSize(minimumWindowWidth, minimumWindowHeight)];

Modified: trunk/Source/WebKit/mac/WebInspector/WebNodeHighlight.mm (197790 => 197791)


--- trunk/Source/WebKit/mac/WebInspector/WebNodeHighlight.mm	2016-03-08 20:18:51 UTC (rev 197790)
+++ trunk/Source/WebKit/mac/WebInspector/WebNodeHighlight.mm	2016-03-08 20:26:17 UTC (rev 197791)
@@ -91,7 +91,10 @@
     _inspectorController = inspectorController;
 
 #if !PLATFORM(IOS)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     int styleMask = NSBorderlessWindowMask;
+#pragma clang diagnostic pop
     NSRect contentRect = [NSWindow contentRectForFrameRect:[self _computeHighlightWindowFrame] styleMask:styleMask];
     _highlightWindow = [[NSWindow alloc] initWithContentRect:contentRect styleMask:styleMask backing:NSBackingStoreBuffered defer:NO];
     [_highlightWindow setBackgroundColor:[NSColor clearColor]];

Modified: trunk/Source/WebKit/mac/WebView/WebFrameView.mm (197790 => 197791)


--- trunk/Source/WebKit/mac/WebView/WebFrameView.mm	2016-03-08 20:18:51 UTC (rev 197790)
+++ trunk/Source/WebKit/mac/WebView/WebFrameView.mm	2016-03-08 20:26:17 UTC (rev 197791)
@@ -917,6 +917,8 @@
     Frame* coreFrame = [self _web_frame];
     BOOL maintainsBackForwardList = coreFrame && static_cast<BackForwardList*>(coreFrame->page()->backForward().client())->enabled() ? YES : NO;
     
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     count = [characters length];
     for (index = 0; index < count; ++index) {
         switch ([characters characterAtIndex:index]) {
@@ -1089,7 +1091,7 @@
                 break;
         }
     }
-    
+#pragma clang diagnostic pop
     if (callSuper) {
         [super keyDown:event];
     } else {

Modified: trunk/Source/WebKit/mac/WebView/WebFullScreenController.mm (197790 => 197791)


--- trunk/Source/WebKit/mac/WebView/WebFullScreenController.mm	2016-03-08 20:18:51 UTC (rev 197790)
+++ trunk/Source/WebKit/mac/WebView/WebFullScreenController.mm	2016-03-08 20:26:17 UTC (rev 197791)
@@ -86,8 +86,11 @@
 #pragma mark Initialization
 - (id)init
 {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     // Do not defer window creation, to make sure -windowNumber is created (needed by WebWindowScaleAnimation).
     NSWindow *window = [[WebCoreFullScreenWindow alloc] initWithContentRect:NSZeroRect styleMask:NSClosableWindowMask backing:NSBackingStoreBuffered defer:NO];
+#pragma clang diagnostic pop
     self = [super initWithWindow:window];
     [window release];
     if (!self)
@@ -459,7 +462,10 @@
 
 static RetainPtr<NSWindow> createBackgroundFullscreenWindow(NSRect frame)
 {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     NSWindow *window = [[NSWindow alloc] initWithContentRect:frame styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO];
+#pragma clang diagnostic pop
     [window setOpaque:YES];
     [window setBackgroundColor:[NSColor blackColor]];
     [window setReleasedWhenClosed:NO];

Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (197790 => 197791)


--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm	2016-03-08 20:18:51 UTC (rev 197790)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm	2016-03-08 20:26:17 UTC (rev 197791)
@@ -1350,10 +1350,12 @@
 
 - (void)_postFakeMouseMovedEventForFlagsChangedEvent:(NSEvent *)flagsChangedEvent
 {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     NSEvent *fakeEvent = [NSEvent mouseEventWithType:NSMouseMoved location:flagsChangedEvent.window.mouseLocationOutsideOfEventStream
         modifierFlags:flagsChangedEvent.modifierFlags timestamp:flagsChangedEvent.timestamp windowNumber:flagsChangedEvent.windowNumber
         context:nullptr eventNumber:0 clickCount:0 pressure:0];
-
+#pragma clang diagnostic pop
     [self mouseMoved:fakeEvent];
 }
 
@@ -1503,7 +1505,10 @@
 #endif
 {
 #if !PLATFORM(IOS)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     ASSERT(!event || [event type] == NSLeftMouseDown || [event type] == NSRightMouseDown || [event type] == NSOtherMouseDown);
+#pragma clang diagnostic pop
 #else
     ASSERT(!event || event.type == WebEventMouseDown);
 #endif
@@ -1862,8 +1867,11 @@
 #if !PLATFORM(IOS)
 static BOOL isQuickLookEvent(NSEvent *event)
 {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     const int kCGSEventSystemSubtypeHotKeyCombinationReleased = 9;
     return [event type] == NSSystemDefined && [event subtype] == kCGSEventSystemSubtypeHotKeyCombinationReleased && [event data1] == 'lkup';
+#pragma clang diagnostic pop
 }
 #endif
 
@@ -1919,11 +1927,14 @@
     else {
         // FIXME: Why doesn't this include mouse entered/exited events, or other mouse button events?
         NSEvent *event = [[self window] currentEvent];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
         captureHitsOnSubviews = !([event type] == NSMouseMoved
             || [event type] == NSRightMouseDown
             || ([event type] == NSLeftMouseDown && ([event modifierFlags] & NSControlKeyMask) != 0)
             || [event type] == NSFlagsChanged
             || isQuickLookEvent(event));
+#pragma clang diagnostic pop
     }
 
     if (!captureHitsOnSubviews) {
@@ -2011,6 +2022,8 @@
 - (void)_sendToolTipMouseExited
 {
     // Nothing matters except window, trackingNumber, and userData.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     NSEvent *fakeEvent = [NSEvent enterExitEventWithType:NSMouseExited
         location:NSMakePoint(0, 0)
         modifierFlags:0
@@ -2020,11 +2033,14 @@
         eventNumber:0
         trackingNumber:TRACKING_RECT_TAG
         userData:_private->trackingRectUserData];
+#pragma clang diagnostic pop
     [_private->trackingRectOwner mouseExited:fakeEvent];
 }
 
 - (void)_sendToolTipMouseEntered
 {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     // Nothing matters except window, trackingNumber, and userData.
     NSEvent *fakeEvent = [NSEvent enterExitEventWithType:NSMouseEntered
         location:NSMakePoint(0, 0)
@@ -2036,6 +2052,7 @@
         trackingNumber:TRACKING_RECT_TAG
         userData:_private->trackingRectUserData];
     [_private->trackingRectOwner mouseEntered:fakeEvent];
+#pragma clang diagnostic pop
 }
 #endif // !PLATFORM(IOS)
 
@@ -2071,6 +2088,8 @@
 static bool mouseEventIsPartOfClickOrDrag(NSEvent *event)
 {
     switch ([event type]) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
         case NSLeftMouseDown:
         case NSLeftMouseUp:
         case NSLeftMouseDragged:
@@ -2080,6 +2099,7 @@
         case NSOtherMouseDown:
         case NSOtherMouseUp:
         case NSOtherMouseDragged:
+#pragma clang diagnostic pop
             return true;
         default:
             return false;
@@ -2113,6 +2133,8 @@
         float yScroll = visibleRect.origin.y;
         float xScroll = visibleRect.origin.x;
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
         NSEvent *event = [NSEvent mouseEventWithType:NSMouseMoved
             location:NSMakePoint(-1 - xScroll, -1 - yScroll)
             modifierFlags:[[NSApp currentEvent] modifierFlags]
@@ -2120,6 +2142,7 @@
             windowNumber:[[view window] windowNumber]
             context:nullptr
             eventNumber:0 clickCount:0 pressure:0];
+#pragma clang diagnostic pop
         if (Frame* lastHitCoreFrame = core([lastHitView _frame]))
             lastHitCoreFrame->eventHandler().mouseMoved(event, [[self _webView] _pressureEvent]);
     }
@@ -3328,9 +3351,12 @@
     // or from calls back from WebCore once we begin mouse-down event handling.
 #if !PLATFORM(IOS)            
     NSEvent *event = [NSApp currentEvent];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     if ([event type] == NSLeftMouseDown
             && !_private->handlingMouseDownEvent
             && NSPointInRect([event locationInWindow], [self convertRect:[self visibleRect] toView:nil])) {
+#pragma clang diagnostic pop
         return NO;
     }
 #else
@@ -3499,10 +3525,13 @@
 
 #if !PLATFORM(IOS)
         if (!_private->flagsChangedEventMonitor) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
             _private->flagsChangedEventMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSFlagsChangedMask handler:^(NSEvent *flagsChangedEvent) {
                 [self _postFakeMouseMovedEventForFlagsChangedEvent:flagsChangedEvent];
                 return flagsChangedEvent;
             }];
+#pragma clang diagnostic pop
         }
     } else {
         [NSEvent removeMonitor:_private->flagsChangedEventMonitor];
@@ -4765,12 +4794,19 @@
         return 0;
 
     switch ([event type]) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     case NSKeyDown: {
+#pragma clang diagnostic pop
+
         PlatformKeyboardEvent platformEvent = PlatformEventFactory::createPlatformKeyboardEvent(event);
         platformEvent.disambiguateKeyDownEvent(PlatformEvent::RawKeyDown);
         return KeyboardEvent::create(platformEvent, coreFrame->document()->defaultView());
     }
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     case NSKeyUp:
+#pragma clang diagnostic pop
         return KeyboardEvent::create(PlatformEventFactory::createPlatformKeyboardEvent(event), coreFrame->document()->defaultView());
     default:
         return 0;
@@ -5464,9 +5500,12 @@
     if (![self _canEdit])
         return NO;
     
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     if (([event modifierFlags] & NSDeviceIndependentModifierFlagsMask) != NSCommandKeyMask)
         return NO;
-    
+#pragma clang diagnostic pop
+
     NSString *string = [event characters];
     if ([string caseInsensitiveCompare:@"b"] == NSOrderedSame) {
         [self executeCoreCommandByName:"ToggleBold"];
@@ -6398,11 +6437,14 @@
         return NO;
 
     NSEvent *macEvent = platformEvent->macEvent();
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     if ([macEvent type] == NSKeyDown && [_private->completionController filterKeyDown:macEvent])
         return YES;
     
     if ([macEvent type] == NSFlagsChanged)
         return NO;
+#pragma clang diagnostic pop
     
     parameters.event = event;
     _private->interpretKeyEventsParameters = &parameters;

Modified: trunk/Source/WebKit/mac/WebView/WebPDFView.mm (197790 => 197791)


--- trunk/Source/WebKit/mac/WebView/WebPDFView.mm	2016-03-08 20:18:51 UTC (rev 197790)
+++ trunk/Source/WebKit/mac/WebView/WebPDFView.mm	2016-03-08 20:26:17 UTC (rev 197791)
@@ -318,7 +318,10 @@
     // Override hitTest so we can override menuForEvent.
     NSEvent *event = [NSApp currentEvent];
     NSEventType type = [event type];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     if (type == NSRightMouseDown || (type == NSLeftMouseDown && ([event modifierFlags] & NSControlKeyMask)))
+#pragma clang diagnostic pop
         return self;
 
     return [super hitTest:point];
@@ -998,6 +1001,8 @@
     int button = noButton;
     RefPtr<Event> event;
     switch ([nsEvent type]) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
         case NSLeftMouseUp:
             button = 0;
             break;
@@ -1013,6 +1018,7 @@
             event = KeyboardEvent::create(pe, 0);
             break;
         }
+#pragma clang diagnostic pop
         default:
             break;
     }
@@ -1021,10 +1027,13 @@
 #if ENABLE(POINTER_LOCK)
             0, 0,
 #endif
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
             [nsEvent modifierFlags] & NSControlKeyMask,
             [nsEvent modifierFlags] & NSAlternateKeyMask,
             [nsEvent modifierFlags] & NSShiftKeyMask,
             [nsEvent modifierFlags] & NSCommandKeyMask,
+#pragma clang diagnostic pop
             button, 0, WebCore::ForceAtClick, 0, true);
     }
 
@@ -1117,6 +1126,8 @@
     // FIXME 4400480: when PDFView implements the standard scrolling selectors that this
     // method is used to mimic, we can eliminate this method and call them directly.
     NSString *keyAsString = [NSString stringWithCharacters:&functionKey length:1];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     return [NSEvent keyEventWithType:NSKeyDown
                             location:NSZeroPoint
                        modifierFlags:0
@@ -1127,6 +1138,7 @@
          charactersIgnoringModifiers:keyAsString
                            isARepeat:NO
                              keyCode:0];
+#pragma clang diagnostic pop
 }
 
 - (void)_lookUpInDictionaryFromMenu:(id)sender

Modified: trunk/Source/WebKit/mac/WebView/WebTextCompletionController.mm (197790 => 197791)


--- trunk/Source/WebKit/mac/WebView/WebTextCompletionController.mm	2016-03-08 20:18:51 UTC (rev 197790)
+++ trunk/Source/WebKit/mac/WebView/WebTextCompletionController.mm	2016-03-08 20:26:17 UTC (rev 197791)
@@ -112,7 +112,10 @@
     [scrollView setDocumentView:_tableView];
     [_tableView release];
     
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     _popupWindow = [[NSWindow alloc] initWithContentRect:scrollFrame styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO];
+#pragma clang diagnostic pop
     [_popupWindow setAlphaValue:0.88f];
     [_popupWindow setContentView:scrollView];
     [scrollView release];
@@ -152,8 +155,8 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
         maxWidth = ceilf([NSScrollView frameSizeForContentSize:NSMakeSize(maxWidth, 100.0f) hasHorizontalScroller:NO hasVerticalScroller:YES borderType:NSNoBorder].width);
+        maxWidth = ceilf([NSWindow frameRectForContentRect:NSMakeRect(0.0f, 0.0f, maxWidth, 100.0f) styleMask:NSBorderlessWindowMask].size.width);
 #pragma clang diagnostic pop
-        maxWidth = ceilf([NSWindow frameRectForContentRect:NSMakeRect(0.0f, 0.0f, maxWidth, 100.0f) styleMask:NSBorderlessWindowMask].size.width);
         maxWidth += 5.0f;
         windowFrame.size.width = std::max(maxWidth, windowFrame.size.width);
     }

Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (197790 => 197791)


--- trunk/Source/WebKit/mac/WebView/WebView.mm	2016-03-08 20:18:51 UTC (rev 197790)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm	2016-03-08 20:26:17 UTC (rev 197791)
@@ -6020,7 +6020,10 @@
         flags |= DragApplicationHasAttachedSheet;
     if ([draggingInfo draggingSource] == self)
         flags |= DragApplicationIsSource;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     if ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask)
+#pragma clang diagnostic pop
         flags |= DragApplicationIsCopyKeyDown;
     return static_cast<DragApplicationFlags>(flags);
 }

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to