Title: [258970] trunk/Source/WebCore
- Revision
- 258970
- Author
- [email protected]
- Date
- 2020-03-24 20:31:27 -0700 (Tue, 24 Mar 2020)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (258969 => 258970)
--- trunk/Source/WebCore/ChangeLog 2020-03-25 03:21:25 UTC (rev 258969)
+++ trunk/Source/WebCore/ChangeLog 2020-03-25 03:31:27 UTC (rev 258970)
@@ -1,3 +1,19 @@
+2020-03-24 John Wilander <[email protected]>
+
+ 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 <[email protected]>
[MultiColumn] Infinite recursion in RenderBlockFlow::relayoutToAvoidWidows
Modified: trunk/Source/WebCore/page/mac/ServicesOverlayController.mm (258969 => 258970)
--- trunk/Source/WebCore/page/mac/ServicesOverlayController.mm 2020-03-25 03:21:25 UTC (rev 258969)
+++ trunk/Source/WebCore/page/mac/ServicesOverlayController.mm 2020-03-25 03:31:27 UTC (rev 258970)
@@ -515,7 +515,9 @@
rect.setLocation(mainFrameView.windowToContents(viewForRange->contentsToWindow(rect.location())));
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()));
}
@@ -556,8 +558,10 @@
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()));
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
