Title: [172484] trunk/Source/WebKit2
- Revision
- 172484
- Author
- [email protected]
- Date
- 2014-08-12 13:03:26 -0700 (Tue, 12 Aug 2014)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (172483 => 172484)
--- trunk/Source/WebKit2/ChangeLog 2014-08-12 19:31:04 UTC (rev 172483)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-12 20:03:26 UTC (rev 172484)
@@ -1,5 +1,22 @@
2014-08-12 Tim Horton <[email protected]>
+ 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 <[email protected]>
+
Add a fade transition to services highlights
https://bugs.webkit.org/show_bug.cgi?id=135829
<rdar://problem/17935736>
Modified: trunk/Source/WebKit2/WebProcess/WebPage/ServicesOverlayController.h (172483 => 172484)
--- trunk/Source/WebKit2/WebProcess/WebPage/ServicesOverlayController.h 2014-08-12 19:31:04 UTC (rev 172483)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ServicesOverlayController.h 2014-08-12 20:03:26 UTC (rev 172484)
@@ -143,6 +143,7 @@
HashSet<Highlight*> m_highlights;
+ // FIXME: These should move onto Highlight.
Vector<WebCore::LayoutRect> m_currentSelectionRects;
bool m_isTextOnly;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm (172483 => 172484)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm 2014-08-12 19:31:04 UTC (rev 172483)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm 2014-08-12 20:03:26 UTC (rev 172484)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
