Title: [95458] trunk/Source/WebKit/mac
- Revision
- 95458
- Author
- [email protected]
- Date
- 2011-09-19 12:46:42 -0700 (Mon, 19 Sep 2011)
Log 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:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (95457 => 95458)
--- trunk/Source/WebKit/mac/ChangeLog 2011-09-19 19:44:18 UTC (rev 95457)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-09-19 19:46:42 UTC (rev 95458)
@@ -1,3 +1,24 @@
+2011-09-19 Anders Carlsson <[email protected]>
+
+ 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 <[email protected]>
WebKit part of [mac] WebKit contains Objective-C classes that are not prefixed with its standard prefixes
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (95457 => 95458)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2011-09-19 19:44:18 UTC (rev 95457)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2011-09-19 19:46:42 UTC (rev 95458)
@@ -543,10 +543,7 @@
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]);
}
void WebChromeClient::invalidateWindow(const IntRect&, bool immediate)
@@ -559,15 +556,6 @@
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];
- }
}
void WebChromeClient::invalidateContentsForSlowScroll(const IntRect& rect, bool immediate)
@@ -581,27 +569,17 @@
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;
}
void WebChromeClient::contentsSizeChanged(Frame*, const IntSize&) const
@@ -612,8 +590,7 @@
{
// 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]) {
if ([view isKindOfClass:[NSClipView class]]) {
@@ -653,7 +630,7 @@
WebFrame *webFrame = kit(frame);
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]);
}
Modified: trunk/Source/WebKit/mac/WebView/WebDataSource.mm (95457 => 95458)
--- trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2011-09-19 19:44:18 UTC (rev 95457)
+++ trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2011-09-19 19:46:42 UTC (rev 95458)
@@ -235,9 +235,7 @@
RetainPtr<WebDataSource*> protect(self);
[[self representation] receivedData:data withDataSource:self];
-
- if ([[self _webView] _usesDocumentViews])
- [[[[self webFrame] frameView] documentView] dataSourceUpdated:self];
+ [[[[self webFrame] frameView] documentView] dataSourceUpdated:self];
}
- (void)_setMainDocumentError:(NSError *)error
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
