Title: [177371] trunk/Source
- Revision
- 177371
- Author
- [email protected]
- Date
- 2014-12-16 11:07:50 -0800 (Tue, 16 Dec 2014)
Log Message
Disable TextIndication for Lookup immediate actions
https://bugs.webkit.org/show_bug.cgi?id=139684
rdar://problem/19266902
Reviewed by Anders Carlsson.
* UIProcess/mac/WKImmediateActionController.mm:
(-[WKImmediateActionController _animationControllerForText]):
* WebView/WebView.mm:
(-[WebView _animationControllerForDictionaryLookupPopupInfo:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (177370 => 177371)
--- trunk/Source/WebKit/mac/ChangeLog 2014-12-16 18:59:02 UTC (rev 177370)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-16 19:07:50 UTC (rev 177371)
@@ -1,3 +1,13 @@
+2014-12-16 Tim Horton <[email protected]>
+
+ Disable TextIndication for Lookup immediate actions
+ https://bugs.webkit.org/show_bug.cgi?id=139684
+
+ Reviewed by Anders Carlsson.
+
+ * WebView/WebView.mm:
+ (-[WebView _animationControllerForDictionaryLookupPopupInfo:]):
+
2014-12-15 Beth Dakin <[email protected]>
Build fix.
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (177370 => 177371)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-12-16 18:59:02 UTC (rev 177370)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-12-16 19:07:50 UTC (rev 177371)
@@ -8632,7 +8632,6 @@
if (!mutableOptions)
mutableOptions = adoptNS([[NSMutableDictionary alloc] init]);
[mutableOptions setObject:@YES forKey:getLUTermOptionDisableSearchTermIndicator()];
- [self _setTextIndicator:dictionaryPopupInfo.textIndicator.get() fadeOut:NO animationCompletionHandler:[] { }];
return [getLULookupDefinitionModuleClass() lookupAnimationControllerForTerm:dictionaryPopupInfo.attributedString.get() atLocation:textBaselineOrigin options:mutableOptions.get()];
}
Modified: trunk/Source/WebKit2/ChangeLog (177370 => 177371)
--- trunk/Source/WebKit2/ChangeLog 2014-12-16 18:59:02 UTC (rev 177370)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-16 19:07:50 UTC (rev 177371)
@@ -1,3 +1,13 @@
+2014-12-16 Tim Horton <[email protected]>
+
+ Disable TextIndication for Lookup immediate actions
+ https://bugs.webkit.org/show_bug.cgi?id=139684
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController _animationControllerForText]):
+
2014-12-16 Dan Bernstein <[email protected]>
[Cocoa] WKWebProcessPlugInLoadDelegate can’t tell what type of same-document navigation has happened
Modified: trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (177370 => 177371)
--- trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2014-12-16 18:59:02 UTC (rev 177370)
+++ trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2014-12-16 19:07:50 UTC (rev 177371)
@@ -513,7 +513,6 @@
RetainPtr<NSMutableDictionary> mutableOptions = adoptNS([(NSDictionary *)dictionaryPopupInfo.options.get() mutableCopy]);
if (canLoadLUTermOptionDisableSearchTermIndicator() && dictionaryPopupInfo.textIndicator.contentImage) {
- [_wkView _setTextIndicator:TextIndicator::create(dictionaryPopupInfo.textIndicator) fadeOut:NO animationCompletionHandler:[]{ }];
[mutableOptions setObject:@YES forKey:getLUTermOptionDisableSearchTermIndicator()];
return [getLULookupDefinitionModuleClass() lookupAnimationControllerForTerm:dictionaryPopupInfo.attributedString.string.get() atLocation:textBaselineOrigin options:mutableOptions.get()];
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
