<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[176175] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/176175">176175</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-16 23:03:06 -0800 (Sun, 16 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Start cleaning up minimal UI from WKWebView
https://bugs.webkit.org/show_bug.cgi?id=138725
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-11-16
Reviewed by Sam Weinig.
Start removing the old update path for minimumLayoutSize/maximumUnobscuredSize.
Unfortunately, I cannot remove everything yet because the clients still did not have
alternatives to [_overrideLayoutParametersWithMinimumLayoutSize:minimumLayoutSizeForMinimalUI:maximumUnobscuredSizeOverride]
and might change the minimal UI options.
This patch adds [_overrideLayoutParametersWithMinimumLayoutSize:maximumUnobscuredSizeOverride] to move
in the right direction. Next we'll udpate the client code and get rid of all the useless code.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _overrideLayoutParametersWithMinimumLayoutSize:minimumLayoutSizeForMinimalUI:maximumUnobscuredSizeOverride:]):
(-[WKWebView _overrideLayoutParametersWithMinimumLayoutSize:maximumUnobscuredSizeOverride:]):
(-[WKWebView _minimumLayoutSizeOverrideForMinimalUI]): Deleted.
* UIProcess/API/Cocoa/WKWebViewPrivate.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176174 => 176175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-17 07:01:21 UTC (rev 176174)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-17 07:03:06 UTC (rev 176175)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-11-16 Benjamin Poulain <bpoulain@apple.com>
+
+ Start cleaning up minimal UI from WKWebView
+ https://bugs.webkit.org/show_bug.cgi?id=138725
+
+ Reviewed by Sam Weinig.
+
+ Start removing the old update path for minimumLayoutSize/maximumUnobscuredSize.
+
+ Unfortunately, I cannot remove everything yet because the clients still did not have
+ alternatives to [_overrideLayoutParametersWithMinimumLayoutSize:minimumLayoutSizeForMinimalUI:maximumUnobscuredSizeOverride]
+ and might change the minimal UI options.
+
+ This patch adds [_overrideLayoutParametersWithMinimumLayoutSize:maximumUnobscuredSizeOverride] to move
+ in the right direction. Next we'll udpate the client code and get rid of all the useless code.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _overrideLayoutParametersWithMinimumLayoutSize:minimumLayoutSizeForMinimalUI:maximumUnobscuredSizeOverride:]):
+ (-[WKWebView _overrideLayoutParametersWithMinimumLayoutSize:maximumUnobscuredSizeOverride:]):
+ (-[WKWebView _minimumLayoutSizeOverrideForMinimalUI]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+
</ins><span class="cx"> 2014-11-16 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [TexMap] Add typecasting support for GraphicsLayerTextureMapper
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (176174 => 176175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-11-17 07:01:21 UTC (rev 176174)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-11-17 07:03:06 UTC (rev 176175)
</span><span class="lines">@@ -2116,12 +2116,6 @@
</span><span class="cx"> _page->setViewportConfigurationMinimumLayoutSize(WebCore::FloatSize(minimumLayoutSizeOverride));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (CGSize)_minimumLayoutSizeOverrideForMinimalUI
-{
- ASSERT(_overridesMinimumLayoutSizeForMinimalUI);
- return _minimumLayoutSizeOverrideForMinimalUI;
-}
-
</del><span class="cx"> - (void)_setMinimumLayoutSizeOverrideForMinimalUI:(CGSize)size
</span><span class="cx"> {
</span><span class="cx"> _overridesMinimumLayoutSizeForMinimalUI = YES;
</span><span class="lines">@@ -2421,13 +2415,18 @@
</span><span class="cx">
</span><span class="cx"> - (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize minimumLayoutSizeForMinimalUI:(CGSize)minimumLayoutSizeForMinimalUI maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride
</span><span class="cx"> {
</span><del>- // FIXME: After Safari is updated to use this function instead of setting the parameters separately, we should remove
- // the individual setters and send a single message to send everything at once to the WebProcess.
- self._minimumLayoutSizeOverride = minimumLayoutSize;
- self._minimumLayoutSizeOverrideForMinimalUI = minimumLayoutSizeForMinimalUI;
- self._maximumUnobscuredSizeOverride = maximumUnobscuredSizeOverride;
</del><ins>+ [self _setMinimumLayoutSizeOverride:minimumLayoutSize];
+ [self _setMinimumLayoutSizeOverrideForMinimalUI:minimumLayoutSizeForMinimalUI];
+ [self _setMaximumUnobscuredSizeOverride:maximumUnobscuredSizeOverride];
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride
+{
+ [self _setMinimumLayoutSizeOverride:minimumLayoutSize];
+ [self _setMinimumLayoutSizeOverrideForMinimalUI:minimumLayoutSize];
+ [self _setMaximumUnobscuredSizeOverride:maximumUnobscuredSizeOverride];
+}
+
</ins><span class="cx"> - (UIView *)_viewForFindUI
</span><span class="cx"> {
</span><span class="cx"> return [self viewForZoomingInScrollView:[self scrollView]];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (176174 => 176175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-11-17 07:01:21 UTC (rev 176174)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-11-17 07:03:06 UTC (rev 176175)
</span><span class="lines">@@ -106,14 +106,10 @@
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> // DERECATED: The setters of the three following function are deprecated, please use overrideLayoutParameters.
</span><span class="cx"> // Define the smallest size a page take with a regular viewport.
</span><del>-@property (nonatomic, setter=_setMinimumLayoutSizeOverride:) CGSize _minimumLayoutSizeOverride;
-// Define the smallest size a page take with the minmal-ui viewport.
-@property (nonatomic, setter=_setMinimumLayoutSizeOverrideForMinimalUI:) CGSize _minimumLayoutSizeOverrideForMinimalUI;
</del><ins>+@property (nonatomic, readonly) CGSize _minimumLayoutSizeOverride;
</ins><span class="cx"> // Define the largest size the unobscured area can get for the current view bounds. This value is used to define viewport units.
</span><del>-@property (nonatomic, setter=_setMaximumUnobscuredSizeOverride:) CGSize _maximumUnobscuredSizeOverride;
</del><ins>+@property (nonatomic, readonly) CGSize _maximumUnobscuredSizeOverride;
</ins><span class="cx">
</span><del>-@property (nonatomic, readonly) BOOL _usesMinimalUI;
-
</del><span class="cx"> // Define the inset of the scrollview unusable by the web page.
</span><span class="cx"> @property (nonatomic, setter=_setObscuredInsets:) UIEdgeInsets _obscuredInsets;
</span><span class="cx">
</span><span class="lines">@@ -145,6 +141,8 @@
</span><span class="cx">
</span><span class="cx"> - (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize minimumLayoutSizeForMinimalUI:(CGSize)minimumLayoutSizeForMinimalUI maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride;
</span><span class="cx">
</span><ins>+- (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride;
+
</ins><span class="cx"> - (UIView *)_viewForFindUI;
</span><span class="cx">
</span><span class="cx"> - (void)_setOverlaidAccessoryViewsInset:(CGSize)inset;
</span></span></pre>
</div>
</div>
</body>
</html>