Changeset 95467 in webkit

Timestamp:

Sep 19, 2011 1:39:15 PM (13 years ago)

Author:

andersca@apple.com

Message:

Remove -[WebView _selectionChanged] and -[WebView _setTooltip:]
​https://bugs.webkit.org/show_bug.cgi?id=68385

Reviewed by Adam Roben.

Move these functions back into the respective clients and remove usesDocumentViews checks.

• WebCoreSupport/WebChromeClient.mm:

(WebChromeClient::setToolTip):

• WebCoreSupport/WebEditorClient.mm:

(WebEditorClient::respondToChangedSelection):

• WebView/WebView.mm:
• WebView/WebViewEventHandling.mm:
• WebView/WebViewInternal.h:

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/WebChromeClient.mm (modified) (1 diff)
• WebCoreSupport/WebEditorClient.mm (modified) (1 diff)
• WebView/WebView.mm (modified) (1 diff)
• WebView/WebViewEventHandling.mm (modified) (1 diff)
• WebView/WebViewInternal.h (modified) (2 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-09-19  Anders Carlsson  <andersca@apple.com>
+
+        Remove -[WebView _selectionChanged] and -[WebView _setTooltip:]
+        https://bugs.webkit.org/show_bug.cgi?id=68385
+
+        Reviewed by Adam Roben.
+
+        Move these functions back into the respective clients and remove usesDocumentViews checks.
+
+        * WebCoreSupport/WebChromeClient.mm:
+        (WebChromeClient::setToolTip):
+        * WebCoreSupport/WebEditorClient.mm:
+        (WebEditorClient::respondToChangedSelection):
+        * WebView/WebView.mm:
+        * WebView/WebViewEventHandling.mm:
+        * WebView/WebViewInternal.h:
+
 2011-09-19  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm

@@ -623 +623 @@
 void WebChromeClient::setToolTip(const String& toolTip, TextDirection)
 {
-    [m_webView _setToolTip:toolTip];
+    NSView<WebDocumentView> *documentView = [[[m_webView _selectedOrMainFrame] frameView] documentView];
+    if ([documentView isKindOfClass:[WebHTMLView class]])
+        [(WebHTMLView *)documentView _setToolTip:toolTip];
 }
 

trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm

@@ -293 +293 @@
 void WebEditorClient::respondToChangedSelection()
 {
-    [m_webView _selectionChanged];
+    NSView<WebDocumentView> *documentView = [[[m_webView _selectedOrMainFrame] frameView] documentView];
+    if ([documentView isKindOfClass:[WebHTMLView class]])
+        [(WebHTMLView *)documentView _selectionChanged];
 
     // FIXME: This quirk is needed due to <rdar://problem/5009625> - We can phase it out once Aperture can adopt the new behavior on their end

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

@@ -6029 +6029 @@
 }
 
-- (void)_selectionChanged
-{
-    if (_private->usesDocumentViews) {
-        id documentView = [[[self _selectedOrMainFrame] frameView] documentView];
-        if ([documentView isKindOfClass:[WebHTMLView class]])
-            [documentView _selectionChanged];
-        return;
-    }
-
-    // FIXME (Viewless): We'll need code here.
-}
-
 - (Frame*)_mainCoreFrame
 {

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

@@ -226 +226 @@
 }
 
-- (void)_setToolTip:(NSString *)toolTip
-{
-    if (_private->usesDocumentViews) {
-        id documentView = [[[self _selectedOrMainFrame] frameView] documentView];
-        if ([documentView isKindOfClass:[WebHTMLView class]])
-            [documentView _setToolTip:toolTip];
-        return;
-    }
-
-    // FIXME (Viewless): Code to handle tooltips needs to move into WebView.
-}
-
 @end

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

@@ -86 +86 @@
 #endif
 
-- (void)_selectionChanged;
-
 #if USE(ACCELERATED_COMPOSITING)
 - (BOOL)_needsOneShotDrawingSynchronization;
@@ -107 +105 @@
 - (void)_cancelUpdateMouseoverTimer;
 - (void)_stopAutoscrollTimer;
-- (void)_setToolTip:(NSString *)toolTip;
 @end