Changeset 258970 in webkit

Timestamp:

Mar 24, 2020 8:31:27 PM (4 years ago)

Author:

wilander@apple.com

Message:

Build fix for deprecated DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection
​https://bugs.webkit.org/show_bug.cgi?id=209530
<rdar://problem/60855794>

Unreviewed build fix. Solution suggested by Darin Adler.

• page/mac/ServicesOverlayController.mm:

(WebCore::ServicesOverlayController::buildPhoneNumberHighlights):

Use of DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection put between
ALLOW_DEPRECATED_DECLARATIONS_BEGIN and ALLOW_DEPRECATED_DECLARATIONS_END.

(WebCore::ServicesOverlayController::buildSelectionHighlight):

Use of DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection put between
ALLOW_DEPRECATED_DECLARATIONS_BEGIN and ALLOW_DEPRECATED_DECLARATIONS_END.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/mac/ServicesOverlayController.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-03-24  John Wilander  <wilander@apple.com>
+
+        Build fix for deprecated DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection
+        https://bugs.webkit.org/show_bug.cgi?id=209530
+        <rdar://problem/60855794>
+
+        Unreviewed build fix. Solution suggested by Darin Adler.
+
+        * page/mac/ServicesOverlayController.mm:
+        (WebCore::ServicesOverlayController::buildPhoneNumberHighlights):
+            Use of DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection put between
+            ALLOW_DEPRECATED_DECLARATIONS_BEGIN and ALLOW_DEPRECATED_DECLARATIONS_END.
+        (WebCore::ServicesOverlayController::buildSelectionHighlight):
+            Use of DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection put between
+            ALLOW_DEPRECATED_DECLARATIONS_BEGIN and ALLOW_DEPRECATED_DECLARATIONS_END.
+
 2020-03-24  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/page/mac/ServicesOverlayController.mm

@@ -516 +516 @@
 
         CGRect cgRect = rect;
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
         RetainPtr<DDHighlightRef> ddHighlight = adoptCF(DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection(nullptr, &cgRect, 1, mainFrameView.visibleContentRect(), DDHighlightStyleBubbleStandard | DDHighlightStyleStandardIconArrow, YES, NSWritingDirectionNatural, NO, YES));
+ALLOW_DEPRECATED_DECLARATIONS_END
 
         newPotentialHighlights.add(Highlight::createForTelephoneNumber(*this, ddHighlight, range.releaseNonNull()));
@@ -557 +559 @@
         if (!cgRects.isEmpty()) {
             CGRect visibleRect = mainFrameView->visibleContentRect();
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
             RetainPtr<DDHighlightRef> ddHighlight = adoptCF(DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection(nullptr, cgRects.begin(), cgRects.size(), visibleRect, DDHighlightStyleBubbleNone | DDHighlightStyleStandardIconArrow | DDHighlightStyleButtonShowAlways, YES, NSWritingDirectionNatural, NO, YES));
-            
+ALLOW_DEPRECATED_DECLARATIONS_END
+
             newPotentialHighlights.add(Highlight::createForSelection(*this, ddHighlight, selectionRange.releaseNonNull()));
         }