The UNUSED_PARAM macros in ServicesOverlayController.mm are causing ASan build failures.
authordburkart@apple.com <dburkart@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 26 Aug 2014 20:37:04 +0000 (20:37 +0000)
committerdburkart@apple.com <dburkart@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 26 Aug 2014 20:37:04 +0000 (20:37 +0000)
https://bugs.webkit.org/show_bug.cgi?id=136262

Reviewed by David Kilzer.

* WebProcess/WebPage/mac/ServicesOverlayController.mm:
(WebKit::ServicesOverlayController::selectionRectsDidChange):
(WebKit::ServicesOverlayController::selectedTelephoneNumberRangesChanged):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@172974 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm

index 6533f13..51122d5 100644 (file)
@@ -1,3 +1,14 @@
+2014-08-26  Dana Burkart  <dburkart@apple.com>
+
+        The UNUSED_PARAM macros in ServicesOverlayController.mm are causing ASan build failures.
+        https://bugs.webkit.org/show_bug.cgi?id=136262
+
+        Reviewed by David Kilzer.
+
+        * WebProcess/WebPage/mac/ServicesOverlayController.mm:
+        (WebKit::ServicesOverlayController::selectionRectsDidChange):
+        (WebKit::ServicesOverlayController::selectedTelephoneNumberRangesChanged):
+
 2014-08-26  Csaba Osztrogon√°c  <ossy@webkit.org>
 
         [EFL] URTBF after r172966.
index 12e001e..16f7222 100644 (file)
@@ -376,7 +376,7 @@ static void compactRectsWithGapRects(Vector<LayoutRect>& rects, const Vector<Gap
 
 void ServicesOverlayController::selectionRectsDidChange(const Vector<LayoutRect>& rects, const Vector<GapRects>& gapRects, bool isTextOnly)
 {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED > 1090
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1090
     m_currentSelectionRects = rects;
     m_isTextOnly = isTextOnly;
 
@@ -392,6 +392,8 @@ void ServicesOverlayController::selectionRectsDidChange(const Vector<LayoutRect>
     buildSelectionHighlight();
 #else
     UNUSED_PARAM(rects);
+    UNUSED_PARAM(gapRects);
+    UNUSED_PARAM(isTextOnly);
 #endif
 }
 
@@ -400,8 +402,6 @@ void ServicesOverlayController::selectedTelephoneNumberRangesChanged()
 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1090
     LOG(Services, "ServicesOverlayController - Telephone number ranges changed\n");
     buildPhoneNumberHighlights();
-#else
-    UNUSED_PARAM(ranges);
 #endif
 }