Title: [162929] trunk/Source
Revision
162929
Author
mr...@apple.com
Date
2014-01-28 02:40:58 -0800 (Tue, 28 Jan 2014)

Log Message

<https://webkit.org/b/127767> Disable some deprecation warnings to fix the build.

Reviewed by Ryosuke Niwa.

Source/WebCore:

* accessibility/mac/AXObjectCacheMac.mm:
(WebCore::AXObjectCache::postPlatformNotification):
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper renderWidgetChildren]):
* platform/audio/mac/AudioDestinationMac.cpp:
(WebCore::AudioDestinationMac::configure):
* platform/audio/mac/AudioFileReaderMac.cpp:
(WebCore::AudioFileReader::createBus):

Source/WebKit/mac:

* WebCoreSupport/PopupMenuMac.mm:
(PopupMenuMac::populate):

Source/WebKit2:

* UIProcess/API/mac/WKView.mm:
(-[WKView _updateWindowAndViewFrames]):
* WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (162928 => 162929)


--- trunk/Source/WebCore/ChangeLog	2014-01-28 10:22:47 UTC (rev 162928)
+++ trunk/Source/WebCore/ChangeLog	2014-01-28 10:40:58 UTC (rev 162929)
@@ -1,3 +1,18 @@
+2014-01-28  Mark Rowe  <mr...@apple.com>
+
+        <https://webkit.org/b/127767> Disable some deprecation warnings to fix the build.
+
+        Reviewed by Ryosuke Niwa.
+
+        * accessibility/mac/AXObjectCacheMac.mm:
+        (WebCore::AXObjectCache::postPlatformNotification):
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        (-[WebAccessibilityObjectWrapper renderWidgetChildren]):
+        * platform/audio/mac/AudioDestinationMac.cpp:
+        (WebCore::AudioDestinationMac::configure):
+        * platform/audio/mac/AudioFileReaderMac.cpp:
+        (WebCore::AudioFileReader::createBus):
+
 2014-01-28  Carlos Garcia Campos  <cgar...@igalia.com>
 
         [SOUP] Remove soupURIToKURL

Modified: trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm (162928 => 162929)


--- trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm	2014-01-28 10:22:47 UTC (rev 162928)
+++ trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm	2014-01-28 10:40:58 UTC (rev 162929)
@@ -135,7 +135,10 @@
     
     // NSAccessibilityPostNotification will call this method, (but not when running DRT), so ASSERT here to make sure it does not crash.
     // https://bugs.webkit.org/show_bug.cgi?id=46662
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     ASSERT([obj->wrapper() accessibilityIsIgnored] || true);
+#pragma clang diagnostic pop
     
     NSAccessibilityPostNotification(obj->wrapper(), macNotification);
     

Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (162928 => 162929)


--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm	2014-01-28 10:22:47 UTC (rev 162928)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm	2014-01-28 10:40:58 UTC (rev 162929)
@@ -1531,7 +1531,10 @@
     Widget* widget = m_object->widget();
     if (!widget)
         return nil;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     return [(widget->platformWidget()) accessibilityAttributeValue: NSAccessibilityChildrenAttribute];
+#pragma clang diagnostic pop
 }
 
 - (id)remoteAccessibilityParentObject
@@ -1835,6 +1838,8 @@
     return NSAccessibilityUnknownRole;
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 - (NSString*)subrole
 {
     if (m_object->isPasswordField())
@@ -1979,6 +1984,7 @@
     
     return nil;
 }
