Title: [187912] branches/safari-601.1-branch/Source/WebCore
- Revision
- 187912
- Author
- matthew_han...@apple.com
- Date
- 2015-08-04 16:45:02 -0700 (Tue, 04 Aug 2015)
Log Message
Merge r187792. rdar://problem/22116575
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187911 => 187912)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-08-04 23:44:25 UTC (rev 187911)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-08-04 23:45:02 UTC (rev 187912)
@@ -1,3 +1,20 @@
+2015-08-04 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r187792. rdar://problem/22116575
+
+ 2015-08-03 Tim Horton <timothy_hor...@apple.com>
+
+ REGRESSION (r186916): TextIndicators for multiline link previews are unreadable/offset/blank
+ https://bugs.webkit.org/show_bug.cgi?id=147615
+ <rdar://problem/22116575>
+
+ Reviewed by Dean Jackson.
+
+ * page/mac/TextIndicatorWindow.mm:
+ (-[WebTextIndicatorView initWithFrame:textIndicator:margin:offset:]):
+ No need to offset by the difference between the text bounding rect and the selection bounding rect,
+ because the snapshot is now (after r186916) taken of exactly the text bounding rect.
+
2015-08-03 Matthew Hanson <matthew_han...@apple.com>
Merge r187691. rdar://problem/22060183
Modified: branches/safari-601.1-branch/Source/WebCore/page/mac/TextIndicatorWindow.mm (187911 => 187912)
--- branches/safari-601.1-branch/Source/WebCore/page/mac/TextIndicatorWindow.mm 2015-08-04 23:44:25 UTC (rev 187911)
+++ branches/safari-601.1-branch/Source/WebCore/page/mac/TextIndicatorWindow.mm 2015-08-04 23:45:02 UTC (rev 187912)
@@ -222,7 +222,6 @@
[textLayer setContents:(id)contentsImage.get()];
FloatRect imageRect = textRect;
- imageRect.move(_textIndicator->textBoundingRectInRootViewCoordinates().location() - _textIndicator->selectionRectInRootViewCoordinates().location());
[textLayer setContentsRect:CGRectMake(imageRect.x() / contentsImageLogicalSize.width(), imageRect.y() / contentsImageLogicalSize.height(), imageRect.width() / contentsImageLogicalSize.width(), imageRect.height() / contentsImageLogicalSize.height())];
[textLayer setContentsGravity:kCAGravityCenter];
[textLayer setContentsScale:_textIndicator->contentImageScaleFactor()];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
