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