Changeset 176695 in webkit

Timestamp:

Dec 2, 2014, 3:41:23 PM (12 years ago)

Author:

timothy_horton@apple.com

Message:

Loading Lookup causes http/tests/cache/post-redirect-get.php to fail
​https://bugs.webkit.org/show_bug.cgi?id=139204
<rdar://problem/19120929>

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.

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebView.mm (modified) (2 diffs)
• WebView/WebViewData.h (modified) (1 diff)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2014-12-02  Tim Horton  <timothy_horton@apple.com>
+
+        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-02  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -1030 +1030 @@
 #if !PLATFORM(IOS)
     [self _registerDraggedTypes];
-
-    if (canLoadLUNotificationPopoverWillClose())
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_dictionaryLookupPopoverWillClose:) name:getLUNotificationPopoverWillClose() object:nil];
 #endif
 
@@ -8622 +8619 @@
     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)

trunk/Source/WebKit/mac/WebView/WebViewData.h

@@ -153 +153 @@
 #endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
     std::unique_ptr<WebCore::TextIndicatorWindow> textIndicatorWindow;
+    BOOL hasInitializedLookupObserver;
 #endif // PLATFORM(MAC)