Disable TextIndication for Lookup immediate actions
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Dec 2014 19:07:50 +0000 (19:07 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Dec 2014 19:07:50 +0000 (19:07 +0000)
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:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@177371 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm

index 1af0c7c..58a6c15 100644 (file)
@@ -1,3 +1,13 @@
+2014-12-16  Tim Horton  <timothy_horton@apple.com>
+
+        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  <bdakin@apple.com>
 
         Build fix.
index b1f277c..f573d09 100644 (file)
@@ -8632,7 +8632,6 @@ static void glibContextIterationCallback(CFRunLoopObserverRef, CFRunLoopActivity
         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()];
     }
 
index c84819b..089ba45 100644 (file)
@@ -1,3 +1,13 @@
+2014-12-16  Tim Horton  <timothy_horton@apple.com>
+
+        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  <mitz@apple.com>
 
         [Cocoa] WKWebProcessPlugInLoadDelegate can’t tell what type of same-document navigation has happened
index 3d504b5..4e17d95 100644 (file)
@@ -513,7 +513,6 @@ static bool targetSizeFitsInAvailableSpace(NSSize targetSize, NSSize availableSp
 
     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()];
     }