Title: [186909] trunk/Source/WebKit/mac
- Revision
- 186909
- Author
- [email protected]
- Date
- 2015-07-16 14:50:50 -0700 (Thu, 16 Jul 2015)
Log Message
[iOS] Expose contentsSizeRespectingOverflow() via WebView so UIWebView can use it
https://bugs.webkit.org/show_bug.cgi?id=146924
WebKit part of rdar://problem/21802456
Reviewed by Tim Horton.
Expose the FrameView's contentsSizeRespectingOverflow() via WebView, for use
by UIKit.
* WebView/WebView.mm:
(-[WebView _contentsSizeRespectingOverflow]):
* WebView/WebViewPrivate.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (186908 => 186909)
--- trunk/Source/WebKit/mac/ChangeLog 2015-07-16 21:40:12 UTC (rev 186908)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-07-16 21:50:50 UTC (rev 186909)
@@ -1,3 +1,18 @@
+2015-07-13 Simon Fraser <[email protected]>
+
+ [iOS] Expose contentsSizeRespectingOverflow() via WebView so UIWebView can use it
+ https://bugs.webkit.org/show_bug.cgi?id=146924
+ WebKit part of rdar://problem/21802456
+
+ Reviewed by Tim Horton.
+
+ Expose the FrameView's contentsSizeRespectingOverflow() via WebView, for use
+ by UIKit.
+
+ * WebView/WebView.mm:
+ (-[WebView _contentsSizeRespectingOverflow]):
+ * WebView/WebViewPrivate.h:
+
2015-07-14 Anders Carlsson <[email protected]>
Remove wkPopupMenu from WebCoreSystemInterface; it's not called from WebCore
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (186908 => 186909)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-07-16 21:40:12 UTC (rev 186908)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-07-16 21:50:50 UTC (rev 186909)
@@ -1560,6 +1560,14 @@
return _private->page->renderTreeSize();
}
+- (NSSize)_contentsSizeRespectingOverflow
+{
+ if (FrameView* view = [self _mainCoreFrame]->view())
+ return view->contentsSizeRespectingOverflow();
+
+ return [[[[self mainFrame] frameView] documentView] bounds].size;
+}
+
- (void)_dispatchTileDidDraw:(CALayer*)tile
{
id mailDelegate = [self _webMailDelegate];
Modified: trunk/Source/WebKit/mac/WebView/WebViewPrivate.h (186908 => 186909)
--- trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2015-07-16 21:40:12 UTC (rev 186908)
+++ trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2015-07-16 21:50:50 UTC (rev 186909)
@@ -442,6 +442,7 @@
- (DOMCSSStyleDeclaration *)styleAtSelectionStart;
- (NSUInteger)_renderTreeSize;
+- (NSSize)_contentsSizeRespectingOverflow;
/*!
* @method _handleMemoryWarning
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
