Title: [172556] branches/safari-600.1-branch/Source/WebKit2
- Revision
- 172556
- Author
- lforsch...@apple.com
- Date
- 2014-08-13 20:45:45 -0700 (Wed, 13 Aug 2014)
Log Message
Merged r172484. <rdar://problem/17582099>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (172555 => 172556)
--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-08-14 03:43:43 UTC (rev 172555)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-08-14 03:45:45 UTC (rev 172556)
@@ -1,5 +1,26 @@
2014-08-13 Lucas Forschler <lforsch...@apple.com>
+ Merge r172484
+
+ 2014-08-12 Tim Horton <timothy_hor...@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-13 Lucas Forschler <lforsch...@apple.com>
+
Merge r172483
2014-08-12 Tim Horton <timothy_hor...@apple.com>
Modified: branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/ServicesOverlayController.h (172555 => 172556)
--- branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/ServicesOverlayController.h 2014-08-14 03:43:43 UTC (rev 172555)
+++ branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/ServicesOverlayController.h 2014-08-14 03:45:45 UTC (rev 172556)
@@ -143,6 +143,7 @@
HashSet<Highlight*> m_highlights;
+ // FIXME: These should move onto Highlight.
Vector<WebCore::LayoutRect> m_currentSelectionRects;
bool m_isTextOnly;
Modified: branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm (172555 => 172556)
--- branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm 2014-08-14 03:43:43 UTC (rev 172555)
+++ branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm 2014-08-14 03:45:45 UTC (rev 172556)
@@ -589,8 +589,8 @@
if (newActiveHighlight && newActiveHighlight->type() == Highlight::Type::TelephoneNumber)
continue;
- // If this highlight has no compatible services, it can't be active, unless we have telephone number highlights to show in the combined menu.
- if (telephoneNumberRangesForFocusedFrame().isEmpty() && !hasRelevantSelectionServices())
+ // If this highlight has no compatible services, it can't be active.
+ if (!hasRelevantSelectionServices())
continue;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
