Title: [172772] branches/safari-600.1-branch/Source/WebKit2
- Revision
- 172772
- Author
- dburk...@apple.com
- Date
- 2014-08-19 16:02:17 -0700 (Tue, 19 Aug 2014)
Log Message
Merge r172639. <rdar://problem/17957716>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (172771 => 172772)
--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-08-19 23:00:58 UTC (rev 172771)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-08-19 23:02:17 UTC (rev 172772)
@@ -1,5 +1,22 @@
2014-08-19 Dana Burkart <dburk...@apple.com>
+ Merge r172639. <rdar://problem/17957716>
+
+ 2014-08-15 Tim Horton <timothy_hor...@apple.com>
+
+ Service overlays stay fixed when <iframe> scrolls
+ https://bugs.webkit.org/show_bug.cgi?id=135959
+ <rdar://problem/17957716>
+
+ Reviewed by Enrica Casucci.
+
+ * WebProcess/WebPage/mac/ServicesOverlayController.mm:
+ (WebKit::ServicesOverlayController::highlightsAreEquivalent):
+ Tiny correctness fix; highlights can only be equivalent if their
+ types are equivalent as well.
+
+2014-08-19 Dana Burkart <dburk...@apple.com>
+
Merge r172636. <rdar://problem/17957716>
2014-08-15 Tim Horton <timothy_hor...@apple.com>
Modified: branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm (172771 => 172772)
--- branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm 2014-08-19 23:00:58 UTC (rev 172771)
+++ branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm 2014-08-19 23:02:17 UTC (rev 172772)
@@ -613,7 +613,7 @@
if (!a || !b)
return false;
- if (areRangesEqual(a->range(), b->range()))
+ if (a->type() == b->type() && areRangesEqual(a->range(), b->range()))
return true;
return false;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
