<!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>[208455] trunk</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/208455">208455</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-11-09 11:31:56 -0800 (Wed, 09 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Stop using deprecated AppKit enumeration values
https://bugs.webkit.org/show_bug.cgi?id=164494
Reviewed by Darin Adler.
Stop using deprecated AppKit enumeration values.
Source/WebCore:
* editing/cocoa/HTMLConverter.mm:
(HTMLConverter::computedAttributesForElement):
(HTMLConverter::_processElement):
(HTMLConverter::_addMarkersToList):
* page/mac/EventHandlerMac.mm:
(WebCore::EventHandler::keyEvent):
(WebCore::lastEventIsMouseUp):
(WebCore::EventHandler::passSubframeEventToSubframe):
(WebCore::EventHandler::widgetDidHandleWheelEvent):
(WebCore::EventHandler::sendFakeEventsAfterWidgetTracking):
* page/mac/TextIndicatorWindow.mm:
(WebCore::TextIndicatorWindow::setTextIndicator):
* platform/graphics/mac/IconMac.mm:
(WebCore::Icon::paint):
* platform/mac/CursorMac.mm:
(WebCore::createCustomCursor):
* platform/mac/DragImageMac.mm:
(WebCore::dissolveDragImageToFraction):
(WebCore::createDragImageFromImage):
* platform/mac/EventLoopMac.mm:
(WebCore::EventLoop::cycle):
* platform/mac/PasteboardMac.mm:
(WebCore::Pasteboard::setDragImage):
* platform/mac/PlatformEventFactoryMac.mm:
(WebCore::globalPointForEvent):
(WebCore::pointForEvent):
(WebCore::mouseButtonForEvent):
(WebCore::mouseEventTypeForEvent):
(WebCore::clickCountForEvent):
(WebCore::isKeypadEvent):
(WebCore::windowsKeyCodeForKeyEvent):
(WebCore::isKeyUpEvent):
(WebCore::PlatformKeyboardEventBuilder::PlatformKeyboardEventBuilder):
* platform/mac/ScrollbarThemeMac.mm:
(WebCore::scrollbarControlSizeToNSControlSize):
* platform/mac/ThemeMac.mm:
(-[WebCoreThemeView window]):
(WebCore::controlSizeForFont):
(WebCore::controlSizeFromPixelSize):
(WebCore::setUpButtonCell):
(WebCore::stepperControlSizeForFont):
(WebCore::paintStepper):
(WebCore::ThemeMac::minimumControlSize):
* platform/mac/WebVideoFullscreenHUDWindowController.mm:
(-[WebVideoFullscreenHUDWindow initWithContentRect:styleMask:backing:defer:]):
(-[WebVideoFullscreenHUDWindow performKeyEquivalent:]):
(-[WebVideoFullscreenHUDWindowController init]):
(-[WebVideoFullscreenHUDWindowController keyDown:]):
(-[WebVideoFullscreenHUDWindowController windowDidLoad]):
* platform/mac/WebWindowAnimation.mm:
(WebWindowAnimationDurationFromDuration):
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::updateCachedSystemFontDescription):
(WebCore::RenderThemeMac::controlSizeForFont):
(WebCore::RenderThemeMac::controlSizeForCell):
(WebCore::RenderThemeMac::controlSizeForSystemFont):
(WebCore::RenderThemeMac::paintProgressBar):
(WebCore::RenderThemeMac::popupMenuSize):
(WebCore::RenderThemeMac::sliderThumbHorizontal):
(WebCore::RenderThemeMac::sliderThumbVertical):
Source/WebKit/mac:
* Carbon/CarbonWindowAdapter.mm:
(-[CarbonWindowAdapter initWithCarbonWindowRef:takingOwnership:disableOrdering:carbon:]):
(-[CarbonWindowAdapter sendSuperEvent:]):
* 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:]):
(-[WebHTMLView _updateMouseoverWithFakeEvent]):
(isQuickLookEvent):
(-[WebHTMLView hitTest:]):
(-[WebHTMLView _sendToolTipMouseExited]):
(-[WebHTMLView _sendToolTipMouseEntered]):
(mouseEventIsPartOfClickOrDrag):
(-[WebHTMLView _updateMouseoverWithEvent:]):
(-[WebHTMLView _autoscroll]):
(-[WebHTMLView acceptsFirstResponder]):
(-[WebHTMLView viewDidMoveToWindow]):
(-[WebHTMLView mouseDown:mouseDown:]):
(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:]):
Source/WebKit2:
* 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::WebEventFactory::createWebKeyboardEvent):
* 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::showContextMenuWithItems):
* UIProcess/mac/WebInspectorProxyMac.mm:
* 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):
Source/WTF:
* wtf/mac/AppKitCompatibilityDeclarations.h:
Tools:
* DumpRenderTree/mac/EventSendingController.mm:
(eventTypeForMouseButtonAndAction):
(modifierFlags):
(-[EventSendingController mouseMoveToX:Y:]):
(-[EventSendingController contextClick]):
(-[EventSendingController keyDown:withModifiers:withLocation:]):
* DumpRenderTree/mac/TextInputController.m:
(-[TextInputController interpretKeyEvents:withSender:]):
* TestWebKitAPI/Tests/WebKit2Cocoa/CommandBackForward.mm:
(simulateCommandArrow):
* TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenDelegate.mm:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenLayoutConstraints.mm:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenTopContentInset.mm:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2Cocoa/ShouldOpenExternalURLsInNewWindowActions.mm:
(TEST):
* TestWebKitAPI/Tests/WebKit2Cocoa/UserInitiatedActionInNavigationAction.mm:
(UserInitiatedActionTest::SetUp):
(UserInitiatedActionTest::click):
* TestWebKitAPI/Tests/mac/AcceptsFirstMouse.mm:
(TestWebKitAPI::AcceptsFirstMouse::runTest):
* TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm:
(TestWebKitAPI::contextMenuCopyLink):
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/mac/ContextMenuDefaultItemsHaveTags.mm:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/mac/FullscreenZoomInitialFrame.mm:
(TestWebKitAPI::FullscreenZoomInitialFrame::runTest):
* TestWebKitAPI/Tests/mac/MenuTypesForMouseEvents.mm:
(TestWebKitAPI::TEST):
* TestWebKitAPI/mac/PlatformUtilitiesMac.mm:
(TestWebKitAPI::Util::isKeyDown):
* TestWebKitAPI/mac/PlatformWebViewMac.mm:
(TestWebKitAPI::PlatformWebView::initialize):
(TestWebKitAPI::PlatformWebView::simulateSpacebarKeyPress):
(TestWebKitAPI::PlatformWebView::simulateRightClick):
(TestWebKitAPI::PlatformWebView::simulateMouseMove):
(TestWebKitAPI::eventTypeForButton):
(TestWebKitAPI::modifierFlagsForWKModifiers):
* TestWebKitAPI/mac/TestWKWebViewMac.mm:
(__simulated_forceClickAssociatedEventsMask):
(-[TestWKWebViewHostWindow _mouseDownAtPoint:simulatePressure:]):
(-[TestWKWebView _setUpTestWindow:]):
(-[TestWKWebView typeCharacter:]):
* WebKitTestRunner/mac/EventSenderProxy.mm:
(WTR::eventTypeForMouseButtonAndAction):
(WTR::buildModifierFlags):
(WTR::EventSenderProxy::sendMouseDownToStartPressureEvents):
(WTR::EventSenderProxy::mouseForceClick):
(WTR::EventSenderProxy::startAndCancelMouseForceClick):
(WTR::EventSenderProxy::mouseMoveTo):
(WTR::EventSenderProxy::keyDown):
(WTR::EventSenderProxy::swipeGestureWithWheelAndMomentumPhases):
* WebKitTestRunner/mac/PlatformWebViewMac.mm:
(WTR::PlatformWebView::PlatformWebView):
* WebKitTestRunner/mac/TestControllerMac.mm:
(WTR::TestController::platformResetStateToConsistentValues):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfmacAppKitCompatibilityDeclarationsh">trunk/Source/WTF/wtf/mac/AppKitCompatibilityDeclarations.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorePrefixh">trunk/Source/WebCore/WebCorePrefix.h</a></li>
<li><a href="#trunkSourceWebCoreeditingcocoaHTMLConvertermm">trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm</a></li>
<li><a href="#trunkSourceWebCorepagemacEventHandlerMacmm">trunk/Source/WebCore/page/mac/EventHandlerMac.mm</a></li>
<li><a href="#trunkSourceWebCorepagemacTextIndicatorWindowmm">trunk/Source/WebCore/page/mac/TextIndicatorWindow.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacIconMacmm">trunk/Source/WebCore/platform/graphics/mac/IconMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakWAKAppKitStubsh">trunk/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacCursorMacmm">trunk/Source/WebCore/platform/mac/CursorMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacDragImageMacmm">trunk/Source/WebCore/platform/mac/DragImageMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacEventLoopMacmm">trunk/Source/WebCore/platform/mac/EventLoopMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacPasteboardMacmm">trunk/Source/WebCore/platform/mac/PasteboardMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacPlatformEventFactoryMacmm">trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollbarThemeMacmm">trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacThemeMacmm">trunk/Source/WebCore/platform/mac/ThemeMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebVideoFullscreenHUDWindowControllermm">trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebWindowAnimationmm">trunk/Source/WebCore/platform/mac/WebWindowAnimation.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
<li><a href="#trunkSourceWebKitmacCarbonCarbonWindowAdaptermm">trunk/Source/WebKit/mac/Carbon/CarbonWindowAdapter.mm</a></li>
<li><a href="#trunkSourceWebKitmacCarbonHIWebViewmm">trunk/Source/WebKit/mac/Carbon/HIWebView.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSEventExtrasm">trunk/Source/WebKit/mac/Misc/WebNSEventExtras.m</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSViewExtrasm">trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedNetscapePluginHostProxymm">trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedNetscapePluginInstanceProxymm">trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedWebHostedNetscapePluginViewmm">trunk/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebNetscapePluginEventHandlerCarbonmm">trunk/Source/WebKit/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebNetscapePluginEventHandlerCocoamm">trunk/Source/WebKit/mac/Plugins/WebNetscapePluginEventHandlerCocoa.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportPopupMenuMacmm">trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebContextMenuClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebInspectorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebInspectorWebNodeHighlightmm">trunk/Source/WebKit/mac/WebInspector/WebNodeHighlight.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebKitPrefixh">trunk/Source/WebKit/mac/WebKitPrefix.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFrameViewmm">trunk/Source/WebKit/mac/WebView/WebFrameView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFullScreenControllermm">trunk/Source/WebKit/mac/WebView/WebFullScreenController.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPDFViewmm">trunk/Source/WebKit/mac/WebView/WebPDFView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebTextCompletionControllermm">trunk/Source/WebKit/mac/WebView/WebTextCompletionController.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<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="#trunkSourceWebKit2WebProcessPluginsNetscapemacNetscapePluginMacmm">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFDeprecatedPDFPluginmm">trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.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>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacEventSendingControllermm">trunk/Tools/DumpRenderTree/mac/EventSendingController.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacTextInputControllerm">trunk/Tools/DumpRenderTree/mac/TextInputController.m</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaCommandBackForwardmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/CommandBackForward.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaFullscreenDelegatemm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenDelegate.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaFullscreenLayoutConstraintsmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenLayoutConstraints.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaFullscreenTopContentInsetmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenTopContentInset.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaShouldOpenExternalURLsInNewWindowActionsmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ShouldOpenExternalURLsInNewWindowActions.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaUserInitiatedActionInNavigationActionmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/UserInitiatedActionInNavigationAction.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacAcceptsFirstMousemm">trunk/Tools/TestWebKitAPI/Tests/mac/AcceptsFirstMouse.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacContextMenuCanCopyURLmm">trunk/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacContextMenuDefaultItemsHaveTagsmm">trunk/Tools/TestWebKitAPI/Tests/mac/ContextMenuDefaultItemsHaveTags.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacFullscreenZoomInitialFramemm">trunk/Tools/TestWebKitAPI/Tests/mac/FullscreenZoomInitialFrame.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacMenuTypesForMouseEventsmm">trunk/Tools/TestWebKitAPI/Tests/mac/MenuTypesForMouseEvents.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPImacPlatformUtilitiesMacmm">trunk/Tools/TestWebKitAPI/mac/PlatformUtilitiesMac.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPImacPlatformWebViewMacmm">trunk/Tools/TestWebKitAPI/mac/PlatformWebViewMac.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPImacTestWKWebViewMacmm">trunk/Tools/TestWebKitAPI/mac/TestWKWebViewMac.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnermacEventSenderProxymm">trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnermacPlatformWebViewMacmm">trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnermacTestControllerMacmm">trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WTF/ChangeLog 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-11-09 Chris Dumez <cdumez@apple.com>
+
+ [Mac] Stop using deprecated AppKit enumeration values
+ https://bugs.webkit.org/show_bug.cgi?id=164494
+
+ Reviewed by Darin Adler.
+
+ Stop using deprecated AppKit enumeration values.
+
+ * wtf/mac/AppKitCompatibilityDeclarations.h:
+
</ins><span class="cx"> 2016-11-05 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> Fixed compilation of LLInt with MinGW
</span></span></pre></div>
<a id="trunkSourceWTFwtfmacAppKitCompatibilityDeclarationsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/mac/AppKitCompatibilityDeclarations.h (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/mac/AppKitCompatibilityDeclarations.h 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WTF/wtf/mac/AppKitCompatibilityDeclarations.h 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -57,7 +57,11 @@
</span><span class="cx">
</span><span class="cx"> static const NSControlSize NSControlSizeRegular = NSRegularControlSize;
</span><span class="cx"> static const NSControlSize NSControlSizeSmall = NSSmallControlSize;
</span><ins>+static const NSControlSize NSControlSizeMini = NSMiniControlSize;
</ins><span class="cx">
</span><ins>+static const NSSliderType NSSliderTypeLinear = NSLinearSlider;
+static const NSSliderType NSSliderTypeCircular = NSCircularSlider;
+
</ins><span class="cx"> static const NSEventMask NSEventMaskAny = NSAnyEventMask;
</span><span class="cx"> static const NSEventMask NSEventMaskFlagsChanged = NSFlagsChangedMask;
</span><span class="cx"> static const NSEventMask NSEventMaskKeyDown = NSKeyDownMask;
</span><span class="lines">@@ -83,6 +87,7 @@
</span><span class="cx"> static const NSEventModifierFlags NSEventModifierFlagShift = NSShiftKeyMask;
</span><span class="cx"> static const NSEventModifierFlags NSEventModifierFlagHelp = NSHelpKeyMask;
</span><span class="cx">
</span><ins>+static const NSEventType NSEventTypeApplicationDefined = NSApplicationDefined;
</ins><span class="cx"> static const NSEventType NSEventTypeFlagsChanged = NSFlagsChanged;
</span><span class="cx"> static const NSEventType NSEventTypeKeyDown = NSKeyDown;
</span><span class="cx"> static const NSEventType NSEventTypeKeyUp = NSKeyUp;
</span><span class="lines">@@ -89,6 +94,8 @@
</span><span class="cx"> static const NSEventType NSEventTypeLeftMouseDown = NSLeftMouseDown;
</span><span class="cx"> static const NSEventType NSEventTypeLeftMouseDragged = NSLeftMouseDragged;
</span><span class="cx"> static const NSEventType NSEventTypeLeftMouseUp = NSLeftMouseUp;
</span><ins>+static const NSEventType NSEventTypeMouseEntered = NSMouseEntered;
+static const NSEventType NSEventTypeMouseExited = NSMouseExited;
</ins><span class="cx"> static const NSEventType NSEventTypeMouseMoved = NSMouseMoved;
</span><span class="cx"> static const NSEventType NSEventTypeOtherMouseDown = NSOtherMouseDown;
</span><span class="cx"> static const NSEventType NSEventTypeOtherMouseDragged = NSOtherMouseDragged;
</span><span class="lines">@@ -105,6 +112,11 @@
</span><span class="cx"> static const NSTextAlignment NSTextAlignmentCenter = NSCenterTextAlignment;
</span><span class="cx"> static const NSTextAlignment NSTextAlignmentLeft = NSLeftTextAlignment;
</span><span class="cx"> static const NSTextAlignment NSTextAlignmentNatural = NSNaturalTextAlignment;
</span><ins>+static const NSTextAlignment NSTextAlignmentJustified = NSJustifiedTextAlignment;
+
+typedef NSInteger NSWritingDirectionFormatType;
+static const NSWritingDirectionFormatType = NSTextWritingDirectionOverride;
+static const NSWritingDirectionEmbedding = NSTextWritingDirectionEmbedding;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> typedef NSUInteger NSWindowStyleMask;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebCore/ChangeLog 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -1,3 +1,73 @@
</span><ins>+2016-11-09 Chris Dumez <cdumez@apple.com>
+
+ [Mac] Stop using deprecated AppKit enumeration values
+ https://bugs.webkit.org/show_bug.cgi?id=164494
+
+ Reviewed by Darin Adler.
+
+ Stop using deprecated AppKit enumeration values.
+
+ * editing/cocoa/HTMLConverter.mm:
+ (HTMLConverter::computedAttributesForElement):
+ (HTMLConverter::_processElement):
+ (HTMLConverter::_addMarkersToList):
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::EventHandler::keyEvent):
+ (WebCore::lastEventIsMouseUp):
+ (WebCore::EventHandler::passSubframeEventToSubframe):
+ (WebCore::EventHandler::widgetDidHandleWheelEvent):
+ (WebCore::EventHandler::sendFakeEventsAfterWidgetTracking):
+ * page/mac/TextIndicatorWindow.mm:
+ (WebCore::TextIndicatorWindow::setTextIndicator):
+ * platform/graphics/mac/IconMac.mm:
+ (WebCore::Icon::paint):
+ * platform/mac/CursorMac.mm:
+ (WebCore::createCustomCursor):
+ * platform/mac/DragImageMac.mm:
+ (WebCore::dissolveDragImageToFraction):
+ (WebCore::createDragImageFromImage):
+ * platform/mac/EventLoopMac.mm:
+ (WebCore::EventLoop::cycle):
+ * platform/mac/PasteboardMac.mm:
+ (WebCore::Pasteboard::setDragImage):
+ * platform/mac/PlatformEventFactoryMac.mm:
+ (WebCore::globalPointForEvent):
+ (WebCore::pointForEvent):
+ (WebCore::mouseButtonForEvent):
+ (WebCore::mouseEventTypeForEvent):
+ (WebCore::clickCountForEvent):
+ (WebCore::isKeypadEvent):
+ (WebCore::windowsKeyCodeForKeyEvent):
+ (WebCore::isKeyUpEvent):
+ (WebCore::PlatformKeyboardEventBuilder::PlatformKeyboardEventBuilder):
+ * platform/mac/ScrollbarThemeMac.mm:
+ (WebCore::scrollbarControlSizeToNSControlSize):
+ * platform/mac/ThemeMac.mm:
+ (-[WebCoreThemeView window]):
+ (WebCore::controlSizeForFont):
+ (WebCore::controlSizeFromPixelSize):
+ (WebCore::setUpButtonCell):
+ (WebCore::stepperControlSizeForFont):
+ (WebCore::paintStepper):
+ (WebCore::ThemeMac::minimumControlSize):
+ * platform/mac/WebVideoFullscreenHUDWindowController.mm:
+ (-[WebVideoFullscreenHUDWindow initWithContentRect:styleMask:backing:defer:]):
+ (-[WebVideoFullscreenHUDWindow performKeyEquivalent:]):
+ (-[WebVideoFullscreenHUDWindowController init]):
+ (-[WebVideoFullscreenHUDWindowController keyDown:]):
+ (-[WebVideoFullscreenHUDWindowController windowDidLoad]):
+ * platform/mac/WebWindowAnimation.mm:
+ (WebWindowAnimationDurationFromDuration):
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::updateCachedSystemFontDescription):
+ (WebCore::RenderThemeMac::controlSizeForFont):
+ (WebCore::RenderThemeMac::controlSizeForCell):
+ (WebCore::RenderThemeMac::controlSizeForSystemFont):
+ (WebCore::RenderThemeMac::paintProgressBar):
+ (WebCore::RenderThemeMac::popupMenuSize):
+ (WebCore::RenderThemeMac::sliderThumbHorizontal):
+ (WebCore::RenderThemeMac::sliderThumbVertical):
+
</ins><span class="cx"> 2016-11-08 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] UI Library: iOS inline controls
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorePrefixh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCorePrefix.h (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCorePrefix.h 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebCore/WebCorePrefix.h 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -163,7 +163,10 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx"> #else
</span><ins>+#if USE(APPKIT)
</ins><span class="cx"> #import <Cocoa/Cocoa.h>
</span><ins>+#import <wtf/mac/AppKitCompatibilityDeclarations.h>
+#endif
</ins><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaHTMLConvertermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -113,10 +113,6 @@
</span><span class="cx"> #define PlatformFont NSFont
</span><span class="cx"> #define PlatformFontClass NSFont
</span><span class="cx">
</span><del>-#define NSTextAlignmentLeft NSLeftTextAlignment
-#define NSTextAlignmentRight NSRightTextAlignment
-#define NSTextAlignmentCenter NSCenterTextAlignment
-#define NSTextAlignmentJustified NSJustifiedTextAlignment
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -184,10 +180,10 @@
</span><span class="cx"> NSWritingDirectionRightToLeft = 1 // Right to left writing direction
</span><span class="cx"> } NS_ENUM_AVAILABLE_IOS(6_0);
</span><span class="cx">
</span><del>-typedef NS_ENUM(NSInteger, NSTextWritingDirection) {
- NSTextWritingDirectionEmbedding = (0 << 1),
- NSTextWritingDirectionOverride = (1 << 1)
-} NS_ENUM_AVAILABLE_IOS(7_0);
</del><ins>+typedef NS_ENUM(NSInteger, NSWritingDirectionFormatType) {
+ NSWritingDirectionEmbedding = (0 << 1),
+ NSWritingDirectionOverride = (1 << 1)
+} NS_ENUM_AVAILABLE_IOS(9_0);
</ins><span class="cx">
</span><span class="cx"> enum {
</span><span class="cx"> NSEnterCharacter = 0x0003,
</span><span class="lines">@@ -1210,8 +1206,6 @@
</span><span class="cx"> String textAlign = _caches->propertyValueForNode(coreBlockElement, CSSPropertyTextAlign);
</span><span class="cx"> if (textAlign.length()) {
</span><span class="cx"> // WebKit can return -khtml-left, -khtml-right, -khtml-center
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> if (textAlign.endsWith("left"))
</span><span class="cx"> [paragraphStyle setAlignment:NSTextAlignmentLeft];
</span><span class="cx"> else if (textAlign.endsWith("right"))
</span><span class="lines">@@ -1220,7 +1214,6 @@
</span><span class="cx"> [paragraphStyle setAlignment:NSTextAlignmentCenter];
</span><span class="cx"> else if (textAlign.endsWith("justify"))
</span><span class="cx"> [paragraphStyle setAlignment:NSTextAlignmentJustified];
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String direction = _caches->propertyValueForNode(coreBlockElement, CSSPropertyDirection);
</span><span class="lines">@@ -1851,18 +1844,12 @@
</span><span class="cx"> else {
</span><span class="cx"> String bidi = _caches->propertyValueForNode(element, CSSPropertyUnicodeBidi);
</span><span class="cx"> if (bidi == "embed") {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- NSUInteger val = NSTextWritingDirectionEmbedding;
-#pragma clang diagnostic pop
</del><ins>+ NSUInteger val = NSWritingDirectionEmbedding;
</ins><span class="cx"> if (_caches->propertyValueForNode(element, CSSPropertyDirection) == "rtl")
</span><span class="cx"> val |= NSWritingDirectionRightToLeft;
</span><span class="cx"> [_writingDirectionArray addObject:[NSNumber numberWithUnsignedInteger:val]];
</span><span class="cx"> } else if (bidi == "bidi-override") {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- NSUInteger val = NSTextWritingDirectionOverride;
-#pragma clang diagnostic pop
</del><ins>+ NSUInteger val = NSWritingDirectionOverride;
</ins><span class="cx"> if (_caches->propertyValueForNode(element, CSSPropertyDirection) == "rtl")
</span><span class="cx"> val |= NSWritingDirectionRightToLeft;
</span><span class="cx"> [_writingDirectionArray addObject:[NSNumber numberWithUnsignedInteger:val]];
</span><span class="lines">@@ -2063,14 +2050,7 @@
</span><span class="cx"> tab = [[PlatformNSTextTab alloc] initWithType:NSLeftTabStopType location:markerLocation];
</span><span class="cx"> [newStyle addTabStop:tab];
</span><span class="cx"> [tab release];
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> tab = [[PlatformNSTextTab alloc] initWithTextAlignment:NSTextAlignmentNatural location:listLocation options:@{ }];
</span><del>-#else
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- tab = [[PlatformNSTextTab alloc] initWithTextAlignment:NSNaturalTextAlignment location:listLocation options:@{ }];
-#pragma clang diagnostic pop
-#endif
</del><span class="cx"> [newStyle addTabStop:tab];
</span><span class="cx"> [tab release];
</span><span class="cx"> [_attrStr addAttribute:NSParagraphStyleAttributeName value:newStyle range:paragraphRange];
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacEventHandlerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -150,10 +150,7 @@
</span><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx">
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- ASSERT([event type] == NSKeyDown || [event type] == NSKeyUp);
-#pragma clang diagnostic pop
</del><ins>+ ASSERT([event type] == NSEventTypeKeyDown || [event type] == NSEventTypeKeyUp);
</ins><span class="cx">
</span><span class="cx"> CurrentEventScope scope(event, nil);
</span><span class="cx"> return keyEvent(PlatformEventFactory::createPlatformKeyboardEvent(event));
</span><span class="lines">@@ -206,12 +203,9 @@
</span><span class="cx">
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> NSEvent *currentEventAfterHandlingMouseDown = [NSApp currentEvent];
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> return EventHandler::currentNSEvent() != currentEventAfterHandlingMouseDown
</span><del>- && [currentEventAfterHandlingMouseDown type] == NSLeftMouseUp
</del><ins>+ && [currentEventAfterHandlingMouseDown type] == NSEventTypeLeftMouseUp
</ins><span class="cx"> && [currentEventAfterHandlingMouseDown timestamp] >= [EventHandler::currentNSEvent() timestamp];
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -375,58 +369,55 @@
</span><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx">
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> switch ([currentNSEvent() type]) {
</span><del>- case NSLeftMouseDragged:
- case NSOtherMouseDragged:
- case NSRightMouseDragged:
- // This check is bogus and results in <rdar://6813830>, but removing it breaks a number of
- // layout tests.
- if (!m_mouseDownWasInSubframe)
- return false;
</del><ins>+ case NSEventTypeLeftMouseDragged:
+ case NSEventTypeOtherMouseDragged:
+ case NSEventTypeRightMouseDragged:
+ // This check is bogus and results in <rdar://6813830>, but removing it breaks a number of
+ // layout tests.
+ if (!m_mouseDownWasInSubframe)
+ return false;
</ins><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>- if (subframe->page()->dragController().didInitiateDrag())
- return false;
</del><ins>+ if (subframe->page()->dragController().didInitiateDrag())
+ return false;
</ins><span class="cx"> #endif
</span><del>- case NSMouseMoved:
- // Since we're passing in currentNSEvent() here, we can call
- // handleMouseMoveEvent() directly, since the save/restore of
- // currentNSEvent() that mouseMoved() does would have no effect.
- ASSERT(!m_sendingEventToSubview);
- m_sendingEventToSubview = true;
- subframe->eventHandler().handleMouseMoveEvent(currentPlatformMouseEvent(), hoveredNode);
- m_sendingEventToSubview = false;
- return true;
</del><ins>+ case NSEventTypeMouseMoved:
+ // Since we're passing in currentNSEvent() here, we can call
+ // handleMouseMoveEvent() directly, since the save/restore of
+ // currentNSEvent() that mouseMoved() does would have no effect.
+ ASSERT(!m_sendingEventToSubview);
+ m_sendingEventToSubview = true;
+ subframe->eventHandler().handleMouseMoveEvent(currentPlatformMouseEvent(), hoveredNode);
+ m_sendingEventToSubview = false;
+ return true;
</ins><span class="cx">
</span><del>- case NSLeftMouseDown: {
- Node* node = event.targetNode();
- if (!node)
- return false;
- auto* renderer = node->renderer();
- if (!is<RenderWidget>(renderer))
- return false;
- Widget* widget = downcast<RenderWidget>(*renderer).widget();
- if (!widget || !widget->isFrameView())
- return false;
- if (!passWidgetMouseDownEventToWidget(downcast<RenderWidget>(renderer)))
- return false;
- m_mouseDownWasInSubframe = true;
- return true;
- }
- case NSLeftMouseUp: {
- if (!m_mouseDownWasInSubframe)
- return false;
- ASSERT(!m_sendingEventToSubview);
- m_sendingEventToSubview = true;
- subframe->eventHandler().handleMouseReleaseEvent(currentPlatformMouseEvent());
- m_sendingEventToSubview = false;
- return true;
- }
- default:
</del><ins>+ case NSEventTypeLeftMouseDown: {
+ Node* node = event.targetNode();
+ if (!node)
</ins><span class="cx"> return false;
</span><ins>+ auto* renderer = node->renderer();
+ if (!is<RenderWidget>(renderer))
+ return false;
+ Widget* widget = downcast<RenderWidget>(*renderer).widget();
+ if (!widget || !widget->isFrameView())
+ return false;
+ if (!passWidgetMouseDownEventToWidget(downcast<RenderWidget>(renderer)))
+ return false;
+ m_mouseDownWasInSubframe = true;
+ return true;
</ins><span class="cx"> }
</span><del>-#pragma clang diagnostic pop
</del><ins>+ case NSEventTypeLeftMouseUp: {
+ if (!m_mouseDownWasInSubframe)
+ return false;
+ ASSERT(!m_sendingEventToSubview);
+ m_sendingEventToSubview = true;
+ subframe->eventHandler().handleMouseReleaseEvent(currentPlatformMouseEvent());
+ m_sendingEventToSubview = false;
+ return true;
+ }
+ default:
+ return false;
+ }
</ins><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -479,11 +470,8 @@
</span><span class="cx"> return downcast<FrameView>(widget).frame().eventHandler().handleWheelEvent(wheelEvent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if ([currentNSEvent() type] != NSScrollWheel || m_sendingEventToSubview)
</del><ins>+ if ([currentNSEvent() type] != NSEventTypeScrollWheel || m_sendingEventToSubview)
</ins><span class="cx"> return false;
</span><del>-#pragma clang diagnostic pop
</del><span class="cx">
</span><span class="cx"> ASSERT(nodeView);
</span><span class="cx"> ASSERT([nodeView superview]);
</span><span class="lines">@@ -586,12 +574,10 @@
</span><span class="cx">
</span><span class="cx"> m_sendingEventToSubview = false;
</span><span class="cx"> int eventType = [initiatingEvent type];
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if (eventType == NSLeftMouseDown || eventType == NSKeyDown) {
</del><ins>+ if (eventType == NSEventTypeLeftMouseDown || eventType == NSEventTypeKeyDown) {
</ins><span class="cx"> NSEvent *fakeEvent = nil;
</span><del>- if (eventType == NSLeftMouseDown) {
- fakeEvent = [NSEvent mouseEventWithType:NSLeftMouseUp
</del><ins>+ if (eventType == NSEventTypeLeftMouseDown) {
+ fakeEvent = [NSEvent mouseEventWithType:NSEventTypeLeftMouseUp
</ins><span class="cx"> location:[initiatingEvent locationInWindow]
</span><span class="cx"> modifierFlags:[initiatingEvent modifierFlags]
</span><span class="cx"> timestamp:[initiatingEvent timestamp]
</span><span class="lines">@@ -602,8 +588,8 @@
</span><span class="cx"> pressure:[initiatingEvent pressure]];
</span><span class="cx">
</span><span class="cx"> [NSApp postEvent:fakeEvent atStart:YES];
</span><del>- } else { // eventType == NSKeyDown
- fakeEvent = [NSEvent keyEventWithType:NSKeyUp
</del><ins>+ } else { // eventType == NSEventTypeKeyDown
+ fakeEvent = [NSEvent keyEventWithType:NSEventTypeKeyUp
</ins><span class="cx"> location:[initiatingEvent locationInWindow]
</span><span class="cx"> modifierFlags:[initiatingEvent modifierFlags]
</span><span class="cx"> timestamp:[initiatingEvent timestamp]
</span><span class="lines">@@ -619,8 +605,12 @@
</span><span class="cx"> // FIXME: We should really get the current modifierFlags here, but there's no way to poll
</span><span class="cx"> // them in Cocoa, and because the event stream was stolen by the Carbon menu code we have
</span><span class="cx"> // no up-to-date cache of them anywhere.
</span><del>- fakeEvent = [NSEvent mouseEventWithType:NSMouseMoved
- location:[[view->platformWidget() window] convertScreenToBase:[NSEvent mouseLocation]]
</del><ins>+ fakeEvent = [NSEvent mouseEventWithType:NSEventTypeMouseMoved
+ location:[[view->platformWidget() window]
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ convertScreenToBase:[NSEvent mouseLocation]]
+#pragma clang diagnostic pop
</ins><span class="cx"> modifierFlags:[initiatingEvent modifierFlags]
</span><span class="cx"> timestamp:[initiatingEvent timestamp]
</span><span class="cx"> windowNumber:[initiatingEvent windowNumber]
</span><span class="lines">@@ -628,7 +618,6 @@
</span><span class="cx"> eventNumber:0
</span><span class="cx"> clickCount:0
</span><span class="cx"> pressure:0];
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> [NSApp postEvent:fakeEvent atStart:YES];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacTextIndicatorWindowmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/TextIndicatorWindow.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/TextIndicatorWindow.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebCore/page/mac/TextIndicatorWindow.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -457,13 +457,10 @@
</span><span class="cx"> verticalMargin = CGCeiling(verticalMargin);
</span><span class="cx">
</span><span class="cx"> CGRect contentRect = CGRectInset(textBoundingRectInScreenCoordinates, -horizontalMargin, -verticalMargin);
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- NSRect windowContentRect = [NSWindow contentRectForFrameRect:NSRectFromCGRect(contentRect) styleMask:NSBorderlessWindowMask];
</del><ins>+ NSRect windowContentRect = [NSWindow contentRectForFrameRect:NSRectFromCGRect(contentRect) styleMask:NSWindowStyleMaskBorderless];
</ins><span class="cx"> NSRect integralWindowContentRect = NSIntegralRect(windowContentRect);
</span><span class="cx"> NSPoint fractionalTextOffset = NSMakePoint(windowContentRect.origin.x - integralWindowContentRect.origin.x, windowContentRect.origin.y - integralWindowContentRect.origin.y);
</span><del>- m_textIndicatorWindow = adoptNS([[NSWindow alloc] initWithContentRect:integralWindowContentRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]);
-#pragma clang diagnostic pop
</del><ins>+ m_textIndicatorWindow = adoptNS([[NSWindow alloc] initWithContentRect:integralWindowContentRect styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO]);
</ins><span class="cx"> [m_textIndicatorWindow setBackgroundColor:[NSColor clearColor]];
</span><span class="cx"> [m_textIndicatorWindow setOpaque:NO];
</span><span class="cx"> [m_textIndicatorWindow setIgnoresMouseEvents:YES];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacIconMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/IconMac.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/IconMac.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebCore/platform/graphics/mac/IconMac.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #import "LocalCurrentGraphicsContext.h"
</span><span class="cx"> #import "UTIUtilities.h"
</span><span class="cx"> #import <wtf/RefPtr.h>
</span><del>-#include <wtf/text/WTFString.h>
</del><ins>+#import <wtf/text/WTFString.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -98,10 +98,7 @@
</span><span class="cx">
</span><span class="cx"> LocalCurrentGraphicsContext localCurrentGC(context);
</span><span class="cx">
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- [m_nsImage drawInRect:rect fromRect:NSMakeRect(0, 0, [m_nsImage size].width, [m_nsImage size].height) operation:NSCompositeSourceOver fraction:1.0f];
-#pragma clang diagnostic pop
</del><ins>+ [m_nsImage drawInRect:rect fromRect:NSMakeRect(0, 0, [m_nsImage size].width, [m_nsImage size].height) operation:NSCompositingOperationSourceOver fraction:1.0f];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWAKAppKitStubsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -154,15 +154,15 @@
</span><span class="cx">
</span><span class="cx"> /* Device-independent bits found in event modifier flags */
</span><span class="cx"> enum {
</span><del>- NSAlphaShiftKeyMask = 1 << 16,
- NSShiftKeyMask = 1 << 17,
- NSControlKeyMask = 1 << 18,
- NSAlternateKeyMask = 1 << 19,
- NSCommandKeyMask = 1 << 20,
- NSNumericPadKeyMask = 1 << 21,
- NSHelpKeyMask = 1 << 22,
- NSFunctionKeyMask = 1 << 23,
- NSDeviceIndependentModifierFlagsMask = 0xffff0000U
</del><ins>+ NSEventModifierFlagCapsLock = 1 << 16,
+ NSEventModifierFlagShift = 1 << 17,
+ NSEventModifierFlagControl = 1 << 18,
+ NSEventModifierFlagOption = 1 << 19,
+ NSEventModifierFlagCommand = 1 << 20,
+ NSEventModifierFlagNumericPad = 1 << 21,
+ NSEventModifierFlagHelp = 1 << 22,
+ NSEventModifierFlagFunction = 1 << 23,
+ NSEventModifierFlagDeviceIndependentFlagsMask = 0xffff0000U
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef enum _WKWritingDirection {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacCursorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/CursorMac.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/CursorMac.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebCore/platform/mac/CursorMac.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -64,10 +64,7 @@
</span><span class="cx"> NSRect fromRect = NSMakeRect(0, 0, image->width(), image->height());
</span><span class="cx">
</span><span class="cx"> [expandedImage lockFocus];
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- [nsImage drawInRect:toRect fromRect:fromRect operation:NSCompositeSourceOver fraction:1];
-#pragma clang diagnostic pop
</del><ins>+ [nsImage drawInRect:toRect fromRect:fromRect operation:NSCompositingOperationSourceOver fraction:1];
</ins><span class="cx"> [expandedImage unlockFocus];
</span><span class="cx">
</span><span class="cx"> return adoptNS([[NSCursor alloc] initWithImage:expandedImage.get() hotSpot:hotSpot]);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacDragImageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/DragImageMac.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/DragImageMac.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebCore/platform/mac/DragImageMac.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -75,10 +75,7 @@
</span><span class="cx"> RetainPtr<NSImage> dissolvedImage = adoptNS([[NSImage alloc] initWithSize:[image.get() size]]);
</span><span class="cx">
</span><span class="cx"> [dissolvedImage.get() lockFocus];
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- [image.get() drawAtPoint:NSZeroPoint fromRect:NSMakeRect(0, 0, [image size].width, [image size].height) operation:NSCompositeCopy fraction:delta];
-#pragma clang diagnostic pop
</del><ins>+ [image.get() drawAtPoint:NSZeroPoint fromRect:NSMakeRect(0, 0, [image size].width, [image size].height) operation:NSCompositingOperationCopy fraction:delta];
</ins><span class="cx"> [dissolvedImage.get() unlockFocus];
</span><span class="cx">
</span><span class="cx"> return dissolvedImage;
</span><span class="lines">@@ -119,10 +116,8 @@
</span><span class="cx"> [cocoaTransform.get() setTransformStruct:*(NSAffineTransformStruct*)&transform];
</span><span class="cx"> [cocoaTransform.get() concat];
</span><span class="cx">
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- [image->snapshotNSImage() drawInRect:destRect fromRect:NSMakeRect(0, 0, size.width(), size.height()) operation:NSCompositeSourceOver fraction:1.0];
-#pragma clang diagnostic pop
</del><ins>+ [image->snapshotNSImage() drawInRect:destRect fromRect:NSMakeRect(0, 0, size.width(), size.height()) operation:NSCompositingOperationSourceOver fraction:1.0];
+
</ins><span class="cx"> [rotatedDragImage.get() unlockFocus];
</span><span class="cx">
</span><span class="cx"> return rotatedDragImage;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacEventLoopMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/EventLoopMac.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/EventLoopMac.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebCore/platform/mac/EventLoopMac.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -31,10 +31,7 @@
</span><span class="cx"> void EventLoop::cycle()
</span><span class="cx"> {
</span><span class="cx"> [NSApp setWindowsNeedUpdate:YES];
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- [NSApp sendEvent:[NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate dateWithTimeIntervalSinceNow:0.05] inMode:NSDefaultRunLoopMode dequeue:YES]];
-#pragma clang diagnostic pop
</del><ins>+ [NSApp sendEvent:[NSApp nextEventMatchingMask:NSEventMaskAny untilDate:[NSDate dateWithTimeIntervalSinceNow:0.05] inMode:NSDefaultRunLoopMode dequeue:YES]];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacPasteboardMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/PasteboardMac.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -653,11 +653,8 @@
</span><span class="cx"> // Hack: We must post an event to wake up the NSDragManager, which is sitting in a nextEvent call
</span><span class="cx"> // up the stack from us because the CoreFoundation drag manager does not use the run loop by itself.
</span><span class="cx"> // This is the most innocuous event to use, per Kristen Forster.
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- NSEvent* event = [NSEvent mouseEventWithType:NSMouseMoved location:NSZeroPoint
</del><ins>+ NSEvent* event = [NSEvent mouseEventWithType:NSEventTypeMouseMoved location:NSZeroPoint
</ins><span class="cx"> modifierFlags:0 timestamp:0 windowNumber:0 context:nil eventNumber:0 clickCount:0 pressure:0];
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> [NSApp postEvent:event atStart:YES];
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacPlatformEventFactoryMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #import <HIToolbox/Events.h>
</span><span class="cx"> #import <mach/mach_time.h>
</span><span class="cx"> #import <wtf/ASCIICType.h>
</span><del>-#import <wtf/mac/AppKitCompatibilityDeclarations.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -52,27 +51,24 @@
</span><span class="cx"> {
</span><span class="cx"> switch ([event type]) {
</span><span class="cx"> #if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
</span><del>- case NSEventTypePressure:
</del><ins>+ case NSEventTypePressure:
</ins><span class="cx"> #endif
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- case NSLeftMouseDown:
- case NSLeftMouseDragged:
- case NSLeftMouseUp:
- case NSMouseEntered:
- case NSMouseExited:
- case NSMouseMoved:
- case NSOtherMouseDown:
- case NSOtherMouseDragged:
- case NSOtherMouseUp:
- case NSRightMouseDown:
- case NSRightMouseDragged:
- case NSRightMouseUp:
- case NSScrollWheel:
-#pragma clang diagnostic pop
- return globalPoint([event locationInWindow], [event window]);
- default:
- return { 0, 0 };
</del><ins>+ case NSEventTypeLeftMouseDown:
+ case NSEventTypeLeftMouseDragged:
+ case NSEventTypeLeftMouseUp:
+ case NSEventTypeMouseEntered:
+ case NSEventTypeMouseExited:
+ case NSEventTypeMouseMoved:
+ case NSEventTypeOtherMouseDown:
+ case NSEventTypeOtherMouseDragged:
+ case NSEventTypeOtherMouseUp:
+ case NSEventTypeRightMouseDown:
+ case NSEventTypeRightMouseDragged:
+ case NSEventTypeRightMouseUp:
+ case NSEventTypeScrollWheel:
+ return globalPoint([event locationInWindow], [event window]);
+ default:
+ return { 0, 0 };
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -80,34 +76,31 @@
</span><span class="cx"> {
</span><span class="cx"> switch ([event type]) {
</span><span class="cx"> #if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
</span><del>- case NSEventTypePressure:
</del><ins>+ case NSEventTypePressure:
</ins><span class="cx"> #endif
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- case NSLeftMouseDown:
- case NSLeftMouseDragged:
- case NSLeftMouseUp:
- case NSMouseEntered:
- case NSMouseExited:
- case NSMouseMoved:
- case NSOtherMouseDown:
- case NSOtherMouseDragged:
- case NSOtherMouseUp:
- case NSRightMouseDown:
- case NSRightMouseDragged:
- case NSRightMouseUp:
- case NSScrollWheel: {
- // 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];
- if (windowView)
- location = [windowView convertPoint:location fromView:nil];
- return IntPoint(location);
- }
-#pragma clang diagnostic pop
- default:
- return IntPoint();
</del><ins>+ case NSEventTypeLeftMouseDown:
+ case NSEventTypeLeftMouseDragged:
+ case NSEventTypeLeftMouseUp:
+ case NSEventTypeMouseEntered:
+ case NSEventTypeMouseExited:
+ case NSEventTypeMouseMoved:
+ case NSEventTypeOtherMouseDown:
+ case NSEventTypeOtherMouseDragged:
+ case NSEventTypeOtherMouseUp:
+ case NSEventTypeRightMouseDown:
+ case NSEventTypeRightMouseDragged:
+ case NSEventTypeRightMouseUp:
+ case NSEventTypeScrollWheel: {
+ // 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];
+ if (windowView)
+ location = [windowView convertPoint:location fromView:nil];
+ return IntPoint(location);
</ins><span class="cx"> }
</span><ins>+ default:
+ return IntPoint();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static MouseButton mouseButtonForEvent(NSEvent *event)
</span><span class="lines">@@ -114,25 +107,22 @@
</span><span class="cx"> {
</span><span class="cx"> switch ([event type]) {
</span><span class="cx"> #if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
</span><del>- case NSEventTypePressure:
</del><ins>+ case NSEventTypePressure:
</ins><span class="cx"> #endif
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- case NSLeftMouseDown:
- case NSLeftMouseUp:
- case NSLeftMouseDragged:
- return LeftButton;
- case NSRightMouseDown:
- case NSRightMouseUp:
- case NSRightMouseDragged:
- return RightButton;
- case NSOtherMouseDown:
- case NSOtherMouseUp:
- case NSOtherMouseDragged:
- return MiddleButton;
-#pragma clang diagnostic pop
- default:
- return NoButton;
</del><ins>+ case NSEventTypeLeftMouseDown:
+ case NSEventTypeLeftMouseUp:
+ case NSEventTypeLeftMouseDragged:
+ return LeftButton;
+ case NSEventTypeRightMouseDown:
+ case NSEventTypeRightMouseUp:
+ case NSEventTypeRightMouseDragged:
+ return RightButton;
+ case NSEventTypeOtherMouseDown:
+ case NSEventTypeOtherMouseUp:
+ case NSEventTypeOtherMouseDragged:
+ return MiddleButton;
+ default:
+ return NoButton;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -139,26 +129,23 @@
</span><span class="cx"> static PlatformEvent::Type mouseEventTypeForEvent(NSEvent* event)
</span><span class="cx"> {
</span><span class="cx"> switch ([event type]) {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- case NSLeftMouseDragged:
- case NSMouseEntered:
- case NSMouseExited:
- case NSMouseMoved:
- case NSOtherMouseDragged:
- case NSRightMouseDragged:
- return PlatformEvent::MouseMoved;
- case NSLeftMouseDown:
- case NSRightMouseDown:
- case NSOtherMouseDown:
- return PlatformEvent::MousePressed;
- case NSLeftMouseUp:
- case NSRightMouseUp:
- case NSOtherMouseUp:
- return PlatformEvent::MouseReleased;
-#pragma clang diagnostic pop
- default:
- return PlatformEvent::MouseMoved;
</del><ins>+ case NSEventTypeLeftMouseDragged:
+ case NSEventTypeMouseEntered:
+ case NSEventTypeMouseExited:
+ case NSEventTypeMouseMoved:
+ case NSEventTypeOtherMouseDragged:
+ case NSEventTypeRightMouseDragged:
+ return PlatformEvent::MouseMoved;
+ case NSEventTypeLeftMouseDown:
+ case NSEventTypeRightMouseDown:
+ case NSEventTypeOtherMouseDown:
+ return PlatformEvent::MousePressed;
+ case NSEventTypeLeftMouseUp:
+ case NSEventTypeRightMouseUp:
+ case NSEventTypeOtherMouseUp:
+ return PlatformEvent::MouseReleased;
+ default:
+ return PlatformEvent::MouseMoved;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -165,21 +152,18 @@
</span><span class="cx"> static int clickCountForEvent(NSEvent *event)
</span><span class="cx"> {
</span><span class="cx"> switch ([event type]) {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- case NSLeftMouseDown:
- case NSLeftMouseUp:
- case NSLeftMouseDragged:
- case NSRightMouseDown:
- case NSRightMouseUp:
- case NSRightMouseDragged:
- case NSOtherMouseDown:
- case NSOtherMouseUp:
- case NSOtherMouseDragged:
-#pragma clang diagnostic pop
- return [event clickCount];
- default:
- return 0;
</del><ins>+ case NSEventTypeLeftMouseDown:
+ case NSEventTypeLeftMouseUp:
+ case NSEventTypeLeftMouseDragged:
+ case NSEventTypeRightMouseDown:
+ case NSEventTypeRightMouseUp:
+ case NSEventTypeRightMouseDragged:
+ case NSEventTypeOtherMouseDown:
+ case NSEventTypeOtherMouseUp:
+ case NSEventTypeOtherMouseDragged:
+ return [event clickCount];
+ default:
+ return 0;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -497,28 +481,28 @@
</span><span class="cx"> {
</span><span class="cx"> if ([event type] == NSEventTypeFlagsChanged) {
</span><span class="cx"> switch ([event keyCode]) {
</span><del>- case 54: // Right Command
- case 55: // Left Command
- return String("Meta");
-
- case 57: // Capslock
- return String("CapsLock");
-
- case 56: // Left Shift
- case 60: // Right Shift
- return String("Shift");
-
- case 58: // Left Alt
- case 61: // Right Alt
- return String("Alt");
-
- case 59: // Left Ctrl
- case 62: // Right Ctrl
- return String("Control");
-
- default:
- ASSERT_NOT_REACHED();
- return emptyString();
</del><ins>+ case 54: // Right Command
+ case 55: // Left Command
+ return String("Meta");
+
+ case 57: // Capslock
+ return String("CapsLock");
+
+ case 56: // Left Shift
+ case 60: // Right Shift
+ return String("Shift");
+
+ case 58: // Left Alt
+ case 61: // Right Alt
+ return String("Alt");
+
+ case 59: // Left Ctrl
+ case 62: // Right Ctrl
+ return String("Control");
+
+ default:
+ ASSERT_NOT_REACHED();
+ return emptyString();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -534,44 +518,38 @@
</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><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- case NSKeyDown:
- case NSKeyUp:
- case NSFlagsChanged:
- break;
-#pragma clang diagnostic pop
- default:
- return false;
</del><ins>+ case NSEventTypeKeyDown:
+ case NSEventTypeKeyUp:
+ case NSEventTypeFlagsChanged:
+ break;
+ default:
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if ([event modifierFlags] & NSNumericPadKeyMask)
-#pragma clang diagnostic pop
</del><ins>+ if ([event modifierFlags] & NSEventModifierFlagNumericPad)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> switch ([event keyCode]) {
</span><del>- case 71: // Clear
- case 81: // =
- case 75: // /
- case 67: // *
- case 78: // -
- case 69: // +
- case 76: // Enter
- case 65: // .
- case 82: // 0
- case 83: // 1
- case 84: // 2
- case 85: // 3
- case 86: // 4
- case 87: // 5
- case 88: // 6
- case 89: // 7
- case 91: // 8
- case 92: // 9
- return true;
- }
</del><ins>+ case 71: // Clear
+ case 81: // =
+ case 75: // /
+ case 67: // *
+ case 78: // -
+ case 69: // +
+ case 76: // Enter
+ case 65: // .
+ case 82: // 0
+ case 83: // 1
+ case 84: // 2
+ case 85: // 3
+ case 86: // 4
+ case 87: // 5
+ case 88: // 6
+ case 89: // 7
+ case 91: // 8
+ case 92: // 9
+ return true;
+ }
</ins><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -585,10 +563,7 @@
</span><span class="cx"> // 2. Keys for which there is no known Mac virtual key codes, like PrintScreen.
</span><span class="cx"> // 3. Certain punctuation keys. On Windows, these are also remapped depending on current keyboard layout,
</span><span class="cx"> // but see comment in windowsKeyCodeForCharCode().
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if (!isKeypadEvent(event) && ([event type] == NSKeyDown || [event type] == NSKeyUp)) {
-#pragma clang diagnostic pop
</del><ins>+ if (!isKeypadEvent(event) && ([event type] == NSEventTypeKeyDown || [event type] == NSEventTypeKeyUp)) {
</ins><span class="cx"> // Cmd switches Roman letters for Dvorak-QWERTY layout, so try modified characters first.
</span><span class="cx"> NSString* s = [event characters];
</span><span class="cx"> code = [s length] > 0 ? windowsKeyCodeForCharCode([s characterAtIndex:0]) : 0;
</span><span class="lines">@@ -646,35 +621,32 @@
</span><span class="cx">
</span><span class="cx"> static inline bool isKeyUpEvent(NSEvent *event)
</span><span class="cx"> {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if ([event type] != NSFlagsChanged)
- return [event type] == NSKeyUp;
</del><ins>+ if ([event type] != NSEventTypeFlagsChanged)
+ return [event type] == NSEventTypeKeyUp;
</ins><span class="cx"> // FIXME: This logic fails if the user presses both Shift keys at once, for example:
</span><span class="cx"> // we treat releasing one of them as keyDown.
</span><span class="cx"> switch ([event keyCode]) {
</span><del>- case 54: // Right Command
- case 55: // Left Command
- return ([event modifierFlags] & NSCommandKeyMask) == 0;
-
- case 57: // Capslock
- return ([event modifierFlags] & NSAlphaShiftKeyMask) == 0;
-
- case 56: // Left Shift
- case 60: // Right Shift
- return ([event modifierFlags] & NSShiftKeyMask) == 0;
-
- case 58: // Left Alt
- case 61: // Right Alt
- return ([event modifierFlags] & NSAlternateKeyMask) == 0;
-
- case 59: // Left Ctrl
- case 62: // Right Ctrl
- return ([event modifierFlags] & NSControlKeyMask) == 0;
-
- case 63: // Function
- return ([event modifierFlags] & NSFunctionKeyMask) == 0;
-#pragma clang diagnostic pop
</del><ins>+ case 54: // Right Command
+ case 55: // Left Command
+ return !([event modifierFlags] & NSEventModifierFlagCommand);
+
+ case 57: // Capslock
+ return !([event modifierFlags] & NSEventModifierFlagCapsLock);
+
+ case 56: // Left Shift
+ case 60: // Right Shift
+ return !([event modifierFlags] & NSEventModifierFlagShift);
+
+ case 58: // Left Alt
+ case 61: // Right Alt
+ return !([event modifierFlags] & NSEventModifierFlagOption);
+
+ case 59: // Left Ctrl
+ case 62: // Right Ctrl
+ return !([event modifierFlags] & NSEventModifierFlagControl);
+
+ case 63: // Function
+ return !([event modifierFlags] & NSEventModifierFlagFunction);
</ins><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -818,10 +790,7 @@
</span><span class="cx"> m_key = keyForKeyEvent(event);
</span><span class="cx"> m_code = codeForKeyEvent(event);
</span><span class="cx"> m_windowsVirtualKeyCode = windowsKeyCodeForKeyEvent(event);
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- m_autoRepeat = [event type] != NSFlagsChanged && [event isARepeat];
-#pragma clang diagnostic pop
</del><ins>+ m_autoRepeat = [event type] != NSEventTypeFlagsChanged && [event isARepeat];
</ins><span class="cx"> m_isKeypad = isKeypadEvent(event);
</span><span class="cx"> m_isSystemKey = false; // SystemKey is always false on the Mac.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollbarThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -139,18 +139,15 @@
</span><span class="cx">
</span><span class="cx"> static NSControlSize scrollbarControlSizeToNSControlSize(ScrollbarControlSize controlSize)
</span><span class="cx"> {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> switch (controlSize) {
</span><span class="cx"> case RegularScrollbar:
</span><del>- return NSRegularControlSize;
</del><ins>+ return NSControlSizeRegular;
</ins><span class="cx"> case SmallScrollbar:
</span><del>- return NSSmallControlSize;
</del><ins>+ return NSControlSizeSmall;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return NSRegularControlSize;
-#pragma clang diagnostic pop
</del><ins>+ return NSControlSizeRegular;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollbarThemeMac::didCreateScrollerImp(Scrollbar& scrollbar)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ThemeMac.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ThemeMac.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -67,11 +67,8 @@
</span><span class="cx"> {
</span><span class="cx"> // Using defer:YES prevents us from wasting any window server resources for this window, since we're not actually
</span><span class="cx"> // going to draw into it. The other arguments match what you get when calling -[NSWindow init].
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> static WebCoreThemeWindow *window = [[WebCoreThemeWindow alloc] initWithContentRect:NSMakeRect(100, 100, 100, 100)
</span><del>- styleMask:NSTitledWindowMask backing:NSBackingStoreBuffered defer:YES];
-#pragma clang diagnostic pop
</del><ins>+ styleMask:NSWindowStyleMaskTitled backing:NSBackingStoreBuffered defer:YES];
</ins><span class="cx"> return window;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -144,15 +141,12 @@
</span><span class="cx">
</span><span class="cx"> static NSControlSize controlSizeForFont(const FontCascade& font)
</span><span class="cx"> {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> int fontSize = font.pixelSize();
</span><span class="cx"> if (fontSize >= 16)
</span><del>- return NSRegularControlSize;
</del><ins>+ return NSControlSizeRegular;
</ins><span class="cx"> if (fontSize >= 11)
</span><del>- return NSSmallControlSize;
- return NSMiniControlSize;
-#pragma clang diagnostic pop
</del><ins>+ return NSControlSizeSmall;
+ return NSControlSizeMini;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static LengthSize sizeFromNSControlSize(NSControlSize nsControlSize, const LengthSize& zoomedSize, float zoomFactor, const std::array<IntSize, 3>& sizes)
</span><span class="lines">@@ -175,16 +169,13 @@
</span><span class="cx">
</span><span class="cx"> static ControlSize controlSizeFromPixelSize(const std::array<IntSize, 3>& sizes, const IntSize& minZoomedSize, float zoomFactor)
</span><span class="cx"> {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if (minZoomedSize.width() >= static_cast<int>(sizes[NSRegularControlSize].width() * zoomFactor) &&
- minZoomedSize.height() >= static_cast<int>(sizes[NSRegularControlSize].height() * zoomFactor))
- return NSRegularControlSize;
- if (minZoomedSize.width() >= static_cast<int>(sizes[NSSmallControlSize].width() * zoomFactor) &&
- minZoomedSize.height() >= static_cast<int>(sizes[NSSmallControlSize].height() * zoomFactor))
- return NSSmallControlSize;
- return NSMiniControlSize;
-#pragma clang diagnostic pop
</del><ins>+ if (minZoomedSize.width() >= static_cast<int>(sizes[NSControlSizeRegular].width() * zoomFactor)
+ && minZoomedSize.height() >= static_cast<int>(sizes[NSControlSizeRegular].height() * zoomFactor))
+ return NSControlSizeRegular;
+ if (minZoomedSize.width() >= static_cast<int>(sizes[NSControlSizeSmall].width() * zoomFactor)
+ && minZoomedSize.height() >= static_cast<int>(sizes[NSControlSizeSmall].height() * zoomFactor))
+ return NSControlSizeSmall;
+ return NSControlSizeMini;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void setControlSize(NSCell* cell, const std::array<IntSize, 3>& sizes, const IntSize& minZoomedSize, float zoomFactor)
</span><span class="lines">@@ -480,10 +471,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Set the control size based off the rectangle we're painting into.
</span><span class="cx"> const std::array<IntSize, 3>& sizes = buttonSizes();
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if (part == SquareButtonPart || zoomedSize.height() > buttonSizes()[NSRegularControlSize].height() * zoomFactor) {
-#pragma clang diagnostic pop
</del><ins>+ if (part == SquareButtonPart || zoomedSize.height() > buttonSizes()[NSControlSizeRegular].height() * zoomFactor) {
</ins><span class="cx"> // Use the square button
</span><span class="cx"> if ([cell bezelStyle] != NSShadowlessSquareBezelStyle)
</span><span class="cx"> [cell setBezelStyle:NSShadowlessSquareBezelStyle];
</span><span class="lines">@@ -579,15 +567,12 @@
</span><span class="cx"> // should be equal to or less than the corresponding text field height,
</span><span class="cx"> static NSControlSize stepperControlSizeForFont(const FontCascade& font)
</span><span class="cx"> {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> int fontSize = font.pixelSize();
</span><span class="cx"> if (fontSize >= 18)
</span><del>- return NSRegularControlSize;
</del><ins>+ return NSControlSizeRegular;
</ins><span class="cx"> if (fontSize >= 13)
</span><del>- return NSSmallControlSize;
- return NSMiniControlSize;
-#pragma clang diagnostic pop
</del><ins>+ return NSControlSizeSmall;
+ return NSControlSizeMini;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void paintStepper(ControlStates& states, GraphicsContext& context, const FloatRect& zoomedRect, float zoomFactor, ScrollView*)
</span><span class="lines">@@ -600,15 +585,12 @@
</span><span class="cx"> drawInfo.state = convertControlStatesToThemeDrawState(kThemeIncDecButton, states);
</span><span class="cx"> drawInfo.adornment = kThemeAdornmentDefault;
</span><span class="cx"> ControlSize controlSize = controlSizeFromPixelSize(stepperSizes(), IntSize(zoomedRect.size()), zoomFactor);
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if (controlSize == NSSmallControlSize)
</del><ins>+ if (controlSize == NSControlSizeSmall)
</ins><span class="cx"> drawInfo.kind = kThemeIncDecButtonSmall;
</span><del>- else if (controlSize == NSMiniControlSize)
</del><ins>+ else if (controlSize == NSControlSizeMini)
</ins><span class="cx"> drawInfo.kind = kThemeIncDecButtonMini;
</span><span class="cx"> else
</span><span class="cx"> drawInfo.kind = kThemeIncDecButton;
</span><del>-#pragma clang diagnostic pop
</del><span class="cx">
</span><span class="cx"> IntRect rect(zoomedRect);
</span><span class="cx"> GraphicsContextStateSaver stateSaver(context);
</span><span class="lines">@@ -749,12 +731,9 @@
</span><span class="cx"> case ButtonPart:
</span><span class="cx"> return LengthSize(Length(0, Fixed), Length(static_cast<int>(15 * zoomFactor), Fixed));
</span><span class="cx"> case InnerSpinButtonPart:{
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- IntSize base = stepperSizes()[NSMiniControlSize];
</del><ins>+ IntSize base = stepperSizes()[NSControlSizeMini];
</ins><span class="cx"> return LengthSize(Length(static_cast<int>(base.width() * zoomFactor), Fixed),
</span><span class="cx"> Length(static_cast<int>(base.height() * zoomFactor), Fixed));
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> }
</span><span class="cx"> default:
</span><span class="cx"> return Theme::minimumControlSize(part, font, zoomFactor);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebVideoFullscreenHUDWindowControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -73,10 +73,7 @@
</span><span class="cx"> - (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(aStyle);
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- self = [super initWithContentRect:contentRect styleMask:NSBorderlessWindowMask backing:bufferingType defer:flag];
-#pragma clang diagnostic pop
</del><ins>+ self = [super initWithContentRect:contentRect styleMask:NSWindowStyleMaskBorderless backing:bufferingType defer:flag];
</ins><span class="cx"> if (!self)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="lines">@@ -122,15 +119,12 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)performKeyEquivalent:(NSEvent *)event
</span><span class="cx"> {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> // Block all command key events while the fullscreen window is up.
</span><del>- if ([event type] != NSKeyDown)
</del><ins>+ if ([event type] != NSEventTypeKeyDown)
</ins><span class="cx"> return NO;
</span><span class="cx">
</span><del>- if (!([event modifierFlags] & NSCommandKeyMask))
</del><ins>+ if (!([event modifierFlags] & NSEventModifierFlagCommand))
</ins><span class="cx"> return NO;
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -145,11 +139,7 @@
</span><span class="cx">
</span><span class="cx"> - (id)init
</span><span class="cx"> {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- NSWindow *window = [[WebVideoFullscreenHUDWindow alloc] initWithContentRect:NSMakeRect(0, 0, windowWidth, windowHeight)
- styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO];
-#pragma clang diagnostic pop
</del><ins>+ NSWindow *window = [[WebVideoFullscreenHUDWindow alloc] initWithContentRect:NSMakeRect(0, 0, windowWidth, windowHeight) styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO];
</ins><span class="cx"> self = [super initWithWindow:window];
</span><span class="cx"> [window setDelegate:self];
</span><span class="cx"> [window release];
</span><span class="lines">@@ -188,20 +178,17 @@
</span><span class="cx"> case ' ':
</span><span class="cx"> [self togglePlaying:nil];
</span><span class="cx"> return;
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> case NSUpArrowFunctionKey:
</span><del>- if ([event modifierFlags] & NSAlternateKeyMask)
</del><ins>+ if ([event modifierFlags] & NSEventModifierFlagOption)
</ins><span class="cx"> [self setVolume:[self maxVolume]];
</span><span class="cx"> else
</span><span class="cx"> [self incrementVolume];
</span><span class="cx"> return;
</span><span class="cx"> case NSDownArrowFunctionKey:
</span><del>- if ([event modifierFlags] & NSAlternateKeyMask)
</del><ins>+ if ([event modifierFlags] & NSEventModifierFlagOption)
</ins><span class="cx"> [self setVolume:0];
</span><span class="cx"> else
</span><span class="cx"> [self decrementVolume];
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> return;
</span><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="lines">@@ -378,17 +365,11 @@
</span><span class="cx"> [contentView addSubview:_timeline];
</span><span class="cx">
</span><span class="cx"> _elapsedTimeText = createTimeTextField(NSMakeRect(timeTextFieldHorizontalMargin, timelineBottomMargin, timeTextFieldWidth, timeTextFieldHeight));
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- [_elapsedTimeText setAlignment:NSLeftTextAlignment];
-#pragma clang diagnostic pop
</del><ins>+ [_elapsedTimeText setAlignment:NSTextAlignmentLeft];
</ins><span class="cx"> [contentView addSubview:_elapsedTimeText];
</span><span class="cx">
</span><span class="cx"> _remainingTimeText = createTimeTextField(NSMakeRect(windowWidth - timeTextFieldHorizontalMargin - timeTextFieldWidth, timelineBottomMargin, timeTextFieldWidth, timeTextFieldHeight));
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- [_remainingTimeText setAlignment:NSRightTextAlignment];
-#pragma clang diagnostic pop
</del><ins>+ [_remainingTimeText setAlignment:NSTextAlignmentRight];
</ins><span class="cx"> [contentView addSubview:_remainingTimeText];
</span><span class="cx">
</span><span class="cx"> [window recalculateKeyViewLoop];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebWindowAnimationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebWindowAnimation.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebWindowAnimation.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebCore/platform/mac/WebWindowAnimation.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -38,10 +38,7 @@
</span><span class="cx">
</span><span class="cx"> static NSTimeInterval WebWindowAnimationDurationFromDuration(NSTimeInterval duration)
</span><span class="cx"> {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- return ([[NSApp currentEvent] modifierFlags] & NSShiftKeyMask) ? duration * slowMotionFactor : duration;
-#pragma clang diagnostic pop
</del><ins>+ return ([[NSApp currentEvent] modifierFlags] & NSEventModifierFlagShift) ? duration * slowMotionFactor : duration;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static NSRect scaledRect(NSRect _initialFrame, NSRect _finalFrame, CGFloat factor)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -379,22 +379,13 @@
</span><span class="cx"> fontName = AtomicString("-apple-status-bar", AtomicString::ConstructFromLiteral);
</span><span class="cx"> break;
</span><span class="cx"> case CSSValueWebkitMiniControl:
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSMiniControlSize]];
-#pragma clang diagnostic pop
</del><ins>+ font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSControlSizeMini]];
</ins><span class="cx"> break;
</span><span class="cx"> case CSSValueWebkitSmallControl:
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSSmallControlSize]];
-#pragma clang diagnostic pop
</del><ins>+ font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSControlSizeSmall]];
</ins><span class="cx"> break;
</span><span class="cx"> case CSSValueWebkitControl:
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSRegularControlSize]];
-#pragma clang diagnostic pop
</del><ins>+ font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSControlSizeRegular]];
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> font = [NSFont systemFontOfSize:[NSFont systemFontSize]];
</span><span class="lines">@@ -777,30 +768,24 @@
</span><span class="cx"> NSControlSize RenderThemeMac::controlSizeForFont(const RenderStyle& style) const
</span><span class="cx"> {
</span><span class="cx"> int fontSize = style.fontSize();
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> if (fontSize >= 16)
</span><del>- return NSRegularControlSize;
</del><ins>+ return NSControlSizeRegular;
</ins><span class="cx"> if (fontSize >= 11)
</span><del>- return NSSmallControlSize;
- return NSMiniControlSize;
-#pragma clang diagnostic pop
</del><ins>+ return NSControlSizeSmall;
+ return NSControlSizeMini;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NSControlSize RenderThemeMac::controlSizeForCell(NSCell*, const IntSize* sizes, const IntSize& minSize, float zoomLevel) const
</span><span class="cx"> {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if (minSize.width() >= static_cast<int>(sizes[NSRegularControlSize].width() * zoomLevel)
- && minSize.height() >= static_cast<int>(sizes[NSRegularControlSize].height() * zoomLevel))
- return NSRegularControlSize;
</del><ins>+ if (minSize.width() >= static_cast<int>(sizes[NSControlSizeRegular].width() * zoomLevel)
+ && minSize.height() >= static_cast<int>(sizes[NSControlSizeRegular].height() * zoomLevel))
+ return NSControlSizeRegular;
</ins><span class="cx">
</span><del>- if (minSize.width() >= static_cast<int>(sizes[NSSmallControlSize].width() * zoomLevel)
- && minSize.height() >= static_cast<int>(sizes[NSSmallControlSize].height() * zoomLevel))
- return NSSmallControlSize;
</del><ins>+ if (minSize.width() >= static_cast<int>(sizes[NSControlSizeSmall].width() * zoomLevel)
+ && minSize.height() >= static_cast<int>(sizes[NSControlSizeSmall].height() * zoomLevel))
+ return NSControlSizeSmall;
</ins><span class="cx">
</span><del>- return NSMiniControlSize;
-#pragma clang diagnostic pop
</del><ins>+ return NSControlSizeMini;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderThemeMac::setControlSize(NSCell* cell, const IntSize* sizes, const IntSize& minSize, float zoomLevel)
</span><span class="lines">@@ -857,15 +842,12 @@
</span><span class="cx">
</span><span class="cx"> NSControlSize RenderThemeMac::controlSizeForSystemFont(const RenderStyle& style) const
</span><span class="cx"> {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> int fontSize = style.fontSize();
</span><del>- if (fontSize >= [NSFont systemFontSizeForControlSize:NSRegularControlSize])
- return NSRegularControlSize;
- if (fontSize >= [NSFont systemFontSizeForControlSize:NSSmallControlSize])
- return NSSmallControlSize;
- return NSMiniControlSize;
-#pragma clang diagnostic pop
</del><ins>+ if (fontSize >= [NSFont systemFontSizeForControlSize:NSControlSizeRegular])
+ return NSControlSizeRegular;
+ if (fontSize >= [NSFont systemFontSizeForControlSize:NSControlSizeSmall])
+ return NSControlSizeSmall;
+ return NSControlSizeMini;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderThemeMac::paintTextField(const RenderObject& o, const PaintInfo& paintInfo, const FloatRect& r)
</span><span class="lines">@@ -1147,10 +1129,7 @@
</span><span class="cx"> const auto& renderProgress = downcast<RenderProgress>(renderObject);
</span><span class="cx"> HIThemeTrackDrawInfo trackInfo;
</span><span class="cx"> trackInfo.version = 0;
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if (controlSize == NSRegularControlSize)
-#pragma clang diagnostic pop
</del><ins>+ if (controlSize == NSControlSizeRegular)
</ins><span class="cx"> trackInfo.kind = renderProgress.position() < 0 ? kThemeLargeIndeterminateBar : kThemeLargeProgressBar;
</span><span class="cx"> else
</span><span class="cx"> trackInfo.kind = renderProgress.position() < 0 ? kThemeMediumIndeterminateBar : kThemeMediumProgressBar;
</span><span class="lines">@@ -1438,15 +1417,12 @@
</span><span class="cx"> NSPopUpButtonCell* popupButton = this->popupButton();
</span><span class="cx"> NSControlSize size = controlSizeForCell(popupButton, popupButtonSizes(), rect.size(), style.effectiveZoom());
</span><span class="cx"> switch (size) {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- case NSRegularControlSize:
</del><ins>+ case NSControlSizeRegular:
</ins><span class="cx"> return PopupMenuStyle::PopupMenuSizeNormal;
</span><del>- case NSSmallControlSize:
</del><ins>+ case NSControlSizeSmall:
</ins><span class="cx"> return PopupMenuStyle::PopupMenuSizeSmall;
</span><del>- case NSMiniControlSize:
</del><ins>+ case NSControlSizeMini:
</ins><span class="cx"> return PopupMenuStyle::PopupMenuSizeMini;
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> default:
</span><span class="cx"> return PopupMenuStyle::PopupMenuSizeNormal;
</span><span class="cx"> }
</span><span class="lines">@@ -2055,12 +2031,9 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_sliderThumbHorizontal) {
</span><span class="cx"> m_sliderThumbHorizontal = adoptNS([[NSSliderCell alloc] init]);
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- [m_sliderThumbHorizontal.get() setSliderType:NSLinearSlider];
- [m_sliderThumbHorizontal.get() setControlSize:NSSmallControlSize];
</del><ins>+ [m_sliderThumbHorizontal.get() setSliderType:NSSliderTypeLinear];
+ [m_sliderThumbHorizontal.get() setControlSize:NSControlSizeSmall];
</ins><span class="cx"> [m_sliderThumbHorizontal.get() setFocusRingType:NSFocusRingTypeExterior];
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return m_sliderThumbHorizontal.get();
</span><span class="lines">@@ -2070,11 +2043,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_sliderThumbVertical) {
</span><span class="cx"> m_sliderThumbVertical = adoptNS([[NSSliderCell alloc] init]);
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- [m_sliderThumbVertical.get() setSliderType:NSLinearSlider];
- [m_sliderThumbVertical.get() setControlSize:NSSmallControlSize];
-#pragma clang diagnostic pop
</del><ins>+ [m_sliderThumbVertical.get() setSliderType:NSSliderTypeLinear];
+ [m_sliderThumbVertical.get() setControlSize:NSControlSizeSmall];
</ins><span class="cx"> [m_sliderThumbVertical.get() setFocusRingType:NSFocusRingTypeExterior];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacCarbonCarbonWindowAdaptermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Carbon/CarbonWindowAdapter.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Carbon/CarbonWindowAdapter.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit/mac/Carbon/CarbonWindowAdapter.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -173,13 +173,14 @@
</span><span class="cx">
</span><span class="cx"> // Figure out the window's style mask.
</span><span class="cx"> styleMask = WKCarbonWindowMask();
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if (windowAttributes & kWindowCloseBoxAttribute) styleMask |= NSClosableWindowMask;
- if (windowAttributes & kWindowResizableAttribute) styleMask |= NSResizableWindowMask;
- if (windowFeatures & kWindowCanCollapse) styleMask |= NSMiniaturizableWindowMask;
- if (windowFeatures & kWindowHasTitleBar) styleMask |= NSTitledWindowMask;
-#pragma clang diagnostic pop
</del><ins>+ if (windowAttributes & kWindowCloseBoxAttribute)
+ styleMask |= NSWindowStyleMaskClosable;
+ if (windowAttributes & kWindowResizableAttribute)
+ styleMask |= NSWindowStyleMaskResizable;
+ if (windowFeatures & kWindowCanCollapse)
+ styleMask |= NSWindowStyleMaskMiniaturizable;
+ if (windowFeatures & kWindowHasTitleBar)
+ styleMask |= NSWindowStyleMaskTitled;
</ins><span class="cx">
</span><span class="cx"> osStatus = GetWindowModality(_windowRef, &windowModality, NULL);
</span><span class="cx"> if (osStatus != noErr) {
</span><span class="lines">@@ -393,18 +394,12 @@
</span><span class="cx"> // Ignore some unknown event that gets sent when NSTextViews in printing accessory views are focused. M.P. Notice - 12/7/00
</span><span class="cx"> BOOL ignoreEvent = NO;
</span><span class="cx"> NSEventType eventType = [inEvent type];
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if (eventType==NSSystemDefined) {
-#pragma clang diagnostic pop
</del><ins>+ if (eventType == NSEventTypeSystemDefined) {
</ins><span class="cx"> short eventSubtype = [inEvent subtype];
</span><del>- if (eventSubtype==7) {
</del><ins>+ if (eventSubtype == 7) {
</ins><span class="cx"> ignoreEvent = YES;
</span><span class="cx"> }
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- } else if (eventType == NSKeyDown) {
-#pragma clang diagnostic pop
</del><ins>+ } else if (eventType == NSEventTypeKeyDown) {
</ins><span class="cx"> // Handle command-space as [NSApp sendEvent:] does.
</span><span class="cx"> if ([NSInputContext processInputKeyBindings:inEvent]) {
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKitmacCarbonHIWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Carbon/HIWebView.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Carbon/HIWebView.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit/mac/Carbon/HIWebView.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -539,7 +539,7 @@
</span><span class="cx"> NSPoint location = NSMakePoint(point.x, [window frame].size.height - point.y);
</span><span class="cx">
</span><span class="cx"> // Make up an event with the point and send it to the window.
</span><del>- NSEvent *kitEvent = [NSEvent mouseEventWithType:NSRightMouseDown
</del><ins>+ NSEvent *kitEvent = [NSEvent mouseEventWithType:NSEventTypeRightMouseDown
</ins><span class="cx"> location:location
</span><span class="cx"> modifierFlags:0
</span><span class="cx"> timestamp:GetEventTime(inEvent)
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -1,3 +1,67 @@
</span><ins>+2016-11-09 Chris Dumez <cdumez@apple.com>
+
+ [Mac] Stop using deprecated AppKit enumeration values
+ https://bugs.webkit.org/show_bug.cgi?id=164494
+
+ Reviewed by Darin Adler.
+
+ Stop using deprecated AppKit enumeration values.
+
+ * Carbon/CarbonWindowAdapter.mm:
+ (-[CarbonWindowAdapter initWithCarbonWindowRef:takingOwnership:disableOrdering:carbon:]):
+ (-[CarbonWindowAdapter sendSuperEvent:]):
+ * 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:]):
+ (-[WebHTMLView _updateMouseoverWithFakeEvent]):
+ (isQuickLookEvent):
+ (-[WebHTMLView hitTest:]):
+ (-[WebHTMLView _sendToolTipMouseExited]):
+ (-[WebHTMLView _sendToolTipMouseEntered]):
+ (mouseEventIsPartOfClickOrDrag):
+ (-[WebHTMLView _updateMouseoverWithEvent:]):
+ (-[WebHTMLView _autoscroll]):
+ (-[WebHTMLView acceptsFirstResponder]):
+ (-[WebHTMLView viewDidMoveToWindow]):
+ (-[WebHTMLView mouseDown:mouseDown:]):
+ (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:]):
+
</ins><span class="cx"> 2016-11-09 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Support TouchBar in WebKit
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSEventExtrasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSEventExtras.m (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebNSEventExtras.m 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit/mac/Misc/WebNSEventExtras.m 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #import <WebKitLegacy/WebNSEventExtras.h>
</span><ins>+#import <wtf/mac/AppKitCompatibilityDeclarations.h>
</ins><span class="cx">
</span><span class="cx"> @implementation NSEvent (WebExtras)
</span><span class="cx">
</span><span class="lines">@@ -35,10 +36,7 @@
</span><span class="cx"> -(BOOL)_web_isKeyEvent:(unichar)key
</span><span class="cx"> {
</span><span class="cx"> int type = [self type];
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if (type != NSKeyDown && type != NSKeyUp)
-#pragma clang diagnostic pop
</del><ins>+ if (type != NSEventTypeKeyDown && type != NSEventTypeKeyUp)
</ins><span class="cx"> return NO;
</span><span class="cx">
</span><span class="cx"> NSString *chars = [self charactersIgnoringModifiers];
</span><span class="lines">@@ -67,10 +65,7 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)_web_isOptionTabKeyEvent
</span><span class="cx"> {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- return ([self modifierFlags] & NSAlternateKeyMask) && [self _web_isTabKeyEvent];
-#pragma clang diagnostic pop
</del><ins>+ return ([self modifierFlags] & NSEventModifierFlagOption) && [self _web_isTabKeyEvent];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)_web_isReturnOrEnterKeyEvent
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSViewExtrasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> #import <WebKitLegacy/WebNSPasteboardExtras.h>
</span><ins>+#import <wtf/mac/AppKitCompatibilityDeclarations.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -82,12 +83,9 @@
</span><span class="cx"> NSEvent *nextEvent, *firstEvent, *dragEvent, *mouseUp;
</span><span class="cx"> BOOL dragIt;
</span><span class="cx">
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if ([mouseDownEvent type] != NSLeftMouseDown) {
</del><ins>+ if ([mouseDownEvent type] != NSEventTypeLeftMouseDown) {
</ins><span class="cx"> return NO;
</span><span class="cx"> }
</span><del>-#pragma clang diagnostic pop
</del><span class="cx">
</span><span class="cx"> nextEvent = nil;
</span><span class="cx"> firstEvent = nil;
</span><span class="lines">@@ -95,9 +93,7 @@
</span><span class="cx"> mouseUp = nil;
</span><span class="cx"> dragIt = NO;
</span><span class="cx">
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- while ((nextEvent = [[self window] nextEventMatchingMask:(NSLeftMouseUpMask | NSLeftMouseDraggedMask)
</del><ins>+ while ((nextEvent = [[self window] nextEventMatchingMask:(NSEventMaskLeftMouseUp | NSEventMaskLeftMouseDragged)
</ins><span class="cx"> untilDate:expiration
</span><span class="cx"> inMode:NSEventTrackingRunLoopMode
</span><span class="cx"> dequeue:YES]) != nil) {
</span><span class="lines">@@ -105,7 +101,7 @@
</span><span class="cx"> firstEvent = nextEvent;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ([nextEvent type] == NSLeftMouseDragged) {
</del><ins>+ if ([nextEvent type] == NSEventTypeLeftMouseDragged) {
</ins><span class="cx"> float deltax = ABS([nextEvent locationInWindow].x - [mouseDownEvent locationInWindow].x);
</span><span class="cx"> float deltay = ABS([nextEvent locationInWindow].y - [mouseDownEvent locationInWindow].y);
</span><span class="cx"> dragEvent = nextEvent;
</span><span class="lines">@@ -119,12 +115,11 @@
</span><span class="cx"> dragIt = YES;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- } else if ([nextEvent type] == NSLeftMouseUp) {
</del><ins>+ } else if ([nextEvent type] == NSEventTypeLeftMouseUp) {
</ins><span class="cx"> mouseUp = nextEvent;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#pragma clang diagnostic pop
</del><span class="cx">
</span><span class="cx"> // Since we've been dequeuing the events (If we don't, we'll never see the mouse up...),
</span><span class="cx"> // we need to push some of the events back on. It makes sense to put the first and last
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedNetscapePluginHostProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -230,10 +230,7 @@
</span><span class="cx"> ASSERT(!m_placeholderWindow);
</span><span class="cx"> ASSERT(!m_activationObserver);
</span><span class="cx">
</span><del>-#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
</del><ins>+ m_placeholderWindow = adoptNS([[WebPlaceholderModalWindow alloc] initWithContentRect:NSMakeRect(0, 0, 1, 1) styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:YES]);
</ins><span class="cx">
</span><span class="cx"> m_activationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationWillBecomeActiveNotification object:NSApp queue:nil
</span><span class="cx"> usingBlock:^(NSNotification *){ applicationDidBecomeActive(); }];
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedNetscapePluginInstanceProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -465,15 +465,12 @@
</span><span class="cx"> {
</span><span class="cx"> NSData *charactersData = [NSData dataWithBytes:&character length:1];
</span><span class="cx">
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> _WKPHPluginInstanceKeyboardEvent(m_pluginHostProxy->port(), m_pluginID,
</span><span class="cx"> [NSDate timeIntervalSinceReferenceDate],
</span><del>- NPCocoaEventKeyDown, NSCommandKeyMask,
</del><ins>+ NPCocoaEventKeyDown, NSEventModifierFlagCommand,
</ins><span class="cx"> const_cast<char*>(reinterpret_cast<const char*>([charactersData bytes])), [charactersData length],
</span><span class="cx"> const_cast<char*>(reinterpret_cast<const char*>([charactersData bytes])), [charactersData length],
</span><span class="cx"> false, keyCode, character);
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetscapePluginInstanceProxy::flagsChanged(NSEvent *event)
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedWebHostedNetscapePluginViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -443,10 +443,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (_cachedSnapshot) {
</span><span class="cx"> NSRect sourceRect = { NSZeroPoint, [_cachedSnapshot.get() size] };
</span><del>-#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
</del><ins>+ [_cachedSnapshot.get() drawInRect:[self bounds] fromRect:sourceRect operation:NSCompositingOperationSourceOver fraction:1];
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebNetscapePluginEventHandlerCarbonmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -62,22 +62,22 @@
</span><span class="cx">
</span><span class="cx"> modifiers = 0;
</span><span class="cx">
</span><del>- if (eventType != NSLeftMouseDown && eventType != NSRightMouseDown)
</del><ins>+ if (eventType != NSEventTypeLeftMouseDown && eventType != NSEventTypeRightMouseDown)
</ins><span class="cx"> modifiers |= btnState;
</span><span class="cx">
</span><del>- if (modifierFlags & NSCommandKeyMask)
</del><ins>+ if (modifierFlags & NSEventModifierFlagCommand)
</ins><span class="cx"> modifiers |= cmdKey;
</span><span class="cx">
</span><del>- if (modifierFlags & NSShiftKeyMask)
</del><ins>+ if (modifierFlags & NSEventModifierFlagShift)
</ins><span class="cx"> modifiers |= shiftKey;
</span><span class="cx">
</span><del>- if (modifierFlags & NSAlphaShiftKeyMask)
</del><ins>+ if (modifierFlags & NSEventModifierFlagCapsLock)
</ins><span class="cx"> modifiers |= alphaLock;
</span><span class="cx">
</span><del>- if (modifierFlags & NSAlternateKeyMask)
</del><ins>+ if (modifierFlags & NSEventModifierFlagOption)
</ins><span class="cx"> modifiers |= optionKey;
</span><span class="cx">
</span><del>- if (modifierFlags & NSControlKeyMask || eventType == NSRightMouseDown)
</del><ins>+ if (modifierFlags & NSEventModifierFlagControl || eventType == NSEventTypeRightMouseDown)
</ins><span class="cx"> modifiers |= controlKey;
</span><span class="cx">
</span><span class="cx"> return modifiers;
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebNetscapePluginEventHandlerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginEventHandlerCocoa.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginEventHandlerCocoa.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginEventHandlerCocoa.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -161,10 +161,7 @@
</span><span class="cx">
</span><span class="cx"> NPCocoaEvent event;
</span><span class="cx"> initializeEvent(&event, NPCocoaEventKeyDown);
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- event.data.key.modifierFlags = NSCommandKeyMask;
-#pragma clang diagnostic pop
</del><ins>+ event.data.key.modifierFlags = NSEventModifierFlagCommand;
</ins><span class="cx"> event.data.key.keyCode = keyCode;
</span><span class="cx"> event.data.key.isARepeat = false;
</span><span class="cx"> event.data.key.characters = (NPNSString *)characters.get();
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportPopupMenuMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -90,17 +90,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSMutableParagraphStyle> paragraphStyle = adoptNS([[NSParagraphStyle defaultParagraphStyle] mutableCopy]);
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- [paragraphStyle setAlignment:menuTextDirection == LTR ? NSLeftTextAlignment : NSRightTextAlignment];
-#pragma clang diagnostic pop
</del><ins>+ [paragraphStyle setAlignment:menuTextDirection == LTR ? NSTextAlignmentLeft : NSTextAlignmentRight];
</ins><span class="cx"> NSWritingDirection writingDirection = style.textDirection() == LTR ? NSWritingDirectionLeftToRight : NSWritingDirectionRightToLeft;
</span><span class="cx"> [paragraphStyle setBaseWritingDirection:writingDirection];
</span><span class="cx"> if (style.hasTextDirectionOverride()) {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- RetainPtr<NSNumber> writingDirectionValue = adoptNS([[NSNumber alloc] initWithInteger:writingDirection + NSTextWritingDirectionOverride]);
-#pragma clang diagnostic pop
</del><ins>+ RetainPtr<NSNumber> writingDirectionValue = adoptNS([[NSNumber alloc] initWithInteger:writingDirection + NSWritingDirectionOverride]);
</ins><span class="cx"> RetainPtr<NSArray> writingDirectionArray = adoptNS([[NSArray alloc] initWithObjects:writingDirectionValue.get(), nil]);
</span><span class="cx"> [attributes setObject:writingDirectionArray.get() forKey:NSWritingDirectionAttributeName];
</span><span class="cx"> }
</span><span class="lines">@@ -206,18 +200,15 @@
</span><span class="cx">
</span><span class="cx"> NSControlSize controlSize;
</span><span class="cx"> switch (m_client->menuStyle().menuSize()) {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> case PopupMenuStyle::PopupMenuSizeNormal:
</span><del>- controlSize = NSRegularControlSize;
</del><ins>+ controlSize = NSControlSizeRegular;
</ins><span class="cx"> break;
</span><span class="cx"> case PopupMenuStyle::PopupMenuSizeSmall:
</span><del>- controlSize = NSSmallControlSize;
</del><ins>+ controlSize = NSControlSizeSmall;
</ins><span class="cx"> break;
</span><span class="cx"> case PopupMenuStyle::PopupMenuSizeMini:
</span><del>- controlSize = NSMiniControlSize;
</del><ins>+ controlSize = NSControlSizeMini;
</ins><span class="cx"> break;
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKPopupMenu(menu, location, roundf(NSWidth(r)), dummyView.get(), index, toNSFont(font), controlSize, !m_client->menuStyle().hasDefaultAppearance());
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebContextMenuClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -269,10 +269,7 @@
</span><span class="cx">
</span><span class="cx"> NSView* view = frameView->documentView();
</span><span class="cx"> IntPoint point = frameView->contentsToWindow(page->contextMenuController().hitTestResult().roundedPointInInnerNodeFrame());
</span><del>-#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
</del><ins>+ NSEvent* event = [NSEvent mouseEventWithType:NSEventTypeRightMouseDown location:point modifierFlags:0 timestamp:0 windowNumber:[[view window] windowNumber] context:0 eventNumber:0 clickCount:1 pressure:1];
</ins><span class="cx">
</span><span class="cx"> // Show the contextual menu for this event.
</span><span class="cx"> bool isServicesMenu;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -1561,17 +1561,14 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> const UIEventWithKeyState* keyStateEvent = findEventWithKeyState(const_cast<Event*>(event));
</span><span class="cx"> if (keyStateEvent && keyStateEvent->isTrusted()) {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> if (keyStateEvent->ctrlKey())
</span><del>- modifierFlags |= NSControlKeyMask;
</del><ins>+ modifierFlags |= NSEventModifierFlagControl;
</ins><span class="cx"> if (keyStateEvent->altKey())
</span><del>- modifierFlags |= NSAlternateKeyMask;
</del><ins>+ modifierFlags |= NSEventModifierFlagOption;
</ins><span class="cx"> if (keyStateEvent->shiftKey())
</span><del>- modifierFlags |= NSShiftKeyMask;
</del><ins>+ modifierFlags |= NSEventModifierFlagShift;
</ins><span class="cx"> if (keyStateEvent->metaKey())
</span><del>- modifierFlags |= NSCommandKeyMask;
-#pragma clang diagnostic pop
</del><ins>+ modifierFlags |= NSEventModifierFlagCommand;
</ins><span class="cx"> }
</span><span class="cx"> #else
</span><span class="cx"> // No modifier flags on iOS right now
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebInspectorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -191,10 +191,7 @@
</span><span class="cx">
</span><span class="cx"> bool WebInspectorFrontendClient::canAttach()
</span><span class="cx"> {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if ([[m_frontendWindowController window] styleMask] & NSFullScreenWindowMask)
-#pragma clang diagnostic pop
</del><ins>+ if ([[m_frontendWindowController window] styleMask] & NSWindowStyleMaskFullScreen)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return canAttachWindow();
</span><span class="lines">@@ -465,10 +462,7 @@
</span><span class="cx"> if (window)
</span><span class="cx"> return window;
</span><span class="cx">
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- NSUInteger styleMask = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask | NSFullSizeContentViewWindowMask;
-#pragma clang diagnostic pop
</del><ins>+ NSUInteger styleMask = NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskResizable | NSWindowStyleMaskFullSizeContentView;
</ins><span class="cx"> window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, initialWindowWidth, initialWindowHeight) styleMask:styleMask backing:NSBackingStoreBuffered defer:NO];
</span><span class="cx"> [window setDelegate:self];
</span><span class="cx"> [window setMinSize:NSMakeSize(minimumWindowWidth, minimumWindowHeight)];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebInspectorWebNodeHighlightmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebInspector/WebNodeHighlight.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebInspector/WebNodeHighlight.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit/mac/WebInspector/WebNodeHighlight.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -91,10 +91,7 @@
</span><span class="cx"> _inspectorController = inspectorController;
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- int styleMask = NSBorderlessWindowMask;
-#pragma clang diagnostic pop
</del><ins>+ int styleMask = NSWindowStyleMaskBorderless;
</ins><span class="cx"> NSRect contentRect = [NSWindow contentRectForFrameRect:[self _computeHighlightWindowFrame] styleMask:styleMask];
</span><span class="cx"> _highlightWindow = [[NSWindow alloc] initWithContentRect:contentRect styleMask:styleMask backing:NSBackingStoreBuffered defer:NO];
</span><span class="cx"> [_highlightWindow setBackgroundColor:[NSColor clearColor]];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebKitPrefixh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebKitPrefix.h (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebKitPrefix.h 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit/mac/WebKitPrefix.h 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -77,6 +77,7 @@
</span><span class="cx"> #ifdef __OBJC__
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> #import <Cocoa/Cocoa.h>
</span><ins>+#import <wtf/mac/AppKitCompatibilityDeclarations.h>
</ins><span class="cx"> #else
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFrameViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrameView.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -915,9 +915,7 @@
</span><span class="cx"> BOOL callSuper = YES;
</span><span class="cx"> Frame* coreFrame = [self _web_frame];
</span><span class="cx"> BOOL maintainsBackForwardList = coreFrame && static_cast<BackForwardList*>(coreFrame->page()->backForward().client())->enabled() ? YES : NO;
</span><del>-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><ins>+
</ins><span class="cx"> count = [characters length];
</span><span class="cx"> for (index = 0; index < count; ++index) {
</span><span class="cx"> switch ([characters characterAtIndex:index]) {
</span><span class="lines">@@ -928,7 +926,7 @@
</span><span class="cx"> }
</span><span class="cx"> // This odd behavior matches some existing browsers,
</span><span class="cx"> // including Windows IE
</span><del>- if (modifierFlags & NSShiftKeyMask) {
</del><ins>+ if (modifierFlags & NSEventModifierFlagShift) {
</ins><span class="cx"> [self _goForward];
</span><span class="cx"> } else {
</span><span class="cx"> [self _goBack];
</span><span class="lines">@@ -943,7 +941,7 @@
</span><span class="cx"> callSuper = YES;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- if (modifierFlags & NSShiftKeyMask) {
</del><ins>+ if (modifierFlags & NSEventModifierFlagShift) {
</ins><span class="cx"> [self scrollPageUp:nil];
</span><span class="cx"> } else {
</span><span class="cx"> [self scrollPageDown:nil];
</span><span class="lines">@@ -984,7 +982,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case NSUpArrowFunctionKey:
</span><span class="cx"> // We don't handle shifted or control-arrow keys here, so let super have a chance.
</span><del>- if (modifierFlags & (NSShiftKeyMask | NSControlKeyMask)) {
</del><ins>+ if (modifierFlags & (NSEventModifierFlagShift | NSEventModifierFlagControl)) {
</ins><span class="cx"> callSuper = YES;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -998,9 +996,9 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>- if (modifierFlags & NSCommandKeyMask) {
</del><ins>+ if (modifierFlags & NSEventModifierFlagCommand) {
</ins><span class="cx"> [self scrollToBeginningOfDocument:nil];
</span><del>- } else if (modifierFlags & NSAlternateKeyMask) {
</del><ins>+ } else if (modifierFlags & NSEventModifierFlagOption) {
</ins><span class="cx"> [self scrollPageUp:nil];
</span><span class="cx"> } else {
</span><span class="cx"> [self scrollLineUp:nil];
</span><span class="lines">@@ -1009,7 +1007,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case NSDownArrowFunctionKey:
</span><span class="cx"> // We don't handle shifted or control-arrow keys here, so let super have a chance.
</span><del>- if (modifierFlags & (NSShiftKeyMask | NSControlKeyMask)) {
</del><ins>+ if (modifierFlags & (NSEventModifierFlagShift | NSEventModifierFlagControl)) {
</ins><span class="cx"> callSuper = YES;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -1023,9 +1021,9 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>- if (modifierFlags & NSCommandKeyMask) {
</del><ins>+ if (modifierFlags & NSEventModifierFlagCommand) {
</ins><span class="cx"> [self scrollToEndOfDocument:nil];
</span><del>- } else if (modifierFlags & NSAlternateKeyMask) {
</del><ins>+ } else if (modifierFlags & NSEventModifierFlagOption) {
</ins><span class="cx"> [self scrollPageDown:nil];
</span><span class="cx"> } else {
</span><span class="cx"> [self scrollLineDown:nil];
</span><span class="lines">@@ -1034,12 +1032,12 @@
</span><span class="cx"> break;
</span><span class="cx"> case NSLeftArrowFunctionKey:
</span><span class="cx"> // We don't handle shifted or control-arrow keys here, so let super have a chance.
</span><del>- if (modifierFlags & (NSShiftKeyMask | NSControlKeyMask)) {
</del><ins>+ if (modifierFlags & (NSEventModifierFlagShift | NSEventModifierFlagControl)) {
</ins><span class="cx"> callSuper = YES;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> // Check back/forward related keys.
</span><del>- if (modifierFlags & NSCommandKeyMask) {
</del><ins>+ if (modifierFlags & NSEventModifierFlagCommand) {
</ins><span class="cx"> if (!maintainsBackForwardList) {
</span><span class="cx"> callSuper = YES;
</span><span class="cx"> break;
</span><span class="lines">@@ -1052,7 +1050,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (modifierFlags & NSAlternateKeyMask) {
</del><ins>+ if (modifierFlags & NSEventModifierFlagOption) {
</ins><span class="cx"> [self _pageHorizontally:YES];
</span><span class="cx"> } else {
</span><span class="cx"> [self _scrollLineHorizontally:YES];
</span><span class="lines">@@ -1062,12 +1060,12 @@
</span><span class="cx"> break;
</span><span class="cx"> case NSRightArrowFunctionKey:
</span><span class="cx"> // We don't handle shifted or control-arrow keys here, so let super have a chance.
</span><del>- if (modifierFlags & (NSShiftKeyMask | NSControlKeyMask)) {
</del><ins>+ if (modifierFlags & (NSEventModifierFlagShift | NSEventModifierFlagControl)) {
</ins><span class="cx"> callSuper = YES;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> // Check back/forward related keys.
</span><del>- if (modifierFlags & NSCommandKeyMask) {
</del><ins>+ if (modifierFlags & NSEventModifierFlagCommand) {
</ins><span class="cx"> if (!maintainsBackForwardList) {
</span><span class="cx"> callSuper = YES;
</span><span class="cx"> break;
</span><span class="lines">@@ -1080,7 +1078,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (modifierFlags & NSAlternateKeyMask) {
</del><ins>+ if (modifierFlags & NSEventModifierFlagOption) {
</ins><span class="cx"> [self _pageHorizontally:NO];
</span><span class="cx"> } else {
</span><span class="cx"> [self _scrollLineHorizontally:NO];
</span><span class="lines">@@ -1090,7 +1088,6 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> if (callSuper) {
</span><span class="cx"> [super keyDown:event];
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFullScreenControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFullScreenController.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFullScreenController.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit/mac/WebView/WebFullScreenController.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -86,11 +86,8 @@
</span><span class="cx"> #pragma mark Initialization
</span><span class="cx"> - (id)init
</span><span class="cx"> {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> // Do not defer window creation, to make sure -windowNumber is created (needed by WebWindowScaleAnimation).
</span><del>- NSWindow *window = [[WebCoreFullScreenWindow alloc] initWithContentRect:NSZeroRect styleMask:NSClosableWindowMask backing:NSBackingStoreBuffered defer:NO];
-#pragma clang diagnostic pop
</del><ins>+ NSWindow *window = [[WebCoreFullScreenWindow alloc] initWithContentRect:NSZeroRect styleMask:NSWindowStyleMaskClosable backing:NSBackingStoreBuffered defer:NO];
</ins><span class="cx"> self = [super initWithWindow:window];
</span><span class="cx"> [window release];
</span><span class="cx"> if (!self)
</span><span class="lines">@@ -462,10 +459,7 @@
</span><span class="cx">
</span><span class="cx"> static RetainPtr<NSWindow> createBackgroundFullscreenWindow(NSRect frame)
</span><span class="cx"> {
</span><del>-#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
</del><ins>+ NSWindow *window = [[NSWindow alloc] initWithContentRect:frame styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO];
</ins><span class="cx"> [window setOpaque:YES];
</span><span class="cx"> [window setBackgroundColor:[NSColor blackColor]];
</span><span class="cx"> [window setReleasedWhenClosed:NO];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -140,12 +140,12 @@
</span><span class="cx"> #import <wtf/RunLoop.h>
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><ins>+#import "WebNSEventExtras.h"
+#import "WebNSPasteboardExtras.h"
</ins><span class="cx"> #import <AppKit/NSAccessibility.h>
</span><span class="cx"> #import <ApplicationServices/ApplicationServices.h>
</span><span class="cx"> #import <WebCore/NSMenuSPI.h>
</span><span class="cx"> #import <WebCore/PlatformEventFactoryMac.h>
</span><del>-#import "WebNSEventExtras.h"
-#import "WebNSPasteboardExtras.h"
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #import <QuartzCore/QuartzCore.h>
</span><span class="lines">@@ -1351,12 +1351,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)_postFakeMouseMovedEventForFlagsChangedEvent:(NSEvent *)flagsChangedEvent
</span><span class="cx"> {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- NSEvent *fakeEvent = [NSEvent mouseEventWithType:NSMouseMoved location:flagsChangedEvent.window.mouseLocationOutsideOfEventStream
</del><ins>+ NSEvent *fakeEvent = [NSEvent mouseEventWithType:NSEventTypeMouseMoved location:flagsChangedEvent.window.mouseLocationOutsideOfEventStream
</ins><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><del>-#pragma clang diagnostic pop
</del><span class="cx"> [self mouseMoved:fakeEvent];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1506,10 +1503,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>-#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
</del><ins>+ ASSERT(!event || [event type] == NSEventTypeLeftMouseDown || [event type] == NSEventTypeRightMouseDown || [event type] == NSEventTypeOtherMouseDown);
</ins><span class="cx"> #else
</span><span class="cx"> ASSERT(!event || event.type == WebEventMouseDown);
</span><span class="cx"> #endif
</span><span class="lines">@@ -1661,16 +1655,17 @@
</span><span class="cx">
</span><span class="cx"> - (void)_updateMouseoverWithFakeEvent
</span><span class="cx"> {
</span><ins>+ NSEvent *fakeEvent = [NSEvent mouseEventWithType:NSEventTypeMouseMoved
+ location:[[self window]
</ins><span class="cx"> #pragma clang diagnostic push
</span><span class="cx"> #pragma clang diagnostic ignored "-Wdeprecated-declarations"
</span><del>- NSEvent *fakeEvent = [NSEvent mouseEventWithType:NSMouseMoved
- location:[[self window] convertScreenToBase:[NSEvent mouseLocation]]
</del><ins>+ convertScreenToBase:[NSEvent mouseLocation]]
+#pragma clang diagnostic pop
</ins><span class="cx"> modifierFlags:[[NSApp currentEvent] modifierFlags]
</span><span class="cx"> timestamp:[NSDate timeIntervalSinceReferenceDate]
</span><span class="cx"> windowNumber:[[self window] windowNumber]
</span><span class="cx"> context:nullptr
</span><span class="cx"> eventNumber:0 clickCount:0 pressure:0];
</span><del>-#pragma clang diagnostic pop
</del><span class="cx">
</span><span class="cx"> [self _updateMouseoverWithEvent:fakeEvent];
</span><span class="cx"> }
</span><span class="lines">@@ -1868,11 +1863,8 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> static BOOL isQuickLookEvent(NSEvent *event)
</span><span class="cx"> {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> const int kCGSEventSystemSubtypeHotKeyCombinationReleased = 9;
</span><del>- return [event type] == NSSystemDefined && [event subtype] == kCGSEventSystemSubtypeHotKeyCombinationReleased && [event data1] == 'lkup';
-#pragma clang diagnostic pop
</del><ins>+ return [event type] == NSEventTypeSystemDefined && [event subtype] == kCGSEventSystemSubtypeHotKeyCombinationReleased && [event data1] == 'lkup';
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1928,14 +1920,11 @@
</span><span class="cx"> else {
</span><span class="cx"> // FIXME: Why doesn't this include mouse entered/exited events, or other mouse button events?
</span><span class="cx"> NSEvent *event = [[self window] currentEvent];
</span><del>-#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
</del><ins>+ captureHitsOnSubviews = !([event type] == NSEventTypeMouseMoved
+ || [event type] == NSEventTypeRightMouseDown
+ || ([event type] == NSEventTypeLeftMouseDown && [event modifierFlags] & NSEventModifierFlagControl)
+ || [event type] == NSEventTypeFlagsChanged
</ins><span class="cx"> || isQuickLookEvent(event));
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!captureHitsOnSubviews) {
</span><span class="lines">@@ -2023,9 +2012,7 @@
</span><span class="cx"> - (void)_sendToolTipMouseExited
</span><span class="cx"> {
</span><span class="cx"> // Nothing matters except window, trackingNumber, and userData.
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- NSEvent *fakeEvent = [NSEvent enterExitEventWithType:NSMouseExited
</del><ins>+ NSEvent *fakeEvent = [NSEvent enterExitEventWithType:NSEventTypeMouseExited
</ins><span class="cx"> location:NSMakePoint(0, 0)
</span><span class="cx"> modifierFlags:0
</span><span class="cx"> timestamp:0
</span><span class="lines">@@ -2034,16 +2021,13 @@
</span><span class="cx"> eventNumber:0
</span><span class="cx"> trackingNumber:TRACKING_RECT_TAG
</span><span class="cx"> userData:_private->trackingRectUserData];
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> [_private->trackingRectOwner mouseExited:fakeEvent];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_sendToolTipMouseEntered
</span><span class="cx"> {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> // Nothing matters except window, trackingNumber, and userData.
</span><del>- NSEvent *fakeEvent = [NSEvent enterExitEventWithType:NSMouseEntered
</del><ins>+ NSEvent *fakeEvent = [NSEvent enterExitEventWithType:NSEventTypeMouseEntered
</ins><span class="cx"> location:NSMakePoint(0, 0)
</span><span class="cx"> modifierFlags:0
</span><span class="cx"> timestamp:0
</span><span class="lines">@@ -2053,7 +2037,6 @@
</span><span class="cx"> trackingNumber:TRACKING_RECT_TAG
</span><span class="cx"> userData:_private->trackingRectUserData];
</span><span class="cx"> [_private->trackingRectOwner mouseEntered:fakeEvent];
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> }
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span><span class="lines">@@ -2089,21 +2072,18 @@
</span><span class="cx"> static bool mouseEventIsPartOfClickOrDrag(NSEvent *event)
</span><span class="cx"> {
</span><span class="cx"> switch ([event type]) {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- case NSLeftMouseDown:
- case NSLeftMouseUp:
- case NSLeftMouseDragged:
- case NSRightMouseDown:
- case NSRightMouseUp:
- case NSRightMouseDragged:
- case NSOtherMouseDown:
- case NSOtherMouseUp:
- case NSOtherMouseDragged:
-#pragma clang diagnostic pop
- return true;
- default:
- return false;
</del><ins>+ case NSEventTypeLeftMouseDown:
+ case NSEventTypeLeftMouseUp:
+ case NSEventTypeLeftMouseDragged:
+ case NSEventTypeRightMouseDown:
+ case NSEventTypeRightMouseUp:
+ case NSEventTypeRightMouseDragged:
+ case NSEventTypeOtherMouseDown:
+ case NSEventTypeOtherMouseUp:
+ case NSEventTypeOtherMouseDragged:
+ return true;
+ default:
+ return false;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2134,9 +2114,7 @@
</span><span class="cx"> float yScroll = visibleRect.origin.y;
</span><span class="cx"> float xScroll = visibleRect.origin.x;
</span><span class="cx">
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- NSEvent *event = [NSEvent mouseEventWithType:NSMouseMoved
</del><ins>+ NSEvent *event = [NSEvent mouseEventWithType:NSEventTypeMouseMoved
</ins><span class="cx"> location:NSMakePoint(-1 - xScroll, -1 - yScroll)
</span><span class="cx"> modifierFlags:[[NSApp currentEvent] modifierFlags]
</span><span class="cx"> timestamp:[NSDate timeIntervalSinceReferenceDate]
</span><span class="lines">@@ -2143,7 +2121,7 @@
</span><span class="cx"> windowNumber:[[view window] windowNumber]
</span><span class="cx"> context:nullptr
</span><span class="cx"> eventNumber:0 clickCount:0 pressure:0];
</span><del>-#pragma clang diagnostic pop
</del><ins>+
</ins><span class="cx"> if (Frame* lastHitCoreFrame = core([lastHitView _frame]))
</span><span class="cx"> lastHitCoreFrame->eventHandler().mouseMoved(event, [[self _webView] _pressureEvent]);
</span><span class="cx"> }
</span><span class="lines">@@ -2330,16 +2308,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><ins>+ NSEvent *fakeEvent = [NSEvent mouseEventWithType:NSEventTypeLeftMouseDragged
+ location:[[self window]
</ins><span class="cx"> #pragma clang diagnostic push
</span><span class="cx"> #pragma clang diagnostic ignored "-Wdeprecated-declarations"
</span><del>- NSEvent *fakeEvent = [NSEvent mouseEventWithType:NSLeftMouseDragged
- location:[[self window] convertScreenToBase:[NSEvent mouseLocation]]
</del><ins>+ convertScreenToBase:[NSEvent mouseLocation]]
+#pragma clang diagnostic pop
</ins><span class="cx"> modifierFlags:[[NSApp currentEvent] modifierFlags]
</span><span class="cx"> timestamp:[NSDate timeIntervalSinceReferenceDate]
</span><span class="cx"> windowNumber:[[self window] windowNumber]
</span><span class="cx"> context:nullptr
</span><span class="cx"> eventNumber:0 clickCount:0 pressure:0];
</span><del>-#pragma clang diagnostic pop
</del><ins>+
</ins><span class="cx"> [self mouseDragged:fakeEvent];
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -3354,12 +3334,9 @@
</span><span class="cx"> // or from calls back from WebCore once we begin mouse-down event handling.
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> NSEvent *event = [NSApp currentEvent];
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if ([event type] == NSLeftMouseDown
</del><ins>+ if ([event type] == NSEventTypeLeftMouseDown
</ins><span class="cx"> && !_private->handlingMouseDownEvent
</span><span class="cx"> && NSPointInRect([event locationInWindow], [self convertRect:[self visibleRect] toView:nil])) {
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> return NO;
</span><span class="cx"> }
</span><span class="cx"> #else
</span><span class="lines">@@ -3528,13 +3505,10 @@
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> if (!_private->flagsChangedEventMonitor) {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- _private->flagsChangedEventMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSFlagsChangedMask handler:^(NSEvent *flagsChangedEvent) {
</del><ins>+ _private->flagsChangedEventMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSEventMaskFlagsChanged handler:^(NSEvent *flagsChangedEvent) {
</ins><span class="cx"> [self _postFakeMouseMovedEventForFlagsChangedEvent:flagsChangedEvent];
</span><span class="cx"> return flagsChangedEvent;
</span><span class="cx"> }];
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> [NSEvent removeMonitor:_private->flagsChangedEventMonitor];
</span><span class="lines">@@ -4540,11 +4514,12 @@
</span><span class="cx"> NSInputManager *currentInputManager = [NSInputManager currentInputManager];
</span><span class="cx">
</span><span class="cx"> if (![currentInputManager wantsToHandleMouseEvents] || ![currentInputManager handleMouseEvent:event]) {
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> [_private->completionController endRevertingChange:NO moveLeft:NO];
</span><span class="cx">
</span><span class="cx"> // If the web page handles the context menu event and menuForEvent: returns nil, we'll get control click events here.
</span><span class="cx"> // We don't want to pass them along to KHTML a second time.
</span><del>- if (!([event modifierFlags] & NSControlKeyMask)) {
</del><ins>+ if (!([event modifierFlags] & NSEventModifierFlagControl)) {
</ins><span class="cx"> _private->ignoringMouseDraggedEvents = NO;
</span><span class="cx">
</span><span class="cx"> // Let WebCore get a chance to deal with the event. This will call back to us
</span><span class="lines">@@ -4553,7 +4528,6 @@
</span><span class="cx"> coreframe->eventHandler().mouseDown(event, [[self _webView] _pressureEvent]);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> _private->handlingMouseDownEvent = NO;
</span><span class="lines">@@ -4642,7 +4616,7 @@
</span><span class="cx">
</span><span class="cx"> // Once the dragging machinery kicks in, we no longer get mouse drags or the up event.
</span><span class="cx"> // WebCore expects to get balanced down/up's, so we must fake up a mouseup.
</span><del>- NSEvent *fakeEvent = [NSEvent mouseEventWithType:NSLeftMouseUp
</del><ins>+ NSEvent *fakeEvent = [NSEvent mouseEventWithType:NSEventTypeLeftMouseUp
</ins><span class="cx"> location:windowMouseLoc
</span><span class="cx"> modifierFlags:[[NSApp currentEvent] modifierFlags]
</span><span class="cx"> timestamp:[NSDate timeIntervalSinceReferenceDate]
</span><span class="lines">@@ -4818,19 +4792,12 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> switch ([event type]) {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- case NSKeyDown: {
-#pragma clang diagnostic pop
-
</del><ins>+ case NSEventTypeKeyDown: {
</ins><span class="cx"> PlatformKeyboardEvent platformEvent = PlatformEventFactory::createPlatformKeyboardEvent(event);
</span><span class="cx"> platformEvent.disambiguateKeyDownEvent(PlatformEvent::RawKeyDown);
</span><span class="cx"> return KeyboardEvent::create(platformEvent, coreFrame->document()->defaultView());
</span><span class="cx"> }
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- case NSKeyUp:
-#pragma clang diagnostic pop
</del><ins>+ case NSEventTypeKeyUp:
</ins><span class="cx"> return KeyboardEvent::create(PlatformEventFactory::createPlatformKeyboardEvent(event), coreFrame->document()->defaultView());
</span><span class="cx"> default:
</span><span class="cx"> return 0;
</span><span class="lines">@@ -5524,11 +5491,8 @@
</span><span class="cx"> if (![self _canEdit])
</span><span class="cx"> return NO;
</span><span class="cx">
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if (([event modifierFlags] & NSDeviceIndependentModifierFlagsMask) != NSCommandKeyMask)
</del><ins>+ if (([event modifierFlags] & NSEventModifierFlagDeviceIndependentFlagsMask) != NSEventModifierFlagCommand)
</ins><span class="cx"> return NO;
</span><del>-#pragma clang diagnostic pop
</del><span class="cx">
</span><span class="cx"> NSString *string = [event characters];
</span><span class="cx"> if ([string caseInsensitiveCompare:@"b"] == NSOrderedSame) {
</span><span class="lines">@@ -6448,14 +6412,11 @@
</span><span class="cx"> return NO;
</span><span class="cx">
</span><span class="cx"> NSEvent *macEvent = platformEvent->macEvent();
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if ([macEvent type] == NSKeyDown && [_private->completionController filterKeyDown:macEvent])
</del><ins>+ if ([macEvent type] == NSEventTypeKeyDown && [_private->completionController filterKeyDown:macEvent])
</ins><span class="cx"> return YES;
</span><span class="cx">
</span><del>- if ([macEvent type] == NSFlagsChanged)
</del><ins>+ if ([macEvent type] == NSEventTypeFlagsChanged)
</ins><span class="cx"> return NO;
</span><del>-#pragma clang diagnostic pop
</del><span class="cx">
</span><span class="cx"> parameters.event = event;
</span><span class="cx"> _private->interpretKeyEventsParameters = &parameters;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPDFViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPDFView.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPDFView.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit/mac/WebView/WebPDFView.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -321,10 +321,7 @@
</span><span class="cx"> // Override hitTest so we can override menuForEvent.
</span><span class="cx"> NSEvent *event = [NSApp currentEvent];
</span><span class="cx"> NSEventType type = [event type];
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if (type == NSRightMouseDown || (type == NSLeftMouseDown && ([event modifierFlags] & NSControlKeyMask)))
-#pragma clang diagnostic pop
</del><ins>+ if (type == NSEventTypeRightMouseDown || (type == NSEventTypeLeftMouseDown && ([event modifierFlags] & NSEventModifierFlagControl)))
</ins><span class="cx"> return self;
</span><span class="cx">
</span><span class="cx"> return [super hitTest:point];
</span><span class="lines">@@ -1009,39 +1006,33 @@
</span><span class="cx"> int button = noButton;
</span><span class="cx"> RefPtr<Event> event;
</span><span class="cx"> switch ([nsEvent type]) {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- case NSLeftMouseUp:
- button = 0;
- break;
- case NSRightMouseUp:
- button = 1;
- break;
- case NSOtherMouseUp:
- button = [nsEvent buttonNumber];
- break;
- case NSKeyDown: {
- PlatformKeyboardEvent pe = PlatformEventFactory::createPlatformKeyboardEvent(nsEvent);
- pe.disambiguateKeyDownEvent(PlatformEvent::RawKeyDown);
- event = KeyboardEvent::create(pe, 0);
- break;
- }
-#pragma clang diagnostic pop
- default:
- break;
</del><ins>+ case NSEventTypeLeftMouseUp:
+ button = 0;
+ break;
+ case NSEventTypeRightMouseUp:
+ button = 1;
+ break;
+ case NSEventTypeOtherMouseUp:
+ button = [nsEvent buttonNumber];
+ break;
+ case NSEventTypeKeyDown: {
+ PlatformKeyboardEvent pe = PlatformEventFactory::createPlatformKeyboardEvent(nsEvent);
+ pe.disambiguateKeyDownEvent(PlatformEvent::RawKeyDown);
+ event = KeyboardEvent::create(pe, 0);
+ break;
</ins><span class="cx"> }
</span><ins>+ default:
+ break;
+ }
</ins><span class="cx"> if (button != noButton) {
</span><span class="cx"> event = MouseEvent::create(eventNames().clickEvent, true, true, currentTime(), 0, [nsEvent clickCount], 0, 0, 0, 0,
</span><span class="cx"> #if ENABLE(POINTER_LOCK)
</span><span class="cx"> 0, 0,
</span><span class="cx"> #endif
</span><del>-#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
</del><ins>+ [nsEvent modifierFlags] & NSEventModifierFlagControl,
+ [nsEvent modifierFlags] & NSEventModifierFlagOption,
+ [nsEvent modifierFlags] & NSEventModifierFlagShift,
+ [nsEvent modifierFlags] & NSEventModifierFlagCommand,
</ins><span class="cx"> button, 0, WebCore::ForceAtClick, 0, 0, true);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1149,9 +1140,7 @@
</span><span class="cx"> // FIXME 4400480: when PDFView implements the standard scrolling selectors that this
</span><span class="cx"> // method is used to mimic, we can eliminate this method and call them directly.
</span><span class="cx"> NSString *keyAsString = [NSString stringWithCharacters:&functionKey length:1];
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- return [NSEvent keyEventWithType:NSKeyDown
</del><ins>+ return [NSEvent keyEventWithType:NSEventTypeKeyDown
</ins><span class="cx"> location:NSZeroPoint
</span><span class="cx"> modifierFlags:0
</span><span class="cx"> timestamp:0
</span><span class="lines">@@ -1161,7 +1150,6 @@
</span><span class="cx"> charactersIgnoringModifiers:keyAsString
</span><span class="cx"> isARepeat:NO
</span><span class="cx"> keyCode:0];
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_lookUpInDictionaryFromMenu:(id)sender
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebTextCompletionControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebTextCompletionController.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebTextCompletionController.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit/mac/WebView/WebTextCompletionController.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -112,10 +112,7 @@
</span><span class="cx"> [scrollView setDocumentView:_tableView];
</span><span class="cx"> [_tableView release];
</span><span class="cx">
</span><del>-#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
</del><ins>+ _popupWindow = [[NSWindow alloc] initWithContentRect:scrollFrame styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO];
</ins><span class="cx"> [_popupWindow setAlphaValue:0.88f];
</span><span class="cx"> [_popupWindow setContentView:scrollView];
</span><span class="cx"> [scrollView release];
</span><span class="lines">@@ -155,8 +152,8 @@
</span><span class="cx"> #pragma clang diagnostic push
</span><span class="cx"> #pragma clang diagnostic ignored "-Wdeprecated-declarations"
</span><span class="cx"> maxWidth = ceilf([NSScrollView frameSizeForContentSize:NSMakeSize(maxWidth, 100.0f) hasHorizontalScroller:NO hasVerticalScroller:YES borderType:NSNoBorder].width);
</span><del>- maxWidth = ceilf([NSWindow frameRectForContentRect:NSMakeRect(0.0f, 0.0f, maxWidth, 100.0f) styleMask:NSBorderlessWindowMask].size.width);
</del><span class="cx"> #pragma clang diagnostic pop
</span><ins>+ maxWidth = ceilf([NSWindow frameRectForContentRect:NSMakeRect(0.0f, 0.0f, maxWidth, 100.0f) styleMask:NSWindowStyleMaskBorderless].size.width);
</ins><span class="cx"> maxWidth += 5.0f;
</span><span class="cx"> windowFrame.size.width = std::max(maxWidth, windowFrame.size.width);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -6426,10 +6426,7 @@
</span><span class="cx"> flags |= DragApplicationHasAttachedSheet;
</span><span class="cx"> if ([draggingInfo draggingSource] == self)
</span><span class="cx"> flags |= DragApplicationIsSource;
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask)
-#pragma clang diagnostic pop
</del><ins>+ if ([[NSApp currentEvent] modifierFlags] & NSEventModifierFlagOption)
</ins><span class="cx"> flags |= DragApplicationIsCopyKeyDown;
</span><span class="cx"> return static_cast<DragApplicationFlags>(flags);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -1,3 +1,54 @@
</span><ins>+2016-11-09 Chris Dumez <cdumez@apple.com>
+
+ [Mac] Stop using deprecated AppKit enumeration values
+ https://bugs.webkit.org/show_bug.cgi?id=164494
+
+ Reviewed by Darin Adler.
+
+ Stop using deprecated AppKit enumeration values.
+
+ * 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::WebEventFactory::createWebKeyboardEvent):
+ * 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::showContextMenuWithItems):
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ * 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-11-09 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Support TouchBar in WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacChildProcessMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -197,10 +197,7 @@
</span><span class="cx"> ASSERT([NSApp isRunning]);
</span><span class="cx"> [NSApp stop:nil];
</span><span class="cx">
</span><del>-#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
</del><ins>+ NSEvent *event = [NSEvent otherEventWithType:NSEventTypeApplicationDefined location:NSMakePoint(0, 0) modifierFlags:0 timestamp:0.0 windowNumber:0 context:nil subtype:0 data1:0 data2:0];
</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 (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -63,78 +63,69 @@
</span><span class="cx">
</span><span class="cx"> static WebMouseEvent::Button mouseButtonForEvent(NSEvent *event)
</span><span class="cx"> {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> switch ([event type]) {
</span><del>- case NSLeftMouseDown:
- case NSLeftMouseUp:
- case NSLeftMouseDragged:
- return WebMouseEvent::LeftButton;
- case NSRightMouseDown:
- case NSRightMouseUp:
- case NSRightMouseDragged:
- return WebMouseEvent::RightButton;
- case NSOtherMouseDown:
- case NSOtherMouseUp:
- case NSOtherMouseDragged:
- return WebMouseEvent::MiddleButton;
</del><ins>+ case NSEventTypeLeftMouseDown:
+ case NSEventTypeLeftMouseUp:
+ case NSEventTypeLeftMouseDragged:
+ return WebMouseEvent::LeftButton;
+ case NSEventTypeRightMouseDown:
+ case NSEventTypeRightMouseUp:
+ case NSEventTypeRightMouseDragged:
+ return WebMouseEvent::RightButton;
+ case NSEventTypeOtherMouseDown:
+ case NSEventTypeOtherMouseUp:
+ case NSEventTypeOtherMouseDragged:
+ return WebMouseEvent::MiddleButton;
</ins><span class="cx"> #if defined(__LP64__)
</span><del>- case NSEventTypePressure:
</del><ins>+ case NSEventTypePressure:
</ins><span class="cx"> #endif
</span><del>- case NSMouseEntered:
- case NSMouseExited:
- return currentMouseButton();
- default:
- return WebMouseEvent::NoButton;
</del><ins>+ case NSEventTypeMouseEntered:
+ case NSEventTypeMouseExited:
+ return currentMouseButton();
+ default:
+ return WebMouseEvent::NoButton;
</ins><span class="cx"> }
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static WebEvent::Type mouseEventTypeForEvent(NSEvent* event)
</span><span class="cx"> {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> switch ([event type]) {
</span><del>- case NSLeftMouseDragged:
- case NSMouseEntered:
- case NSMouseExited:
- case NSMouseMoved:
- case NSOtherMouseDragged:
- case NSRightMouseDragged:
- return WebEvent::MouseMove;
- case NSLeftMouseDown:
- case NSRightMouseDown:
- case NSOtherMouseDown:
- return WebEvent::MouseDown;
- case NSLeftMouseUp:
- case NSRightMouseUp:
- case NSOtherMouseUp:
- return WebEvent::MouseUp;
- default:
- return WebEvent::MouseMove;
</del><ins>+ case NSEventTypeLeftMouseDragged:
+ case NSEventTypeMouseEntered:
+ case NSEventTypeMouseExited:
+ case NSEventTypeMouseMoved:
+ case NSEventTypeOtherMouseDragged:
+ case NSEventTypeRightMouseDragged:
+ return WebEvent::MouseMove;
+ case NSEventTypeLeftMouseDown:
+ case NSEventTypeRightMouseDown:
+ case NSEventTypeOtherMouseDown:
+ return WebEvent::MouseDown;
+ case NSEventTypeLeftMouseUp:
+ case NSEventTypeRightMouseUp:
+ case NSEventTypeOtherMouseUp:
+ return WebEvent::MouseUp;
+ default:
+ return WebEvent::MouseMove;
</ins><span class="cx"> }
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static int clickCountForEvent(NSEvent *event)
</span><span class="cx"> {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> switch ([event type]) {
</span><del>- case NSLeftMouseDown:
- case NSLeftMouseUp:
- case NSLeftMouseDragged:
- case NSRightMouseDown:
- case NSRightMouseUp:
- case NSRightMouseDragged:
- case NSOtherMouseDown:
- case NSOtherMouseUp:
- case NSOtherMouseDragged:
- return [event clickCount];
- default:
- return 0;
</del><ins>+ case NSEventTypeLeftMouseDown:
+ case NSEventTypeLeftMouseUp:
+ case NSEventTypeLeftMouseDragged:
+ case NSEventTypeRightMouseDown:
+ case NSEventTypeRightMouseUp:
+ case NSEventTypeRightMouseDragged:
+ case NSEventTypeOtherMouseDown:
+ case NSEventTypeOtherMouseUp:
+ case NSEventTypeOtherMouseDragged:
+ return [event clickCount];
+ default:
+ return 0;
</ins><span class="cx"> }
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static NSPoint globalPointForEvent(NSEvent *event)
</span><span class="lines">@@ -143,22 +134,19 @@
</span><span class="cx"> #if defined(__LP64__)
</span><span class="cx"> case NSEventTypePressure:
</span><span class="cx"> #endif
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- case NSLeftMouseDown:
- case NSLeftMouseDragged:
- case NSLeftMouseUp:
- case NSMouseEntered:
- case NSMouseExited:
- case NSMouseMoved:
- case NSOtherMouseDown:
- case NSOtherMouseDragged:
- case NSOtherMouseUp:
- case NSRightMouseDown:
- case NSRightMouseDragged:
- case NSRightMouseUp:
- case NSScrollWheel:
-#pragma clang diagnostic pop
</del><ins>+ case NSEventTypeLeftMouseDown:
+ case NSEventTypeLeftMouseUp:
+ case NSEventTypeLeftMouseDragged:
+ case NSEventTypeMouseEntered:
+ case NSEventTypeMouseExited:
+ case NSEventTypeMouseMoved:
+ case NSEventTypeOtherMouseDown:
+ case NSEventTypeOtherMouseUp:
+ case NSEventTypeOtherMouseDragged:
+ case NSEventTypeRightMouseDown:
+ case NSEventTypeRightMouseUp:
+ case NSEventTypeRightMouseDragged:
+ case NSEventTypeScrollWheel:
</ins><span class="cx"> return WebCore::globalPoint([event locationInWindow], [event window]);
</span><span class="cx"> default:
</span><span class="cx"> return NSZeroPoint;
</span><span class="lines">@@ -171,22 +159,19 @@
</span><span class="cx"> #if defined(__LP64__)
</span><span class="cx"> case NSEventTypePressure:
</span><span class="cx"> #endif
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- case NSLeftMouseDown:
- case NSLeftMouseDragged:
- case NSLeftMouseUp:
- case NSMouseEntered:
- case NSMouseExited:
- case NSMouseMoved:
- case NSOtherMouseDown:
- case NSOtherMouseDragged:
- case NSOtherMouseUp:
- case NSRightMouseDown:
- case NSRightMouseDragged:
- case NSRightMouseUp:
- case NSScrollWheel: {
-#pragma clang diagnostic pop
</del><ins>+ case NSEventTypeLeftMouseDown:
+ case NSEventTypeLeftMouseUp:
+ case NSEventTypeLeftMouseDragged:
+ case NSEventTypeMouseEntered:
+ case NSEventTypeMouseExited:
+ case NSEventTypeMouseMoved:
+ case NSEventTypeOtherMouseDown:
+ case NSEventTypeOtherMouseUp:
+ case NSEventTypeOtherMouseDragged:
+ case NSEventTypeRightMouseDown:
+ case NSEventTypeRightMouseUp:
+ case NSEventTypeRightMouseDragged:
+ case NSEventTypeScrollWheel: {
</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">@@ -240,10 +225,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (replacesSoftSpace)
</span><span class="cx"> return emptyString();
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if ([event type] == NSFlagsChanged)
-#pragma clang diagnostic pop
</del><ins>+ if ([event type] == NSEventTypeFlagsChanged)
</ins><span class="cx"> return emptyString();
</span><span class="cx"> return String([event characters]);
</span><span class="cx"> }
</span><span class="lines">@@ -252,10 +234,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (replacesSoftSpace)
</span><span class="cx"> return emptyString();
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if ([event type] == NSFlagsChanged)
-#pragma clang diagnostic pop
</del><ins>+ if ([event type] == NSEventTypeFlagsChanged)
</ins><span class="cx"> return emptyString();
</span><span class="cx"> return String([event charactersIgnoringModifiers]);
</span><span class="cx"> }
</span><span class="lines">@@ -264,38 +243,35 @@
</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><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- case NSKeyDown:
- case NSKeyUp:
- case NSFlagsChanged:
-#pragma clang diagnostic pop
- break;
- default:
- return false;
</del><ins>+ case NSEventTypeKeyDown:
+ case NSEventTypeKeyUp:
+ case NSEventTypeFlagsChanged:
+ break;
+ default:
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch ([event keyCode]) {
</span><del>- case 71: // Clear
- case 81: // =
- case 75: // /
- case 67: // *
- case 78: // -
- case 69: // +
- case 76: // Enter
- case 65: // .
- case 82: // 0
- case 83: // 1
- case 84: // 2
- case 85: // 3
- case 86: // 4
- case 87: // 5
- case 88: // 6
- case 89: // 7
- case 91: // 8
- case 92: // 9
- return true;
- }
</del><ins>+ case 71: // Clear
+ case 81: // =
+ case 75: // /
+ case 67: // *
+ case 78: // -
+ case 69: // +
+ case 76: // Enter
+ case 65: // .
+ case 82: // 0
+ case 83: // 1
+ case 84: // 2
+ case 85: // 3
+ case 86: // 4
+ case 87: // 5
+ case 88: // 6
+ case 89: // 7
+ case 91: // 8
+ case 92: // 9
+ return true;
+ }
</ins><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -302,36 +278,33 @@
</span><span class="cx">
</span><span class="cx"> static inline bool isKeyUpEvent(NSEvent *event)
</span><span class="cx"> {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if ([event type] != NSFlagsChanged)
- return [event type] == NSKeyUp;
</del><ins>+ if ([event type] != NSEventTypeFlagsChanged)
+ return [event type] == NSEventTypeKeyUp;
</ins><span class="cx"> // FIXME: This logic fails if the user presses both Shift keys at once, for example:
</span><span class="cx"> // we treat releasing one of them as keyDown.
</span><span class="cx"> switch ([event keyCode]) {
</span><del>- case 54: // Right Command
- case 55: // Left Command
- return ([event modifierFlags] & NSCommandKeyMask) == 0;
-
- case 57: // Capslock
- return ([event modifierFlags] & NSAlphaShiftKeyMask) == 0;
-
- case 56: // Left Shift
- case 60: // Right Shift
- return ([event modifierFlags] & NSShiftKeyMask) == 0;
-
- case 58: // Left Alt
- case 61: // Right Alt
- return ([event modifierFlags] & NSAlternateKeyMask) == 0;
-
- case 59: // Left Ctrl
- case 62: // Right Ctrl
- return ([event modifierFlags] & NSControlKeyMask) == 0;
-
- case 63: // Function
- return ([event modifierFlags] & NSFunctionKeyMask) == 0;
</del><ins>+ case 54: // Right Command
+ case 55: // Left Command
+ return !([event modifierFlags] & NSEventModifierFlagCommand);
+
+ case 57: // Capslock
+ return !([event modifierFlags] & NSEventModifierFlagCapsLock);
+
+ case 56: // Left Shift
+ case 60: // Right Shift
+ return !([event modifierFlags] & NSEventModifierFlagShift);
+
+ case 58: // Left Alt
+ case 61: // Right Alt
+ return !([event modifierFlags] & NSEventModifierFlagOption);
+
+ case 59: // Left Ctrl
+ case 62: // Right Ctrl
+ return !([event modifierFlags] & NSEventModifierFlagControl);
+
+ case 63: // Function
+ return !([event modifierFlags] & NSEventModifierFlagFunction);
</ins><span class="cx"> }
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -339,7 +312,6 @@
</span><span class="cx"> {
</span><span class="cx"> unsigned modifiers = 0;
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
</del><span class="cx"> if ([event modifierFlags] & NSEventModifierFlagCapsLock)
</span><span class="cx"> modifiers |= WebEvent::CapsLockKey;
</span><span class="cx"> if ([event modifierFlags] & NSEventModifierFlagShift)
</span><span class="lines">@@ -350,18 +322,6 @@
</span><span class="cx"> modifiers |= WebEvent::AltKey;
</span><span class="cx"> if ([event modifierFlags] & NSEventModifierFlagCommand)
</span><span class="cx"> modifiers |= WebEvent::MetaKey;
</span><del>-#else
- if ([event modifierFlags] & NSAlphaShiftKeyMask)
- modifiers |= WebEvent::CapsLockKey;
- if ([event modifierFlags] & NSShiftKeyMask)
- modifiers |= WebEvent::ShiftKey;
- if ([event modifierFlags] & NSControlKeyMask)
- modifiers |= WebEvent::ControlKey;
- if ([event modifierFlags] & NSAlternateKeyMask)
- modifiers |= WebEvent::AltKey;
- if ([event modifierFlags] & NSCommandKeyMask)
- modifiers |= WebEvent::MetaKey;
-#endif
</del><span class="cx">
</span><span class="cx"> return (WebEvent::Modifiers)modifiers;
</span><span class="cx"> }
</span><span class="lines">@@ -484,10 +444,7 @@
</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><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- bool autoRepeat = ([event type] != NSFlagsChanged) && [event isARepeat];
-#pragma clang diagnostic pop
</del><ins>+ bool autoRepeat = [event type] != NSEventTypeFlagsChanged && [event isARepeat];
</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 (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -79,7 +79,6 @@
</span><span class="cx"> {
</span><span class="cx"> NSEventModifierFlags modifierFlags = 0;
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
</del><span class="cx"> if (modifiers & WebKit::WebEvent::CapsLockKey)
</span><span class="cx"> modifierFlags |= NSEventModifierFlagCapsLock;
</span><span class="cx"> if (modifiers & WebKit::WebEvent::ShiftKey)
</span><span class="lines">@@ -90,18 +89,6 @@
</span><span class="cx"> modifierFlags |= NSEventModifierFlagOption;
</span><span class="cx"> if (modifiers & WebKit::WebEvent::MetaKey)
</span><span class="cx"> modifierFlags |= NSEventModifierFlagCommand;
</span><del>-#else
- if (modifiers & WebKit::WebEvent::CapsLockKey)
- modifierFlags |= NSAlphaShiftKeyMask;
- if (modifiers & WebKit::WebEvent::ShiftKey)
- modifierFlags |= NSShiftKeyMask;
- if (modifiers & WebKit::WebEvent::ControlKey)
- modifierFlags |= NSControlKeyMask;
- if (modifiers & WebKit::WebEvent::AltKey)
- modifierFlags |= NSAlternateKeyMask;
- if (modifiers & WebKit::WebEvent::MetaKey)
- modifierFlags |= NSCommandKeyMask;
-#endif
</del><span class="cx">
</span><span class="cx"> return modifierFlags;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -1316,11 +1316,8 @@
</span><span class="cx"> if (direction != NSDirectSelection) {
</span><span class="cx"> NSEvent *event = [NSApp currentEvent];
</span><span class="cx"> NSEvent *keyboardEvent = nil;
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if ([event type] == NSKeyDown || [event type] == NSKeyUp)
</del><ins>+ if ([event type] == NSEventTypeKeyDown || [event type] == NSEventTypeKeyUp)
</ins><span class="cx"> keyboardEvent = event;
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> m_page->setInitialFocus(direction == NSSelectingNext, keyboardEvent != nil, NativeWebKeyboardEvent(keyboardEvent, false, false, { }), [](WebKit::CallbackBase::Error) { });
</span><span class="cx"> }
</span><span class="cx"> return true;
</span><span class="lines">@@ -1544,10 +1541,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> NSWindow *window = m_view.window;
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if ((window.styleMask & NSFullSizeContentViewWindowMask) && !window.titlebarAppearsTransparent && ![m_view enclosingScrollView]) {
-#pragma clang diagnostic pop
</del><ins>+ if ((window.styleMask & NSWindowStyleMaskFullSizeContentView) && !window.titlebarAppearsTransparent && ![m_view enclosingScrollView]) {
</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">@@ -1924,10 +1918,7 @@
</span><span class="cx">
</span><span class="cx"> if (!m_flagsChangedEventMonitor) {
</span><span class="cx"> auto weakThis = createWeakPtr();
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- m_flagsChangedEventMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSFlagsChangedMask handler:[weakThis] (NSEvent *flagsChangedEvent) {
-#pragma clang diagnostic pop
</del><ins>+ m_flagsChangedEventMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSEventMaskFlagsChanged handler:[weakThis] (NSEvent *flagsChangedEvent) {
</ins><span class="cx"> if (weakThis)
</span><span class="cx"> weakThis->postFakeMouseMovedEventForFlagsChangedEvent(flagsChangedEvent);
</span><span class="cx"> return flagsChangedEvent;
</span><span class="lines">@@ -1998,12 +1989,9 @@
</span><span class="cx">
</span><span class="cx"> void WebViewImpl::postFakeMouseMovedEventForFlagsChangedEvent(NSEvent *flagsChangedEvent)
</span><span class="cx"> {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- NSEvent *fakeEvent = [NSEvent mouseEventWithType:NSMouseMoved location:flagsChangedEvent.window.mouseLocationOutsideOfEventStream
</del><ins>+ NSEvent *fakeEvent = [NSEvent mouseEventWithType:NSEventTypeMouseMoved location:flagsChangedEvent.window.mouseLocationOutsideOfEventStream
</ins><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><del>-#pragma clang diagnostic pop
</del><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">@@ -2352,10 +2340,7 @@
</span><span class="cx"> NSWindow *WebViewImpl::createFullScreenWindow()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><del>-#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
</del><ins>+ return [[[WebCoreFullScreenWindow alloc] initWithContentRect:[[NSScreen mainScreen] frame] styleMask:(NSWindowStyleMaskBorderless | NSWindowStyleMaskResizable) backing:NSBackingStoreBuffered defer:NO] autorelease];
</ins><span class="cx"> #else
</span><span class="cx"> return nil;
</span><span class="cx"> #endif
</span><span class="lines">@@ -3327,9 +3312,7 @@
</span><span class="cx"> void WebViewImpl::sendToolTipMouseExited()
</span><span class="cx"> {
</span><span class="cx"> // Nothing matters except window, trackingNumber, and userData.
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- NSEvent *fakeEvent = [NSEvent enterExitEventWithType:NSMouseExited
</del><ins>+ NSEvent *fakeEvent = [NSEvent enterExitEventWithType:NSEventTypeMouseExited
</ins><span class="cx"> location:NSMakePoint(0, 0)
</span><span class="cx"> modifierFlags:0
</span><span class="cx"> timestamp:0
</span><span class="lines">@@ -3338,7 +3321,6 @@
</span><span class="cx"> eventNumber:0
</span><span class="cx"> trackingNumber:TRACKING_RECT_TAG
</span><span class="cx"> userData:m_trackingRectUserData];
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> [m_trackingRectOwner mouseExited:fakeEvent];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3345,9 +3327,7 @@
</span><span class="cx"> void WebViewImpl::sendToolTipMouseEntered()
</span><span class="cx"> {
</span><span class="cx"> // Nothing matters except window, trackingNumber, and userData.
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- NSEvent *fakeEvent = [NSEvent enterExitEventWithType:NSMouseEntered
</del><ins>+ NSEvent *fakeEvent = [NSEvent enterExitEventWithType:NSEventTypeMouseEntered
</ins><span class="cx"> location:NSMakePoint(0, 0)
</span><span class="cx"> modifierFlags:0
</span><span class="cx"> timestamp:0
</span><span class="lines">@@ -3356,7 +3336,6 @@
</span><span class="cx"> eventNumber:0
</span><span class="cx"> trackingNumber:TRACKING_RECT_TAG
</span><span class="cx"> userData:m_trackingRectUserData];
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> [m_trackingRectOwner mouseEntered:fakeEvent];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3512,10 +3491,7 @@
</span><span class="cx"> flags |= WebCore::DragApplicationHasAttachedSheet;
</span><span class="cx"> if (draggingInfo.draggingSource == view)
</span><span class="cx"> flags |= WebCore::DragApplicationIsSource;
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if ([NSApp currentEvent].modifierFlags & NSAlternateKeyMask)
-#pragma clang diagnostic pop
</del><ins>+ if ([NSApp currentEvent].modifierFlags & NSEventModifierFlagOption)
</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">@@ -4055,10 +4031,7 @@
</span><span class="cx">
</span><span class="cx"> void WebViewImpl::setLastMouseDownEvent(NSEvent *event)
</span><span class="cx"> {
</span><del>-#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
</del><ins>+ ASSERT(!event || event.type == NSEventTypeLeftMouseDown || event.type == NSEventTypeRightMouseDown || event.type == NSEventTypeOtherMouseDown);
</ins><span class="cx">
</span><span class="cx"> if (event == m_lastMouseDownEvent.get())
</span><span class="cx"> return;
</span><span class="lines">@@ -4095,11 +4068,8 @@
</span><span class="cx">
</span><span class="cx"> void WebViewImpl::doneWithKeyEvent(NSEvent *event, bool eventWasHandled)
</span><span class="cx"> {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if ([event type] != NSKeyDown)
</del><ins>+ if ([event type] != NSEventTypeKeyDown)
</ins><span class="cx"> return;
</span><del>-#pragma clang diagnostic pop
</del><span class="cx">
</span><span class="cx"> if (tryPostProcessPluginComplexTextInputKeyDown(event))
</span><span class="cx"> return;
</span><span class="lines">@@ -4175,11 +4145,8 @@
</span><span class="cx"> {
</span><span class="cx"> Vector<WebCore::KeypressCommand> commands;
</span><span class="cx">
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if ([event type] != NSKeyDown)
</del><ins>+ if ([event type] != NSEventTypeKeyDown)
</ins><span class="cx"> return commands;
</span><del>-#pragma clang diagnostic pop
</del><span class="cx">
</span><span class="cx"> ASSERT(!m_collectedKeypressCommands);
</span><span class="cx"> m_collectedKeypressCommands = &commands;
</span><span class="lines">@@ -4554,11 +4521,8 @@
</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><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if ([[event charactersIgnoringModifiers] isEqualToString:@"\e"] && !([event modifierFlags] & NSDeviceIndependentModifierFlagsMask))
</del><ins>+ if ([[event charactersIgnoringModifiers] isEqualToString:@"\e"] && !([event modifierFlags] & NSEventModifierFlagDeviceIndependentFlagsMask))
</ins><span class="cx"> return [m_view _web_superPerformKeyEquivalent:event];
</span><del>-#pragma clang diagnostic pop
</del><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 (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -231,10 +231,7 @@
</span><span class="cx"> ASSERT(!m_placeholderWindow);
</span><span class="cx"> ASSERT(!m_activationObserver);
</span><span class="cx">
</span><del>-#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
</del><ins>+ m_placeholderWindow = adoptNS([[WKPlaceholderModalWindow alloc] initWithContentRect:NSMakeRect(0, 0, 1, 1) styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:YES]);
</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 (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -463,10 +463,7 @@
</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><del>-#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
</del><ins>+ NSEvent *event = [NSEvent mouseEventWithType:NSEventTypeRightMouseUp location:menuLocation modifierFlags:0 timestamp:0 windowNumber:m_webView.window.windowNumber context:nil eventNumber:0 clickCount:0 pressure:0];
</ins><span class="cx"> [NSMenu popUpContextMenu:m_menu.get() withEvent:event forView:m_webView];
</span><span class="cx">
</span><span class="cx"> if (m_contextMenuListener) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -48,10 +48,7 @@
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-static const NSUInteger windowStyleMask = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask | NSFullSizeContentViewWindowMask;
-#pragma clang diagnostic pop
</del><ins>+static const NSUInteger windowStyleMask = NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskResizable | NSWindowStyleMaskFullSizeContentView;
</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></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPopupMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -74,19 +74,13 @@
</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><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- [paragraphStyle setAlignment:menuTextDirection == LTR ? NSLeftTextAlignment : NSRightTextAlignment];
-#pragma clang diagnostic pop
</del><ins>+ [paragraphStyle setAlignment:menuTextDirection == LTR ? NSTextAlignmentLeft : NSTextAlignmentRight];
</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="cx"> nil]);
</span><span class="cx"> if (items[i].m_hasTextDirectionOverride) {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- RetainPtr<NSNumber> writingDirectionValue = adoptNS([[NSNumber alloc] initWithInteger:writingDirection + NSTextWritingDirectionOverride]);
-#pragma clang diagnostic pop
</del><ins>+ RetainPtr<NSNumber> writingDirectionValue = adoptNS([[NSNumber alloc] initWithInteger:writingDirection + NSWritingDirectionOverride]);
</ins><span class="cx"> RetainPtr<NSArray> writingDirectionArray = adoptNS([[NSArray alloc] initWithObjects:writingDirectionValue.get(), nil]);
</span><span class="cx"> [attributes setObject:writingDirectionArray.get() forKey:NSWritingDirectionAttributeName];
</span><span class="cx"> }
</span><span class="lines">@@ -154,18 +148,15 @@
</span><span class="cx">
</span><span class="cx"> NSControlSize controlSize;
</span><span class="cx"> switch (data.menuSize) {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> case WebCore::PopupMenuStyle::PopupMenuSizeNormal:
</span><del>- controlSize = NSRegularControlSize;
</del><ins>+ controlSize = NSControlSizeRegular;
</ins><span class="cx"> break;
</span><span class="cx"> case WebCore::PopupMenuStyle::PopupMenuSizeSmall:
</span><del>- controlSize = NSSmallControlSize;
</del><ins>+ controlSize = NSControlSizeSmall;
</ins><span class="cx"> break;
</span><span class="cx"> case WebCore::PopupMenuStyle::PopupMenuSizeMini:
</span><del>- controlSize = NSMiniControlSize;
</del><ins>+ controlSize = NSControlSizeMini;
</ins><span class="cx"> break;
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<WebPopupMenuProxyMac> protect(*this);
</span><span class="lines">@@ -183,13 +174,11 @@
</span><span class="cx"> if (!m_client->currentlyProcessedMouseDownEvent())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> NSEvent* initiatingNSEvent = m_client->currentlyProcessedMouseDownEvent()->nativeEvent();
</span><del>- if ([initiatingNSEvent type] != NSLeftMouseDown)
</del><ins>+ if ([initiatingNSEvent type] != NSEventTypeLeftMouseDown)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- NSEvent *fakeEvent = [NSEvent mouseEventWithType:NSLeftMouseUp
</del><ins>+ NSEvent *fakeEvent = [NSEvent mouseEventWithType:NSEventTypeLeftMouseUp
</ins><span class="cx"> location:[initiatingNSEvent locationInWindow]
</span><span class="cx"> modifierFlags:[initiatingNSEvent modifierFlags]
</span><span class="cx"> timestamp:[initiatingNSEvent timestamp]
</span><span class="lines">@@ -198,13 +187,14 @@
</span><span class="cx"> eventNumber:[initiatingNSEvent eventNumber]
</span><span class="cx"> clickCount:[initiatingNSEvent clickCount]
</span><span class="cx"> pressure:[initiatingNSEvent pressure]];
</span><del>-#pragma clang diagnostic pop
</del><span class="cx">
</span><span class="cx"> [NSApp postEvent:fakeEvent atStart:YES];
</span><ins>+ fakeEvent = [NSEvent mouseEventWithType:NSEventTypeMouseMoved
+ location:[[m_webView window]
</ins><span class="cx"> #pragma clang diagnostic push
</span><span class="cx"> #pragma clang diagnostic ignored "-Wdeprecated-declarations"
</span><del>- fakeEvent = [NSEvent mouseEventWithType:NSMouseMoved
- location:[[m_webView window] convertScreenToBase:[NSEvent mouseLocation]]
</del><ins>+ convertScreenToBase:[NSEvent mouseLocation]]
+#pragma clang diagnostic pop
</ins><span class="cx"> modifierFlags:[initiatingNSEvent modifierFlags]
</span><span class="cx"> timestamp:[initiatingNSEvent timestamp]
</span><span class="cx"> windowNumber:[initiatingNSEvent windowNumber]
</span><span class="lines">@@ -212,7 +202,6 @@
</span><span class="cx"> eventNumber:0
</span><span class="cx"> clickCount:0
</span><span class="cx"> pressure:0];
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> [NSApp postEvent:fakeEvent atStart:YES];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapemacNetscapePluginMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -475,13 +475,13 @@
</span><span class="cx"> uint32_t modifiers = 0;
</span><span class="cx">
</span><span class="cx"> if (event.shiftKey())
</span><del>- modifiers |= NSShiftKeyMask;
</del><ins>+ modifiers |= NSEventModifierFlagShift;
</ins><span class="cx"> if (event.controlKey())
</span><del>- modifiers |= NSControlKeyMask;
</del><ins>+ modifiers |= NSEventModifierFlagControl;
</ins><span class="cx"> if (event.altKey())
</span><del>- modifiers |= NSAlternateKeyMask;
</del><ins>+ modifiers |= NSEventModifierFlagOption;
</ins><span class="cx"> if (event.metaKey())
</span><del>- modifiers |= NSCommandKeyMask;
</del><ins>+ modifiers |= NSEventModifierFlagCommand;
</ins><span class="cx">
</span><span class="cx"> return modifiers;
</span><span class="cx"> }
</span><span class="lines">@@ -706,15 +706,15 @@
</span><span class="cx"> unsigned modifierFlags = 0;
</span><span class="cx">
</span><span class="cx"> if (keyboardEvent.capsLockKey())
</span><del>- modifierFlags |= NSAlphaShiftKeyMask;
</del><ins>+ modifierFlags |= NSEventModifierFlagCapsLock;
</ins><span class="cx"> if (keyboardEvent.shiftKey())
</span><del>- modifierFlags |= NSShiftKeyMask;
</del><ins>+ modifierFlags |= NSEventModifierFlagShift;
</ins><span class="cx"> if (keyboardEvent.controlKey())
</span><del>- modifierFlags |= NSControlKeyMask;
</del><ins>+ modifierFlags |= NSEventModifierFlagControl;
</ins><span class="cx"> if (keyboardEvent.altKey())
</span><del>- modifierFlags |= NSAlternateKeyMask;
</del><ins>+ modifierFlags |= NSEventModifierFlagOption;
</ins><span class="cx"> if (keyboardEvent.metaKey())
</span><del>- modifierFlags |= NSCommandKeyMask;
</del><ins>+ modifierFlags |= NSEventModifierFlagCommand;
</ins><span class="cx">
</span><span class="cx"> return modifierFlags;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFDeprecatedPDFPluginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -1278,33 +1278,28 @@
</span><span class="cx">
</span><span class="cx"> static NSUInteger modifierFlagsFromWebEvent(const WebEvent& event)
</span><span class="cx"> {
</span><del>-#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
</del><ins>+ return (event.shiftKey() ? NSEventModifierFlagShift : 0)
+ | (event.controlKey() ? NSEventModifierFlagControl : 0)
+ | (event.altKey() ? NSEventModifierFlagOption : 0)
+ | (event.metaKey() ? NSEventModifierFlagCommand : 0);
</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><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> switch (event.type()) {
</span><span class="cx"> case WebEvent::KeyDown:
</span><del>- eventType = NSKeyDown;
</del><ins>+ eventType = NSEventTypeKeyDown;
</ins><span class="cx"> return true;
</span><span class="cx"> case WebEvent::KeyUp:
</span><del>- eventType = NSKeyUp;
</del><ins>+ eventType = NSEventTypeKeyUp;
</ins><span class="cx"> return true;
</span><span class="cx"> case WebEvent::MouseDown:
</span><span class="cx"> switch (static_cast<const WebMouseEvent&>(event).button()) {
</span><span class="cx"> case WebMouseEvent::LeftButton:
</span><del>- eventType = NSLeftMouseDown;
</del><ins>+ eventType = NSEventTypeLeftMouseDown;
</ins><span class="cx"> return true;
</span><span class="cx"> case WebMouseEvent::RightButton:
</span><del>- eventType = NSRightMouseDown;
</del><ins>+ eventType = NSEventTypeRightMouseDown;
</ins><span class="cx"> return true;
</span><span class="cx"> default:
</span><span class="cx"> return false;
</span><span class="lines">@@ -1312,10 +1307,10 @@
</span><span class="cx"> case WebEvent::MouseUp:
</span><span class="cx"> switch (static_cast<const WebMouseEvent&>(event).button()) {
</span><span class="cx"> case WebMouseEvent::LeftButton:
</span><del>- eventType = NSLeftMouseUp;
</del><ins>+ eventType = NSEventTypeLeftMouseUp;
</ins><span class="cx"> return true;
</span><span class="cx"> case WebMouseEvent::RightButton:
</span><del>- eventType = NSRightMouseUp;
</del><ins>+ eventType = NSEventTypeRightMouseUp;
</ins><span class="cx"> return true;
</span><span class="cx"> default:
</span><span class="cx"> return false;
</span><span class="lines">@@ -1323,13 +1318,13 @@
</span><span class="cx"> case WebEvent::MouseMove:
</span><span class="cx"> switch (static_cast<const WebMouseEvent&>(event).button()) {
</span><span class="cx"> case WebMouseEvent::LeftButton:
</span><del>- eventType = NSLeftMouseDragged;
</del><ins>+ eventType = NSEventTypeLeftMouseDragged;
</ins><span class="cx"> return true;
</span><span class="cx"> case WebMouseEvent::RightButton:
</span><del>- eventType = NSRightMouseDragged;
</del><ins>+ eventType = NSEventTypeRightMouseDragged;
</ins><span class="cx"> return true;
</span><span class="cx"> case WebMouseEvent::NoButton:
</span><del>- eventType = NSMouseMoved;
</del><ins>+ eventType = NSEventTypeMouseMoved;
</ins><span class="cx"> return true;
</span><span class="cx"> default:
</span><span class="cx"> return false;
</span><span class="lines">@@ -1337,7 +1332,6 @@
</span><span class="cx"> default:
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-#pragma clang diagnostic pop
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NSEvent *PDFPlugin::nsEventForWebMouseEvent(const WebMouseEvent& event)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -963,10 +963,10 @@
</span><span class="cx">
</span><span class="cx"> static NSUInteger modifierFlagsFromWebEvent(const WebEvent& event)
</span><span class="cx"> {
</span><del>- return (event.shiftKey() ? NSShiftKeyMask : 0)
- | (event.controlKey() ? NSControlKeyMask : 0)
- | (event.altKey() ? NSAlternateKeyMask : 0)
- | (event.metaKey() ? NSCommandKeyMask : 0);
</del><ins>+ return (event.shiftKey() ? NSEventModifierFlagShift : 0)
+ | (event.controlKey() ? NSEventModifierFlagControl : 0)
+ | (event.altKey() ? NSEventModifierFlagOption : 0)
+ | (event.metaKey() ? NSEventModifierFlagCommand : 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool getEventTypeFromWebEvent(const WebEvent& event, NSEventType& eventType)
</span><span class="lines">@@ -975,10 +975,10 @@
</span><span class="cx"> case WebEvent::MouseDown:
</span><span class="cx"> switch (static_cast<const WebMouseEvent&>(event).button()) {
</span><span class="cx"> case WebMouseEvent::LeftButton:
</span><del>- eventType = NSLeftMouseDown;
</del><ins>+ eventType = NSEventTypeLeftMouseDown;
</ins><span class="cx"> return true;
</span><span class="cx"> case WebMouseEvent::RightButton:
</span><del>- eventType = NSRightMouseDown;
</del><ins>+ eventType = NSEventTypeRightMouseDown;
</ins><span class="cx"> return true;
</span><span class="cx"> default:
</span><span class="cx"> return false;
</span><span class="lines">@@ -986,10 +986,10 @@
</span><span class="cx"> case WebEvent::MouseUp:
</span><span class="cx"> switch (static_cast<const WebMouseEvent&>(event).button()) {
</span><span class="cx"> case WebMouseEvent::LeftButton:
</span><del>- eventType = NSLeftMouseUp;
</del><ins>+ eventType = NSEventTypeLeftMouseUp;
</ins><span class="cx"> return true;
</span><span class="cx"> case WebMouseEvent::RightButton:
</span><del>- eventType = NSRightMouseUp;
</del><ins>+ eventType = NSEventTypeRightMouseUp;
</ins><span class="cx"> return true;
</span><span class="cx"> default:
</span><span class="cx"> return false;
</span><span class="lines">@@ -997,13 +997,13 @@
</span><span class="cx"> case WebEvent::MouseMove:
</span><span class="cx"> switch (static_cast<const WebMouseEvent&>(event).button()) {
</span><span class="cx"> case WebMouseEvent::LeftButton:
</span><del>- eventType = NSLeftMouseDragged;
</del><ins>+ eventType = NSEventTypeLeftMouseDragged;
</ins><span class="cx"> return true;
</span><span class="cx"> case WebMouseEvent::RightButton:
</span><del>- eventType = NSRightMouseDragged;
</del><ins>+ eventType = NSEventTypeRightMouseDragged;
</ins><span class="cx"> return true;
</span><span class="cx"> case WebMouseEvent::NoButton:
</span><del>- eventType = NSMouseMoved;
</del><ins>+ eventType = NSEventTypeMouseMoved;
</ins><span class="cx"> return true;
</span><span class="cx"> default:
</span><span class="cx"> return false;
</span><span class="lines">@@ -1756,11 +1756,11 @@
</span><span class="cx">
</span><span class="cx"> switch (event.type()) {
</span><span class="cx"> case PlatformEvent::MouseMoved:
</span><del>- return [pdfLayerController mouseDragged:eventWithType(NSLeftMouseDragged) inHUDWithBounds:HUDRectInRootViewCoordinates];
</del><ins>+ return [pdfLayerController mouseDragged:eventWithType(NSEventTypeLeftMouseDragged) inHUDWithBounds:HUDRectInRootViewCoordinates];
</ins><span class="cx"> case PlatformEvent::MousePressed:
</span><del>- return [pdfLayerController mouseDown:eventWithType(NSLeftMouseDown) inHUDWithBounds:HUDRectInRootViewCoordinates];
</del><ins>+ return [pdfLayerController mouseDown:eventWithType(NSEventTypeLeftMouseDown) inHUDWithBounds:HUDRectInRootViewCoordinates];
</ins><span class="cx"> case PlatformEvent::MouseReleased:
</span><del>- return [pdfLayerController mouseUp:eventWithType(NSLeftMouseUp) inHUDWithBounds:HUDRectInRootViewCoordinates];
</del><ins>+ return [pdfLayerController mouseUp:eventWithType(NSEventTypeLeftMouseUp) inHUDWithBounds:HUDRectInRootViewCoordinates];
</ins><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginTextAnnotationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -53,21 +53,18 @@
</span><span class="cx">
</span><span class="cx"> static const String cssAlignmentValueForNSTextAlignment(NSTextAlignment alignment)
</span><span class="cx"> {
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> switch (alignment) {
</span><del>- case NSLeftTextAlignment:
</del><ins>+ case NSTextAlignmentLeft:
</ins><span class="cx"> return "left";
</span><del>- case NSRightTextAlignment:
</del><ins>+ case NSTextAlignmentRight:
</ins><span class="cx"> return "right";
</span><del>- case NSCenterTextAlignment:
</del><ins>+ case NSTextAlignmentCenter:
</ins><span class="cx"> return "center";
</span><del>- case NSJustifiedTextAlignment:
</del><ins>+ case NSTextAlignmentJustified:
</ins><span class="cx"> return "justify";
</span><del>- case NSNaturalTextAlignment:
</del><ins>+ case NSTextAlignmentNatural:
</ins><span class="cx"> return "-webkit-start";
</span><span class="cx"> }
</span><del>-#pragma clang diagnostic pop
</del><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 (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -63,10 +63,7 @@
</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><del>-#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
</del><ins>+ [image drawInRect:NSMakeRect(0, 0, bitmap->size().width(), bitmap->size().height()) fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1 respectFlipped:YES hints:nil];
</ins><span class="cx">
</span><span class="cx"> [NSGraphicsContext setCurrentContext:savedContext.get()];
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Tools/ChangeLog 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -1,3 +1,72 @@
</span><ins>+2016-11-09 Chris Dumez <cdumez@apple.com>
+
+ [Mac] Stop using deprecated AppKit enumeration values
+ https://bugs.webkit.org/show_bug.cgi?id=164494
+
+ Reviewed by Darin Adler.
+
+ Stop using deprecated AppKit enumeration values.
+
+ * DumpRenderTree/mac/EventSendingController.mm:
+ (eventTypeForMouseButtonAndAction):
+ (modifierFlags):
+ (-[EventSendingController mouseMoveToX:Y:]):
+ (-[EventSendingController contextClick]):
+ (-[EventSendingController keyDown:withModifiers:withLocation:]):
+ * DumpRenderTree/mac/TextInputController.m:
+ (-[TextInputController interpretKeyEvents:withSender:]):
+ * TestWebKitAPI/Tests/WebKit2Cocoa/CommandBackForward.mm:
+ (simulateCommandArrow):
+ * TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenDelegate.mm:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenLayoutConstraints.mm:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenTopContentInset.mm:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2Cocoa/ShouldOpenExternalURLsInNewWindowActions.mm:
+ (TEST):
+ * TestWebKitAPI/Tests/WebKit2Cocoa/UserInitiatedActionInNavigationAction.mm:
+ (UserInitiatedActionTest::SetUp):
+ (UserInitiatedActionTest::click):
+ * TestWebKitAPI/Tests/mac/AcceptsFirstMouse.mm:
+ (TestWebKitAPI::AcceptsFirstMouse::runTest):
+ * TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm:
+ (TestWebKitAPI::contextMenuCopyLink):
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/mac/ContextMenuDefaultItemsHaveTags.mm:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/mac/FullscreenZoomInitialFrame.mm:
+ (TestWebKitAPI::FullscreenZoomInitialFrame::runTest):
+ * TestWebKitAPI/Tests/mac/MenuTypesForMouseEvents.mm:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/mac/PlatformUtilitiesMac.mm:
+ (TestWebKitAPI::Util::isKeyDown):
+ * TestWebKitAPI/mac/PlatformWebViewMac.mm:
+ (TestWebKitAPI::PlatformWebView::initialize):
+ (TestWebKitAPI::PlatformWebView::simulateSpacebarKeyPress):
+ (TestWebKitAPI::PlatformWebView::simulateRightClick):
+ (TestWebKitAPI::PlatformWebView::simulateMouseMove):
+ (TestWebKitAPI::eventTypeForButton):
+ (TestWebKitAPI::modifierFlagsForWKModifiers):
+ * TestWebKitAPI/mac/TestWKWebViewMac.mm:
+ (__simulated_forceClickAssociatedEventsMask):
+ (-[TestWKWebViewHostWindow _mouseDownAtPoint:simulatePressure:]):
+ (-[TestWKWebView _setUpTestWindow:]):
+ (-[TestWKWebView typeCharacter:]):
+ * WebKitTestRunner/mac/EventSenderProxy.mm:
+ (WTR::eventTypeForMouseButtonAndAction):
+ (WTR::buildModifierFlags):
+ (WTR::EventSenderProxy::sendMouseDownToStartPressureEvents):
+ (WTR::EventSenderProxy::mouseForceClick):
+ (WTR::EventSenderProxy::startAndCancelMouseForceClick):
+ (WTR::EventSenderProxy::mouseMoveTo):
+ (WTR::EventSenderProxy::keyDown):
+ (WTR::EventSenderProxy::swipeGestureWithWheelAndMomentumPhases):
+ * WebKitTestRunner/mac/PlatformWebViewMac.mm:
+ (WTR::PlatformWebView::PlatformWebView):
+ * WebKitTestRunner/mac/TestControllerMac.mm:
+ (WTR::TestController::platformResetStateToConsistentValues):
+
</ins><span class="cx"> 2016-11-09 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Support TouchBar in WebKit
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacEventSendingControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/EventSendingController.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/EventSendingController.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Tools/DumpRenderTree/mac/EventSendingController.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> #import <Carbon/Carbon.h> // for GetCurrentEventTime()
</span><ins>+#import <wtf/mac/AppKitCompatibilityDeclarations.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -355,33 +356,33 @@
</span><span class="cx"> static NSEventType eventTypeForMouseButtonAndAction(int button, MouseAction action)
</span><span class="cx"> {
</span><span class="cx"> switch (button) {
</span><del>- case LeftMouseButton:
- switch (action) {
- case MouseDown:
- return NSLeftMouseDown;
- case MouseUp:
- return NSLeftMouseUp;
- case MouseDragged:
- return NSLeftMouseDragged;
- }
- case RightMouseButton:
- switch (action) {
- case MouseDown:
- return NSRightMouseDown;
- case MouseUp:
- return NSRightMouseUp;
- case MouseDragged:
- return NSRightMouseDragged;
- }
- default:
- switch (action) {
- case MouseDown:
- return NSOtherMouseDown;
- case MouseUp:
- return NSOtherMouseUp;
- case MouseDragged:
- return NSOtherMouseDragged;
- }
</del><ins>+ case LeftMouseButton:
+ switch (action) {
+ case MouseDown:
+ return NSEventTypeLeftMouseDown;
+ case MouseUp:
+ return NSEventTypeLeftMouseUp;
+ case MouseDragged:
+ return NSEventTypeLeftMouseDragged;
+ }
+ case RightMouseButton:
+ switch (action) {
+ case MouseDown:
+ return NSEventTypeRightMouseDown;
+ case MouseUp:
+ return NSEventTypeRightMouseUp;
+ case MouseDragged:
+ return NSEventTypeRightMouseDragged;
+ }
+ default:
+ switch (action) {
+ case MouseDown:
+ return NSEventTypeOtherMouseDown;
+ case MouseUp:
+ return NSEventTypeOtherMouseUp;
+ case MouseDragged:
+ return NSEventTypeOtherMouseDragged;
+ }
</ins><span class="cx"> }
</span><span class="cx"> assert(0);
</span><span class="cx"> return static_cast<NSEventType>(0);
</span><span class="lines">@@ -433,11 +434,11 @@
</span><span class="cx"> static int modifierFlags(const NSString* modifierName)
</span><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>- const int controlKeyMask = NSControlKeyMask;
- const int shiftKeyMask = NSShiftKeyMask;
- const int alternateKeyMask = NSAlternateKeyMask;
- const int commandKeyMask = NSCommandKeyMask;
- const int capsLockKeyMask = NSAlphaShiftKeyMask;
</del><ins>+ const int controlKeyMask = NSEventModifierFlagControl;
+ const int shiftKeyMask = NSEventModifierFlagShift;
+ const int alternateKeyMask = NSEventModifierFlagOption;
+ const int commandKeyMask = NSEventModifierFlagCommand;
+ const int capsLockKeyMask = NSEventModifierFlagCapsLock;
</ins><span class="cx"> #else
</span><span class="cx"> const int controlKeyMask = WebEventFlagMaskControl;
</span><span class="cx"> const int shiftKeyMask = WebEventFlagMaskShift;
</span><span class="lines">@@ -643,7 +644,7 @@
</span><span class="cx"> NSView *view = [mainFrame webView];
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> lastMousePosition = [view convertPoint:NSMakePoint(x, [view frame].size.height - y) toView:nil];
</span><del>- NSEvent *event = [NSEvent mouseEventWithType:(leftMouseButtonDown ? NSLeftMouseDragged : NSMouseMoved)
</del><ins>+ NSEvent *event = [NSEvent mouseEventWithType:(leftMouseButtonDown ? NSEventTypeLeftMouseDragged : NSEventTypeMouseMoved)
</ins><span class="cx"> location:lastMousePosition
</span><span class="cx"> modifierFlags:0
</span><span class="cx"> timestamp:[self currentEventTime]
</span><span class="lines">@@ -777,7 +778,7 @@
</span><span class="cx"> [[[mainFrame frameView] documentView] layout];
</span><span class="cx"> [self updateClickCountForButton:RightMouseButton];
</span><span class="cx">
</span><del>- NSEvent *event = [NSEvent mouseEventWithType:NSRightMouseDown
</del><ins>+ NSEvent *event = [NSEvent mouseEventWithType:NSEventTypeRightMouseDown
</ins><span class="cx"> location:lastMousePosition
</span><span class="cx"> modifierFlags:0
</span><span class="cx"> timestamp:[self currentEventTime]
</span><span class="lines">@@ -1013,7 +1014,7 @@
</span><span class="cx">
</span><span class="cx"> if ([character length] == 1 && [character characterAtIndex:0] >= 'A' && [character characterAtIndex:0] <= 'Z') {
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>- modifierFlags |= NSShiftKeyMask;
</del><ins>+ modifierFlags |= NSEventModifierFlagShift;
</ins><span class="cx"> #else
</span><span class="cx"> modifierFlags |= WebEventFlagMaskAlphaShift;
</span><span class="cx"> #endif
</span><span class="lines">@@ -1023,12 +1024,12 @@
</span><span class="cx"> modifierFlags |= buildModifierFlags(modifiers);
</span><span class="cx">
</span><span class="cx"> if (location == DOM_KEY_LOCATION_NUMPAD)
</span><del>- modifierFlags |= NSNumericPadKeyMask;
</del><ins>+ modifierFlags |= NSEventModifierFlagNumericPad;
</ins><span class="cx">
</span><span class="cx"> [[[mainFrame frameView] documentView] layout];
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>- NSEvent *event = [NSEvent keyEventWithType:NSKeyDown
</del><ins>+ NSEvent *event = [NSEvent keyEventWithType:NSEventTypeKeyDown
</ins><span class="cx"> location:NSMakePoint(5, 5)
</span><span class="cx"> modifierFlags:modifierFlags
</span><span class="cx"> timestamp:[self currentEventTime]
</span><span class="lines">@@ -1060,7 +1061,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>- event = [NSEvent keyEventWithType:NSKeyUp
</del><ins>+ event = [NSEvent keyEventWithType:NSEventTypeKeyUp
</ins><span class="cx"> location:NSMakePoint(5, 5)
</span><span class="cx"> modifierFlags:modifierFlags
</span><span class="cx"> timestamp:[self currentEventTime]
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacTextInputControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/TextInputController.m (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/TextInputController.m 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Tools/DumpRenderTree/mac/TextInputController.m 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> #import <WebKit/WebScriptObject.h>
</span><span class="cx"> #import <WebKit/WebTypesInternal.h>
</span><span class="cx"> #import <WebKit/WebView.h>
</span><ins>+#import <wtf/mac/AppKitCompatibilityDeclarations.h>
</ins><span class="cx">
</span><span class="cx"> @interface TextInputController (DumpRenderTreeInputMethodHandler)
</span><span class="cx"> - (BOOL)interpretKeyEvents:(NSArray *)eventArray withSender:(WebHTMLView *)sender;
</span><span class="lines">@@ -507,21 +508,21 @@
</span><span class="cx"> NSEvent *event = [eventArray objectAtIndex:0];
</span><span class="cx"> unsigned modifierFlags = [event modifierFlags];
</span><span class="cx"> NSMutableArray *modifiers = [[NSMutableArray alloc] init];
</span><del>- if (modifierFlags & NSAlphaShiftKeyMask)
</del><ins>+ if (modifierFlags & NSEventModifierFlagCapsLock)
</ins><span class="cx"> [modifiers addObject:@"NSAlphaShiftKeyMask"];
</span><del>- if (modifierFlags & NSShiftKeyMask)
</del><ins>+ if (modifierFlags & NSEventModifierFlagShift)
</ins><span class="cx"> [modifiers addObject:@"NSShiftKeyMask"];
</span><del>- if (modifierFlags & NSControlKeyMask)
</del><ins>+ if (modifierFlags & NSEventModifierFlagControl)
</ins><span class="cx"> [modifiers addObject:@"NSControlKeyMask"];
</span><del>- if (modifierFlags & NSAlternateKeyMask)
</del><ins>+ if (modifierFlags & NSEventModifierFlagOption)
</ins><span class="cx"> [modifiers addObject:@"NSAlternateKeyMask"];
</span><del>- if (modifierFlags & NSCommandKeyMask)
</del><ins>+ if (modifierFlags & NSEventModifierFlagCommand)
</ins><span class="cx"> [modifiers addObject:@"NSCommandKeyMask"];
</span><del>- if (modifierFlags & NSNumericPadKeyMask)
</del><ins>+ if (modifierFlags & NSEventModifierFlagNumericPad)
</ins><span class="cx"> [modifiers addObject:@"NSNumericPadKeyMask"];
</span><del>- if (modifierFlags & NSHelpKeyMask)
</del><ins>+ if (modifierFlags & NSEventModifierFlagHelp)
</ins><span class="cx"> [modifiers addObject:@"NSHelpKeyMask"];
</span><del>- if (modifierFlags & NSFunctionKeyMask)
</del><ins>+ if (modifierFlags & NSEventModifierFlagFunction)
</ins><span class="cx"> [modifiers addObject:@"NSFunctionKeyMask"];
</span><span class="cx">
</span><span class="cx"> WebScriptObject* eventParam = [inputMethodHandler evaluateWebScript:@"new Object();"];
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaCommandBackForwardmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/CommandBackForward.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/CommandBackForward.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/CommandBackForward.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #import <WebKit/WKRetainPtr.h>
</span><span class="cx"> #import <WebKit/WKViewPrivate.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><ins>+#import <wtf/mac/AppKitCompatibilityDeclarations.h>
</ins><span class="cx">
</span><span class="cx"> @interface CommandBackForwardOffscreenWindow : NSWindow
</span><span class="cx"> @end
</span><span class="lines">@@ -62,9 +63,9 @@
</span><span class="cx"> NSString *eventCharacter = (direction == Left) ? [NSString stringWithCharacters:&left length:1] : [NSString stringWithCharacters:&right length:1];
</span><span class="cx"> unsigned short keyCode = (direction == Left) ? 0x7B : 0x7C;
</span><span class="cx">
</span><del>- NSEvent *event = [NSEvent keyEventWithType:NSKeyDown
</del><ins>+ NSEvent *event = [NSEvent keyEventWithType:NSEventTypeKeyDown
</ins><span class="cx"> location:NSMakePoint(5, 5)
</span><del>- modifierFlags:NSCommandKeyMask
</del><ins>+ modifierFlags:NSEventModifierFlagCommand
</ins><span class="cx"> timestamp:GetCurrentEventTime()
</span><span class="cx"> windowNumber:[view.window windowNumber]
</span><span class="cx"> context:[NSGraphicsContext currentContext]
</span><span class="lines">@@ -75,9 +76,9 @@
</span><span class="cx">
</span><span class="cx"> [view keyDown:event];
</span><span class="cx">
</span><del>- event = [NSEvent keyEventWithType:NSKeyUp
</del><ins>+ event = [NSEvent keyEventWithType:NSEventTypeKeyUp
</ins><span class="cx"> location:NSMakePoint(5, 5)
</span><del>- modifierFlags:NSCommandKeyMask
</del><ins>+ modifierFlags:NSEventModifierFlagCommand
</ins><span class="cx"> timestamp:GetCurrentEventTime()
</span><span class="cx"> windowNumber:[view.window windowNumber]
</span><span class="cx"> context:[NSGraphicsContext currentContext]
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaFullscreenDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenDelegate.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenDelegate.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenDelegate.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #import <WebKit/WKWebViewPrivate.h>
</span><span class="cx"> #import <WebKit/_WKFullscreenDelegate.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><ins>+#import <wtf/mac/AppKitCompatibilityDeclarations.h>
</ins><span class="cx">
</span><span class="cx"> static bool receivedLoadedMessage;
</span><span class="cx"> static bool receivedWillEnterFullscreenMessage;
</span><span class="lines">@@ -83,7 +84,7 @@
</span><span class="cx"> [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"fullscreenChangeHandler"];
</span><span class="cx"> [webView _setFullscreenDelegate:handler.get()];
</span><span class="cx">
</span><del>- RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:[webView frame] styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]);
</del><ins>+ RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:[webView frame] styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO]);
</ins><span class="cx"> [[window contentView] addSubview:webView.get()];
</span><span class="cx">
</span><span class="cx"> NSURLRequest *request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"FullscreenDelegate" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
</span><span class="lines">@@ -90,7 +91,7 @@
</span><span class="cx"> [webView loadRequest:request];
</span><span class="cx"> TestWebKitAPI::Util::run(&receivedLoadedMessage);
</span><span class="cx">
</span><del>- NSEvent *event = [NSEvent mouseEventWithType:NSLeftMouseDown location:NSMakePoint(5, 5) modifierFlags:0 timestamp:0 windowNumber:window.get().windowNumber context:0 eventNumber:0 clickCount:0 pressure:0];
</del><ins>+ NSEvent *event = [NSEvent mouseEventWithType:NSEventTypeLeftMouseDown location:NSMakePoint(5, 5) modifierFlags:0 timestamp:0 windowNumber:window.get().windowNumber context:0 eventNumber:0 clickCount:0 pressure:0];
</ins><span class="cx"> [webView mouseDown:event];
</span><span class="cx">
</span><span class="cx"> ASSERT_FALSE([webView _isInFullscreen]);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaFullscreenLayoutConstraintsmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenLayoutConstraints.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenLayoutConstraints.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenLayoutConstraints.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #import <WebKit/WKWebViewConfigurationPrivate.h>
</span><span class="cx"> #import <WebKit/WKWebViewPrivate.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><ins>+#import <wtf/mac/AppKitCompatibilityDeclarations.h>
</ins><span class="cx">
</span><span class="cx"> static bool receivedLoadedMessage;
</span><span class="cx"> static bool receivedFullscreenChangeMessage;
</span><span class="lines">@@ -60,7 +61,7 @@
</span><span class="cx"> RetainPtr<FullscreenStateChangeMessageHandler> handler = adoptNS([[FullscreenStateChangeMessageHandler alloc] init]);
</span><span class="cx"> [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"fullscreenStateChangeHandler"];
</span><span class="cx">
</span><del>- RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:[webView frame] styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]);
</del><ins>+ RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:[webView frame] styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO]);
</ins><span class="cx"> webView.get().translatesAutoresizingMaskIntoConstraints = NO;
</span><span class="cx"> [[window contentView] addSubview:webView.get()];
</span><span class="cx">
</span><span class="lines">@@ -74,7 +75,7 @@
</span><span class="cx"> [webView loadRequest:request];
</span><span class="cx"> TestWebKitAPI::Util::run(&receivedLoadedMessage);
</span><span class="cx">
</span><del>- NSEvent *event = [NSEvent mouseEventWithType:NSLeftMouseDown location:NSMakePoint(5, 5) modifierFlags:0 timestamp:0 windowNumber:window.get().windowNumber context:0 eventNumber:0 clickCount:0 pressure:0];
</del><ins>+ NSEvent *event = [NSEvent mouseEventWithType:NSEventTypeLeftMouseDown location:NSMakePoint(5, 5) modifierFlags:0 timestamp:0 windowNumber:window.get().windowNumber context:0 eventNumber:0 clickCount:0 pressure:0];
</ins><span class="cx"> [webView mouseDown:event];
</span><span class="cx">
</span><span class="cx"> TestWebKitAPI::Util::run(&receivedFullscreenChangeMessage);
</span><span class="lines">@@ -81,7 +82,7 @@
</span><span class="cx">
</span><span class="cx"> receivedFullscreenChangeMessage = false;
</span><span class="cx">
</span><del>- NSEvent *exitFSEvent = [NSEvent mouseEventWithType:NSLeftMouseDown location:NSMakePoint(5, 5) modifierFlags:0 timestamp:0 windowNumber:window.get().windowNumber context:0 eventNumber:0 clickCount:0 pressure:0];
</del><ins>+ NSEvent *exitFSEvent = [NSEvent mouseEventWithType:NSEventTypeLeftMouseDown location:NSMakePoint(5, 5) modifierFlags:0 timestamp:0 windowNumber:window.get().windowNumber context:0 eventNumber:0 clickCount:0 pressure:0];
</ins><span class="cx"> [webView mouseDown:exitFSEvent];
</span><span class="cx">
</span><span class="cx"> TestWebKitAPI::Util::run(&receivedFullscreenChangeMessage);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaFullscreenTopContentInsetmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenTopContentInset.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenTopContentInset.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenTopContentInset.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #import <WebKit/WKWebViewConfigurationPrivate.h>
</span><span class="cx"> #import <WebKit/WKWebViewPrivate.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><ins>+#import <wtf/mac/AppKitCompatibilityDeclarations.h>
</ins><span class="cx">
</span><span class="cx"> static bool receivedLoadedMessage;
</span><span class="cx"> static bool receivedFullscreenChangeMessage;
</span><span class="lines">@@ -61,7 +62,7 @@
</span><span class="cx"> RetainPtr<FullscreenChangeMessageHandler> handler = adoptNS([[FullscreenChangeMessageHandler alloc] init]);
</span><span class="cx"> [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"fullscreenChangeHandler"];
</span><span class="cx">
</span><del>- RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:[webView frame] styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]);
</del><ins>+ RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:[webView frame] styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO]);
</ins><span class="cx"> [[window contentView] addSubview:webView.get()];
</span><span class="cx">
</span><span class="cx"> NSURLRequest *request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"FullscreenTopContentInset" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
</span><span class="lines">@@ -68,7 +69,7 @@
</span><span class="cx"> [webView loadRequest:request];
</span><span class="cx"> TestWebKitAPI::Util::run(&receivedLoadedMessage);
</span><span class="cx">
</span><del>- NSEvent *event = [NSEvent mouseEventWithType:NSLeftMouseDown location:NSMakePoint(5, 5) modifierFlags:0 timestamp:0 windowNumber:window.get().windowNumber context:0 eventNumber:0 clickCount:0 pressure:0];
</del><ins>+ NSEvent *event = [NSEvent mouseEventWithType:NSEventTypeLeftMouseDown location:NSMakePoint(5, 5) modifierFlags:0 timestamp:0 windowNumber:window.get().windowNumber context:0 eventNumber:0 clickCount:0 pressure:0];
</ins><span class="cx"> [webView mouseDown:event];
</span><span class="cx">
</span><span class="cx"> TestWebKitAPI::Util::run(&receivedFullscreenChangeMessage);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaShouldOpenExternalURLsInNewWindowActionsmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ShouldOpenExternalURLsInNewWindowActions.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ShouldOpenExternalURLsInNewWindowActions.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ShouldOpenExternalURLsInNewWindowActions.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #import <WebKit/WKNavigationActionPrivate.h>
</span><span class="cx"> #import <WebKit/WKWebViewPrivate.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><ins>+#import <wtf/mac/AppKitCompatibilityDeclarations.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="lines">@@ -73,7 +74,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
</span><span class="cx">
</span><del>- auto window = adoptNS([[NSWindow alloc] initWithContentRect:[webView frame] styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES]);
</del><ins>+ auto window = adoptNS([[NSWindow alloc] initWithContentRect:[webView frame] styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:YES]);
</ins><span class="cx"> [[window contentView] addSubview:webView.get()];
</span><span class="cx">
</span><span class="cx"> auto controller = adoptNS([[ShouldOpenExternalURLsInNewWindowActionsController alloc] init]);
</span><span class="lines">@@ -86,8 +87,8 @@
</span><span class="cx">
</span><span class="cx"> NSPoint clickPoint = NSMakePoint(100, 100);
</span><span class="cx">
</span><del>- [[webView hitTest:clickPoint] mouseDown:[NSEvent mouseEventWithType:NSLeftMouseDown location:clickPoint modifierFlags:0 timestamp:0 windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1]];
- [[webView hitTest:clickPoint] mouseUp:[NSEvent mouseEventWithType:NSLeftMouseUp location:clickPoint modifierFlags:0 timestamp:0 windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1]];
</del><ins>+ [[webView hitTest:clickPoint] mouseDown:[NSEvent mouseEventWithType:NSEventTypeLeftMouseDown location:clickPoint modifierFlags:0 timestamp:0 windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1]];
+ [[webView hitTest:clickPoint] mouseUp:[NSEvent mouseEventWithType:NSEventTypeLeftMouseUp location:clickPoint modifierFlags:0 timestamp:0 windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1]];
</ins><span class="cx"> TestWebKitAPI::Util::run(&createdWebView);
</span><span class="cx"> createdWebView = false;
</span><span class="cx">
</span><span class="lines">@@ -108,8 +109,8 @@
</span><span class="cx"> TestWebKitAPI::Util::run(&finishedNavigation);
</span><span class="cx"> finishedNavigation = false;
</span><span class="cx">
</span><del>- [[webView hitTest:clickPoint] mouseDown:[NSEvent mouseEventWithType:NSLeftMouseDown location:clickPoint modifierFlags:0 timestamp:0 windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1]];
- [[webView hitTest:clickPoint] mouseUp:[NSEvent mouseEventWithType:NSLeftMouseUp location:clickPoint modifierFlags:0 timestamp:0 windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1]];
</del><ins>+ [[webView hitTest:clickPoint] mouseDown:[NSEvent mouseEventWithType:NSEventTypeLeftMouseDown location:clickPoint modifierFlags:0 timestamp:0 windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1]];
+ [[webView hitTest:clickPoint] mouseUp:[NSEvent mouseEventWithType:NSEventTypeLeftMouseUp location:clickPoint modifierFlags:0 timestamp:0 windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1]];
</ins><span class="cx"> TestWebKitAPI::Util::run(&createdWebView);
</span><span class="cx"> createdWebView = false;
</span><span class="cx">
</span><span class="lines">@@ -134,7 +135,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
</span><span class="cx">
</span><del>- auto window = adoptNS([[NSWindow alloc] initWithContentRect:[webView frame] styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES]);
</del><ins>+ auto window = adoptNS([[NSWindow alloc] initWithContentRect:[webView frame] styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:YES]);
</ins><span class="cx"> [[window contentView] addSubview:webView.get()];
</span><span class="cx">
</span><span class="cx"> auto controller = adoptNS([[ShouldOpenExternalURLsInNewWindowActionsController alloc] init]);
</span><span class="lines">@@ -148,8 +149,8 @@
</span><span class="cx"> NSPoint clickPoint = NSMakePoint(100, 100);
</span><span class="cx">
</span><span class="cx"> decidedPolicy = false;
</span><del>- [[webView hitTest:clickPoint] mouseDown:[NSEvent mouseEventWithType:NSLeftMouseDown location:clickPoint modifierFlags:0 timestamp:0 windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1]];
- [[webView hitTest:clickPoint] mouseUp:[NSEvent mouseEventWithType:NSLeftMouseUp location:clickPoint modifierFlags:0 timestamp:0 windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1]];
</del><ins>+ [[webView hitTest:clickPoint] mouseDown:[NSEvent mouseEventWithType:NSEventTypeLeftMouseDown location:clickPoint modifierFlags:0 timestamp:0 windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1]];
+ [[webView hitTest:clickPoint] mouseUp:[NSEvent mouseEventWithType:NSEventTypeLeftMouseUp location:clickPoint modifierFlags:0 timestamp:0 windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1]];
</ins><span class="cx"> TestWebKitAPI::Util::run(&decidedPolicy);
</span><span class="cx"> decidedPolicy = false;
</span><span class="cx">
</span><span class="lines">@@ -178,8 +179,8 @@
</span><span class="cx"> finishedNavigation = false;
</span><span class="cx">
</span><span class="cx"> decidedPolicy = false;
</span><del>- [[webView hitTest:clickPoint] mouseDown:[NSEvent mouseEventWithType:NSLeftMouseDown location:clickPoint modifierFlags:0 timestamp:0 windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1]];
- [[webView hitTest:clickPoint] mouseUp:[NSEvent mouseEventWithType:NSLeftMouseUp location:clickPoint modifierFlags:0 timestamp:0 windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1]];
</del><ins>+ [[webView hitTest:clickPoint] mouseDown:[NSEvent mouseEventWithType:NSEventTypeLeftMouseDown location:clickPoint modifierFlags:0 timestamp:0 windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1]];
+ [[webView hitTest:clickPoint] mouseUp:[NSEvent mouseEventWithType:NSEventTypeLeftMouseUp location:clickPoint modifierFlags:0 timestamp:0 windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1]];
</ins><span class="cx"> TestWebKitAPI::Util::run(&decidedPolicy);
</span><span class="cx"> decidedPolicy = false;
</span><span class="cx">
</span><span class="lines">@@ -210,7 +211,7 @@
</span><span class="cx"> TEST(WebKit2, RestoreShouldOpenExternalURLsPolicyAfterCrash)
</span><span class="cx"> {
</span><span class="cx"> auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
</span><del>- auto window = adoptNS([[NSWindow alloc] initWithContentRect:[webView frame] styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES]);
</del><ins>+ auto window = adoptNS([[NSWindow alloc] initWithContentRect:[webView frame] styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:YES]);
</ins><span class="cx"> [[window contentView] addSubview:webView.get()];
</span><span class="cx"> auto controller = adoptNS([[ShouldOpenExternalURLsInNewWindowActionsController alloc] init]);
</span><span class="cx"> [webView setNavigationDelegate:controller.get()];
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaUserInitiatedActionInNavigationActionmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/UserInitiatedActionInNavigationAction.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/UserInitiatedActionInNavigationAction.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/UserInitiatedActionInNavigationAction.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #import <WebKit/WKWebViewPrivate.h>
</span><span class="cx"> #import <WebKit/_WKUserInitiatedAction.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><ins>+#import <wtf/mac/AppKitCompatibilityDeclarations.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="lines">@@ -72,7 +73,7 @@
</span><span class="cx"> {
</span><span class="cx"> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
</span><span class="cx">
</span><del>- window = adoptNS([[NSWindow alloc] initWithContentRect:[webView frame] styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES]);
</del><ins>+ window = adoptNS([[NSWindow alloc] initWithContentRect:[webView frame] styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:YES]);
</ins><span class="cx"> [[window contentView] addSubview:webView.get()];
</span><span class="cx">
</span><span class="cx"> delegate = adoptNS([[UserInitiatedActionInNavigationActionDelegate alloc] init]);
</span><span class="lines">@@ -99,8 +100,8 @@
</span><span class="cx"> {
</span><span class="cx"> NSPoint clickPoint = NSMakePoint(100, 100);
</span><span class="cx">
</span><del>- [[webView hitTest:clickPoint] mouseDown:[NSEvent mouseEventWithType:NSLeftMouseDown location:clickPoint modifierFlags:0 timestamp:0 windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1]];
- [[webView hitTest:clickPoint] mouseUp:[NSEvent mouseEventWithType:NSLeftMouseUp location:clickPoint modifierFlags:0 timestamp:0 windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1]];
</del><ins>+ [[webView hitTest:clickPoint] mouseDown:[NSEvent mouseEventWithType:NSEventTypeLeftMouseDown location:clickPoint modifierFlags:0 timestamp:0 windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1]];
+ [[webView hitTest:clickPoint] mouseUp:[NSEvent mouseEventWithType:NSEventTypeLeftMouseUp location:clickPoint modifierFlags:0 timestamp:0 windowNumber:[window windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1]];
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacAcceptsFirstMousemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/AcceptsFirstMouse.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/AcceptsFirstMouse.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/AcceptsFirstMouse.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "WebKitAgnosticTest.h"
</span><span class="cx">
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><ins>+#include <wtf/mac/AppKitCompatibilityDeclarations.h>
</ins><span class="cx">
</span><span class="cx"> @interface NSApplication (TestWebKitAPINSApplicationDetails)
</span><span class="cx"> - (void)_setCurrentEvent:(NSEvent *)event;
</span><span class="lines">@@ -47,17 +48,17 @@
</span><span class="cx"> template <typename View>
</span><span class="cx"> void AcceptsFirstMouse::runTest(View view)
</span><span class="cx"> {
</span><del>- RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:view.frame styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES]);
</del><ins>+ RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:view.frame styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:YES]);
</ins><span class="cx"> [[window.get() contentView] addSubview:view];
</span><span class="cx">
</span><span class="cx"> CGFloat viewHeight = view.bounds.size.height;
</span><span class="cx">
</span><span class="cx"> NSPoint pointInsideSelection = NSMakePoint(50, viewHeight - 50);
</span><del>- NSEvent *mouseEventInsideSelection = [NSEvent mouseEventWithType:NSLeftMouseDown location:pointInsideSelection modifierFlags:0 timestamp:0 windowNumber:[window.get() windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1];
</del><ins>+ NSEvent *mouseEventInsideSelection = [NSEvent mouseEventWithType:NSEventTypeLeftMouseDown location:pointInsideSelection modifierFlags:0 timestamp:0 windowNumber:[window.get() windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1];
</ins><span class="cx"> EXPECT_TRUE([[view hitTest:pointInsideSelection] acceptsFirstMouse:mouseEventInsideSelection]);
</span><span class="cx">
</span><span class="cx"> NSPoint pointOutsideSelection = NSMakePoint(50, viewHeight - 150);
</span><del>- NSEvent *mouseEventOutsideSelection = [NSEvent mouseEventWithType:NSLeftMouseDown location:pointOutsideSelection modifierFlags:0 timestamp:0 windowNumber:[window.get() windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1];
</del><ins>+ NSEvent *mouseEventOutsideSelection = [NSEvent mouseEventWithType:NSEventTypeLeftMouseDown location:pointOutsideSelection modifierFlags:0 timestamp:0 windowNumber:[window.get() windowNumber] context:nil eventNumber:0 clickCount:1 pressure:1];
</ins><span class="cx"> EXPECT_FALSE([[view hitTest:pointInsideSelection] acceptsFirstMouse:mouseEventOutsideSelection]);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacContextMenuCanCopyURLmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #import <WebKit/DOM.h>
</span><span class="cx"> #import <Carbon/Carbon.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><ins>+#import <wtf/mac/AppKitCompatibilityDeclarations.h>
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @interface ContextMenuCanCopyURLDelegate : NSObject <WebFrameLoadDelegate> {
</span><span class="lines">@@ -61,7 +62,7 @@
</span><span class="cx"> DOMHTMLAnchorElement *anchor = (DOMHTMLAnchorElement *)[[documentElement querySelectorAll:@"a"] item:itemIndex];
</span><span class="cx">
</span><span class="cx"> NSWindow *window = [webView window];
</span><del>- NSEvent *event = [NSEvent mouseEventWithType:NSRightMouseDown
</del><ins>+ NSEvent *event = [NSEvent mouseEventWithType:NSEventTypeRightMouseDown
</ins><span class="cx"> location:NSMakePoint(anchor.offsetLeft + anchor.offsetWidth / 2, window.frame.size.height - (anchor.offsetTop + anchor.offsetHeight / 2))
</span><span class="cx"> modifierFlags:0
</span><span class="cx"> timestamp:GetCurrentEventTime()
</span><span class="lines">@@ -89,7 +90,7 @@
</span><span class="cx"> TEST(WebKit1, ContextMenuCanCopyURL)
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0,0,800,600) frameName:nil groupName:nil]);
</span><del>- RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:NSMakeRect(100, 100, 800, 600) styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES]);
</del><ins>+ RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:NSMakeRect(100, 100, 800, 600) styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:YES]);
</ins><span class="cx"> RetainPtr<ContextMenuCanCopyURLDelegate> delegate = adoptNS([[ContextMenuCanCopyURLDelegate alloc] init]);
</span><span class="cx">
</span><span class="cx"> [window.get().contentView addSubview:webView.get()];
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacContextMenuDefaultItemsHaveTagsmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/ContextMenuDefaultItemsHaveTags.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/ContextMenuDefaultItemsHaveTags.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/ContextMenuDefaultItemsHaveTags.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #import "PlatformWebView.h"
</span><span class="cx"> #import <Carbon/Carbon.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><ins>+#import <wtf/mac/AppKitCompatibilityDeclarations.h>
</ins><span class="cx">
</span><span class="cx"> @interface ContextMenuDefaultItemsHaveTagsDelegate : NSObject <WebFrameLoadDelegate>
</span><span class="cx"> @end
</span><span class="lines">@@ -49,7 +50,7 @@
</span><span class="cx"> TEST(WebKit1, ContextMenuDefaultItemsHaveTags)
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) frameName:nil groupName:nil]);
</span><del>- RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:NSMakeRect(100, 100, 800, 600) styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES]);
</del><ins>+ RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:NSMakeRect(100, 100, 800, 600) styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:YES]);
</ins><span class="cx"> RetainPtr<ContextMenuDefaultItemsHaveTagsDelegate> delegate = adoptNS([[ContextMenuDefaultItemsHaveTagsDelegate alloc] init]);
</span><span class="cx">
</span><span class="cx"> [window.get().contentView addSubview:webView.get()];
</span><span class="lines">@@ -59,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> Util::run(&didFinishLoad);
</span><span class="cx">
</span><del>- NSEvent *event = [NSEvent mouseEventWithType:NSRightMouseDown location:NSMakePoint(400, 300) modifierFlags:0 timestamp:[NSDate timeIntervalSinceReferenceDate]
</del><ins>+ NSEvent *event = [NSEvent mouseEventWithType:NSEventTypeRightMouseDown location:NSMakePoint(400, 300) modifierFlags:0 timestamp:[NSDate timeIntervalSinceReferenceDate]
</ins><span class="cx"> windowNumber:[window windowNumber] context:[NSGraphicsContext currentContext] eventNumber:0 clickCount:0 pressure:0];
</span><span class="cx"> NSView *subView = [webView hitTest:[event locationInWindow]];
</span><span class="cx"> NSMenu *menu = [subView menuForEvent:event];
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacFullscreenZoomInitialFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/FullscreenZoomInitialFrame.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/FullscreenZoomInitialFrame.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/FullscreenZoomInitialFrame.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #import <WebKit/WKViewPrivate.h>
</span><span class="cx"> #import <WebKit/WKPreferencesPrivate.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><ins>+#import <wtf/mac/AppKitCompatibilityDeclarations.h>
</ins><span class="cx">
</span><span class="cx"> @interface NSWindowController (WebKitFullScreenAdditions)
</span><span class="cx"> - (NSRect)initialFrame;
</span><span class="lines">@@ -150,12 +151,12 @@
</span><span class="cx"> template <typename View>
</span><span class="cx"> void FullscreenZoomInitialFrame::runTest(View view)
</span><span class="cx"> {
</span><del>- RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:view.frame styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]);
</del><ins>+ RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:view.frame styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO]);
</ins><span class="cx"> [window.get().contentView addSubview:view];
</span><span class="cx">
</span><span class="cx"> setPageScale(view, 2);
</span><span class="cx">
</span><del>- NSEvent *event = [NSEvent mouseEventWithType:NSLeftMouseDown location:NSMakePoint(5, 5) modifierFlags:0 timestamp:0 windowNumber:window.get().windowNumber context:0 eventNumber:0 clickCount:0 pressure:0];
</del><ins>+ NSEvent *event = [NSEvent mouseEventWithType:NSEventTypeLeftMouseDown location:NSMakePoint(5, 5) modifierFlags:0 timestamp:0 windowNumber:window.get().windowNumber context:0 eventNumber:0 clickCount:0 pressure:0];
</ins><span class="cx">
</span><span class="cx"> isWaitingForPageSignalToContinue = true;
</span><span class="cx"> didGetPageSignalToContinue = false;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacMenuTypesForMouseEventsmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/MenuTypesForMouseEvents.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/MenuTypesForMouseEvents.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/MenuTypesForMouseEvents.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #import <WebCore/PlatformEventFactoryMac.h>
</span><span class="cx"> #import <wtf/AutodrainedPool.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><ins>+#import <wtf/mac/AppKitCompatibilityDeclarations.h>
</ins><span class="cx">
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="cx">
</span><span class="lines">@@ -63,77 +64,77 @@
</span><span class="cx">
</span><span class="cx"> TEST(WebKit1, MenuAndButtonForNormalLeftClick)
</span><span class="cx"> {
</span><del>- buildAndPerformTest(NSLeftMouseDown, 0, WebCore::LeftButton, NSMenuTypeNone);
</del><ins>+ buildAndPerformTest(NSEventTypeLeftMouseDown, 0, WebCore::LeftButton, NSMenuTypeNone);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit1, MenuAndButtonForNormalRightClick)
</span><span class="cx"> {
</span><del>- buildAndPerformTest(NSRightMouseDown, 0, WebCore::RightButton, NSMenuTypeContextMenu);
</del><ins>+ buildAndPerformTest(NSEventTypeRightMouseDown, 0, WebCore::RightButton, NSMenuTypeContextMenu);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit1, MenuAndButtonForNormalMiddleClick)
</span><span class="cx"> {
</span><del>- buildAndPerformTest(NSOtherMouseDown, 0, WebCore::MiddleButton, NSMenuTypeNone);
</del><ins>+ buildAndPerformTest(NSEventTypeOtherMouseDown, 0, WebCore::MiddleButton, NSMenuTypeNone);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit1, MenuAndButtonForControlLeftClick)
</span><span class="cx"> {
</span><del>- buildAndPerformTest(NSLeftMouseDown, NSControlKeyMask, WebCore::LeftButton, NSMenuTypeContextMenu);
</del><ins>+ buildAndPerformTest(NSEventTypeLeftMouseDown, NSEventModifierFlagControl, WebCore::LeftButton, NSMenuTypeContextMenu);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit1, MenuAndButtonForControlRightClick)
</span><span class="cx"> {
</span><del>- buildAndPerformTest(NSRightMouseDown, NSControlKeyMask, WebCore::RightButton, NSMenuTypeContextMenu);
</del><ins>+ buildAndPerformTest(NSEventTypeRightMouseDown, NSEventModifierFlagControl, WebCore::RightButton, NSMenuTypeContextMenu);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit1, MenuAndButtonForControlMiddleClick)
</span><span class="cx"> {
</span><del>- buildAndPerformTest(NSOtherMouseDown, NSControlKeyMask, WebCore::MiddleButton, NSMenuTypeNone);
</del><ins>+ buildAndPerformTest(NSEventTypeOtherMouseDown, NSEventModifierFlagControl, WebCore::MiddleButton, NSMenuTypeNone);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit1, MenuAndButtonForShiftLeftClick)
</span><span class="cx"> {
</span><del>- buildAndPerformTest(NSLeftMouseDown, NSShiftKeyMask, WebCore::LeftButton, NSMenuTypeNone);
</del><ins>+ buildAndPerformTest(NSEventTypeLeftMouseDown, NSEventModifierFlagShift, WebCore::LeftButton, NSMenuTypeNone);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit1, MenuAndButtonForShiftRightClick)
</span><span class="cx"> {
</span><del>- buildAndPerformTest(NSRightMouseDown, NSShiftKeyMask, WebCore::RightButton, NSMenuTypeContextMenu);
</del><ins>+ buildAndPerformTest(NSEventTypeRightMouseDown, NSEventModifierFlagShift, WebCore::RightButton, NSMenuTypeContextMenu);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit1, MenuAndButtonForShiftMiddleClick)
</span><span class="cx"> {
</span><del>- buildAndPerformTest(NSOtherMouseDown, NSShiftKeyMask, WebCore::MiddleButton, NSMenuTypeNone);
</del><ins>+ buildAndPerformTest(NSEventTypeOtherMouseDown, NSEventModifierFlagShift, WebCore::MiddleButton, NSMenuTypeNone);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit1, MenuAndButtonForCommandLeftClick)
</span><span class="cx"> {
</span><del>- buildAndPerformTest(NSLeftMouseDown, NSCommandKeyMask, WebCore::LeftButton, NSMenuTypeNone);
</del><ins>+ buildAndPerformTest(NSEventTypeLeftMouseDown, NSEventModifierFlagCommand, WebCore::LeftButton, NSMenuTypeNone);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit1, MenuAndButtonForCommandRightClick)
</span><span class="cx"> {
</span><del>- buildAndPerformTest(NSRightMouseDown, NSCommandKeyMask, WebCore::RightButton, NSMenuTypeContextMenu);
</del><ins>+ buildAndPerformTest(NSEventTypeRightMouseDown, NSEventModifierFlagCommand, WebCore::RightButton, NSMenuTypeContextMenu);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit1, MenuAndButtonForCommandMiddleClick)
</span><span class="cx"> {
</span><del>- buildAndPerformTest(NSOtherMouseDown, NSCommandKeyMask, WebCore::MiddleButton, NSMenuTypeNone);
</del><ins>+ buildAndPerformTest(NSEventTypeOtherMouseDown, NSEventModifierFlagCommand, WebCore::MiddleButton, NSMenuTypeNone);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit1, MenuAndButtonForAltLeftClick)
</span><span class="cx"> {
</span><del>- buildAndPerformTest(NSLeftMouseDown, NSAlternateKeyMask, WebCore::LeftButton, NSMenuTypeNone);
</del><ins>+ buildAndPerformTest(NSEventTypeLeftMouseDown, NSEventModifierFlagOption, WebCore::LeftButton, NSMenuTypeNone);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit1, MenuAndButtonForAltRightClick)
</span><span class="cx"> {
</span><del>- buildAndPerformTest(NSRightMouseDown, NSAlternateKeyMask, WebCore::RightButton, NSMenuTypeContextMenu);
</del><ins>+ buildAndPerformTest(NSEventTypeRightMouseDown, NSEventModifierFlagOption, WebCore::RightButton, NSMenuTypeContextMenu);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit1, MenuAndButtonForAltMiddleClick)
</span><span class="cx"> {
</span><del>- buildAndPerformTest(NSOtherMouseDown, NSAlternateKeyMask, WebCore::MiddleButton, NSMenuTypeNone);
</del><ins>+ buildAndPerformTest(NSEventTypeOtherMouseDown, NSEventModifierFlagOption, WebCore::MiddleButton, NSMenuTypeNone);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPImacPlatformUtilitiesMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/mac/PlatformUtilitiesMac.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/mac/PlatformUtilitiesMac.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Tools/TestWebKitAPI/mac/PlatformUtilitiesMac.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include <WebKit/WKURLResponseNS.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><ins>+#include <wtf/mac/AppKitCompatibilityDeclarations.h>
</ins><span class="cx">
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="cx"> namespace Util {
</span><span class="lines">@@ -62,7 +63,7 @@
</span><span class="cx">
</span><span class="cx"> bool isKeyDown(WKNativeEventPtr event)
</span><span class="cx"> {
</span><del>- return [event type] == NSKeyDown;
</del><ins>+ return [event type] == NSEventTypeKeyDown;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace Util
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPImacPlatformWebViewMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/mac/PlatformWebViewMac.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/mac/PlatformWebViewMac.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Tools/TestWebKitAPI/mac/PlatformWebViewMac.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #import <Carbon/Carbon.h>
</span><span class="cx"> #import <WebKit/WKRetainPtr.h>
</span><span class="cx"> #import <WebKit/WKViewPrivate.h>
</span><ins>+#import <wtf/mac/AppKitCompatibilityDeclarations.h>
</ins><span class="cx">
</span><span class="cx"> @interface ActiveOffscreenWindow : NSWindow
</span><span class="cx"> @end
</span><span class="lines">@@ -53,7 +54,7 @@
</span><span class="cx"> [m_view setWindowOcclusionDetectionEnabled:NO];
</span><span class="cx">
</span><span class="cx"> NSRect windowRect = NSOffsetRect(rect, -10000, [(NSScreen *)[[NSScreen screens] objectAtIndex:0] frame].size.height - rect.size.height + 10000);
</span><del>- m_window = [[ActiveOffscreenWindow alloc] initWithContentRect:windowRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES];
</del><ins>+ m_window = [[ActiveOffscreenWindow alloc] initWithContentRect:windowRect styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:YES];
</ins><span class="cx"> [m_window setColorSpace:[[NSScreen mainScreen] colorSpace]];
</span><span class="cx"> [[m_window contentView] addSubview:m_view];
</span><span class="cx"> [m_window orderBack:nil];
</span><span class="lines">@@ -121,7 +122,7 @@
</span><span class="cx">
</span><span class="cx"> void PlatformWebView::simulateSpacebarKeyPress()
</span><span class="cx"> {
</span><del>- NSEvent *event = [NSEvent keyEventWithType:NSKeyDown
</del><ins>+ NSEvent *event = [NSEvent keyEventWithType:NSEventTypeKeyDown
</ins><span class="cx"> location:NSMakePoint(5, 5)
</span><span class="cx"> modifierFlags:0
</span><span class="cx"> timestamp:GetCurrentEventTime()
</span><span class="lines">@@ -134,7 +135,7 @@
</span><span class="cx">
</span><span class="cx"> [m_view keyDown:event];
</span><span class="cx">
</span><del>- event = [NSEvent keyEventWithType:NSKeyUp
</del><ins>+ event = [NSEvent keyEventWithType:NSEventTypeKeyUp
</ins><span class="cx"> location:NSMakePoint(5, 5)
</span><span class="cx"> modifierFlags:0
</span><span class="cx"> timestamp:GetCurrentEventTime()
</span><span class="lines">@@ -150,7 +151,7 @@
</span><span class="cx">
</span><span class="cx"> void PlatformWebView::simulateRightClick(unsigned x, unsigned y)
</span><span class="cx"> {
</span><del>- NSEvent *event = [NSEvent mouseEventWithType:NSRightMouseDown
</del><ins>+ NSEvent *event = [NSEvent mouseEventWithType:NSEventTypeRightMouseDown
</ins><span class="cx"> location:NSMakePoint(x, y)
</span><span class="cx"> modifierFlags:0
</span><span class="cx"> timestamp:GetCurrentEventTime()
</span><span class="lines">@@ -163,7 +164,7 @@
</span><span class="cx">
</span><span class="cx"> [m_view rightMouseDown:event];
</span><span class="cx">
</span><del>- event = [NSEvent mouseEventWithType:NSRightMouseUp
</del><ins>+ event = [NSEvent mouseEventWithType:NSEventTypeRightMouseUp
</ins><span class="cx"> location:NSMakePoint(x, y)
</span><span class="cx"> modifierFlags:0
</span><span class="cx"> timestamp:GetCurrentEventTime()
</span><span class="lines">@@ -179,7 +180,7 @@
</span><span class="cx">
</span><span class="cx"> void PlatformWebView::simulateMouseMove(unsigned x, unsigned y)
</span><span class="cx"> {
</span><del>- NSEvent *event = [NSEvent mouseEventWithType:NSMouseMoved
</del><ins>+ NSEvent *event = [NSEvent mouseEventWithType:NSEventTypeMouseMoved
</ins><span class="cx"> location:NSMakePoint(x, y)
</span><span class="cx"> modifierFlags:0
</span><span class="cx"> timestamp:GetCurrentEventTime()
</span><span class="lines">@@ -197,16 +198,16 @@
</span><span class="cx"> {
</span><span class="cx"> switch (button) {
</span><span class="cx"> case kWKEventMouseButtonLeftButton:
</span><del>- return NSLeftMouseDown;
</del><ins>+ return NSEventTypeLeftMouseDown;
</ins><span class="cx"> case kWKEventMouseButtonRightButton:
</span><del>- return NSRightMouseDown;
</del><ins>+ return NSEventTypeRightMouseDown;
</ins><span class="cx"> case kWKEventMouseButtonMiddleButton:
</span><del>- return NSOtherMouseDown;
</del><ins>+ return NSEventTypeOtherMouseDown;
</ins><span class="cx"> case kWKEventMouseButtonNoButton:
</span><del>- return NSLeftMouseDown;
</del><ins>+ return NSEventTypeLeftMouseDown;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return NSLeftMouseDown;
</del><ins>+ return NSEventTypeLeftMouseDown;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static NSEventModifierFlags modifierFlagsForWKModifiers(WKEventModifiers modifiers)
</span><span class="lines">@@ -213,15 +214,15 @@
</span><span class="cx"> {
</span><span class="cx"> NSEventModifierFlags returnVal = 0;
</span><span class="cx"> if (modifiers & kWKEventModifiersShiftKey)
</span><del>- returnVal |= NSShiftKeyMask;
</del><ins>+ returnVal |= NSEventModifierFlagShift;
</ins><span class="cx"> if (modifiers & kWKEventModifiersControlKey)
</span><del>- returnVal |= NSControlKeyMask;
</del><ins>+ returnVal |= NSEventModifierFlagControl;
</ins><span class="cx"> if (modifiers & kWKEventModifiersAltKey)
</span><del>- returnVal |= NSAlternateKeyMask;
</del><ins>+ returnVal |= NSEventModifierFlagOption;
</ins><span class="cx"> if (modifiers & kWKEventModifiersMetaKey)
</span><del>- returnVal |= NSCommandKeyMask;
</del><ins>+ returnVal |= NSEventModifierFlagCommand;
</ins><span class="cx"> if (modifiers & kWKEventModifiersCapsLockKey)
</span><del>- returnVal |= NSAlphaShiftKeyMask;
</del><ins>+ returnVal |= NSEventModifierFlagCapsLock;
</ins><span class="cx">
</span><span class="cx"> return returnVal;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPImacTestWKWebViewMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/mac/TestWKWebViewMac.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/mac/TestWKWebViewMac.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Tools/TestWebKitAPI/mac/TestWKWebViewMac.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #import <WebKit/WebKitPrivate.h>
</span><span class="cx"> #import <objc/runtime.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><ins>+#import <wtf/mac/AppKitCompatibilityDeclarations.h>
</ins><span class="cx">
</span><span class="cx"> @implementation TestMessageHandler {
</span><span class="cx"> NSMutableDictionary<NSString *, dispatch_block_t> *_messageHandlers;
</span><span class="lines">@@ -70,21 +71,13 @@
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101003
</span><span class="cx"> NSEventMask __simulated_forceClickAssociatedEventsMask(id self, SEL _cmd)
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
</del><span class="cx"> return NSEventMaskPressure | NSEventMaskLeftMouseDown | NSEventMaskLeftMouseUp | NSEventMaskLeftMouseDragged;
</span><del>-#else
- return NSEventMaskPressure | (1 << NSLeftMouseDown) | (1 << NSLeftMouseUp) | (1 << NSLeftMouseDragged);
-#endif
</del><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> - (void)_mouseDownAtPoint:(NSPoint)point simulatePressure:(BOOL)simulatePressure
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
</del><span class="cx"> NSEventType mouseEventType = NSEventTypeLeftMouseDown;
</span><del>-#else
- NSEventType mouseEventType = NSLeftMouseDown;
-#endif
</del><span class="cx">
</span><span class="cx"> NSEventMask modifierFlags = 0;
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101003
</span><span class="lines">@@ -157,7 +150,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)_setUpTestWindow:(NSRect)frame
</span><span class="cx"> {
</span><del>- _hostWindow = [[TestWKWebViewHostWindow alloc] initWithContentRect:frame styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO];
</del><ins>+ _hostWindow = [[TestWKWebViewHostWindow alloc] initWithContentRect:frame styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO];
</ins><span class="cx"> [_hostWindow setFrameOrigin:NSMakePoint(0, 0)];
</span><span class="cx"> [[_hostWindow contentView] addSubview:self];
</span><span class="cx"> [_hostWindow setIsVisible:YES];
</span><span class="lines">@@ -193,13 +186,8 @@
</span><span class="cx">
</span><span class="cx"> - (void)typeCharacter:(char)character {
</span><span class="cx"> NSString *characterAsString = [NSString stringWithFormat:@"%c" , character];
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
</del><span class="cx"> NSEventType keyDownEventType = NSEventTypeKeyDown;
</span><span class="cx"> NSEventType keyUpEventType = NSEventTypeKeyUp;
</span><del>-#else
- NSEventType keyDownEventType = NSKeyDown;
- NSEventType keyUpEventType = NSKeyUp;
-#endif
</del><span class="cx"> [self keyDown:[NSEvent keyEventWithType:keyDownEventType location:NSZeroPoint modifierFlags:0 timestamp:GetCurrentEventTime() windowNumber:_hostWindow.windowNumber context:nil characters:characterAsString charactersIgnoringModifiers:characterAsString isARepeat:NO keyCode:character]];
</span><span class="cx"> [self keyUp:[NSEvent keyEventWithType:keyUpEventType location:NSZeroPoint modifierFlags:0 timestamp:GetCurrentEventTime() windowNumber:_hostWindow.windowNumber context:nil characters:characterAsString charactersIgnoringModifiers:characterAsString isARepeat:NO keyCode:character]];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnermacEventSenderProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #import <WebKit/WKPagePrivate.h>
</span><span class="cx"> #import <WebKit/WKWebView.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><ins>+#import <wtf/mac/AppKitCompatibilityDeclarations.h>
</ins><span class="cx">
</span><span class="cx"> @interface NSApplication (Details)
</span><span class="cx"> - (void)_setCurrentEvent:(NSEvent *)event;
</span><span class="lines">@@ -207,33 +208,33 @@
</span><span class="cx"> static NSEventType eventTypeForMouseButtonAndAction(int button, MouseAction action)
</span><span class="cx"> {
</span><span class="cx"> switch (button) {
</span><del>- case LeftMouseButton:
- switch (action) {
- case MouseDown:
- return NSLeftMouseDown;
- case MouseUp:
- return NSLeftMouseUp;
- case MouseDragged:
- return NSLeftMouseDragged;
- }
- case RightMouseButton:
- switch (action) {
- case MouseDown:
- return NSRightMouseDown;
- case MouseUp:
- return NSRightMouseUp;
- case MouseDragged:
- return NSRightMouseDragged;
- }
- default:
- switch (action) {
- case MouseDown:
- return NSOtherMouseDown;
- case MouseUp:
- return NSOtherMouseUp;
- case MouseDragged:
- return NSOtherMouseDragged;
- }
</del><ins>+ case LeftMouseButton:
+ switch (action) {
+ case MouseDown:
+ return NSEventTypeLeftMouseDown;
+ case MouseUp:
+ return NSEventTypeLeftMouseUp;
+ case MouseDragged:
+ return NSEventTypeLeftMouseDragged;
+ }
+ case RightMouseButton:
+ switch (action) {
+ case MouseDown:
+ return NSEventTypeRightMouseDown;
+ case MouseUp:
+ return NSEventTypeRightMouseUp;
+ case MouseDragged:
+ return NSEventTypeRightMouseDragged;
+ }
+ default:
+ switch (action) {
+ case MouseDown:
+ return NSEventTypeOtherMouseDown;
+ case MouseUp:
+ return NSEventTypeOtherMouseUp;
+ case MouseDragged:
+ return NSEventTypeOtherMouseDragged;
+ }
</ins><span class="cx"> }
</span><span class="cx"> assert(0);
</span><span class="cx"> return static_cast<NSEventType>(0);
</span><span class="lines">@@ -243,15 +244,15 @@
</span><span class="cx"> {
</span><span class="cx"> int flags = 0;
</span><span class="cx"> if (modifiers & kWKEventModifiersControlKey)
</span><del>- flags |= NSControlKeyMask;
</del><ins>+ flags |= NSEventModifierFlagControl;
</ins><span class="cx"> if (modifiers & kWKEventModifiersShiftKey)
</span><del>- flags |= NSShiftKeyMask;
</del><ins>+ flags |= NSEventModifierFlagShift;
</ins><span class="cx"> if (modifiers & kWKEventModifiersAltKey)
</span><del>- flags |= NSAlternateKeyMask;
</del><ins>+ flags |= NSEventModifierFlagOption;
</ins><span class="cx"> if (modifiers & kWKEventModifiersMetaKey)
</span><del>- flags |= NSCommandKeyMask;
</del><ins>+ flags |= NSEventModifierFlagCommand;
</ins><span class="cx"> if (modifiers & kWKEventModifiersCapsLockKey)
</span><del>- flags |= NSAlphaShiftKeyMask;
</del><ins>+ flags |= NSEventModifierFlagCapsLock;
</ins><span class="cx"> return flags;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -351,7 +352,7 @@
</span><span class="cx"> {
</span><span class="cx"> updateClickCountForButton(0);
</span><span class="cx">
</span><del>- NSEvent *event = [NSEvent mouseEventWithType:NSLeftMouseDown
</del><ins>+ NSEvent *event = [NSEvent mouseEventWithType:NSEventTypeLeftMouseDown
</ins><span class="cx"> location:NSMakePoint(m_position.x, m_position.y)
</span><span class="cx"> modifierFlags:NSEventMaskPressure
</span><span class="cx"> timestamp:absoluteTimeForEventTime(currentEventTime())
</span><span class="lines">@@ -415,7 +416,7 @@
</span><span class="cx"> RetainPtr<NSEvent> preForceClick = pressureChangeEvent(1, PressureChangeDirection::Increasing);
</span><span class="cx"> RetainPtr<NSEvent> forceClick = pressureChangeEvent(2, PressureChangeDirection::Increasing);
</span><span class="cx"> RetainPtr<NSEvent> releasingPressure = pressureChangeEvent(1, PressureChangeDirection::Decreasing);
</span><del>- NSEvent *mouseUp = [NSEvent mouseEventWithType:NSLeftMouseUp
</del><ins>+ NSEvent *mouseUp = [NSEvent mouseEventWithType:NSEventTypeLeftMouseUp
</ins><span class="cx"> location:NSMakePoint(m_position.x, m_position.y)
</span><span class="cx"> modifierFlags:0
</span><span class="cx"> timestamp:absoluteTimeForEventTime(currentEventTime())
</span><span class="lines">@@ -452,7 +453,7 @@
</span><span class="cx"> RetainPtr<NSEvent> beginPressure = beginPressureEvent(1);
</span><span class="cx"> RetainPtr<NSEvent> increasingPressure = pressureChangeEvent(1, PressureChangeDirection::Increasing);
</span><span class="cx"> RetainPtr<NSEvent> releasingPressure = pressureChangeEvent(1, PressureChangeDirection::Decreasing);
</span><del>- NSEvent *mouseUp = [NSEvent mouseEventWithType:NSLeftMouseUp
</del><ins>+ NSEvent *mouseUp = [NSEvent mouseEventWithType:NSEventTypeLeftMouseUp
</ins><span class="cx"> location:NSMakePoint(m_position.x, m_position.y)
</span><span class="cx"> modifierFlags:0
</span><span class="cx"> timestamp:absoluteTimeForEventTime(currentEventTime())
</span><span class="lines">@@ -602,7 +603,7 @@
</span><span class="cx"> NSPoint position = [view convertPoint:NSMakePoint(x, y) toView:nil];
</span><span class="cx"> m_position.x = position.x;
</span><span class="cx"> m_position.y = position.y;
</span><del>- NSEvent *event = [NSEvent mouseEventWithType:(m_leftMouseButtonDown ? NSLeftMouseDragged : NSMouseMoved)
</del><ins>+ NSEvent *event = [NSEvent mouseEventWithType:(m_leftMouseButtonDown ? NSEventTypeLeftMouseDragged : NSEventTypeMouseMoved)
</ins><span class="cx"> location:position
</span><span class="cx"> modifierFlags:0
</span><span class="cx"> timestamp:absoluteTimeForEventTime(currentEventTime())
</span><span class="lines">@@ -798,7 +799,7 @@
</span><span class="cx"> int modifierFlags = 0;
</span><span class="cx">
</span><span class="cx"> if ([character length] == 1 && [character characterAtIndex:0] >= 'A' && [character characterAtIndex:0] <= 'Z') {
</span><del>- modifierFlags |= NSShiftKeyMask;
</del><ins>+ modifierFlags |= NSEventModifierFlagShift;
</ins><span class="cx"> charactersIgnoringModifiers = [character lowercaseString];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -805,9 +806,9 @@
</span><span class="cx"> modifierFlags |= buildModifierFlags(modifiers);
</span><span class="cx">
</span><span class="cx"> if (keyLocation == 0x03 /*DOM_KEY_LOCATION_NUMPAD*/)
</span><del>- modifierFlags |= NSNumericPadKeyMask;
</del><ins>+ modifierFlags |= NSEventModifierFlagNumericPad;
</ins><span class="cx">
</span><del>- NSEvent *event = [NSEvent keyEventWithType:NSKeyDown
</del><ins>+ NSEvent *event = [NSEvent keyEventWithType:NSEventTypeKeyDown
</ins><span class="cx"> location:NSMakePoint(5, 5)
</span><span class="cx"> modifierFlags:modifierFlags
</span><span class="cx"> timestamp:absoluteTimeForEventTime(currentEventTime())
</span><span class="lines">@@ -822,7 +823,7 @@
</span><span class="cx"> [[m_testController->mainWebView()->platformWindow() firstResponder] keyDown:event];
</span><span class="cx"> [NSApp _setCurrentEvent:nil];
</span><span class="cx">
</span><del>- event = [NSEvent keyEventWithType:NSKeyUp
</del><ins>+ event = [NSEvent keyEventWithType:NSEventTypeKeyUp
</ins><span class="cx"> location:NSMakePoint(5, 5)
</span><span class="cx"> modifierFlags:modifierFlags
</span><span class="cx"> timestamp:absoluteTimeForEventTime(currentEventTime())
</span><span class="lines">@@ -918,7 +919,7 @@
</span><span class="cx"> RetainPtr<EventSenderSyntheticEvent> event = adoptNS([[EventSenderSyntheticEvent alloc] init]);
</span><span class="cx">
</span><span class="cx"> // "mayBegin" a swipe is actually a scroll wheel event.
</span><del>- event->_eventSender_type = (phase == 128) ? NSScrollWheel : NSEventTypeGesture;
</del><ins>+ event->_eventSender_type = (phase == 128) ? NSEventTypeScrollWheel : NSEventTypeGesture;
</ins><span class="cx"> event->_eventSender_subtype = 6; // kIOHIDEventTypeScroll
</span><span class="cx"> event->_eventSender_locationInWindow = NSMakePoint(m_position.x, m_position.y);
</span><span class="cx"> event->_eventSender_location = ([m_testController->mainWebView()->platformWindow() convertRectToScreen:NSMakeRect(m_position.x, m_position.y, 1, 1)].origin);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnermacPlatformWebViewMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #import <WebKit/WKWebViewConfiguration.h>
</span><span class="cx"> #import <WebKit/WKWebViewPrivate.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><ins>+#import <wtf/mac/AppKitCompatibilityDeclarations.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx"> @interface WKWebView (Details)
</span><span class="lines">@@ -145,7 +146,7 @@
</span><span class="cx">
</span><span class="cx"> NSScreen *firstScreen = [[NSScreen screens] objectAtIndex:0];
</span><span class="cx"> NSRect windowRect = m_options.shouldShowWebView ? NSOffsetRect(rect, 100, 100) : NSOffsetRect(rect, -10000, [firstScreen frame].size.height - rect.size.height + 10000);
</span><del>- m_window = [[WebKitTestRunnerWindow alloc] initWithContentRect:windowRect styleMask:NSBorderlessWindowMask backing:(NSBackingStoreType)_NSBackingStoreUnbuffered defer:YES];
</del><ins>+ m_window = [[WebKitTestRunnerWindow alloc] initWithContentRect:windowRect styleMask:NSWindowStyleMaskBorderless backing:(NSBackingStoreType)_NSBackingStoreUnbuffered defer:YES];
</ins><span class="cx"> m_window.platformWebView = this;
</span><span class="cx"> [m_window setColorSpace:[firstScreen colorSpace]];
</span><span class="cx"> [m_window setCollectionBehavior:NSWindowCollectionBehaviorStationary];
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnermacTestControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm (208454 => 208455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm 2016-11-09 19:31:25 UTC (rev 208454)
+++ trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm 2016-11-09 19:31:56 UTC (rev 208455)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> #import <WebKit/_WKUserContentExtensionStorePrivate.h>
</span><span class="cx"> #import <mach-o/dyld.h>
</span><span class="cx"> #import <wtf/ObjcRuntimeExtras.h>
</span><ins>+#import <wtf/mac/AppKitCompatibilityDeclarations.h>
</ins><span class="cx">
</span><span class="cx"> @interface NSSound ()
</span><span class="cx"> + (void)_setAlertType:(NSUInteger)alertType;
</span><span class="lines">@@ -103,7 +104,7 @@
</span><span class="cx"> {
</span><span class="cx"> cocoaResetStateToConsistentValues();
</span><span class="cx">
</span><del>- while ([NSApp nextEventMatchingMask:NSEventMaskGesture | NSScrollWheelMask untilDate:nil inMode:NSDefaultRunLoopMode dequeue:YES]) {
</del><ins>+ while ([NSApp nextEventMatchingMask:NSEventMaskGesture | NSEventTypeScrollWheel untilDate:nil inMode:NSDefaultRunLoopMode dequeue:YES]) {
</ins><span class="cx"> // Clear out (and ignore) any pending gesture and scroll wheel events.
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>