Title: [186943] branches/safari-601.1-branch/Source/WebKit/mac
- Revision
- 186943
- Author
- matthew_han...@apple.com
- Date
- 2015-07-16 22:33:18 -0700 (Thu, 16 Jul 2015)
Log Message
Merge r186909. rdar://problem/21802456
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit/mac/ChangeLog (186942 => 186943)
--- branches/safari-601.1-branch/Source/WebKit/mac/ChangeLog 2015-07-17 05:33:15 UTC (rev 186942)
+++ branches/safari-601.1-branch/Source/WebKit/mac/ChangeLog 2015-07-17 05:33:18 UTC (rev 186943)
@@ -1,3 +1,22 @@
+2015-07-16 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r186909. rdar://problem/21802456
+
+ 2015-07-13 Simon Fraser <simon.fra...@apple.com>
+
+ [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-10 Matthew Hanson <matthew_han...@apple.com>
Disable non-shipping features.
Modified: branches/safari-601.1-branch/Source/WebKit/mac/WebView/WebView.mm (186942 => 186943)
--- branches/safari-601.1-branch/Source/WebKit/mac/WebView/WebView.mm 2015-07-17 05:33:15 UTC (rev 186942)
+++ branches/safari-601.1-branch/Source/WebKit/mac/WebView/WebView.mm 2015-07-17 05:33:18 UTC (rev 186943)
@@ -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: branches/safari-601.1-branch/Source/WebKit/mac/WebView/WebViewPrivate.h (186942 => 186943)
--- branches/safari-601.1-branch/Source/WebKit/mac/WebView/WebViewPrivate.h 2015-07-17 05:33:15 UTC (rev 186942)
+++ branches/safari-601.1-branch/Source/WebKit/mac/WebView/WebViewPrivate.h 2015-07-17 05:33:18 UTC (rev 186943)
@@ -442,6 +442,7 @@
- (DOMCSSStyleDeclaration *)styleAtSelectionStart;
- (NSUInteger)_renderTreeSize;
+- (NSSize)_contentsSizeRespectingOverflow;
/*!
* @method _handleMemoryWarning
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
