<!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>[189105] 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/189105">189105</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-08-28 11:09:49 -0700 (Fri, 28 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of the DynamicSizeWithMinimumViewSize layout mode
https://bugs.webkit.org/show_bug.cgi?id=148554
Reviewed by Anders Carlsson.
* UIProcess/API/C/WKLayoutMode.h:
* UIProcess/API/Cocoa/WKViewPrivate.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _layoutMode]):
(-[WKWebView _setLayoutMode:]):
(-[WKWebView _setMinimumViewSize:]): Deleted.
(-[WKWebView _minimumViewSize]): Deleted.
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
* UIProcess/API/Cocoa/_WKLayoutMode.h:
* UIProcess/API/mac/WKView.mm:
(-[WKView _setMinimumViewSize:]): Deleted.
(-[WKView _minimumViewSize]): Deleted.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::scaleViewAndUpdateGeometryFenced): Deleted.
* UIProcess/WebPageProxy.h:
* UIProcess/mac/WKViewLayoutStrategy.mm:
(+[WKViewLayoutStrategy layoutStrategyWithPage:view:mode:]):
(-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy initWithPage:view:mode:]): Deleted.
(-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy _updateTransientScale:]): Deleted.
(-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy updateLayout]): Deleted.
(-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy didChangeMinimumViewSize]): Deleted.
(-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy willStartLiveResize]): Deleted.
(-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy didEndLiveResize]): Deleted.
(-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy didChangeFrameSize]): Deleted.
(-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy willChangeLayoutStrategy]): Deleted.
* WebProcess/WebPage/DrawingArea.h:
(WebKit::DrawingArea::replyWithFenceAfterNextFlush): Deleted.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::scaleViewAndUpdateGeometryFenced): Deleted.
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::replyWithFenceAfterNextFlush): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKLayoutModeh">trunk/Source/WebKit2/UIProcess/API/C/WKLayoutMode.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h</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>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKLayoutModeh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKLayoutMode.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKViewLayoutStrategyh">trunk/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKViewLayoutStrategymm">trunk/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (189104 => 189105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-08-28 17:59:27 UTC (rev 189104)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-28 18:09:49 UTC (rev 189105)
</span><span class="lines">@@ -1,5 +1,47 @@
</span><span class="cx"> 2015-08-28 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Get rid of the DynamicSizeWithMinimumViewSize layout mode
+ https://bugs.webkit.org/show_bug.cgi?id=148554
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/C/WKLayoutMode.h:
+ * UIProcess/API/Cocoa/WKViewPrivate.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _layoutMode]):
+ (-[WKWebView _setLayoutMode:]):
+ (-[WKWebView _setMinimumViewSize:]): Deleted.
+ (-[WKWebView _minimumViewSize]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/API/Cocoa/_WKLayoutMode.h:
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _setMinimumViewSize:]): Deleted.
+ (-[WKView _minimumViewSize]): Deleted.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::scaleViewAndUpdateGeometryFenced): Deleted.
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/mac/WKViewLayoutStrategy.mm:
+ (+[WKViewLayoutStrategy layoutStrategyWithPage:view:mode:]):
+ (-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy initWithPage:view:mode:]): Deleted.
+ (-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy _updateTransientScale:]): Deleted.
+ (-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy updateLayout]): Deleted.
+ (-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy didChangeMinimumViewSize]): Deleted.
+ (-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy willStartLiveResize]): Deleted.
+ (-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy didEndLiveResize]): Deleted.
+ (-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy didChangeFrameSize]): Deleted.
+ (-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy willChangeLayoutStrategy]): Deleted.
+ * WebProcess/WebPage/DrawingArea.h:
+ (WebKit::DrawingArea::replyWithFenceAfterNextFlush): Deleted.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::scaleViewAndUpdateGeometryFenced): Deleted.
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::replyWithFenceAfterNextFlush): Deleted.
+
+2015-08-28 Timothy Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> [Mac] Right-clicking on GIFs spins the UI process for a while
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=148566
</span><span class="cx"> <rdar://problem/22460854>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKLayoutModeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKLayoutMode.h (189104 => 189105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKLayoutMode.h 2015-08-28 17:59:27 UTC (rev 189104)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKLayoutMode.h 2015-08-28 18:09:49 UTC (rev 189105)
</span><span class="lines">@@ -33,11 +33,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> enum {
</span><del>- kWKLayoutModeViewSize,
- kWKLayoutModeFixedSize,
- kWKLayoutModeDynamicSizeComputedFromViewScale,
- kWKLayoutModeDynamicSizeWithMinimumViewSize,
- kWKLayoutModeDynamicSizeComputedFromMinimumDocumentSize
</del><ins>+ kWKLayoutModeViewSize = 0,
+ kWKLayoutModeFixedSize = 1,
+ kWKLayoutModeDynamicSizeComputedFromViewScale = 2,
+ kWKLayoutModeDynamicSizeComputedFromMinimumDocumentSize = 4
</ins><span class="cx"> };
</span><span class="cx"> typedef uint32_t WKLayoutMode;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h (189104 => 189105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2015-08-28 17:59:27 UTC (rev 189104)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2015-08-28 18:09:49 UTC (rev 189105)
</span><span class="lines">@@ -95,8 +95,6 @@
</span><span class="cx"> @property (nonatomic, setter=_setLayoutMode:) WKLayoutMode _layoutMode;
</span><span class="cx"> // For use with _layoutMode = kWKLayoutModeFixedSize:
</span><span class="cx"> @property (nonatomic, setter=_setFixedLayoutSize:) CGSize _fixedLayoutSize;
</span><del>-// For use with _layoutMode = kWKLayoutModeDynamicSizeWithMinimumViewSize:
-@property (nonatomic, setter=_setMinimumViewSize:) CGSize _minimumViewSize;
</del><span class="cx">
</span><span class="cx"> @property (nonatomic, setter=_setViewScale:) CGFloat _viewScale;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (189104 => 189105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-08-28 17:59:27 UTC (rev 189104)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-08-28 18:09:49 UTC (rev 189105)
</span><span class="lines">@@ -2506,8 +2506,6 @@
</span><span class="cx"> return _WKLayoutModeFixedSize;
</span><span class="cx"> case kWKLayoutModeDynamicSizeComputedFromViewScale:
</span><span class="cx"> return _WKLayoutModeDynamicSizeComputedFromViewScale;
</span><del>- case kWKLayoutModeDynamicSizeWithMinimumViewSize:
- return _WKLayoutModeDynamicSizeWithMinimumViewSize;
</del><span class="cx"> case kWKLayoutModeDynamicSizeComputedFromMinimumDocumentSize:
</span><span class="cx"> return _WKLayoutModeDynamicSizeComputedFromMinimumDocumentSize;
</span><span class="cx"> case kWKLayoutModeViewSize:
</span><span class="lines">@@ -2530,9 +2528,6 @@
</span><span class="cx"> case _WKLayoutModeDynamicSizeComputedFromViewScale:
</span><span class="cx"> wkViewLayoutMode = kWKLayoutModeDynamicSizeComputedFromViewScale;
</span><span class="cx"> break;
</span><del>- case _WKLayoutModeDynamicSizeWithMinimumViewSize:
- wkViewLayoutMode = kWKLayoutModeDynamicSizeWithMinimumViewSize;
- break;
</del><span class="cx"> case _WKLayoutModeDynamicSizeComputedFromMinimumDocumentSize:
</span><span class="cx"> wkViewLayoutMode = kWKLayoutModeDynamicSizeComputedFromMinimumDocumentSize;
</span><span class="cx"> break;
</span><span class="lines">@@ -2574,22 +2569,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_setMinimumViewSize:(CGSize)minimumViewSize
-{
-#if PLATFORM(MAC)
- [_wkView _setMinimumViewSize:minimumViewSize];
-#endif
-}
-
-- (CGSize)_minimumViewSize
-{
-#if PLATFORM(MAC)
- return [_wkView _minimumViewSize];
-#else
- return CGSizeZero;
-#endif
-}
-
</del><span class="cx"> #pragma mark scrollperf methods
</span><span class="cx">
</span><span class="cx"> - (void)_setScrollPerformanceDataCollectionEnabled:(BOOL)enabled
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (189104 => 189105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-08-28 17:59:27 UTC (rev 189104)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-08-28 18:09:49 UTC (rev 189105)
</span><span class="lines">@@ -99,8 +99,6 @@
</span><span class="cx"> @property (nonatomic, setter=_setLayoutMode:) _WKLayoutMode _layoutMode;
</span><span class="cx"> // For use with _layoutMode = _WKLayoutModeFixedSize:
</span><span class="cx"> @property (nonatomic, setter=_setFixedLayoutSize:) CGSize _fixedLayoutSize;
</span><del>-// For use with _layoutMode = _WKLayoutModeDynamicSizeWithMinimumViewSize:
-@property (nonatomic, setter=_setMinimumViewSize:) CGSize _minimumViewSize;
</del><span class="cx">
</span><span class="cx"> @property (nonatomic, setter=_setViewScale:) CGFloat _viewScale;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKLayoutModeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKLayoutMode.h (189104 => 189105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKLayoutMode.h 2015-08-28 17:59:27 UTC (rev 189104)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKLayoutMode.h 2015-08-28 18:09:49 UTC (rev 189105)
</span><span class="lines">@@ -28,17 +28,14 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> typedef NS_ENUM(NSUInteger, _WKLayoutMode) {
</span><del>- _WKLayoutModeViewSize,
- _WKLayoutModeFixedSize,
</del><ins>+ _WKLayoutModeViewSize = 0,
+ _WKLayoutModeFixedSize = 1,
</ins><span class="cx">
</span><span class="cx"> // Lay out the view with its frame scaled by the inverse viewScale.
</span><del>- _WKLayoutModeDynamicSizeComputedFromViewScale,
</del><ins>+ _WKLayoutModeDynamicSizeComputedFromViewScale = 2,
</ins><span class="cx">
</span><del>- // Lay out the view at a heuristically-determined size based on the minimum view size.
- _WKLayoutModeDynamicSizeWithMinimumViewSize,
-
</del><span class="cx"> // Lay out the view at a heuristically-determined size based on the minimum size of the document.
</span><del>- _WKLayoutModeDynamicSizeComputedFromMinimumDocumentSize,
</del><ins>+ _WKLayoutModeDynamicSizeComputedFromMinimumDocumentSize = 4,
</ins><span class="cx">
</span><span class="cx"> } WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (189104 => 189105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-08-28 17:59:27 UTC (rev 189104)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-08-28 18:09:49 UTC (rev 189105)
</span><span class="lines">@@ -267,7 +267,6 @@
</span><span class="cx"> RetainPtr<WKViewLayoutStrategy> _layoutStrategy;
</span><span class="cx"> WKLayoutMode _lastRequestedLayoutMode;
</span><span class="cx"> float _lastRequestedViewScale;
</span><del>- CGSize _minimumViewSize;
</del><span class="cx">
</span><span class="cx"> RetainPtr<CALayer> _rootLayer;
</span><span class="cx">
</span><span class="lines">@@ -4390,17 +4389,6 @@
</span><span class="cx"> [_data->_layoutStrategy didChangeViewScale];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_setMinimumViewSize:(CGSize)minimumViewSize
-{
- _data->_minimumViewSize = minimumViewSize;
- [_data->_layoutStrategy didChangeMinimumViewSize];
-}
-
-- (CGSize)_minimumViewSize
-{
- return _data->_minimumViewSize;
-}
-
</del><span class="cx"> - (void)_dispatchSetTopContentInset
</span><span class="cx"> {
</span><span class="cx"> if (!_data->_didScheduleSetTopContentInset)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (189104 => 189105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-08-28 17:59:27 UTC (rev 189104)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-08-28 18:09:49 UTC (rev 189105)
</span><span class="lines">@@ -2275,22 +2275,6 @@
</span><span class="cx"> m_process->send(Messages::WebPage::ScaleView(scale), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA)
-void WebPageProxy::scaleViewAndUpdateGeometryFenced(double scale, IntSize viewSize, std::function<void (const MachSendRight&, CallbackBase::Error)> callback)
-{
- if (!isValid()) {
- callback(MachSendRight(), CallbackBase::Error::OwnerWasInvalidated);
- return;
- }
-
- m_viewScaleFactor = scale;
- if (m_drawingArea)
- m_drawingArea->willSendUpdateGeometry();
- uint64_t callbackID = m_callbacks.put(WTF::move(callback), m_process->throttler().backgroundActivityToken());
- m_process->send(Messages::WebPage::ScaleViewAndUpdateGeometryFenced(scale, viewSize, callbackID), m_pageID);
-}
-#endif
-
</del><span class="cx"> void WebPageProxy::setIntrinsicDeviceScaleFactor(float scaleFactor)
</span><span class="cx"> {
</span><span class="cx"> if (m_intrinsicDeviceScaleFactor == scaleFactor)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (189104 => 189105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-08-28 17:59:27 UTC (rev 189104)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-08-28 18:09:49 UTC (rev 189105)
</span><span class="lines">@@ -642,9 +642,6 @@
</span><span class="cx"> double pageScaleFactor() const;
</span><span class="cx"> double viewScaleFactor() const { return m_viewScaleFactor; }
</span><span class="cx"> void scaleView(double scale);
</span><del>-#if PLATFORM(COCOA)
- void scaleViewAndUpdateGeometryFenced(double scale, WebCore::IntSize viewSize, std::function<void (const WebCore::MachSendRight&, CallbackBase::Error)>);
-#endif
</del><span class="cx"> void setShouldScaleViewToFitDocument(bool);
</span><span class="cx">
</span><span class="cx"> bool userContentExtensionsEnabled() { return m_userContentExtensionsEnabled; }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKViewLayoutStrategyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.h (189104 => 189105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.h 2015-08-28 17:59:27 UTC (rev 189104)
+++ trunk/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.h 2015-08-28 18:09:49 UTC (rev 189105)
</span><span class="lines">@@ -54,7 +54,6 @@
</span><span class="cx"> - (BOOL)frameSizeUpdatesDisabled;
</span><span class="cx">
</span><span class="cx"> - (void)didChangeViewScale;
</span><del>-- (void)didChangeMinimumViewSize;
</del><span class="cx"> - (void)willStartLiveResize;
</span><span class="cx"> - (void)didEndLiveResize;
</span><span class="cx"> - (void)didChangeFrameSize;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKViewLayoutStrategymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm (189104 => 189105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm 2015-08-28 17:59:27 UTC (rev 189104)
+++ trunk/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm 2015-08-28 18:09:49 UTC (rev 189105)
</span><span class="lines">@@ -45,13 +45,6 @@
</span><span class="cx"> @interface WKViewDynamicSizeComputedFromViewScaleLayoutStrategy : WKViewLayoutStrategy
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@interface WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy : WKViewLayoutStrategy {
- BOOL _isWaitingForCommit;
- BOOL _hasPendingLayout;
- CGFloat _lastCommittedViewScale;
-}
-@end
-
</del><span class="cx"> @interface WKViewDynamicSizeComputedFromMinimumDocumentSizeLayoutStrategy : WKViewLayoutStrategy
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -68,9 +61,6 @@
</span><span class="cx"> case kWKLayoutModeDynamicSizeComputedFromViewScale:
</span><span class="cx"> strategy = [[WKViewDynamicSizeComputedFromViewScaleLayoutStrategy alloc] initWithPage:page view:wkView mode:mode];
</span><span class="cx"> break;
</span><del>- case kWKLayoutModeDynamicSizeWithMinimumViewSize:
- strategy = [[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy alloc] initWithPage:page view:wkView mode:mode];
- break;
</del><span class="cx"> case kWKLayoutModeDynamicSizeComputedFromMinimumDocumentSize:
</span><span class="cx"> strategy = [[WKViewDynamicSizeComputedFromMinimumDocumentSizeLayoutStrategy alloc] initWithPage:page view:wkView mode:mode];
</span><span class="cx"> break;
</span><span class="lines">@@ -137,10 +127,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)didChangeMinimumViewSize
-{
-}
-
</del><span class="cx"> - (void)willStartLiveResize
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -244,142 +230,6 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@implementation WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy
-
-- (instancetype)initWithPage:(WebPageProxy&)page view:(WKView *)wkView mode:(WKLayoutMode)mode
-{
- self = [super initWithPage:page view:wkView mode:mode];
-
- if (!self)
- return nil;
-
- page.setUseFixedLayout(true);
- _lastCommittedViewScale = _page->viewScaleFactor();
-
- return self;
-}
-
-- (void)_updateTransientScale:(CGFloat)scale
-{
- float topContentInset = _page->topContentInset();
-
- CGFloat relativeScale = scale / _lastCommittedViewScale;
-
- CATransform3D transform = CATransform3DMakeTranslation(0, topContentInset - (topContentInset * relativeScale), 0);
- transform = CATransform3DScale(transform, relativeScale, relativeScale, 1);
-
- _wkView._rootLayer.transform = transform;
-}
-
-- (void)updateLayout
-{
- _hasPendingLayout = NO;
-
- CGFloat scale = 1;
-
- CGFloat minimumViewWidth = _wkView._minimumViewSize.width;
- CGFloat minimumViewHeight = _wkView._minimumViewSize.height;
-
- CGFloat fixedLayoutWidth = _wkView.frame.size.width;
- CGFloat fixedLayoutHeight = _wkView.frame.size.height;
-
- if (NSIsEmptyRect(_wkView.frame))
- return;
-
- if (_wkView.frame.size.width < minimumViewWidth) {
- scale = _wkView.frame.size.width / minimumViewWidth;
- fixedLayoutWidth = minimumViewWidth;
- }
-
- if (_wkView.frame.size.height < minimumViewHeight) {
- scale = std::min(_wkView.frame.size.height / minimumViewHeight, scale);
- fixedLayoutWidth = minimumViewHeight;
- }
-
- _page->setFixedLayoutSize(IntSize(fixedLayoutWidth, fixedLayoutHeight));
-
- [self _updateTransientScale:scale];
-
- if (_isWaitingForCommit) {
- _hasPendingLayout = YES;
- return;
- }
-
- if ([_wkView inLiveResize] && _lastCommittedViewScale == 1 && scale == 1 && _frameSizeUpdatesDisabledCount == 1) {
- // Send frame size updates if we're the only ones disabling them,
- // if we're not scaling down. That way, everything will behave like a normal
- // resize except in the critical section.
- if (_wkView.shouldClipToVisibleRect)
- [_wkView _updateViewExposedRect];
- [_wkView _setDrawingAreaSize:[_wkView frame].size];
- return;
- }
-
- if (_lastCommittedViewScale == scale)
- return;
-
- _isWaitingForCommit = YES;
-
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
- RetainPtr<CAContext> context = [_wkView.layer context];
- RetainPtr<WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy> retainedSelf = self;
- _page->scaleViewAndUpdateGeometryFenced(scale, IntSize(_wkView.frame.size), [retainedSelf, context, scale] (const WebCore::MachSendRight& fencePort, CallbackBase::Error error) {
- if (error != CallbackBase::Error::None)
- return;
-
- [context setFencePort:fencePort.sendRight() commitHandler:[retainedSelf, scale] {
- WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy *layoutStrategy = retainedSelf.get();
- layoutStrategy->_lastCommittedViewScale = scale;
- [layoutStrategy _updateTransientScale:scale];
- layoutStrategy->_isWaitingForCommit = NO;
-
- if (layoutStrategy->_hasPendingLayout)
- [layoutStrategy updateLayout];
- }];
- });
-#else
- _page->scaleView(scale);
- _wkView._rootLayer.transform = CATransform3DIdentity;
-#endif
-}
-
-- (void)didChangeMinimumViewSize
-{
- [super didChangeMinimumViewSize];
-
- [self updateLayout];
-}
-
-- (void)willStartLiveResize
-{
- [super willStartLiveResize];
-
- [_wkView disableFrameSizeUpdates];
-}
-
-- (void)didEndLiveResize
-{
- [super didEndLiveResize];
-
- [self updateLayout];
- [_wkView enableFrameSizeUpdates];
-}
-
-- (void)didChangeFrameSize
-{
- [super didChangeFrameSize];
-
- [self updateLayout];
-}
-
-- (void)willChangeLayoutStrategy
-{
- _wkView._rootLayer.transform = CATransform3DIdentity;
- _page->scaleView(1);
-}
-
-@end
-
</del><span class="cx"> @implementation WKViewDynamicSizeComputedFromMinimumDocumentSizeLayoutStrategy
</span><span class="cx">
</span><span class="cx"> - (instancetype)initWithPage:(WebPageProxy&)page view:(WKView *)wkView mode:(WKLayoutMode)mode
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (189104 => 189105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2015-08-28 17:59:27 UTC (rev 189104)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2015-08-28 18:09:49 UTC (rev 189105)
</span><span class="lines">@@ -132,8 +132,6 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> // Used by TiledCoreAnimationDrawingArea.
</span><span class="cx"> virtual void updateGeometry(const WebCore::IntSize& viewSize, const WebCore::IntSize& layerPosition, bool flushSynchronously, const WebCore::MachSendRight& fencePort) { }
</span><del>-
- virtual void replyWithFenceAfterNextFlush(uint64_t callbackID) { ASSERT_NOT_REACHED(); }
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (189104 => 189105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-08-28 17:59:27 UTC (rev 189104)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-08-28 18:09:49 UTC (rev 189105)
</span><span class="lines">@@ -1492,15 +1492,6 @@
</span><span class="cx"> scalePage(pageScale, scrollPositionAtNewScale);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA)
-void WebPage::scaleViewAndUpdateGeometryFenced(double scale, IntSize viewSize, uint64_t callbackID)
-{
- scaleView(scale);
- m_drawingArea->updateGeometry(viewSize, IntSize(), false, MachSendRight());
- m_drawingArea->replyWithFenceAfterNextFlush(callbackID);
-}
-#endif
-
</del><span class="cx"> void WebPage::setDeviceScaleFactor(float scaleFactor)
</span><span class="cx"> {
</span><span class="cx"> if (scaleFactor == m_page->deviceScaleFactor())
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (189104 => 189105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-08-28 17:59:27 UTC (rev 189104)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-08-28 18:09:49 UTC (rev 189105)
</span><span class="lines">@@ -370,9 +370,6 @@
</span><span class="cx"> double totalScaleFactor() const;
</span><span class="cx"> double viewScaleFactor() const;
</span><span class="cx"> void scaleView(double scale);
</span><del>-#if PLATFORM(COCOA)
- void scaleViewAndUpdateGeometryFenced(double scale, WebCore::IntSize viewSize, uint64_t callbackID);
-#endif
</del><span class="cx">
</span><span class="cx"> void setUseFixedLayout(bool);
</span><span class="cx"> bool useFixedLayout() const { return m_useFixedLayout; }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (189104 => 189105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-08-28 17:59:27 UTC (rev 189104)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-08-28 18:09:49 UTC (rev 189105)
</span><span class="lines">@@ -198,9 +198,6 @@
</span><span class="cx"> ScalePage(double scale, WebCore::IntPoint origin)
</span><span class="cx"> ScalePageInViewCoordinates(double scale, WebCore::IntPoint centerInViewCoordinates)
</span><span class="cx"> ScaleView(double scale)
</span><del>-#if PLATFORM(COCOA)
- ScaleViewAndUpdateGeometryFenced(double scale, WebCore::IntSize viewSize, uint64_t callbackID)
-#endif
</del><span class="cx">
</span><span class="cx"> SetUseFixedLayout(bool fixed)
</span><span class="cx"> SetFixedLayoutSize(WebCore::IntSize size)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (189104 => 189105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2015-08-28 17:59:27 UTC (rev 189104)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2015-08-28 18:09:49 UTC (rev 189105)
</span><span class="lines">@@ -86,8 +86,6 @@
</span><span class="cx">
</span><span class="cx"> virtual void attachViewOverlayGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) override;
</span><span class="cx">
</span><del>- virtual void replyWithFenceAfterNextFlush(uint64_t callbackID) override;
-
</del><span class="cx"> // WebCore::LayerFlushSchedulerClient
</span><span class="cx"> virtual bool flushLayers() override;
</span><span class="cx">
</span><span class="lines">@@ -152,7 +150,6 @@
</span><span class="cx">
</span><span class="cx"> WebCore::GraphicsLayer* m_viewOverlayRootLayer;
</span><span class="cx">
</span><del>- Vector<uint64_t> m_fenceCallbacksForAfterNextFlush;
</del><span class="cx"> bool m_shouldScaleViewToFitDocument { false };
</span><span class="cx"> bool m_isScalingViewToFitDocument { false };
</span><span class="cx"> WebCore::IntSize m_lastViewSizeForScaleToFit;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (189104 => 189105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-08-28 17:59:27 UTC (rev 189104)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-08-28 18:09:49 UTC (rev 189105)
</span><span class="lines">@@ -440,16 +440,6 @@
</span><span class="cx"> if (m_transientZoomScale != 1)
</span><span class="cx"> applyTransientZoomToLayers(m_transientZoomScale, m_transientZoomOrigin);
</span><span class="cx">
</span><del>- if (!m_fenceCallbacksForAfterNextFlush.isEmpty()) {
- MachSendRight fencePort = m_layerHostingContext->createFencePort();
-
- for (auto callbackID : m_fenceCallbacksForAfterNextFlush)
- m_webPage.send(Messages::WebPageProxy::MachSendRightCallback(fencePort, callbackID));
- m_fenceCallbacksForAfterNextFlush.clear();
-
- m_layerHostingContext->setFencePort(fencePort.sendRight());
- }
-
</del><span class="cx"> return returnValue;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -874,11 +864,6 @@
</span><span class="cx"> m_layerHostingContext->setFencePort(fencePort.sendRight());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TiledCoreAnimationDrawingArea::replyWithFenceAfterNextFlush(uint64_t callbackID)
-{
- m_fenceCallbacksForAfterNextFlush.append(callbackID);
-}
-
</del><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span></span></pre>
</div>
</div>
</body>
</html>