Diff
Modified: trunk/Source/WebKit2/ChangeLog (197794 => 197795)
--- trunk/Source/WebKit2/ChangeLog 2016-03-08 20:57:25 UTC (rev 197794)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-08 21:02:09 UTC (rev 197795)
@@ -1,3 +1,53 @@
+2016-03-08 Anders Carlsson <[email protected]>
+
+ Ignore deprecation warnings.
+
+ * Shared/mac/ChildProcessMac.mm:
+ (WebKit::ChildProcess::stopNSAppRunLoop):
+ * Shared/mac/WebEventFactory.mm:
+ (WebKit::mouseButtonForEvent):
+ (WebKit::mouseEventTypeForEvent):
+ (WebKit::clickCountForEvent):
+ (WebKit::globalPointForEvent):
+ (WebKit::pointForEvent):
+ (WebKit::textFromEvent):
+ (WebKit::unmodifiedTextFromEvent):
+ (WebKit::isKeypadEvent):
+ (WebKit::isKeyUpEvent):
+ (WebKit::modifiersForEvent):
+ (WebKit::WebEventFactory::createWebKeyboardEvent):
+ * UIProcess/API/Cocoa/WKNavigationAction.mm:
+ (toNSEventModifierFlags):
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::becomeFirstResponder):
+ (WebKit::WebViewImpl::updateContentInsetsIfAutomatic):
+ (WebKit::WebViewImpl::viewDidMoveToWindow):
+ (WebKit::WebViewImpl::postFakeMouseMovedEventForFlagsChangedEvent):
+ (WebKit::WebViewImpl::createFullScreenWindow):
+ (WebKit::WebViewImpl::sendToolTipMouseExited):
+ (WebKit::WebViewImpl::sendToolTipMouseEntered):
+ (WebKit::applicationFlagsForDrag):
+ (WebKit::WebViewImpl::setLastMouseDownEvent):
+ (WebKit::WebViewImpl::doneWithKeyEvent):
+ (WebKit::WebViewImpl::collectKeyboardLayoutCommandsForEvent):
+ (WebKit::WebViewImpl::performKeyEquivalent):
+ * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+ (WebKit::PluginProcessProxy::beginModal):
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::WebContextMenuProxyMac::showContextMenu):
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (WebKit::WebInspectorProxy::platformCanAttach):
+ * UIProcess/mac/WebPopupMenuProxyMac.mm:
+ (WebKit::WebPopupMenuProxyMac::populate):
+ (WebKit::WebPopupMenuProxyMac::showPopupMenu):
+ * WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm:
+ (WebKit::modifierFlagsFromWebEvent):
+ (WebKit::getEventTypeFromWebEvent):
+ * WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm:
+ (WebKit::cssAlignmentValueForNSTextAlignment):
+ * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
+ (WebKit::convertImageToBitmap):
+
2016-03-08 Oliver Hunt <[email protected]>
Start moving to separated writable and executable mappings in the JIT
Modified: trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm (197794 => 197795)
--- trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2016-03-08 20:57:25 UTC (rev 197794)
+++ trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2016-03-08 21:02:09 UTC (rev 197795)
@@ -242,7 +242,10 @@
ASSERT([NSApp isRunning]);
[NSApp stop:nil];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
NSEvent *event = [NSEvent otherEventWithType:NSApplicationDefined location:NSMakePoint(0, 0) modifierFlags:0 timestamp:0.0 windowNumber:0 context:nil subtype:0 data1:0 data2:0];
+#pragma clang diagnostic pop
[NSApp postEvent:event atStart:true];
}
#endif
Modified: trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm (197794 => 197795)
--- trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm 2016-03-08 20:57:25 UTC (rev 197794)
+++ trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm 2016-03-08 21:02:09 UTC (rev 197795)
@@ -63,6 +63,8 @@
static WebMouseEvent::Button mouseButtonForEvent(NSEvent *event)
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
switch ([event type]) {
case NSLeftMouseDown:
case NSLeftMouseUp:
@@ -85,10 +87,13 @@
default:
return WebMouseEvent::NoButton;
}
+#pragma clang diagnostic pop
}
static WebEvent::Type mouseEventTypeForEvent(NSEvent* event)
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
switch ([event type]) {
case NSLeftMouseDragged:
case NSMouseEntered:
@@ -108,10 +113,13 @@
default:
return WebEvent::MouseMove;
}
+#pragma clang diagnostic pop
}
static int clickCountForEvent(NSEvent *event)
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
switch ([event type]) {
case NSLeftMouseDown:
case NSLeftMouseUp:
@@ -126,6 +134,7 @@
default:
return 0;
}
+#pragma clang diagnostic pop
}
static NSScreen *screenForWindow(NSWindow *window)
@@ -162,6 +171,8 @@
#if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
case NSEventTypePressure:
#endif
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
case NSLeftMouseDown:
case NSLeftMouseDragged:
case NSLeftMouseUp:
@@ -175,6 +186,7 @@
case NSRightMouseDragged:
case NSRightMouseUp:
case NSScrollWheel:
+#pragma clang diagnostic pop
return globalPoint([event locationInWindow], [event window]);
default:
return NSZeroPoint;
@@ -187,6 +199,8 @@
#if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
case NSEventTypePressure:
#endif
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
case NSLeftMouseDown:
case NSLeftMouseDragged:
case NSLeftMouseUp:
@@ -200,6 +214,7 @@
case NSRightMouseDragged:
case NSRightMouseUp:
case NSScrollWheel: {
+#pragma clang diagnostic pop
// Note: This will have its origin at the bottom left of the window unless windowView is flipped.
// In those cases, the Y coordinate gets flipped by Widget::convertFromContainingWindow.
NSPoint location = [event locationInWindow];
@@ -251,14 +266,20 @@
static inline String textFromEvent(NSEvent* event)
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if ([event type] == NSFlagsChanged)
+#pragma clang diagnostic pop
return emptyString();
return String([event characters]);
}
static inline String unmodifiedTextFromEvent(NSEvent* event)
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if ([event type] == NSFlagsChanged)
+#pragma clang diagnostic pop
return emptyString();
return String([event charactersIgnoringModifiers]);
}
@@ -267,9 +288,12 @@
{
// Check that this is the type of event that has a keyCode.
switch ([event type]) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
case NSKeyDown:
case NSKeyUp:
case NSFlagsChanged:
+#pragma clang diagnostic pop
break;
default:
return false;
@@ -302,6 +326,8 @@
static inline bool isKeyUpEvent(NSEvent *event)
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if ([event type] != NSFlagsChanged)
return [event type] == NSKeyUp;
// FIXME: This logic fails if the user presses both Shift keys at once, for example:
@@ -329,12 +355,15 @@
case 63: // Function
return ([event modifierFlags] & NSFunctionKeyMask) == 0;
}
+#pragma clang diagnostic pop
return false;
}
static inline WebEvent::Modifiers modifiersForEvent(NSEvent *event)
{
unsigned modifiers = 0;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if ([event modifierFlags] & NSAlphaShiftKeyMask)
modifiers |= WebEvent::CapsLockKey;
if ([event modifierFlags] & NSShiftKeyMask)
@@ -345,6 +374,7 @@
modifiers |= WebEvent::AltKey;
if ([event modifierFlags] & NSCommandKeyMask)
modifiers |= WebEvent::MetaKey;
+#pragma clang diagnostic pop
return (WebEvent::Modifiers)modifiers;
}
@@ -464,7 +494,10 @@
int windowsVirtualKeyCode = windowsKeyCodeForKeyEvent(event);
int nativeVirtualKeyCode = [event keyCode];
int macCharCode = WKGetNSEventKeyChar(event);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
bool autoRepeat = ([event type] != NSFlagsChanged) && [event isARepeat];
+#pragma clang diagnostic pop
bool isKeypad = isKeypadEvent(event);
bool isSystemKey = false; // SystemKey is always false on the Mac.
WebEvent::Modifiers modifiers = modifiersForEvent(event);
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm (197794 => 197795)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm 2016-03-08 20:57:25 UTC (rev 197794)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm 2016-03-08 21:02:09 UTC (rev 197795)
@@ -62,6 +62,8 @@
{
NSEventModifierFlags modifierFlags = 0;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if (modifiers & WebKit::WebEvent::CapsLockKey)
modifierFlags |= NSAlphaShiftKeyMask;
if (modifiers & WebKit::WebEvent::ShiftKey)
@@ -72,7 +74,7 @@
modifierFlags |= NSAlternateKeyMask;
if (modifiers & WebKit::WebEvent::MetaKey)
modifierFlags |= NSCommandKeyMask;
-
+#pragma clang diagnostic pop
return modifierFlags;
}
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (197794 => 197795)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-03-08 20:57:25 UTC (rev 197794)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-03-08 21:02:09 UTC (rev 197795)
@@ -593,8 +593,11 @@
if (direction != NSDirectSelection) {
NSEvent *event = [NSApp currentEvent];
NSEvent *keyboardEvent = nil;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if ([event type] == NSKeyDown || [event type] == NSKeyUp)
keyboardEvent = event;
+#pragma clang diagnostic pop
m_page->setInitialFocus(direction == NSSelectingNext, keyboardEvent != nil, NativeWebKeyboardEvent(keyboardEvent, false, { }), [](WebKit::CallbackBase::Error) { });
}
return true;
@@ -815,7 +818,10 @@
return;
NSWindow *window = m_view.window;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if ((window.styleMask & NSFullSizeContentViewWindowMask) && !window.titlebarAppearsTransparent && ![m_view enclosingScrollView]) {
+#pragma clang diagnostic pop
NSRect contentLayoutRect = [m_view convertRect:window.contentLayoutRect fromView:nil];
CGFloat newTopContentInset = NSMaxY(contentLayoutRect) - NSHeight(contentLayoutRect);
if (m_topContentInset != newTopContentInset)
@@ -1182,7 +1188,10 @@
if (!m_flagsChangedEventMonitor) {
auto weakThis = createWeakPtr();
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
m_flagsChangedEventMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSFlagsChangedMask handler:[weakThis] (NSEvent *flagsChangedEvent) {
+#pragma clang diagnostic pop
if (weakThis)
weakThis->postFakeMouseMovedEventForFlagsChangedEvent(flagsChangedEvent);
return flagsChangedEvent;
@@ -1250,9 +1259,12 @@
void WebViewImpl::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
NativeWebMouseEvent webEvent(fakeEvent, m_lastPressureEvent.get(), m_view);
m_page->handleMouseEvent(webEvent);
}
@@ -1601,7 +1613,10 @@
NSWindow *WebViewImpl::createFullScreenWindow()
{
#if ENABLE(FULLSCREEN_API)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
return [[[WebCoreFullScreenWindow alloc] initWithContentRect:[[NSScreen mainScreen] frame] styleMask:(NSBorderlessWindowMask | NSResizableWindowMask) backing:NSBackingStoreBuffered defer:NO] autorelease];
+#pragma clang diagnostic pop
#else
return nil;
#endif
@@ -2557,6 +2572,8 @@
void WebViewImpl::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
@@ -2566,12 +2583,15 @@
eventNumber:0
trackingNumber:TRACKING_RECT_TAG
userData:m_trackingRectUserData];
+#pragma clang diagnostic pop
[m_trackingRectOwner mouseExited:fakeEvent];
}
void WebViewImpl::sendToolTipMouseEntered()
{
// Nothing matters except window, trackingNumber, and userData.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
NSEvent *fakeEvent = [NSEvent enterExitEventWithType:NSMouseEntered
location:NSMakePoint(0, 0)
modifierFlags:0
@@ -2581,6 +2601,7 @@
eventNumber:0
trackingNumber:TRACKING_RECT_TAG
userData:m_trackingRectUserData];
+#pragma clang diagnostic pop
[m_trackingRectOwner mouseEntered:fakeEvent];
}
@@ -2736,7 +2757,10 @@
flags |= WebCore::DragApplicationHasAttachedSheet;
if (draggingInfo.draggingSource == view)
flags |= WebCore::DragApplicationIsSource;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if ([NSApp currentEvent].modifierFlags & NSAlternateKeyMask)
+#pragma clang diagnostic pop
flags |= WebCore::DragApplicationIsCopyKeyDown;
return static_cast<WebCore::DragApplicationFlags>(flags);
@@ -3325,7 +3349,10 @@
void WebViewImpl::setLastMouseDownEvent(NSEvent *event)
{
+#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
if (event == m_lastMouseDownEvent.get())
return;
@@ -3362,8 +3389,11 @@
void WebViewImpl::doneWithKeyEvent(NSEvent *event, bool eventWasHandled)
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if ([event type] != NSKeyDown)
return;
+#pragma clang diagnostic pop
if (tryPostProcessPluginComplexTextInputKeyDown(event))
return;
@@ -3439,8 +3469,11 @@
{
Vector<WebCore::KeypressCommand> commands;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if ([event type] != NSKeyDown)
return commands;
+#pragma clang diagnostic pop
ASSERT(!m_collectedKeypressCommands);
m_collectedKeypressCommands = &commands;
@@ -3815,8 +3848,11 @@
// We get Esc key here after processing either Esc or Cmd+period. The former starts as a keyDown, and the latter starts as a key equivalent,
// but both get transformed to a cancelOperation: command, executing which passes an Esc key event to -performKeyEquivalent:.
// Don't interpret this event again, avoiding re-entrancy and infinite loops.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if ([[event charactersIgnoringModifiers] isEqualToString:@"\e"] && !([event modifierFlags] & NSDeviceIndependentModifierFlagsMask))
return [m_view _web_superPerformKeyEquivalent:event];
+#pragma clang diagnostic pop
if (m_keyDownEventBeingResent) {
// WebCore has already seen the event, no need for custom processing.
Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (197794 => 197795)
--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2016-03-08 20:57:25 UTC (rev 197794)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2016-03-08 21:02:09 UTC (rev 197795)
@@ -231,7 +231,10 @@
ASSERT(!m_placeholderWindow);
ASSERT(!m_activationObserver);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
m_placeholderWindow = adoptNS([[WKPlaceholderModalWindow alloc] initWithContentRect:NSMakeRect(0, 0, 1, 1) styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES]);
+#pragma clang diagnostic pop
[m_placeholderWindow setReleasedWhenClosed:NO];
m_activationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationWillBecomeActiveNotification object:NSApp queue:nil
Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (197794 => 197795)
--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2016-03-08 20:57:25 UTC (rev 197794)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2016-03-08 21:02:09 UTC (rev 197795)
@@ -472,7 +472,10 @@
[[WKMenuTarget sharedMenuTarget] setMenuProxy:this];
NSPoint menuLocation = [m_webView convertPoint:m_context.menuLocation() toView:nil];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
NSEvent *event = [NSEvent mouseEventWithType:NSRightMouseUp location:menuLocation modifierFlags:0 timestamp:0 windowNumber:m_webView.window.windowNumber context:nil eventNumber:0 clickCount:0 pressure:0];
+#pragma clang diagnostic pop
[NSMenu popUpContextMenu:m_menu.get() withEvent:event forView:m_webView];
}
Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (197794 => 197795)
--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2016-03-08 20:57:25 UTC (rev 197794)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2016-03-08 21:02:09 UTC (rev 197795)
@@ -55,7 +55,10 @@
using namespace WebCore;
using namespace WebKit;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
static const NSUInteger windowStyleMask = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask | NSFullSizeContentViewWindowMask;
+#pragma clang diagnostic pop
// The time we keep our WebView alive before closing it and its process.
// Reusing the WebView improves start up time for people that jump in and out of the Inspector.
@@ -450,8 +453,11 @@
bool WebInspectorProxy::platformCanAttach(bool webProcessCanAttach)
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if ([m_inspectorWindow styleMask] & NSFullScreenWindowMask)
return false;
+#pragma clang diagnostic pop
NSView *inspectedView = inspectedPage()->inspectorAttachmentView();
if ([inspectedView isKindOfClass:[WKView class]] || [inspectedView isKindOfClass:[WKWebView class]])
Modified: trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm (197794 => 197795)
--- trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm 2016-03-08 20:57:25 UTC (rev 197794)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm 2016-03-08 21:02:09 UTC (rev 197795)
@@ -74,7 +74,10 @@
RetainPtr<NSMutableParagraphStyle> paragraphStyle = adoptNS([[NSParagraphStyle defaultParagraphStyle] mutableCopy]);
NSWritingDirection writingDirection = items[i].m_textDirection == LTR ? NSWritingDirectionLeftToRight : NSWritingDirectionRightToLeft;
[paragraphStyle setBaseWritingDirection:writingDirection];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[paragraphStyle setAlignment:menuTextDirection == LTR ? NSLeftTextAlignment : NSRightTextAlignment];
+#pragma clang diagnostic pop
RetainPtr<NSMutableDictionary> attributes = adoptNS([[NSMutableDictionary alloc] initWithObjectsAndKeys:
paragraphStyle.get(), NSParagraphStyleAttributeName,
font, NSFontAttributeName,
@@ -139,6 +142,8 @@
NSControlSize controlSize;
switch (data.menuSize) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
case WebCore::PopupMenuStyle::PopupMenuSizeNormal:
controlSize = NSRegularControlSize;
break;
@@ -148,6 +153,7 @@
case WebCore::PopupMenuStyle::PopupMenuSizeMini:
controlSize = NSMiniControlSize;
break;
+#pragma clang diagnostic pop
}
Ref<WebPopupMenuProxyMac> protect(*this);
@@ -165,10 +171,12 @@
if (!m_client->currentlyProcessedMouseDownEvent())
return;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
NSEvent* initiatingNSEvent = m_client->currentlyProcessedMouseDownEvent()->nativeEvent();
if ([initiatingNSEvent type] != NSLeftMouseDown)
return;
-
+
NSEvent *fakeEvent = [NSEvent mouseEventWithType:NSLeftMouseUp
location:[initiatingNSEvent locationInWindow]
modifierFlags:[initiatingNSEvent modifierFlags]
@@ -178,7 +186,8 @@
eventNumber:[initiatingNSEvent eventNumber]
clickCount:[initiatingNSEvent clickCount]
pressure:[initiatingNSEvent pressure]];
-
+#pragma clang diagnostic pop
+
[NSApp postEvent:fakeEvent atStart:YES];
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm (197794 => 197795)
--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm 2016-03-08 20:57:25 UTC (rev 197794)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm 2016-03-08 21:02:09 UTC (rev 197795)
@@ -1277,14 +1277,19 @@
static NSUInteger modifierFlagsFromWebEvent(const WebEvent& event)
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
return (event.shiftKey() ? NSShiftKeyMask : 0)
| (event.controlKey() ? NSControlKeyMask : 0)
| (event.altKey() ? NSAlternateKeyMask : 0)
| (event.metaKey() ? NSCommandKeyMask : 0);
+#pragma clang diagnostic pop
}
static bool getEventTypeFromWebEvent(const WebEvent& event, NSEventType& eventType)
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
switch (event.type()) {
case WebEvent::KeyDown:
eventType = NSKeyDown;
@@ -1331,6 +1336,7 @@
default:
return false;
}
+#pragma clang diagnostic pop
}
NSEvent *PDFPlugin::nsEventForWebMouseEvent(const WebMouseEvent& event)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm (197794 => 197795)
--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm 2016-03-08 20:57:25 UTC (rev 197794)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm 2016-03-08 21:02:09 UTC (rev 197795)
@@ -52,6 +52,8 @@
static const String cssAlignmentValueForNSTextAlignment(NSTextAlignment alignment)
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
switch (alignment) {
case NSLeftTextAlignment:
return "left";
@@ -64,7 +66,7 @@
case NSNaturalTextAlignment:
return "-webkit-start";
}
-
+#pragma clang diagnostic pop
ASSERT_NOT_REACHED();
return String();
}
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (197794 => 197795)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2016-03-08 20:57:25 UTC (rev 197794)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2016-03-08 21:02:09 UTC (rev 197795)
@@ -65,7 +65,10 @@
RetainPtr<NSGraphicsContext> savedContext = [NSGraphicsContext currentContext];
[NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithGraphicsPort:graphicsContext->platformContext() flipped:YES]];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[image drawInRect:NSMakeRect(0, 0, bitmap->size().width(), bitmap->size().height()) fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1 respectFlipped:YES hints:nil];
+#pragma clang diagnostic pop
[NSGraphicsContext setCurrentContext:savedContext.get()];
