<!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>[197789] trunk/Source/WebCore</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/197789">197789</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-03-08 12:11:36 -0800 (Tue, 08 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ignore deprecation warnings.
* editing/cocoa/HTMLConverter.mm:
(HTMLConverter::computedAttributesForElement):
(HTMLConverter::_addMarkersToList):
* page/mac/EventHandlerMac.mm:
(WebCore::EventHandler::keyEvent):
(WebCore::lastEventIsMouseUp):
(WebCore::EventHandler::passSubframeEventToSubframe):
(WebCore::EventHandler::passWheelEventToWidget):
(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::textFromEvent):
(WebCore::unmodifiedTextFromEvent):
(WebCore::keyIdentifierForKeyEvent):
(WebCore::isKeypadEvent):
(WebCore::windowsKeyCodeForKeyEvent):
(WebCore::isKeyUpEvent):
(WebCore::modifiersForEvent):
(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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197788 => 197789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-08 19:33:10 UTC (rev 197788)
+++ trunk/Source/WebCore/ChangeLog 2016-03-08 20:11:36 UTC (rev 197789)
</span><span class="lines">@@ -1,3 +1,71 @@
</span><ins>+2016-03-08 Anders Carlsson <andersca@apple.com>
+
+ Ignore deprecation warnings.
+
+ * editing/cocoa/HTMLConverter.mm:
+ (HTMLConverter::computedAttributesForElement):
+ (HTMLConverter::_addMarkersToList):
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::EventHandler::keyEvent):
+ (WebCore::lastEventIsMouseUp):
+ (WebCore::EventHandler::passSubframeEventToSubframe):
+ (WebCore::EventHandler::passWheelEventToWidget):
+ (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::textFromEvent):
+ (WebCore::unmodifiedTextFromEvent):
+ (WebCore::keyIdentifierForKeyEvent):
+ (WebCore::isKeypadEvent):
+ (WebCore::windowsKeyCodeForKeyEvent):
+ (WebCore::isKeyUpEvent):
+ (WebCore::modifiersForEvent):
+ (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-03-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed attempt to fix the 32bit build after r197782.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaHTMLConvertermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm (197788 => 197789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2016-03-08 19:33:10 UTC (rev 197788)
+++ trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2016-03-08 20:11:36 UTC (rev 197789)
</span><span class="lines">@@ -1219,6 +1219,8 @@
</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><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><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">@@ -1227,6 +1229,7 @@
</span><span class="cx"> [paragraphStyle setAlignment:NSTextAlignmentCenter];
</span><span class="cx"> else if (textAlign.endsWith("justify"))
</span><span class="cx"> [paragraphStyle setAlignment:NSTextAlignmentJustified];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String direction = _caches->propertyValueForNode(coreBlockElement, CSSPropertyDirection);
</span><span class="lines">@@ -2072,7 +2075,10 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> tab = [[PlatformNSTextTab alloc] initWithTextAlignment:NSTextAlignmentNatural location:listLocation options:@{ }];
</span><span class="cx"> #else
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> tab = [[PlatformNSTextTab alloc] initWithTextAlignment:NSNaturalTextAlignment location:listLocation options:@{ }];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> #endif
</span><span class="cx"> [newStyle addTabStop:tab];
</span><span class="cx"> [tab release];
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacEventHandlerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (197788 => 197789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2016-03-08 19:33:10 UTC (rev 197788)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2016-03-08 20:11:36 UTC (rev 197789)
</span><span class="lines">@@ -145,7 +145,10 @@
</span><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx">
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> ASSERT([event type] == NSKeyDown || [event type] == NSKeyUp);
</span><ins>+#pragma clang diagnostic pop
</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">@@ -198,9 +201,12 @@
</span><span class="cx">
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> NSEvent *currentEventAfterHandlingMouseDown = [NSApp currentEvent];
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> return EventHandler::currentNSEvent() != currentEventAfterHandlingMouseDown
</span><span class="cx"> && [currentEventAfterHandlingMouseDown type] == NSLeftMouseUp
</span><span class="cx"> && [currentEventAfterHandlingMouseDown timestamp] >= [EventHandler::currentNSEvent() timestamp];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -364,6 +370,8 @@
</span><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx">
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> switch ([currentNSEvent() type]) {
</span><span class="cx"> case NSLeftMouseDragged:
</span><span class="cx"> case NSOtherMouseDragged:
</span><span class="lines">@@ -413,6 +421,7 @@
</span><span class="cx"> default:
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -465,8 +474,11 @@
</span><span class="cx"> return downcast<FrameView>(widget).frame().eventHandler().handleWheelEvent(wheelEvent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ([currentNSEvent() type] != NSScrollWheel || m_sendingEventToSubview)
</del><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ if ([currentNSEvent() type] != NSScrollWheel || m_sendingEventToSubview)
</ins><span class="cx"> return false;
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx">
</span><span class="cx"> ASSERT(nodeView);
</span><span class="cx"> ASSERT([nodeView superview]);
</span><span class="lines">@@ -569,6 +581,8 @@
</span><span class="cx">
</span><span class="cx"> m_sendingEventToSubview = false;
</span><span class="cx"> int eventType = [initiatingEvent type];
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> if (eventType == NSLeftMouseDown || eventType == NSKeyDown) {
</span><span class="cx"> NSEvent *fakeEvent = nil;
</span><span class="cx"> if (eventType == NSLeftMouseDown) {
</span><span class="lines">@@ -596,11 +610,10 @@
</span><span class="cx"> keyCode:[initiatingEvent keyCode]];
</span><span class="cx"> [NSApp postEvent:fakeEvent atStart:YES];
</span><span class="cx"> }
</span><ins>+
</ins><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>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> fakeEvent = [NSEvent mouseEventWithType:NSMouseMoved
</span><span class="cx"> location:[[view->platformWidget() window] convertScreenToBase:[NSEvent mouseLocation]]
</span><span class="cx"> modifierFlags:[initiatingEvent modifierFlags]
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacTextIndicatorWindowmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/TextIndicatorWindow.mm (197788 => 197789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/TextIndicatorWindow.mm 2016-03-08 19:33:10 UTC (rev 197788)
+++ trunk/Source/WebCore/page/mac/TextIndicatorWindow.mm 2016-03-08 20:11:36 UTC (rev 197789)
</span><span class="lines">@@ -457,11 +457,13 @@
</span><span class="cx"> verticalMargin = CGCeiling(verticalMargin);
</span><span class="cx">
</span><span class="cx"> CGRect contentRect = CGRectInset(textBoundingRectInScreenCoordinates, -horizontalMargin, -verticalMargin);
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> NSRect windowContentRect = [NSWindow contentRectForFrameRect:NSRectFromCGRect(contentRect) styleMask:NSBorderlessWindowMask];
</span><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><span class="cx"> m_textIndicatorWindow = adoptNS([[NSWindow alloc] initWithContentRect:integralWindowContentRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]);
</span><del>-
</del><ins>+#pragma clang diagnostic pop
</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 (197788 => 197789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/IconMac.mm 2016-03-08 19:33:10 UTC (rev 197788)
+++ trunk/Source/WebCore/platform/graphics/mac/IconMac.mm 2016-03-08 20:11:36 UTC (rev 197789)
</span><span class="lines">@@ -103,7 +103,10 @@
</span><span class="cx">
</span><span class="cx"> LocalCurrentGraphicsContext localCurrentGC(context);
</span><span class="cx">
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> [m_nsImage drawInRect:rect fromRect:NSMakeRect(0, 0, [m_nsImage size].width, [m_nsImage size].height) operation:NSCompositeSourceOver fraction:1.0f];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacCursorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/CursorMac.mm (197788 => 197789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/CursorMac.mm 2016-03-08 19:33:10 UTC (rev 197788)
+++ trunk/Source/WebCore/platform/mac/CursorMac.mm 2016-03-08 20:11:36 UTC (rev 197789)
</span><span class="lines">@@ -64,7 +64,10 @@
</span><span class="cx"> NSRect fromRect = NSMakeRect(0, 0, image->width(), image->height());
</span><span class="cx">
</span><span class="cx"> [expandedImage lockFocus];
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> [nsImage drawInRect:toRect fromRect:fromRect operation:NSCompositeSourceOver fraction:1];
</span><ins>+#pragma clang diagnostic pop
</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 (197788 => 197789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/DragImageMac.mm 2016-03-08 19:33:10 UTC (rev 197788)
+++ trunk/Source/WebCore/platform/mac/DragImageMac.mm 2016-03-08 20:11:36 UTC (rev 197789)
</span><span class="lines">@@ -75,7 +75,10 @@
</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><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> [image.get() drawAtPoint:NSZeroPoint fromRect:NSMakeRect(0, 0, [image size].width, [image size].height) operation:NSCompositeCopy fraction:delta];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> [dissolvedImage.get() unlockFocus];
</span><span class="cx">
</span><span class="cx"> return dissolvedImage;
</span><span class="lines">@@ -116,7 +119,10 @@
</span><span class="cx"> [cocoaTransform.get() setTransformStruct:*(NSAffineTransformStruct*)&transform];
</span><span class="cx"> [cocoaTransform.get() concat];
</span><span class="cx">
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> [image->getNSImage() drawInRect:destRect fromRect:NSMakeRect(0, 0, size.width(), size.height()) operation:NSCompositeSourceOver fraction:1.0];
</span><ins>+#pragma clang diagnostic pop
</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 (197788 => 197789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/EventLoopMac.mm 2016-03-08 19:33:10 UTC (rev 197788)
+++ trunk/Source/WebCore/platform/mac/EventLoopMac.mm 2016-03-08 20:11:36 UTC (rev 197789)
</span><span class="lines">@@ -31,7 +31,10 @@
</span><span class="cx"> void EventLoop::cycle()
</span><span class="cx"> {
</span><span class="cx"> [NSApp setWindowsNeedUpdate:YES];
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> [NSApp sendEvent:[NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate dateWithTimeIntervalSinceNow:0.05] inMode:NSDefaultRunLoopMode dequeue:YES]];
</span><ins>+#pragma clang diagnostic pop
</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 (197788 => 197789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2016-03-08 19:33:10 UTC (rev 197788)
+++ trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2016-03-08 20:11:36 UTC (rev 197789)
</span><span class="lines">@@ -642,8 +642,11 @@
</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><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> NSEvent* event = [NSEvent mouseEventWithType:NSMouseMoved location:NSZeroPoint
</span><span class="cx"> modifierFlags:0 timestamp:0 windowNumber:0 context:nil eventNumber:0 clickCount:0 pressure:0];
</span><ins>+#pragma clang diagnostic pop
</ins><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 (197788 => 197789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2016-03-08 19:33:10 UTC (rev 197788)
+++ trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2016-03-08 20:11:36 UTC (rev 197789)
</span><span class="lines">@@ -52,6 +52,8 @@
</span><span class="cx"> #if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
</span><span class="cx"> case NSEventTypePressure:
</span><span class="cx"> #endif
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> case NSLeftMouseDown:
</span><span class="cx"> case NSLeftMouseDragged:
</span><span class="cx"> case NSLeftMouseUp:
</span><span class="lines">@@ -65,6 +67,7 @@
</span><span class="cx"> case NSRightMouseDragged:
</span><span class="cx"> case NSRightMouseUp:
</span><span class="cx"> case NSScrollWheel:
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> return globalPoint([event locationInWindow], [event window]);
</span><span class="cx"> default:
</span><span class="cx"> return IntPoint();
</span><span class="lines">@@ -77,6 +80,8 @@
</span><span class="cx"> #if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
</span><span class="cx"> case NSEventTypePressure:
</span><span class="cx"> #endif
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> case NSLeftMouseDown:
</span><span class="cx"> case NSLeftMouseDragged:
</span><span class="cx"> case NSLeftMouseUp:
</span><span class="lines">@@ -97,6 +102,7 @@
</span><span class="cx"> location = [windowView convertPoint:location fromView:nil];
</span><span class="cx"> return IntPoint(location);
</span><span class="cx"> }
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> default:
</span><span class="cx"> return IntPoint();
</span><span class="cx"> }
</span><span class="lines">@@ -108,6 +114,8 @@
</span><span class="cx"> #if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
</span><span class="cx"> case NSEventTypePressure:
</span><span class="cx"> #endif
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> case NSLeftMouseDown:
</span><span class="cx"> case NSLeftMouseUp:
</span><span class="cx"> case NSLeftMouseDragged:
</span><span class="lines">@@ -120,6 +128,7 @@
</span><span class="cx"> case NSOtherMouseUp:
</span><span class="cx"> case NSOtherMouseDragged:
</span><span class="cx"> return MiddleButton;
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> default:
</span><span class="cx"> return NoButton;
</span><span class="cx"> }
</span><span class="lines">@@ -128,6 +137,8 @@
</span><span class="cx"> static PlatformEvent::Type mouseEventTypeForEvent(NSEvent* event)
</span><span class="cx"> {
</span><span class="cx"> switch ([event type]) {
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> case NSLeftMouseDragged:
</span><span class="cx"> case NSMouseEntered:
</span><span class="cx"> case NSMouseExited:
</span><span class="lines">@@ -143,6 +154,7 @@
</span><span class="cx"> case NSRightMouseUp:
</span><span class="cx"> case NSOtherMouseUp:
</span><span class="cx"> return PlatformEvent::MouseReleased;
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> default:
</span><span class="cx"> return PlatformEvent::MouseMoved;
</span><span class="cx"> }
</span><span class="lines">@@ -151,6 +163,8 @@
</span><span class="cx"> static int clickCountForEvent(NSEvent *event)
</span><span class="cx"> {
</span><span class="cx"> switch ([event type]) {
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> case NSLeftMouseDown:
</span><span class="cx"> case NSLeftMouseUp:
</span><span class="cx"> case NSLeftMouseDragged:
</span><span class="lines">@@ -160,6 +174,7 @@
</span><span class="cx"> case NSOtherMouseDown:
</span><span class="cx"> case NSOtherMouseUp:
</span><span class="cx"> case NSOtherMouseDragged:
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> return [event clickCount];
</span><span class="cx"> default:
</span><span class="cx"> return 0;
</span><span class="lines">@@ -205,21 +220,30 @@
</span><span class="cx">
</span><span class="cx"> static inline String textFromEvent(NSEvent* event)
</span><span class="cx"> {
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> if ([event type] == NSFlagsChanged)
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> return emptyString();
</span><span class="cx"> return String([event characters]);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline String unmodifiedTextFromEvent(NSEvent* event)
</span><span class="cx"> {
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> if ([event type] == NSFlagsChanged)
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> return emptyString();
</span><span class="cx"> return String([event charactersIgnoringModifiers]);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String keyIdentifierForKeyEvent(NSEvent* event)
</span><span class="cx"> {
</span><del>- if ([event type] == NSFlagsChanged)
</del><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ if ([event type] == NSFlagsChanged)
+#pragma clang diagnostic pop
</ins><span class="cx"> switch ([event keyCode]) {
</span><span class="cx"> case 54: // Right Command
</span><span class="cx"> case 55: // Left Command
</span><span class="lines">@@ -257,15 +281,21 @@
</span><span class="cx"> {
</span><span class="cx"> // Check that this is the type of event that has a keyCode.
</span><span class="cx"> switch ([event type]) {
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> case NSKeyDown:
</span><span class="cx"> case NSKeyUp:
</span><span class="cx"> case NSFlagsChanged:
</span><span class="cx"> break;
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> default:
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> if ([event modifierFlags] & NSNumericPadKeyMask)
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> switch ([event keyCode]) {
</span><span class="lines">@@ -302,7 +332,10 @@
</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><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> if (!isKeypadEvent(event) && ([event type] == NSKeyDown || [event type] == NSKeyUp)) {
</span><ins>+#pragma clang diagnostic pop
</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">@@ -360,6 +393,8 @@
</span><span class="cx">
</span><span class="cx"> static inline bool isKeyUpEvent(NSEvent *event)
</span><span class="cx"> {
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> if ([event type] != NSFlagsChanged)
</span><span class="cx"> return [event type] == NSKeyUp;
</span><span class="cx"> // FIXME: This logic fails if the user presses both Shift keys at once, for example:
</span><span class="lines">@@ -386,12 +421,15 @@
</span><span class="cx">
</span><span class="cx"> case 63: // Function
</span><span class="cx"> return ([event modifierFlags] & NSFunctionKeyMask) == 0;
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline PlatformEvent::Modifiers modifiersForEvent(NSEvent *event)
</span><span class="cx"> {
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> unsigned modifiers = 0;
</span><span class="cx"> if ([event modifierFlags] & NSShiftKeyMask)
</span><span class="cx"> modifiers |= PlatformEvent::ShiftKey;
</span><span class="lines">@@ -401,6 +439,7 @@
</span><span class="cx"> modifiers |= PlatformEvent::AltKey;
</span><span class="cx"> if ([event modifierFlags] & NSCommandKeyMask)
</span><span class="cx"> modifiers |= PlatformEvent::MetaKey;
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> return (PlatformEvent::Modifiers)modifiers;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -525,7 +564,10 @@
</span><span class="cx"> m_windowsVirtualKeyCode = windowsKeyCodeForKeyEvent(event);
</span><span class="cx"> m_nativeVirtualKeyCode = [event keyCode];
</span><span class="cx"> m_macCharCode = wkGetNSEventKeyChar(event);
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> m_autoRepeat = ([event type] != NSFlagsChanged) && [event isARepeat];
</span><ins>+#pragma clang diagnostic pop
</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 (197788 => 197789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2016-03-08 19:33:10 UTC (rev 197788)
+++ trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2016-03-08 20:11:36 UTC (rev 197789)
</span><span class="lines">@@ -138,6 +138,8 @@
</span><span class="cx">
</span><span class="cx"> static NSControlSize scrollbarControlSizeToNSControlSize(ScrollbarControlSize controlSize)
</span><span class="cx"> {
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> switch (controlSize) {
</span><span class="cx"> case RegularScrollbar:
</span><span class="cx"> return NSRegularControlSize;
</span><span class="lines">@@ -147,6 +149,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return NSRegularControlSize;
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollbarThemeMac::registerScrollbar(Scrollbar& scrollbar)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ThemeMac.mm (197788 => 197789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ThemeMac.mm 2016-03-08 19:33:10 UTC (rev 197788)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.mm 2016-03-08 20:11:36 UTC (rev 197789)
</span><span class="lines">@@ -67,8 +67,11 @@
</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><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> static WebCoreThemeWindow *window = [[WebCoreThemeWindow alloc] initWithContentRect:NSMakeRect(100, 100, 100, 100)
</span><span class="cx"> styleMask:NSTitledWindowMask backing:NSBackingStoreBuffered defer:YES];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> return window;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -141,12 +144,15 @@
</span><span class="cx">
</span><span class="cx"> static NSControlSize controlSizeForFont(const FontCascade& font)
</span><span class="cx"> {
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> int fontSize = font.pixelSize();
</span><span class="cx"> if (fontSize >= 16)
</span><span class="cx"> return NSRegularControlSize;
</span><span class="cx"> if (fontSize >= 11)
</span><span class="cx"> return NSSmallControlSize;
</span><span class="cx"> return NSMiniControlSize;
</span><ins>+#pragma clang diagnostic pop
</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">@@ -169,6 +175,8 @@
</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><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> if (minZoomedSize.width() >= static_cast<int>(sizes[NSRegularControlSize].width() * zoomFactor) &&
</span><span class="cx"> minZoomedSize.height() >= static_cast<int>(sizes[NSRegularControlSize].height() * zoomFactor))
</span><span class="cx"> return NSRegularControlSize;
</span><span class="lines">@@ -176,6 +184,7 @@
</span><span class="cx"> minZoomedSize.height() >= static_cast<int>(sizes[NSSmallControlSize].height() * zoomFactor))
</span><span class="cx"> return NSSmallControlSize;
</span><span class="cx"> return NSMiniControlSize;
</span><ins>+#pragma clang diagnostic pop
</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">@@ -471,7 +480,10 @@
</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><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> if (part == SquareButtonPart || zoomedSize.height() > buttonSizes()[NSRegularControlSize].height() * zoomFactor) {
</span><ins>+#pragma clang diagnostic pop
</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">@@ -567,12 +579,15 @@
</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><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> int fontSize = font.pixelSize();
</span><span class="cx"> if (fontSize >= 18)
</span><span class="cx"> return NSRegularControlSize;
</span><span class="cx"> if (fontSize >= 13)
</span><span class="cx"> return NSSmallControlSize;
</span><span class="cx"> return NSMiniControlSize;
</span><ins>+#pragma clang diagnostic pop
</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">@@ -585,12 +600,15 @@
</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><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> if (controlSize == NSSmallControlSize)
</span><span class="cx"> drawInfo.kind = kThemeIncDecButtonSmall;
</span><span class="cx"> else if (controlSize == NSMiniControlSize)
</span><span class="cx"> drawInfo.kind = kThemeIncDecButtonMini;
</span><span class="cx"> else
</span><span class="cx"> drawInfo.kind = kThemeIncDecButton;
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx">
</span><span class="cx"> IntRect rect(zoomedRect);
</span><span class="cx"> GraphicsContextStateSaver stateSaver(context);
</span><span class="lines">@@ -731,9 +749,12 @@
</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><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> IntSize base = stepperSizes()[NSMiniControlSize];
</span><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><ins>+#pragma clang diagnostic pop
</ins><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 (197788 => 197789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm 2016-03-08 19:33:10 UTC (rev 197788)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm 2016-03-08 20:11:36 UTC (rev 197789)
</span><span class="lines">@@ -74,7 +74,10 @@
</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><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> self = [super initWithContentRect:contentRect styleMask:NSBorderlessWindowMask backing:bufferingType defer:flag];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> if (!self)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="lines">@@ -120,13 +123,15 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)performKeyEquivalent:(NSEvent *)event
</span><span class="cx"> {
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> // Block all command key events while the fullscreen window is up.
</span><span class="cx"> if ([event type] != NSKeyDown)
</span><span class="cx"> return NO;
</span><span class="cx">
</span><span class="cx"> if (!([event modifierFlags] & NSCommandKeyMask))
</span><span class="cx"> return NO;
</span><del>-
</del><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -141,8 +146,11 @@
</span><span class="cx">
</span><span class="cx"> - (id)init
</span><span class="cx"> {
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> NSWindow *window = [[WebVideoFullscreenHUDWindow alloc] initWithContentRect:NSMakeRect(0, 0, windowWidth, windowHeight)
</span><span class="cx"> styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO];
</span><ins>+#pragma clang diagnostic pop
</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">@@ -181,6 +189,8 @@
</span><span class="cx"> case ' ':
</span><span class="cx"> [self togglePlaying:nil];
</span><span class="cx"> return;
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> case NSUpArrowFunctionKey:
</span><span class="cx"> if ([event modifierFlags] & NSAlternateKeyMask)
</span><span class="cx"> [self setVolume:[self maxVolume]];
</span><span class="lines">@@ -192,6 +202,7 @@
</span><span class="cx"> [self setVolume:0];
</span><span class="cx"> else
</span><span class="cx"> [self decrementVolume];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> return;
</span><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="lines">@@ -368,11 +379,17 @@
</span><span class="cx"> [contentView addSubview:_timeline];
</span><span class="cx">
</span><span class="cx"> _elapsedTimeText = createTimeTextField(NSMakeRect(timeTextFieldHorizontalMargin, timelineBottomMargin, timeTextFieldWidth, timeTextFieldHeight));
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> [_elapsedTimeText setAlignment:NSLeftTextAlignment];
</span><ins>+#pragma clang diagnostic pop
</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><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> [_remainingTimeText setAlignment:NSRightTextAlignment];
</span><ins>+#pragma clang diagnostic pop
</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 (197788 => 197789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebWindowAnimation.mm 2016-03-08 19:33:10 UTC (rev 197788)
+++ trunk/Source/WebCore/platform/mac/WebWindowAnimation.mm 2016-03-08 20:11:36 UTC (rev 197789)
</span><span class="lines">@@ -38,7 +38,10 @@
</span><span class="cx">
</span><span class="cx"> static NSTimeInterval WebWindowAnimationDurationFromDuration(NSTimeInterval duration)
</span><span class="cx"> {
</span><del>- return ([[NSApp currentEvent] modifierFlags] & NSShiftKeyMask) ? duration * slowMotionFactor : duration;
</del><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ return ([[NSApp currentEvent] modifierFlags] & NSShiftKeyMask) ? duration * slowMotionFactor : duration;
+#pragma clang diagnostic pop
</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 (197788 => 197789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-03-08 19:33:10 UTC (rev 197788)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-03-08 20:11:36 UTC (rev 197789)
</span><span class="lines">@@ -351,13 +351,22 @@
</span><span class="cx"> fontName = AtomicString("-apple-status-bar", AtomicString::ConstructFromLiteral);
</span><span class="cx"> break;
</span><span class="cx"> case CSSValueWebkitMiniControl:
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSMiniControlSize]];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> break;
</span><span class="cx"> case CSSValueWebkitSmallControl:
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSSmallControlSize]];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> break;
</span><span class="cx"> case CSSValueWebkitControl:
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSRegularControlSize]];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> font = [NSFont systemFontOfSize:[NSFont systemFontSize]];
</span><span class="lines">@@ -740,15 +749,20 @@
</span><span class="cx"> NSControlSize RenderThemeMac::controlSizeForFont(const RenderStyle& style) const
</span><span class="cx"> {
</span><span class="cx"> int fontSize = style.fontSize();
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> if (fontSize >= 16)
</span><span class="cx"> return NSRegularControlSize;
</span><span class="cx"> if (fontSize >= 11)
</span><span class="cx"> return NSSmallControlSize;
</span><span class="cx"> return NSMiniControlSize;
</span><ins>+#pragma clang diagnostic pop
</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><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> if (minSize.width() >= static_cast<int>(sizes[NSRegularControlSize].width() * zoomLevel)
</span><span class="cx"> && minSize.height() >= static_cast<int>(sizes[NSRegularControlSize].height() * zoomLevel))
</span><span class="cx"> return NSRegularControlSize;
</span><span class="lines">@@ -758,6 +772,7 @@
</span><span class="cx"> return NSSmallControlSize;
</span><span class="cx">
</span><span class="cx"> return NSMiniControlSize;
</span><ins>+#pragma clang diagnostic pop
</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">@@ -814,12 +829,15 @@
</span><span class="cx">
</span><span class="cx"> NSControlSize RenderThemeMac::controlSizeForSystemFont(const RenderStyle& style) const
</span><span class="cx"> {
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> int fontSize = style.fontSize();
</span><span class="cx"> if (fontSize >= [NSFont systemFontSizeForControlSize:NSRegularControlSize])
</span><span class="cx"> return NSRegularControlSize;
</span><span class="cx"> if (fontSize >= [NSFont systemFontSizeForControlSize:NSSmallControlSize])
</span><span class="cx"> return NSSmallControlSize;
</span><span class="cx"> return NSMiniControlSize;
</span><ins>+#pragma clang diagnostic pop
</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">@@ -1095,7 +1113,10 @@
</span><span class="cx"> const auto& renderProgress = downcast<RenderProgress>(renderObject);
</span><span class="cx"> HIThemeTrackDrawInfo trackInfo;
</span><span class="cx"> trackInfo.version = 0;
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> if (controlSize == NSRegularControlSize)
</span><ins>+#pragma clang diagnostic pop
</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">@@ -1388,12 +1409,15 @@
</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><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> case NSRegularControlSize:
</span><span class="cx"> return PopupMenuStyle::PopupMenuSizeNormal;
</span><span class="cx"> case NSSmallControlSize:
</span><span class="cx"> return PopupMenuStyle::PopupMenuSizeSmall;
</span><span class="cx"> case NSMiniControlSize:
</span><span class="cx"> return PopupMenuStyle::PopupMenuSizeMini;
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> default:
</span><span class="cx"> return PopupMenuStyle::PopupMenuSizeNormal;
</span><span class="cx"> }
</span><span class="lines">@@ -1975,9 +1999,12 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_sliderThumbHorizontal) {
</span><span class="cx"> m_sliderThumbHorizontal = adoptNS([[NSSliderCell alloc] init]);
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> [m_sliderThumbHorizontal.get() setSliderType:NSLinearSlider];
</span><span class="cx"> [m_sliderThumbHorizontal.get() setControlSize:NSSmallControlSize];
</span><span class="cx"> [m_sliderThumbHorizontal.get() setFocusRingType:NSFocusRingTypeExterior];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return m_sliderThumbHorizontal.get();
</span><span class="lines">@@ -1987,8 +2014,11 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_sliderThumbVertical) {
</span><span class="cx"> m_sliderThumbVertical = adoptNS([[NSSliderCell alloc] init]);
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> [m_sliderThumbVertical.get() setSliderType:NSLinearSlider];
</span><span class="cx"> [m_sliderThumbVertical.get() setControlSize:NSSmallControlSize];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> [m_sliderThumbVertical.get() setFocusRingType:NSFocusRingTypeExterior];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>