Title: [194221] trunk/Source/WebKit/mac
- Revision
- 194221
- Author
- [email protected]
- Date
- 2015-12-17 11:42:04 -0800 (Thu, 17 Dec 2015)
Log Message
Data detector yellow highlight location is vertically mirrored in WebKit1
https://bugs.webkit.org/show_bug.cgi?id=152216
<rdar://problem/23848003>
Reviewed by Darin Adler.
* WebView/WebImmediateActionController.mm:
(-[WebImmediateActionController _animationControllerForDataDetectedText]):
Match the conversion we do at every other WK1 TextIndicator construction.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (194220 => 194221)
--- trunk/Source/WebKit/mac/ChangeLog 2015-12-17 18:33:09 UTC (rev 194220)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-12-17 19:42:04 UTC (rev 194221)
@@ -1,3 +1,15 @@
+2015-12-17 Tim Horton <[email protected]>
+
+ Data detector yellow highlight location is vertically mirrored in WebKit1
+ https://bugs.webkit.org/show_bug.cgi?id=152216
+ <rdar://problem/23848003>
+
+ Reviewed by Darin Adler.
+
+ * WebView/WebImmediateActionController.mm:
+ (-[WebImmediateActionController _animationControllerForDataDetectedText]):
+ Match the conversion we do at every other WK1 TextIndicator construction.
+
2015-12-16 Youenn Fablet <[email protected]>
[Fetch API] Add fetch API compile time flag
Modified: trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm (194220 => 194221)
--- trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-12-17 18:33:09 UTC (rev 194220)
+++ trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-12-17 19:42:04 UTC (rev 194221)
@@ -272,7 +272,7 @@
_type = WebImmediateActionLinkPreview;
RefPtr<Range> linkRange = rangeOfContents(*_hitTestResult.URLElement());
- RefPtr<TextIndicator> indicator = TextIndicator::createWithRange(*linkRange, TextIndicatorOptionDefault, TextIndicatorPresentationTransition::FadeIn);
+ auto indicator = TextIndicator::createWithRange(*linkRange, TextIndicatorOptionDefault, TextIndicatorPresentationTransition::FadeIn);
if (indicator)
[_webView _setTextIndicator:*indicator withLifetime:TextIndicatorWindowLifetime::Permanent];
@@ -429,12 +429,13 @@
return nil;
}
- RefPtr<TextIndicator> detectedDataTextIndicator = TextIndicator::createWithRange(*detectedDataRange, TextIndicatorOptionDefault, TextIndicatorPresentationTransition::FadeIn);
+ auto indicator = TextIndicator::createWithRange(*detectedDataRange, TextIndicatorOptionDefault, TextIndicatorPresentationTransition::FadeIn);
+ indicator->data().textBoundingRectInRootViewCoordinates = [_webView _convertRectFromRootView:indicator->textBoundingRectInRootViewCoordinates()];
_currentActionContext = [actionContext contextForView:_webView altMode:YES interactionStartedHandler:^() {
} interactionChangedHandler:^() {
- if (detectedDataTextIndicator)
- [_webView _setTextIndicator:*detectedDataTextIndicator withLifetime:TextIndicatorWindowLifetime::Permanent];
+ if (indicator)
+ [_webView _setTextIndicator:*indicator withLifetime:TextIndicatorWindowLifetime::Permanent];
} interactionStoppedHandler:^() {
[_webView _clearTextIndicatorWithAnimation:TextIndicatorWindowDismissalAnimation::FadeOut];
}];
@@ -461,7 +462,7 @@
RefPtr<Range> linkRange = rangeOfContents(*_hitTestResult.URLElement());
if (!linkRange)
return nullptr;
- RefPtr<TextIndicator> indicator = TextIndicator::createWithRange(*linkRange, TextIndicatorOptionDefault, TextIndicatorPresentationTransition::FadeIn);
+ auto indicator = TextIndicator::createWithRange(*linkRange, TextIndicatorOptionDefault, TextIndicatorPresentationTransition::FadeIn);
indicator->data().textBoundingRectInRootViewCoordinates = [_webView _convertRectFromRootView:indicator->textBoundingRectInRootViewCoordinates()];
_currentActionContext = [actionContext contextForView:_webView altMode:YES interactionStartedHandler:^() {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
