Title: [177354] branches/safari-600.3-branch/Source
- Revision
- 177354
- Author
- [email protected]
- Date
- 2014-12-16 01:04:06 -0800 (Tue, 16 Dec 2014)
Log Message
Merged r177326. <rdar://problem/19198414>
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (177353 => 177354)
--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-12-16 09:02:57 UTC (rev 177353)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-12-16 09:04:06 UTC (rev 177354)
@@ -1,5 +1,15 @@
2014-12-16 Dana Burkart <[email protected]>
+ Merged r177326. <rdar://problem/19198414>
+
+ 2014-12-15 Beth Dakin <[email protected]>
+
+ Speculative build fix.
+
+ * platform/spi/mac/LookupSPI.h:
+
+2014-12-16 Dana Burkart <[email protected]>
+
Merged r177325. <rdar://problem/19198414>
2014-12-15 Beth Dakin <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/LookupSPI.h (177353 => 177354)
--- branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/LookupSPI.h 2014-12-16 09:02:57 UTC (rev 177353)
+++ branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/LookupSPI.h 2014-12-16 09:04:06 UTC (rev 177354)
@@ -48,10 +48,14 @@
#endif // !USE(APPLE_INTERNAL_SDK)
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+
@interface LULookupDefinitionModule (AnimationController)
+ (id<NSImmediateActionAnimationController>)lookupAnimationControllerForTerm:(NSAttributedString *)term atLocation:(NSPoint)screenPoint options:(NSDictionary *)options;
@end
+#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+
#endif // PLATFORM(MAC)
Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (177353 => 177354)
--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-12-16 09:02:57 UTC (rev 177353)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-12-16 09:04:06 UTC (rev 177354)
@@ -1,5 +1,17 @@
2014-12-16 Dana Burkart <[email protected]>
+ Merged r177326. <rdar://problem/19198414>
+
+ 2014-12-15 Beth Dakin <[email protected]>
+
+ Speculative build fix.
+
+ * WebView/WebView.mm:
+ (-[WebView _animationControllerForDictionaryLookupPopupInfo:]):
+ * WebView/WebViewInternal.h:
+
+2014-12-16 Dana Burkart <[email protected]>
+
Merged r177323. <rdar://problem/19198414>
2014-12-15 Beth Dakin <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebView.mm (177353 => 177354)
--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebView.mm 2014-12-16 09:02:57 UTC (rev 177353)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebView.mm 2014-12-16 09:04:06 UTC (rev 177354)
@@ -8608,6 +8608,33 @@
{
return _private->immediateActionController;
}
+
+- (id)_animationControllerForDictionaryLookupPopupInfo:(const DictionaryPopupInfo&)dictionaryPopupInfo
+{
+ if (!dictionaryPopupInfo.attributedString)
+ return nil;
+
+ NSPoint textBaselineOrigin = dictionaryPopupInfo.origin;
+
+ // Convert to screen coordinates.
+ textBaselineOrigin = [self.window convertRectToScreen:NSMakeRect(textBaselineOrigin.x, textBaselineOrigin.y, 0, 0)].origin;
+
+ if (canLoadLUTermOptionDisableSearchTermIndicator() && canLoadLUNotificationPopoverWillClose()) {
+ if (!_private->hasInitializedLookupObserver) {
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_dictionaryLookupPopoverWillClose:) name:getLUNotificationPopoverWillClose() object:nil];
+ _private->hasInitializedLookupObserver = YES;
+ }
+
+ RetainPtr<NSMutableDictionary> mutableOptions = adoptNS([dictionaryPopupInfo.options mutableCopy]);
+ 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()];
+ }
+
+ return [getLULookupDefinitionModuleClass() lookupAnimationControllerForTerm:dictionaryPopupInfo.attributedString.get() atLocation:textBaselineOrigin options:dictionaryPopupInfo.options.get()];
+}
#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
- (void)_setTextIndicator:(TextIndicator *)textIndicator fadeOut:(BOOL)fadeOut animationCompletionHandler:(std::function<void ()>)completionHandler
@@ -8656,33 +8683,6 @@
[getLULookupDefinitionModuleClass() showDefinitionForTerm:dictionaryPopupInfo.attributedString.get() atLocation:textBaselineOrigin options:dictionaryPopupInfo.options.get()];
}
-- (id)_animationControllerForDictionaryLookupPopupInfo:(const DictionaryPopupInfo&)dictionaryPopupInfo
-{
- if (!dictionaryPopupInfo.attributedString)
- return nil;
-
- NSPoint textBaselineOrigin = dictionaryPopupInfo.origin;
-
- // Convert to screen coordinates.
- textBaselineOrigin = [self.window convertRectToScreen:NSMakeRect(textBaselineOrigin.x, textBaselineOrigin.y, 0, 0)].origin;
-
- if (canLoadLUTermOptionDisableSearchTermIndicator() && canLoadLUNotificationPopoverWillClose()) {
- if (!_private->hasInitializedLookupObserver) {
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_dictionaryLookupPopoverWillClose:) name:getLUNotificationPopoverWillClose() object:nil];
- _private->hasInitializedLookupObserver = YES;
- }
-
- RetainPtr<NSMutableDictionary> mutableOptions = adoptNS([dictionaryPopupInfo.options mutableCopy]);
- 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()];
- }
-
- return [getLULookupDefinitionModuleClass() lookupAnimationControllerForTerm:dictionaryPopupInfo.attributedString.get() atLocation:textBaselineOrigin options:dictionaryPopupInfo.options.get()];
-}
-
- (void)_dictionaryLookupPopoverWillClose:(NSNotification *)notification
{
[self _setTextIndicator:nullptr fadeOut:NO animationCompletionHandler:[] { }];
Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebViewInternal.h (177353 => 177354)
--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebViewInternal.h 2014-12-16 09:02:57 UTC (rev 177353)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebViewInternal.h 2014-12-16 09:04:06 UTC (rev 177354)
@@ -261,8 +261,8 @@
- (void)_setTextIndicator:(WebCore::TextIndicator*)textIndicator fadeOut:(BOOL)fadeOut animationCompletionHandler:(std::function<void ()>)completionHandler;
- (void)_clearTextIndicator;
- (void)_showDictionaryLookupPopup:(const DictionaryPopupInfo&)dictionaryPopupInfo;
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
- (id)_animationControllerForDictionaryLookupPopupInfo:(const DictionaryPopupInfo&)dictionaryPopupInfo;
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
- (WebActionMenuController *)_actionMenuController;
- (WebImmediateActionController *)_immediateActionController;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
