[mac] Remove -[WebView setHoverFeedbackSuspended:]

https://bugs.webkit.org/show_bug.cgi?id=75406

Reviewed by Tim Hatcher.

* WebView/WebHTMLView.mm:
(-[WebHTMLView _updateMouseoverWithEvent:]): Removed check for suspended hover updates.
* WebView/WebHTMLViewInternal.h: Removed -_hoverFeedbackSuspendedChanged.
* WebView/WebView.mm:
(-[WebView setHoverFeedbackSuspended:]): Left empty implementation to support versions of
Safari that call this.
(-[WebView isHoverFeedbackSuspended]): Left implementation that always returns NO to support
versions of Safari that call this.
* WebView/WebViewData.h: Removed hoverFeedbackSuspended ivar.
* WebView/WebViewPrivate.h: Removed method definitions.

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

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index 1acdd15cc3c5853746995459dbfea02107cf16e9..99ccd76f56c5f64d8d61b4990dc9c75ac7a5ccd6 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,21 @@
+2012-01-02  Dan Bernstein  <mitz@apple.com>
+
+        [mac] Remove -[WebView setHoverFeedbackSuspended:]
+        https://bugs.webkit.org/show_bug.cgi?id=75406
+
+        Reviewed by Tim Hatcher.
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView _updateMouseoverWithEvent:]): Removed check for suspended hover updates.
+        * WebView/WebHTMLViewInternal.h: Removed -_hoverFeedbackSuspendedChanged.
+        * WebView/WebView.mm:
+        (-[WebView setHoverFeedbackSuspended:]): Left empty implementation to support versions of
+        Safari that call this.
+        (-[WebView isHoverFeedbackSuspended]): Left implementation that always returns NO to support
+        versions of Safari that call this.
+        * WebView/WebViewData.h: Removed hoverFeedbackSuspended ivar.
+        * WebView/WebViewPrivate.h: Removed method definitions.
+
 2011-12-31  Dan Bernstein  <mitz@apple.com>
 
         WebKit/mac changes for: REGRESSION (WebKit2): Cursor, hover states not updated when page scrolls under stationary mouse pointer

diff --git a/Source/WebKit/mac/WebView/WebHTMLView.mm b/Source/WebKit/mac/WebView/WebHTMLView.mm
index 7c7d6c97ffad0cc2663ae707305e9d61dcc10cc8..a8d2814e45f2cbee3a0f6f46d7b3eddc7f71abe8 100644 (file)
--- a/Source/WebKit/mac/WebView/WebHTMLView.mm
+++ b/Source/WebKit/mac/WebView/WebHTMLView.mm
@@ -1558,7 +1558,7 @@ static NSURL* uniqueURLWithRelativePart(NSString *relativePart)
     forceWebHTMLViewHitTest = NO;
     
     WebHTMLView *view = nil;
-    if ([hitView isKindOfClass:[WebHTMLView class]] && ![[(WebHTMLView *)hitView _webView] isHoverFeedbackSuspended])
+    if ([hitView isKindOfClass:[WebHTMLView class]])
         view = (WebHTMLView *)hitView;    
 
     if (view)
@@ -5258,11 +5258,6 @@ static CGPoint coreGraphicsScreenPointForAppKitScreenPoint(NSPoint point)
                                 coreGraphicsScreenPointForAppKitScreenPoint(screenPoint), false, nil);
 }
 