+#pragma clang diagnostic pop
 
 - (NSString*)roleDescription
 {
@@ -3625,6 +3631,8 @@
     return NSNotFound;
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 - (NSUInteger)accessibilityArrayAttributeCount:(NSString *)attribute
 {
     if (![self updateObjectBackingStore])
@@ -3645,6 +3653,7 @@
     
     return [super accessibilityArrayAttributeCount:attribute];
 }
+#pragma clang diagnostic pop
 
 - (NSArray *)accessibilityArrayAttributeValues:(NSString *)attribute index:(NSUInteger)index maxCount:(NSUInteger)maxCount
 {

Modified: trunk/Source/WebCore/platform/audio/mac/AudioDestinationMac.cpp (162928 => 162929)


--- trunk/Source/WebCore/platform/audio/mac/AudioDestinationMac.cpp	2014-01-28 10:22:47 UTC (rev 162928)
+++ trunk/Source/WebCore/platform/audio/mac/AudioDestinationMac.cpp	2014-01-28 10:40:58 UTC (rev 162929)
@@ -124,6 +124,8 @@
     OSStatus result = AudioUnitSetProperty(m_outputUnit, kAudioUnitProperty_SetRenderCallback, kAudioUnitScope_Global, 0, &input, sizeof(input));
     ASSERT(!result);
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     // Set stream format
     AudioStreamBasicDescription streamFormat;
     streamFormat.mSampleRate = m_sampleRate;
@@ -134,6 +136,7 @@
     streamFormat.mFramesPerPacket = 1;
     streamFormat.mBytesPerPacket = sizeof(AudioSampleType);
     streamFormat.mBytesPerFrame = sizeof(AudioSampleType);
+#pragma clang diagnostic pop
 
     result = AudioUnitSetProperty(m_outputUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, 0, (void*)&streamFormat, sizeof(AudioStreamBasicDescription));
     ASSERT(!result);

Modified: trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp (162928 => 162929)


--- trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp	2014-01-28 10:22:47 UTC (rev 162928)
+++ trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp	2014-01-28 10:40:58 UTC (rev 162929)
@@ -157,6 +157,8 @@
     // Client format will be linear PCM (canonical), and potentially change sample-rate.
     m_clientDataFormat = m_fileDataFormat;
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     m_clientDataFormat.mFormatID = kAudioFormatLinearPCM;
     m_clientDataFormat.mFormatFlags = kAudioFormatFlagsCanonical;
     m_clientDataFormat.mBitsPerChannel = 8 * sizeof(AudioSampleType);
@@ -165,6 +167,7 @@
     m_clientDataFormat.mBytesPerPacket = sizeof(AudioSampleType);
     m_clientDataFormat.mBytesPerFrame = sizeof(AudioSampleType);
     m_clientDataFormat.mFormatFlags |= kAudioFormatFlagIsNonInterleaved;
+#pragma clang diagnostic pop
 
     if (sampleRate)
         m_clientDataFormat.mSampleRate = sampleRate;

Modified: trunk/Source/WebKit/mac/ChangeLog (162928 => 162929)


--- trunk/Source/WebKit/mac/ChangeLog	2014-01-28 10:22:47 UTC (rev 162928)
+++ trunk/Source/WebKit/mac/ChangeLog	2014-01-28 10:40:58 UTC (rev 162929)
@@ -1,3 +1,12 @@
+2014-01-28  Mark Rowe  <mr...@apple.com>
+
+        <https://webkit.org/b/127767> Disable some deprecation warnings to fix the build.
+
+        Reviewed by Ryosuke Niwa.
+
+        * WebCoreSupport/PopupMenuMac.mm:
+        (PopupMenuMac::populate):
+
 2014-01-27  Joseph Pecoraro  <pecor...@apple.com>
 
         WebKit1: Enable -Wimplicit-fallthrough and add FALLTHROUGH annotation where needed

Modified: trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm (162928 => 162929)


--- trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm	2014-01-28 10:22:47 UTC (rev 162928)
+++ trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm	2014-01-28 10:40:58 UTC (rev 162929)
@@ -115,13 +115,16 @@
         [menuItem setTitle:[[string string] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]];
         [menuItem setEnabled:m_client->itemIsEnabled(i)];
         [menuItem setToolTip:m_client->itemToolTip(i)];
-        
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
         // Allow the accessible text of the item to be overriden if necessary.
         if (AXObjectCache::accessibilityEnabled()) {
             NSString *accessibilityOverride = m_client->itemAccessibilityText(i);
             if ([accessibilityOverride length])
                 [menuItem accessibilitySetOverrideValue:accessibilityOverride forAttribute:NSAccessibilityDescriptionAttribute];
         }
+#pragma clang diagnostic pop
     }
 
     [[m_popup menu] setMenuChangedMessagesEnabled:messagesEnabled];

Modified: trunk/Source/WebKit2/ChangeLog (162928 => 162929)


--- trunk/Source/WebKit2/ChangeLog	2014-01-28 10:22:47 UTC (rev 162928)
+++ trunk/Source/WebKit2/ChangeLog	2014-01-28 10:40:58 UTC (rev 162929)
@@ -1,3 +1,13 @@
+2014-01-28  Mark Rowe  <mr...@apple.com>
+
+        <https://webkit.org/b/127767> Disable some deprecation warnings to fix the build.
+
+        Reviewed by Ryosuke Niwa.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView _updateWindowAndViewFrames]):
+        * WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm:
+
 2014-01-28  Adrian Perez de Castro  <ape...@igalia.com>
 
         [GTK] Add API to allow setting the process model in WebKitWebContext

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (162928 => 162929)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm	2014-01-28 10:22:47 UTC (rev 162928)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm	2014-01-28 10:40:58 UTC (rev 162929)
@@ -440,8 +440,11 @@
         if (_data->_needsViewFrameInWindowCoordinates)
             viewFrameInWindowCoordinates = [self convertRect:self.frame toView:nil];
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
         if (WebCore::AXObjectCache::accessibilityEnabled())
             accessibilityPosition = [[self accessibilityAttributeValue:NSAccessibilityPositionAttribute] pointValue];
+#pragma clang diagnostic pop
 
         _data->_page->windowAndViewFramesChanged(viewFrameInWindowCoordinates, accessibilityPosition);
     });

Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm (162928 => 162929)


--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm	2014-01-28 10:22:47 UTC (rev 162928)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm	2014-01-28 10:40:58 UTC (rev 162929)
@@ -220,6 +220,8 @@
     return YES;
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 - (id)accessibilityHitTest:(NSPoint)point 
 {
     // Hit-test point comes in as bottom-screen coordinates. Needs to be normalized to the frame of the web page.
@@ -244,6 +246,7 @@
     
     return [[self accessibilityRootObjectWrapper] accessibilityHitTest:point];
 }
+#pragma clang diagnostic pop
 
 - (id)accessibilityFocusedUIElement 
 {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to