Title: [172939] trunk/Source/WebKit2
- Revision
- 172939
- Author
- beid...@apple.com
- Date
- 2014-08-25 15:31:04 -0700 (Mon, 25 Aug 2014)
Log Message
Don't crash when the DataDetectors framework is unavailable.
<rdar://problem/18106066> and https://bugs.webkit.org/show_bug.cgi?id=136234
Reviewed by Tim Horton.
* WebProcess/WebPage/mac/ServicesOverlayController.mm:
(WebKit::ServicesOverlayController::buildPhoneNumberHighlights): Bail if DD.framework didn’t soft link.
(WebKit::ServicesOverlayController::buildSelectionHighlight): Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (172938 => 172939)
--- trunk/Source/WebKit2/ChangeLog 2014-08-25 22:15:27 UTC (rev 172938)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-25 22:31:04 UTC (rev 172939)
@@ -1,3 +1,14 @@
+2014-08-25 Brady Eidson <beid...@apple.com>
+
+ Don't crash when the DataDetectors framework is unavailable.
+ <rdar://problem/18106066> and https://bugs.webkit.org/show_bug.cgi?id=136234
+
+ Reviewed by Tim Horton.
+
+ * WebProcess/WebPage/mac/ServicesOverlayController.mm:
+ (WebKit::ServicesOverlayController::buildPhoneNumberHighlights): Bail if DD.framework didn’t soft link.
+ (WebKit::ServicesOverlayController::buildSelectionHighlight): Ditto.
+
2014-08-25 Antti Koivisto <an...@apple.com>
Remove load scheduling code from network process
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm (172938 => 172939)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm 2014-08-25 22:15:27 UTC (rev 172938)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm 2014-08-25 22:31:04 UTC (rev 172939)
@@ -475,6 +475,9 @@
void ServicesOverlayController::buildPhoneNumberHighlights()
{
+ if (!DataDetectorsLibrary())
+ return;
+
HashSet<RefPtr<Highlight>> newPotentialHighlights;
Frame* mainFrame = m_webPage.mainFrame();
@@ -510,6 +513,9 @@
void ServicesOverlayController::buildSelectionHighlight()
{
+ if (!DataDetectorsLibrary())
+ return;
+
HashSet<RefPtr<Highlight>> newPotentialHighlights;
Vector<CGRect> cgRects;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