-- (void)_hoverFeedbackSuspendedChanged
-{
-    [self _updateMouseoverWithFakeEvent];
-}
-
 - (void)_executeSavedKeypressCommands
 {
     WebHTMLViewInterpretKeyEventsParameters* parameters = _private->interpretKeyEventsParameters;

diff --git a/Source/WebKit/mac/WebView/WebHTMLViewInternal.h b/Source/WebKit/mac/WebView/WebHTMLViewInternal.h
index 8203370f85a087ed5f9315a75acf38fff5f1ba02..a4153ab4f65ed42b54f02f39b63ff54efe556702 100644 (file)
--- a/Source/WebKit/mac/WebView/WebHTMLViewInternal.h
+++ b/Source/WebKit/mac/WebView/WebHTMLViewInternal.h
@@ -48,7 +48,6 @@ namespace WebCore {
 - (id <WebHTMLHighlighter>)_highlighterForType:(NSString*)type;
 - (WebFrame *)_frame;
 - (void)_lookUpInDictionaryFromMenu:(id)sender;
-- (void)_hoverFeedbackSuspendedChanged;
 - (BOOL)_interpretKeyEvent:(WebCore::KeyboardEvent *)event savingCommands:(BOOL)savingCommands;
 - (DOMDocumentFragment *)_documentFragmentFromPasteboard:(NSPasteboard *)pasteboard;
 - (NSEvent *)_mouseDownEvent;

diff --git a/Source/WebKit/mac/WebView/WebView.mm b/Source/WebKit/mac/WebView/WebView.mm
index 6d017770713306d788755c6f07a131fd34168145..07512911abf87abde5ba7b4f5227ada18009fc8a 100644 (file)
--- a/Source/WebKit/mac/WebView/WebView.mm
+++ b/Source/WebKit/mac/WebView/WebView.mm
@@ -4605,28 +4605,18 @@ static BOOL findString(NSView <WebDocumentSearching> *searchView, NSString *stri
     return kit(_private->page->rangeOfString(string, core(previousRange), coreOptions(options)).get());
 }
 
+#if defined(BUILDING_ON_SNOW_LEOPARD) || defined(BUILDING_ON_LION)
+// FIXME: Remove once WebKit no longer needs to support versions of Safari that call this.
 - (void)setHoverFeedbackSuspended:(BOOL)newValue
 {
-    if (_private->hoverFeedbackSuspended == newValue)
-        return;
-    
-    _private->hoverFeedbackSuspended = newValue;
-
-    id <WebDocumentView> documentView = [[[self mainFrame] frameView] documentView];
-    // FIXME: in a perfect world we'd do this in a general way that worked with any document view,
-    // such as by calling a protocol method or using respondsToSelector or sending a notification.
-    // But until there is any need for these more general solutions, we'll just hardwire it to work
-    // with WebHTMLView.
-    // Note that _hoverFeedbackSuspendedChanged needs to be called only on the main WebHTMLView, not
-    // on each subframe separately.
-    if ([documentView isKindOfClass:[WebHTMLView class]])
-        [(WebHTMLView *)documentView _hoverFeedbackSuspendedChanged];
 }
 
+// FIXME: Remove once WebKit no longer needs to support versions of Safari that call this.
 - (BOOL)isHoverFeedbackSuspended
 {
-    return _private->hoverFeedbackSuspended;
+    return NO;
 }
+#endif
 
 - (void)setMainFrameDocumentReady:(BOOL)mainFrameDocumentReady
 {

diff --git a/Source/WebKit/mac/WebView/WebViewData.h b/Source/WebKit/mac/WebView/WebViewData.h
index 1adc9658b05215f6bb8e4f77d069ae3dc8436a75..665cb9175d86a9e1729f92148feb2b9f6e7336e9 100644 (file)
--- a/Source/WebKit/mac/WebView/WebViewData.h
+++ b/Source/WebKit/mac/WebView/WebViewData.h
@@ -133,7 +133,6 @@ private:
     BOOL tabKeyCyclesThroughElementsChanged;
     BOOL becomingFirstResponder;
     BOOL becomingFirstResponderFromOutside;
-    BOOL hoverFeedbackSuspended;
     BOOL usesPageCache;
     BOOL catchesDelegateExceptions;
     BOOL cssAnimationsSuspended;

diff --git a/Source/WebKit/mac/WebView/WebViewPrivate.h b/Source/WebKit/mac/WebView/WebViewPrivate.h
index dbe094c15ce11088de163d0bea7a400a4a2f116d..2bf005dca5eddec76bc3fc12e1a65fe977620247 100644 (file)
--- a/Source/WebKit/mac/WebView/WebViewPrivate.h
+++ b/Source/WebKit/mac/WebView/WebViewPrivate.h
@@ -132,12 +132,6 @@ typedef enum {
 
 - (void)scrollDOMRangeToVisible:(DOMRange *)range;
 
-// setHoverFeedbackSuspended: can be called by clients that want to temporarily prevent the webView
-// from displaying feedback about mouse position. Each WebDocumentView class that displays feedback
-// about mouse position should honor this setting.
-- (void)setHoverFeedbackSuspended:(BOOL)newValue;
-- (BOOL)isHoverFeedbackSuspended;
-
 /*!
 @method setScriptDebugDelegate:
 @abstract Set the WebView's WebScriptDebugDelegate delegate.