X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=blobdiff_plain;f=Source%2FWebKit2%2FChangeLog;h=425a37e1f59ba84a391f65d7ee61f2406d545ad1;hp=6ff0b28baa7742bbd698662070465dc029c2f98d;hb=719213828d7e9815a7fc17ce9f72bcc41eb52e27;hpb=193f3d584c34a250d1cdf8577a405120a016853f

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 6ff0b28baa77..425a37e1f59b 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,20 @@
+2014-08-12  Tim Horton  <timothy_horton@apple.com>
+
+        Don't show the combined menu if there are no services available
+        https://bugs.webkit.org/show_bug.cgi?id=135846
+        <rdar://problem/17582099>
+
+        Reviewed by Enrica Casucci.
+
+        * WebProcess/WebPage/ServicesOverlayController.h:
+        Add a FIXME.
+
+        * WebProcess/WebPage/mac/ServicesOverlayController.mm:
+        (WebKit::ServicesOverlayController::determineActiveHighlight):
+        Don't allow a selection Highlight to become active if there is no
+        service available to handle it. Previously we showed the combined menu
+        with just phone numbers in it if any were detected.
+
 2014-08-12  Tim Horton  <timothy_horton@apple.com>
 
         Add a fade transition to services highlights