Title: [181686] trunk/Source
Revision
181686
Author
[email protected]
Date
2015-03-18 00:05:48 -0700 (Wed, 18 Mar 2015)

Log Message

Ignore some deprecation warnings
https://bugs.webkit.org/show_bug.cgi?id=142813

Reviewed by Mark Rowe.

Fixing the deprecations is tracked by: <rdar://problem/20201450>

Source/WebCore:

* editing/cocoa/HTMLConverter.mm:
(HTMLConverter::_processElement):

Source/WebKit/mac:

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

Source/WebKit2:

* UIProcess/mac/WebPopupMenuProxyMac.mm:
(WebKit::WebPopupMenuProxyMac::populate):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (181685 => 181686)


--- trunk/Source/WebCore/ChangeLog	2015-03-18 06:09:56 UTC (rev 181685)
+++ trunk/Source/WebCore/ChangeLog	2015-03-18 07:05:48 UTC (rev 181686)
@@ -1,3 +1,15 @@
+2015-03-17  Conrad Shultz  <[email protected]>
+
+        Ignore some deprecation warnings
+        https://bugs.webkit.org/show_bug.cgi?id=142813
+
+        Reviewed by Mark Rowe.
+
+        Fixing the deprecations is tracked by: <rdar://problem/20201450>
+
+        * editing/cocoa/HTMLConverter.mm:
+        (HTMLConverter::_processElement):
+
 2015-03-17  Commit Queue  <[email protected]>
 
         Unreviewed, rolling out r181667, r181682, and r181683.

Modified: trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm (181685 => 181686)


--- trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm	2015-03-18 06:09:56 UTC (rev 181685)
+++ trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm	2015-03-18 07:05:48 UTC (rev 181686)
@@ -1929,12 +1929,18 @@
     else {
         String bidi = _caches->propertyValueForNode(element, CSSPropertyUnicodeBidi);
         if (bidi == "embed") {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
             NSUInteger val = NSTextWritingDirectionEmbedding;
+#pragma clang diagnostic pop
             if (_caches->propertyValueForNode(element, CSSPropertyDirection) == "rtl")
                 val |= NSWritingDirectionRightToLeft;
             [_writingDirectionArray addObject:[NSNumber numberWithUnsignedInteger:val]];
         } else if (bidi == "bidi-override") {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
             NSUInteger val = NSTextWritingDirectionOverride;
+#pragma clang diagnostic pop
             if (_caches->propertyValueForNode(element, CSSPropertyDirection) == "rtl")
                 val |= NSWritingDirectionRightToLeft;
             [_writingDirectionArray addObject:[NSNumber numberWithUnsignedInteger:val]];

Modified: trunk/Source/WebKit/mac/ChangeLog (181685 => 181686)


--- trunk/Source/WebKit/mac/ChangeLog	2015-03-18 06:09:56 UTC (rev 181685)
+++ trunk/Source/WebKit/mac/ChangeLog	2015-03-18 07:05:48 UTC (rev 181686)
@@ -1,3 +1,15 @@
+2015-03-17  Conrad Shultz  <[email protected]>
+
+        Ignore some deprecation warnings
+        https://bugs.webkit.org/show_bug.cgi?id=142813
+
+        Reviewed by Mark Rowe.
+
+        Fixing the deprecations is tracked by: <rdar://problem/20201450>
+
+        * WebCoreSupport/PopupMenuMac.mm:
+        (PopupMenuMac::populate):
+
 2015-03-17  Tim Horton  <[email protected]>
 
         Cannot invoke action menus anymore

Modified: trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm (181685 => 181686)


--- trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm	2015-03-18 06:09:56 UTC (rev 181685)
+++ trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm	2015-03-18 07:05:48 UTC (rev 181686)
@@ -94,7 +94,10 @@
         NSWritingDirection writingDirection = style.textDirection() == LTR ? NSWritingDirectionLeftToRight : NSWritingDirectionRightToLeft;
         [paragraphStyle setBaseWritingDirection:writingDirection];
         if (style.hasTextDirectionOverride()) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
             RetainPtr<NSNumber> writingDirectionValue = adoptNS([[NSNumber alloc] initWithInteger:writingDirection + NSTextWritingDirectionOverride]);
+#pragma clang diagnostic pop
             RetainPtr<NSArray> writingDirectionArray = adoptNS([[NSArray alloc] initWithObjects:writingDirectionValue.get(), nil]);
             [attributes setObject:writingDirectionArray.get() forKey:NSWritingDirectionAttributeName];
         }

Modified: trunk/Source/WebKit2/ChangeLog (181685 => 181686)


--- trunk/Source/WebKit2/ChangeLog	2015-03-18 06:09:56 UTC (rev 181685)
+++ trunk/Source/WebKit2/ChangeLog	2015-03-18 07:05:48 UTC (rev 181686)
@@ -1,3 +1,15 @@
+2015-03-17  Conrad Shultz  <[email protected]>
+
+        Ignore some deprecation warnings
+        https://bugs.webkit.org/show_bug.cgi?id=142813
+
+        Reviewed by Mark Rowe.
+
+        Fixing the deprecations is tracked by: <rdar://problem/20201450>
+
+        * UIProcess/mac/WebPopupMenuProxyMac.mm:
+        (WebKit::WebPopupMenuProxyMac::populate):
+
 2015-03-17  Ryuan Choi  <[email protected]>
 
         [EFL] Expose _javascript_ binding interface through ewk_extension

Modified: trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm (181685 => 181686)


--- trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm	2015-03-18 06:09:56 UTC (rev 181685)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm	2015-03-18 07:05:48 UTC (rev 181686)
@@ -81,7 +81,10 @@
                 font, NSFontAttributeName,
             nil]);
             if (items[i].m_hasTextDirectionOverride) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
                 RetainPtr<NSNumber> writingDirectionValue = adoptNS([[NSNumber alloc] initWithInteger:writingDirection + NSTextWritingDirectionOverride]);
+#pragma clang diagnostic pop
                 RetainPtr<NSArray> writingDirectionArray = adoptNS([[NSArray alloc] initWithObjects:writingDirectionValue.get(), nil]);
                 [attributes setObject:writingDirectionArray.get() forKey:NSWritingDirectionAttributeName];
             }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to