Changeset 95458 in webkit

Timestamp:

Sep 19, 2011 12:46:42 PM (13 years ago)

Author:

andersca@apple.com

Message:

Remove calls to -[WebView _usesDocumentViews]
​https://bugs.webkit.org/show_bug.cgi?id=68377

Reviewed by Adam Roben.

Remove checks and begin assuming that -[WebView _usesDocumentViews] always
returns true, since viewless WebKit1 has been abandoned.

• WebCoreSupport/WebChromeClient.mm:

(WebChromeClient::windowResizerRect):
(WebChromeClient::invalidateContentsAndWindow):
(WebChromeClient::screenToWindow):
(WebChromeClient::windowToScreen):
(WebChromeClient::platformPageClient):
(WebChromeClient::scrollRectIntoView):
(WebChromeClient::print):

• WebView/WebDataSource.mm:

(-[WebDataSource _receivedData:]):

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/WebChromeClient.mm (modified) (5 diffs)
• WebView/WebDataSource.mm (modified) (1 diff)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-09-19  Anders Carlsson  <andersca@apple.com>
+
+        Remove calls to -[WebView _usesDocumentViews]
+        https://bugs.webkit.org/show_bug.cgi?id=68377
+
+        Reviewed by Adam Roben.
+
+        Remove checks and begin assuming that -[WebView _usesDocumentViews] always 
+        returns true, since viewless WebKit1 has been abandoned.
+
+        * WebCoreSupport/WebChromeClient.mm:
+        (WebChromeClient::windowResizerRect):
+        (WebChromeClient::invalidateContentsAndWindow):
+        (WebChromeClient::screenToWindow):
+        (WebChromeClient::windowToScreen):
+        (WebChromeClient::platformPageClient):
+        (WebChromeClient::scrollRectIntoView):
+        (WebChromeClient::print):
+        * WebView/WebDataSource.mm:
+        (-[WebDataSource _receivedData:]):
+
 2011-09-19  Dan Bernstein  <mitz@apple.com>
 

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

@@ -544 +544 @@
 IntRect WebChromeClient::windowResizerRect() const
 {
-    NSRect rect = [[m_webView window] _growBoxRect];
-    if ([m_webView _usesDocumentViews])
-        return enclosingIntRect(rect);
-    return enclosingIntRect([m_webView convertRect:rect fromView:nil]);
+    return enclosingIntRect([[m_webView window] _growBoxRect]);
 }
 
@@ -560 +557 @@
 void WebChromeClient::invalidateContentsAndWindow(const IntRect& rect, bool immediate)
 {
-    if ([m_webView _usesDocumentViews])
-        return;
-
-    [m_webView setNeedsDisplayInRect:rect];
-
-    if (immediate) {
-        [[m_webView window] displayIfNeeded];
-        [[m_webView window] flushWindowIfNeeded];
-    }
 }
 
@@ -582 +570 @@
 IntPoint WebChromeClient::screenToWindow(const IntPoint& p) const
 {
-    if ([m_webView _usesDocumentViews])
-        return p;
-    NSPoint windowCoord = [[m_webView window] convertScreenToBase:p];
-    return IntPoint([m_webView convertPoint:windowCoord fromView:nil]);
+    return p;
 }
 
 IntRect WebChromeClient::windowToScreen(const IntRect& r) const
 {
-    if ([m_webView _usesDocumentViews])
-        return r;
-    NSRect tempRect = r;
-    tempRect = [m_webView convertRect:tempRect toView:nil];
-    tempRect.origin = [[m_webView window] convertBaseToScreen:tempRect.origin];
-    return enclosingIntRect(tempRect);
+    return r;
 }
 
 PlatformPageClient WebChromeClient::platformPageClient() const
 {
-    if ([m_webView _usesDocumentViews])
-        return 0;
-    return m_webView;
+    return 0;
 }
 
@@ -613 +591 @@
     // FIXME: This scrolling behavior should be under the control of the embedding client,
     // perhaps in a delegate method, rather than something WebKit does unconditionally.
-    NSView *coordinateView = [m_webView _usesDocumentViews]
-        ? (NSView *)[[[m_webView mainFrame] frameView] documentView] : m_webView;
+    NSView *coordinateView = [[[m_webView mainFrame] frameView] documentView];
     NSRect rect = r;
     for (NSView *view = m_webView; view; view = [view superview]) {
@@ -654 +631 @@
     if ([[m_webView UIDelegate] respondsToSelector:@selector(webView:printFrame:)])
         CallUIDelegate(m_webView, @selector(webView:printFrame:), webFrame);
-    else if ([m_webView _usesDocumentViews])
+    else
         CallUIDelegate(m_webView, @selector(webView:printFrameView:), [webFrame frameView]);
 }

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

@@ -236 +236 @@
     
     [[self representation] receivedData:data withDataSource:self];
-
-    if ([[self _webView] _usesDocumentViews])
-        [[[[self webFrame] frameView] documentView] dataSourceUpdated:self];
+    [[[[self webFrame] frameView] documentView] dataSourceUpdated:self];
 }