Title: [176749] branches/safari-600.3-branch/Source/WebKit/mac
- Revision
- 176749
- Author
- [email protected]
- Date
- 2014-12-03 12:42:22 -0800 (Wed, 03 Dec 2014)
Log Message
Merged r176695. rdar://problems/19120929
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (176748 => 176749)
--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-12-03 20:37:54 UTC (rev 176748)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-12-03 20:42:22 UTC (rev 176749)
@@ -1,5 +1,25 @@
2014-12-03 Dana Burkart <[email protected]>
+ Merge r176695. <rdar://problem/19120929>
+
+ 2014-12-02 Tim Horton <[email protected]>
+
+ Loading Lookup causes http/tests/cache/post-redirect-get.php to fail
+ https://bugs.webkit.org/show_bug.cgi?id=139204
+
+ Reviewed by Anders Carlsson.
+
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+ (-[WebView _showDictionaryLookupPopup:]):
+ * WebView/WebViewData.h:
+ Work around this by delaying the softlinking (and setting up the notification
+ observer) until we actually need it. There's still an underlying bug, but
+ this will fix the test.
+
+
+2014-12-03 Dana Burkart <[email protected]>
+
Merge r176693. <rdar://problem/18944696>
2014-12-02 Beth Dakin <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebView.mm (176748 => 176749)
--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebView.mm 2014-12-03 20:37:54 UTC (rev 176748)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebView.mm 2014-12-03 20:42:22 UTC (rev 176749)
@@ -1032,9 +1032,6 @@
#if !PLATFORM(IOS)
[self _registerDraggedTypes];
-
- if (canLoadLUNotificationPopoverWillClose())
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_dictionaryLookupPopoverWillClose:) name:getLUNotificationPopoverWillClose() object:nil];
#endif
[self _setIsVisible:[self _isViewVisible]];
@@ -8625,7 +8622,12 @@
// Convert to screen coordinates.
textBaselineOrigin = [self.window convertRectToScreen:NSMakeRect(textBaselineOrigin.x, textBaselineOrigin.y, 0, 0)].origin;
- if (canLoadLUTermOptionDisableSearchTermIndicator()) {
+ 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]);
Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebViewData.h (176748 => 176749)
--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebViewData.h 2014-12-03 20:37:54 UTC (rev 176748)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebViewData.h 2014-12-03 20:42:22 UTC (rev 176749)
@@ -152,6 +152,7 @@
WebActionMenuController *actionMenuController;
#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
std::unique_ptr<WebCore::TextIndicatorWindow> textIndicatorWindow;
+ BOOL hasInitializedLookupObserver;
#endif // PLATFORM(MAC)
BOOL allowsUndo;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
