<!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>[183841] trunk</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/183841">183841</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-05-05 16:39:06 -0700 (Tue, 05 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a layout mode for computing fixed layout size from a minimum size
https://bugs.webkit.org/show_bug.cgi?id=144610
<rdar://problem/19790341>
Reviewed by Simon Fraser.
Add a layout mode where WebKit determines the layout size with a set of
(still in flux) heuristics, trying hard to keep the page usable below a
particular client-defined threshold view size.
This can mean that WebKit will start scaling down the page inside the view
to make the whole page fit, using the viewScale mechanism.
* UIProcess/API/C/WKLayoutMode.h:
* UIProcess/API/Cocoa/_WKLayoutMode.h:
Add the new layout mode, and documentation for the two complicated ones.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _layoutMode]):
(-[WKWebView _setLayoutMode:]):
(-[WKWebView _setViewScale:]):
(-[WKWebView _setMinimumViewSize:]):
(-[WKWebView _minimumViewSize]):
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
Forward the layoutMode and viewScale parameters to WKView if we have one.
* UIProcess/API/Cocoa/WKViewPrivate.h:
* UIProcess/API/mac/WKView.mm:
(-[WKView dealloc]):
(-[WKView viewWillStartLiveResize]):
(-[WKView viewDidEndLiveResize]):
(-[WKView setFrameSize:]):
(-[WKView initWithFrame:processPool:configuration:webView:]):
(-[WKView disableFrameSizeUpdates]):
(-[WKView enableFrameSizeUpdates]):
(-[WKView frameSizeUpdatesDisabled]):
(-[WKView _layoutMode]):
(-[WKView _setLayoutMode:]):
(-[WKView _setViewScale:]):
(-[WKView _setMinimumViewSize:]):
(-[WKView _minimumViewSize]):
Store the minimum view size, and update the fixed layout size if needed.
(-[WKView _updateAutomaticallyComputedFixedLayoutSize]): Deleted.
(-[WKView _setAutomaticallyComputesFixedLayoutSizeFromViewScale:]): Deleted.
(-[WKView _automaticallyComputesFixedLayoutSizeFromViewScale]): Deleted.
Store the WKLayoutMode on the WKViewLayoutStrategy instead of having a
bunch of things like _automaticallyComputesFixedLayoutSizeFromViewScale.
* UIProcess/API/mac/WKViewInternal.h:
* UIProcess/mac/WKViewLayoutStrategy.h: Added.
* UIProcess/mac/WKViewLayoutStrategy.mm: Added.
(+[WKViewLayoutStrategy layoutStrategyWithPage:view:mode:]):
(-[WKViewLayoutStrategy initWithPage:view:mode:]):
(-[WKViewLayoutStrategy willDestroyView:]):
(-[WKViewLayoutStrategy layoutMode]):
(-[WKViewLayoutStrategy updateLayout]):
(-[WKViewLayoutStrategy disableFrameSizeUpdates]):
(-[WKViewLayoutStrategy enableFrameSizeUpdates]):
(-[WKViewLayoutStrategy frameSizeUpdatesDisabled]):
(-[WKViewLayoutStrategy didChangeViewScale]):
(-[WKViewLayoutStrategy didChangeMinimumViewSize]):
(-[WKViewLayoutStrategy willStartLiveResize]):
(-[WKViewLayoutStrategy didEndLiveResize]):
(-[WKViewLayoutStrategy didChangeFrameSize]):
(-[WKViewLayoutStrategy willChangeLayoutStrategy]):
(-[WKViewViewSizeLayoutStrategy initWithPage:view:mode:]):
(-[WKViewViewSizeLayoutStrategy updateLayout]):
(-[WKViewFixedSizeLayoutStrategy initWithPage:view:mode:]):
(-[WKViewFixedSizeLayoutStrategy updateLayout]):
(-[WKViewDynamicSizeComputedFromViewScaleLayoutStrategy initWithPage:view:mode:]):
(-[WKViewDynamicSizeComputedFromViewScaleLayoutStrategy updateLayout]):
(-[WKViewDynamicSizeComputedFromViewScaleLayoutStrategy didChangeViewScale]):
(-[WKViewDynamicSizeComputedFromViewScaleLayoutStrategy didChangeFrameSize]):
Move the existing layout strategies from WKView into WKViewLayoutStrategy subclasses.
(-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy initWithPage:view:mode:]):
(-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy updateLayout]):
(-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy didChangeMinimumViewSize]):
(-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy willStartLiveResize]):
(-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy didEndLiveResize]):
While in live resize with the new layout mode, disable frame size updates.
The new layout mode will do a live scale during part of the resize, and
we don't always want to send the new view size to the Web process.
(-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy didChangeFrameSize]):
(-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy willChangeLayoutStrategy]):
While in the new layout mode, maintain the viewScale as the minimum of the
scale required to fit the current view frame size inside the minimumViewSize.
If no scaling is required, carry on as usual, pushing the new view frame size
to the DrawingArea and on to the Web process.
If scaling is required, apply a transform to the view in the UI process,
until the live resize completes, in which case we send a fenced viewScale
adjustment to the Web process (so that the tiles paint at the new viewScale
synchronized with the removal of the transform in the UI process).
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::scaleViewFenced):
* UIProcess/WebPageProxy.h:
* WebProcess/WebPage/DrawingArea.h:
(WebKit::DrawingArea::addFence):
(WebKit::DrawingArea::acceleratedAnimationDidEnd): Deleted.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::scaleViewAndUpdateGeometryFenced):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::addFence):
Add scaleViewAndUpdateGeometryFenced and the ability to install CoreAnimation fences on
TiledCoreAnimationDrawingArea's CAContext.
Add the ability to send updateGeometry out-of-band, so that
we can send it synchronously inside the message along with the CA fence.
We have to both change the viewScale and updateGeometry simultaneously
in the same CA commit that we install the fence into, in order to ensure
that there is no flash.
* platform/spi/cocoa/QuartzCoreSPI.h:
Add some SPI.
* MiniBrowser/mac/BrowserWindow.xib:
* MiniBrowser/mac/BrowserWindowController.h:
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController toggleUseMinimumViewSize:]):
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController toggleUseMinimumViewSize:]):
Add a optional toolbar item to toggle a minimum view size of 1024x0.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh">trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformmacLayerHostingContexth">trunk/Source/WebKit2/Platform/mac/LayerHostingContext.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformmacLayerHostingContextmm">trunk/Source/WebKit2/Platform/mac/LayerHostingContext.mm</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="#trunkSourceWebKit2UIProcessAPImacWKViewInternalh">trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h</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="#trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm">trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxymm">trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreamessagesin">trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in</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="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm</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>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacBrowserWindowxib">trunk/Tools/MiniBrowser/mac/BrowserWindow.xib</a></li>
<li><a href="#trunkToolsMiniBrowsermacBrowserWindowControllerh">trunk/Tools/MiniBrowser/mac/BrowserWindowController.h</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK1BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebCore/ChangeLog 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-05-05 Timothy Horton <timothy_horton@apple.com>
+
+ Add a layout mode for computing fixed layout size from a minimum size
+ https://bugs.webkit.org/show_bug.cgi?id=144610
+ <rdar://problem/19790341>
+
+ Reviewed by Simon Fraser.
+
+ * platform/spi/cocoa/QuartzCoreSPI.h:
+ Add some SPI.
+
</ins><span class="cx"> 2015-05-05 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> iOS] Scroll snap points trigger reentrant layout
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> - (void)invalidate;
</span><span class="cx"> - (mach_port_t)createFencePort;
</span><span class="cx"> - (void)setFencePort:(mach_port_t)port;
</span><ins>+- (void)setFencePort:(mach_port_t)port commitHandler:(void(^)(void))block;
</ins><span class="cx"> @property (readonly) uint32_t contextId;
</span><span class="cx"> @property (strong) CALayer *layer;
</span><span class="cx"> @property CGColorSpaceRef colorSpace;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -1,3 +1,124 @@
</span><ins>+2015-05-05 Timothy Horton <timothy_horton@apple.com>
+
+ Add a layout mode for computing fixed layout size from a minimum size
+ https://bugs.webkit.org/show_bug.cgi?id=144610
+ <rdar://problem/19790341>
+
+ Reviewed by Simon Fraser.
+
+ Add a layout mode where WebKit determines the layout size with a set of
+ (still in flux) heuristics, trying hard to keep the page usable below a
+ particular client-defined threshold view size.
+
+ This can mean that WebKit will start scaling down the page inside the view
+ to make the whole page fit, using the viewScale mechanism.
+
+ * UIProcess/API/C/WKLayoutMode.h:
+ * UIProcess/API/Cocoa/_WKLayoutMode.h:
+ Add the new layout mode, and documentation for the two complicated ones.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _layoutMode]):
+ (-[WKWebView _setLayoutMode:]):
+ (-[WKWebView _setViewScale:]):
+ (-[WKWebView _setMinimumViewSize:]):
+ (-[WKWebView _minimumViewSize]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ Forward the layoutMode and viewScale parameters to WKView if we have one.
+
+ * UIProcess/API/Cocoa/WKViewPrivate.h:
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView dealloc]):
+ (-[WKView viewWillStartLiveResize]):
+ (-[WKView viewDidEndLiveResize]):
+ (-[WKView setFrameSize:]):
+ (-[WKView initWithFrame:processPool:configuration:webView:]):
+ (-[WKView disableFrameSizeUpdates]):
+ (-[WKView enableFrameSizeUpdates]):
+ (-[WKView frameSizeUpdatesDisabled]):
+ (-[WKView _layoutMode]):
+ (-[WKView _setLayoutMode:]):
+ (-[WKView _setViewScale:]):
+ (-[WKView _setMinimumViewSize:]):
+ (-[WKView _minimumViewSize]):
+ Store the minimum view size, and update the fixed layout size if needed.
+
+ (-[WKView _updateAutomaticallyComputedFixedLayoutSize]): Deleted.
+ (-[WKView _setAutomaticallyComputesFixedLayoutSizeFromViewScale:]): Deleted.
+ (-[WKView _automaticallyComputesFixedLayoutSizeFromViewScale]): Deleted.
+ Store the WKLayoutMode on the WKViewLayoutStrategy instead of having a
+ bunch of things like _automaticallyComputesFixedLayoutSizeFromViewScale.
+
+ * UIProcess/API/mac/WKViewInternal.h:
+
+ * UIProcess/mac/WKViewLayoutStrategy.h: Added.
+ * UIProcess/mac/WKViewLayoutStrategy.mm: Added.
+ (+[WKViewLayoutStrategy layoutStrategyWithPage:view:mode:]):
+ (-[WKViewLayoutStrategy initWithPage:view:mode:]):
+ (-[WKViewLayoutStrategy willDestroyView:]):
+ (-[WKViewLayoutStrategy layoutMode]):
+ (-[WKViewLayoutStrategy updateLayout]):
+ (-[WKViewLayoutStrategy disableFrameSizeUpdates]):
+ (-[WKViewLayoutStrategy enableFrameSizeUpdates]):
+ (-[WKViewLayoutStrategy frameSizeUpdatesDisabled]):
+ (-[WKViewLayoutStrategy didChangeViewScale]):
+ (-[WKViewLayoutStrategy didChangeMinimumViewSize]):
+ (-[WKViewLayoutStrategy willStartLiveResize]):
+ (-[WKViewLayoutStrategy didEndLiveResize]):
+ (-[WKViewLayoutStrategy didChangeFrameSize]):
+ (-[WKViewLayoutStrategy willChangeLayoutStrategy]):
+ (-[WKViewViewSizeLayoutStrategy initWithPage:view:mode:]):
+ (-[WKViewViewSizeLayoutStrategy updateLayout]):
+ (-[WKViewFixedSizeLayoutStrategy initWithPage:view:mode:]):
+ (-[WKViewFixedSizeLayoutStrategy updateLayout]):
+ (-[WKViewDynamicSizeComputedFromViewScaleLayoutStrategy initWithPage:view:mode:]):
+ (-[WKViewDynamicSizeComputedFromViewScaleLayoutStrategy updateLayout]):
+ (-[WKViewDynamicSizeComputedFromViewScaleLayoutStrategy didChangeViewScale]):
+ (-[WKViewDynamicSizeComputedFromViewScaleLayoutStrategy didChangeFrameSize]):
+ Move the existing layout strategies from WKView into WKViewLayoutStrategy subclasses.
+
+ (-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy initWithPage:view:mode:]):
+ (-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy updateLayout]):
+ (-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy didChangeMinimumViewSize]):
+ (-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy willStartLiveResize]):
+ (-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy didEndLiveResize]):
+ While in live resize with the new layout mode, disable frame size updates.
+ The new layout mode will do a live scale during part of the resize, and
+ we don't always want to send the new view size to the Web process.
+
+ (-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy didChangeFrameSize]):
+ (-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy willChangeLayoutStrategy]):
+ While in the new layout mode, maintain the viewScale as the minimum of the
+ scale required to fit the current view frame size inside the minimumViewSize.
+ If no scaling is required, carry on as usual, pushing the new view frame size
+ to the DrawingArea and on to the Web process.
+ If scaling is required, apply a transform to the view in the UI process,
+ until the live resize completes, in which case we send a fenced viewScale
+ adjustment to the Web process (so that the tiles paint at the new viewScale
+ synchronized with the removal of the transform in the UI process).
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::scaleViewFenced):
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebPage/DrawingArea.h:
+ (WebKit::DrawingArea::addFence):
+ (WebKit::DrawingArea::acceleratedAnimationDidEnd): Deleted.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::scaleViewAndUpdateGeometryFenced):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::addFence):
+ Add scaleViewAndUpdateGeometryFenced and the ability to install CoreAnimation fences on
+ TiledCoreAnimationDrawingArea's CAContext.
+
+ Add the ability to send updateGeometry out-of-band, so that
+ we can send it synchronously inside the message along with the CA fence.
+ We have to both change the viewScale and updateGeometry simultaneously
+ in the same CA commit that we install the fence into, in order to ensure
+ that there is no flash.
+
</ins><span class="cx"> 2015-05-05 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] Release input NSString when finished copying it.
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformmacLayerHostingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/mac/LayerHostingContext.h (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/mac/LayerHostingContext.h 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/Platform/mac/LayerHostingContext.h 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -62,9 +62,8 @@
</span><span class="cx"> void setColorSpace(CGColorSpaceRef);
</span><span class="cx"> CGColorSpaceRef colorSpace() const;
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><ins>+ // This only works on iOS and OS 10.10+
</ins><span class="cx"> void setFencePort(mach_port_t);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> LayerHostingMode m_layerHostingMode;
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformmacLayerHostingContextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/mac/LayerHostingContext.mm (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/mac/LayerHostingContext.mm 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/Platform/mac/LayerHostingContext.mm 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -102,11 +102,13 @@
</span><span class="cx"> return [m_context colorSpace];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</del><span class="cx"> void LayerHostingContext::setFencePort(mach_port_t fencePort)
</span><span class="cx"> {
</span><ins>+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</ins><span class="cx"> [m_context setFencePort:fencePort];
</span><ins>+#else
+ ASSERT_NOT_REACHED();
+#endif
</ins><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKLayoutModeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKLayoutMode.h (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKLayoutMode.h 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKLayoutMode.h 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -35,7 +35,8 @@
</span><span class="cx"> enum {
</span><span class="cx"> kWKLayoutModeViewSize,
</span><span class="cx"> kWKLayoutModeFixedSize,
</span><del>- kWKLayoutModeDynamicSizeComputedFromViewScale
</del><ins>+ kWKLayoutModeDynamicSizeComputedFromViewScale,
+ kWKLayoutModeDynamicSizeWithMinimumViewSize
</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 (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -90,7 +90,10 @@
</span><span class="cx"> @property (nonatomic, setter=_setTotalHeightOfBanners:) CGFloat _totalHeightOfBanners;
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, setter=_setLayoutMode:) WKLayoutMode _layoutMode;
</span><ins>+// For use with _layoutMode = kWKLayoutModeFixedSize:
</ins><span class="cx"> @property (nonatomic, setter=_setFixedLayoutSize:) CGSize _fixedLayoutSize;
</span><ins>+// For use with _layoutMode = kWKLayoutModeDynamicSizeWithMinimumViewSize:
+@property (nonatomic, setter=_setMinimumViewSize:) CGSize _minimumViewSize;
</ins><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 (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> #import "WKBrowsingContextHandleInternal.h"
</span><span class="cx"> #import "WKErrorInternal.h"
</span><span class="cx"> #import "WKHistoryDelegatePrivate.h"
</span><ins>+#import "WKLayoutMode.h"
</ins><span class="cx"> #import "WKNSData.h"
</span><span class="cx"> #import "WKNSURLExtras.h"
</span><span class="cx"> #import "WKNavigationDelegate.h"
</span><span class="lines">@@ -2290,22 +2291,45 @@
</span><span class="cx">
</span><span class="cx"> - (_WKLayoutMode)_layoutMode
</span><span class="cx"> {
</span><del>- if (_page->useFixedLayout()) {
</del><span class="cx"> #if PLATFORM(MAC)
</span><del>- if ([_wkView _automaticallyComputesFixedLayoutSizeFromViewScale])
- return _WKLayoutModeDynamicSizeComputedFromViewScale;
-#endif
</del><ins>+ switch ([_wkView _layoutMode]) {
+ case kWKLayoutModeFixedSize:
</ins><span class="cx"> return _WKLayoutModeFixedSize;
</span><ins>+ case kWKLayoutModeDynamicSizeComputedFromViewScale:
+ return _WKLayoutModeDynamicSizeComputedFromViewScale;
+ case kWKLayoutModeDynamicSizeWithMinimumViewSize:
+ return _WKLayoutModeDynamicSizeWithMinimumViewSize;
+ case kWKLayoutModeViewSize:
+ default:
+ return _WKLayoutModeViewSize;
</ins><span class="cx"> }
</span><del>- return _WKLayoutModeViewSize;
</del><ins>+#else
+ return _page->useFixedLayout() ? _WKLayoutModeFixedSize : _WKLayoutModeViewSize;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_setLayoutMode:(_WKLayoutMode)layoutMode
</span><span class="cx"> {
</span><ins>+#if PLATFORM(MAC)
+ WKLayoutMode wkViewLayoutMode;
+ switch (layoutMode) {
+ case _WKLayoutModeFixedSize:
+ wkViewLayoutMode = kWKLayoutModeFixedSize;
+ break;
+ case _WKLayoutModeDynamicSizeComputedFromViewScale:
+ wkViewLayoutMode = kWKLayoutModeDynamicSizeComputedFromViewScale;
+ break;
+ case _WKLayoutModeDynamicSizeWithMinimumViewSize:
+ wkViewLayoutMode = kWKLayoutModeDynamicSizeWithMinimumViewSize;
+ break;
+ case _WKLayoutModeViewSize:
+ default:
+ wkViewLayoutMode = kWKLayoutModeViewSize;
+ break;
+ }
+ [_wkView _setLayoutMode:wkViewLayoutMode];
+#else
</ins><span class="cx"> _page->setUseFixedLayout(layoutMode == _WKLayoutModeFixedSize || layoutMode == _WKLayoutModeDynamicSizeComputedFromViewScale);
</span><del>-
-#if PLATFORM(MAC)
- [_wkView _setAutomaticallyComputesFixedLayoutSizeFromViewScale:(layoutMode == _WKLayoutModeDynamicSizeComputedFromViewScale)];
</del><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2326,17 +2350,32 @@
</span><span class="cx">
</span><span class="cx"> - (void)_setViewScale:(CGFloat)viewScale
</span><span class="cx"> {
</span><ins>+#if PLATFORM(MAC)
+ [_wkView _setViewScale:viewScale];
+#else
</ins><span class="cx"> if (viewScale <= 0 || isnan(viewScale) || isinf(viewScale))
</span><span class="cx"> [NSException raise:NSInvalidArgumentException format:@"View scale should be a positive number"];
</span><span class="cx">
</span><span class="cx"> _page->scaleView(viewScale);
</span><ins>+#endif
+}
</ins><span class="cx">
</span><ins>+- (void)_setMinimumViewSize:(CGSize)minimumViewSize
+{
</ins><span class="cx"> #if PLATFORM(MAC)
</span><del>- if ([_wkView _automaticallyComputesFixedLayoutSizeFromViewScale])
- [_wkView _updateAutomaticallyComputedFixedLayoutSize];
</del><ins>+ [_wkView _setMinimumViewSize:minimumViewSize];
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (CGSize)_minimumViewSize
+{
+#if PLATFORM(MAC)
+ return [_wkView _minimumViewSize];
+#else
+ return CGSizeZero;
+#endif
+}
+
</ins><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 (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -93,7 +93,10 @@
</span><span class="cx"> - (void)_close;
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, setter=_setLayoutMode:) _WKLayoutMode _layoutMode;
</span><ins>+// For use with _layoutMode = _WKLayoutModeFixedSize:
</ins><span class="cx"> @property (nonatomic, setter=_setFixedLayoutSize:) CGSize _fixedLayoutSize;
</span><ins>+// For use with _layoutMode = _WKLayoutModeDynamicSizeWithMinimumViewSize:
+@property (nonatomic, setter=_setMinimumViewSize:) CGSize _minimumViewSize;
</ins><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 (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKLayoutMode.h 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKLayoutMode.h 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -30,7 +30,13 @@
</span><span class="cx"> typedef NS_ENUM(NSUInteger, _WKLayoutMode) {
</span><span class="cx"> _WKLayoutModeViewSize,
</span><span class="cx"> _WKLayoutModeFixedSize,
</span><del>- _WKLayoutModeDynamicSizeComputedFromViewScale
</del><ins>+
+ // Lay out the view with its frame scaled by the inverse viewScale.
+ _WKLayoutModeDynamicSizeComputedFromViewScale,
+
+ // Lay out the view at a heuristically-determined size based on the minimum view size.
+ _WKLayoutModeDynamicSizeWithMinimumViewSize
+
</ins><span class="cx"> } WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx"> #import "WKStringCF.h"
</span><span class="cx"> #import "WKTextInputWindowController.h"
</span><span class="cx"> #import "WKViewInternal.h"
</span><ins>+#import "WKViewLayoutStrategy.h"
</ins><span class="cx"> #import "WKViewPrivate.h"
</span><span class="cx"> #import "WKWebView.h"
</span><span class="cx"> #import "WebBackForwardList.h"
</span><span class="lines">@@ -240,7 +241,6 @@
</span><span class="cx">
</span><span class="cx"> NSRect _windowBottomCornerIntersectionRect;
</span><span class="cx">
</span><del>- unsigned _frameSizeUpdatesDisabledCount;
</del><span class="cx"> BOOL _shouldDeferViewInWindowChanges;
</span><span class="cx"> NSWindow *_targetWindowForMovePreparation;
</span><span class="cx">
</span><span class="lines">@@ -268,8 +268,10 @@
</span><span class="cx"> BOOL _ignoresNonWheelEvents;
</span><span class="cx"> BOOL _ignoresAllEvents;
</span><span class="cx"> BOOL _allowsBackForwardNavigationGestures;
</span><del>- BOOL _automaticallyComputesFixedLayoutSizeFromViewScale;
</del><span class="cx">
</span><ins>+ RetainPtr<WKViewLayoutStrategy> _layoutStrategy;
+ CGSize _minimumViewSize;
+
</ins><span class="cx"> RetainPtr<CALayer> _rootLayer;
</span><span class="cx">
</span><span class="cx"> BOOL _didScheduleSetTopContentInset;
</span><span class="lines">@@ -386,6 +388,7 @@
</span><span class="cx"> [_data->_actionMenuController willDestroyView:self];
</span><span class="cx"> [_data->_immediateActionController willDestroyView:self];
</span><span class="cx"> #endif
</span><ins>+ [_data->_layoutStrategy willDestroyView:self];
</ins><span class="cx">
</span><span class="cx"> _data->_page->close();
</span><span class="cx">
</span><span class="lines">@@ -514,11 +517,15 @@
</span><span class="cx"> - (void)viewWillStartLiveResize
</span><span class="cx"> {
</span><span class="cx"> _data->_page->viewWillStartLiveResize();
</span><ins>+
+ [_data->_layoutStrategy willStartLiveResize];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)viewDidEndLiveResize
</span><span class="cx"> {
</span><span class="cx"> _data->_page->viewWillEndLiveResize();
</span><ins>+
+ [_data->_layoutStrategy didEndLiveResize];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)isFlipped
</span><span class="lines">@@ -554,22 +561,9 @@
</span><span class="cx"> {
</span><span class="cx"> [super setFrameSize:size];
</span><span class="cx">
</span><del>- if (![self frameSizeUpdatesDisabled]) {
- if (_data->_clipsToVisibleRect)
- [self _updateViewExposedRect];
- [self _setDrawingAreaSize:size];
- if (_data->_automaticallyComputesFixedLayoutSizeFromViewScale)
- [self _updateAutomaticallyComputedFixedLayoutSize];
- }
</del><ins>+ [_data->_layoutStrategy didChangeFrameSize];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_updateAutomaticallyComputedFixedLayoutSize
-{
- ASSERT(_data->_automaticallyComputesFixedLayoutSizeFromViewScale);
- CGFloat inverseScale = 1 / _data->_page->viewScaleFactor();
- [self _setFixedLayoutSize:CGSizeMake(self.frame.size.width * inverseScale, self.frame.size.height * inverseScale)];
-}
-
</del><span class="cx"> - (void)_updateWindowAndViewFrames
</span><span class="cx"> {
</span><span class="cx"> if (_data->_clipsToVisibleRect)
</span><span class="lines">@@ -3824,6 +3818,8 @@
</span><span class="cx">
</span><span class="cx"> _data->_needsViewFrameInWindowCoordinates = _data->_page->preferences().pluginsEnabled();
</span><span class="cx">
</span><ins>+ _data->_layoutStrategy = [WKViewLayoutStrategy layoutStrategyWithPage:*_data->_page view:self mode:kWKLayoutModeViewSize];
+
</ins><span class="cx"> [self _registerDraggedTypes];
</span><span class="cx">
</span><span class="cx"> self.wantsLayer = YES;
</span><span class="lines">@@ -4002,24 +3998,6 @@
</span><span class="cx">
</span><span class="cx"> #endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx">
</span><del>-- (void)_setAutomaticallyComputesFixedLayoutSizeFromViewScale:(BOOL)automaticallyComputesFixedLayoutSizeFromViewScale
-{
- if (_data->_automaticallyComputesFixedLayoutSizeFromViewScale == automaticallyComputesFixedLayoutSizeFromViewScale)
- return;
-
- _data->_automaticallyComputesFixedLayoutSizeFromViewScale = automaticallyComputesFixedLayoutSizeFromViewScale;
-
- if (!_data->_automaticallyComputesFixedLayoutSizeFromViewScale)
- return;
-
- [self _updateAutomaticallyComputedFixedLayoutSize];
-}
-
-- (BOOL)_automaticallyComputesFixedLayoutSizeFromViewScale
-{
- return _data->_automaticallyComputesFixedLayoutSizeFromViewScale;
-}
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WKView (Private)
</span><span class="lines">@@ -4122,24 +4100,17 @@
</span><span class="cx">
</span><span class="cx"> - (void)disableFrameSizeUpdates
</span><span class="cx"> {
</span><del>- _data->_frameSizeUpdatesDisabledCount++;
</del><ins>+ [_data->_layoutStrategy disableFrameSizeUpdates];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)enableFrameSizeUpdates
</span><span class="cx"> {
</span><del>- if (!_data->_frameSizeUpdatesDisabledCount)
- return;
-
- if (!(--_data->_frameSizeUpdatesDisabledCount)) {
- if (_data->_clipsToVisibleRect)
- [self _updateViewExposedRect];
- [self _setDrawingAreaSize:[self frame].size];
- }
</del><ins>+ [_data->_layoutStrategy enableFrameSizeUpdates];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)frameSizeUpdatesDisabled
</span><span class="cx"> {
</span><del>- return _data->_frameSizeUpdatesDisabledCount > 0;
</del><ins>+ return [_data->_layoutStrategy frameSizeUpdatesDisabled];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (void)hideWordDefinitionWindow
</span><span class="lines">@@ -4376,23 +4347,16 @@
</span><span class="cx">
</span><span class="cx"> - (WKLayoutMode)_layoutMode
</span><span class="cx"> {
</span><del>- if (_data->_page->useFixedLayout()) {
-#if PLATFORM(MAC)
- if (_data->_automaticallyComputesFixedLayoutSizeFromViewScale)
- return kWKLayoutModeDynamicSizeComputedFromViewScale;
-#endif
- return kWKLayoutModeFixedSize;
- }
- return kWKLayoutModeViewSize;
</del><ins>+ return [_data->_layoutStrategy layoutMode];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_setLayoutMode:(WKLayoutMode)layoutMode
</span><span class="cx"> {
</span><del>- _data->_page->setUseFixedLayout(layoutMode == kWKLayoutModeFixedSize || layoutMode == kWKLayoutModeDynamicSizeComputedFromViewScale);
</del><ins>+ if (layoutMode == [_data->_layoutStrategy layoutMode])
+ return;
</ins><span class="cx">
</span><del>-#if PLATFORM(MAC)
- self._automaticallyComputesFixedLayoutSizeFromViewScale = (layoutMode == kWKLayoutModeDynamicSizeComputedFromViewScale);
-#endif
</del><ins>+ [_data->_layoutStrategy willChangeLayoutStrategy];
+ _data->_layoutStrategy = [WKViewLayoutStrategy layoutStrategyWithPage:*_data->_page view:self mode:layoutMode];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (CGSize)_fixedLayoutSize
</span><span class="lines">@@ -4416,9 +4380,20 @@
</span><span class="cx"> [NSException raise:NSInvalidArgumentException format:@"View scale should be a positive number"];
</span><span class="cx">
</span><span class="cx"> _data->_page->scaleView(viewScale);
</span><del>- [self _updateAutomaticallyComputedFixedLayoutSize];
</del><ins>+ [_data->_layoutStrategy didChangeViewScale];
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_setMinimumViewSize:(CGSize)minimumViewSize
+{
+ _data->_minimumViewSize = minimumViewSize;
+ [_data->_layoutStrategy didChangeMinimumViewSize];
+}
+
+- (CGSize)_minimumViewSize
+{
+ return _data->_minimumViewSize;
+}
+
</ins><span class="cx"> - (void)_dispatchSetTopContentInset
</span><span class="cx"> {
</span><span class="cx"> if (!_data->_didScheduleSetTopContentInset)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -148,7 +148,9 @@
</span><span class="cx">
</span><span class="cx"> @property (readonly) NSWindow *_targetWindowForMovePreparation;
</span><span class="cx">
</span><del>-@property (nonatomic, setter=_setAutomaticallyComputesFixedLayoutSizeFromViewScale:) BOOL _automaticallyComputesFixedLayoutSizeFromViewScale;
-- (void)_updateAutomaticallyComputedFixedLayoutSize;
</del><ins>+// For WKViewLayoutStrategy and subclasses:
+- (void)_setDrawingAreaSize:(NSSize)size;
+- (void)_updateViewExposedRect;
+- (CALayer *)_rootLayer;
</ins><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -91,6 +91,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void hideContentUntilNextUpdate() { ASSERT_NOT_REACHED(); }
</span><span class="cx">
</span><ins>+ virtual void willSendUpdateGeometry() { }
+
</ins><span class="cx"> protected:
</span><span class="cx"> explicit DrawingAreaProxy(DrawingAreaType, WebPageProxy&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -2247,6 +2247,19 @@
</span><span class="cx"> m_process->send(Messages::WebPage::ScaleView(scale), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+void WebPageProxy::scaleViewAndUpdateGeometryFenced(double scale, IntSize viewSize, const MachSendRight& fencePort)
+{
+ if (!isValid())
+ return;
+
+ m_viewScaleFactor = scale;
+ if (m_drawingArea)
+ m_drawingArea->willSendUpdateGeometry();
+ m_process->send(Messages::WebPage::ScaleViewAndUpdateGeometryFenced(scale, viewSize, fencePort), m_pageID);
+}
+#endif
+
</ins><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 (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -645,6 +645,9 @@
</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><ins>+#if PLATFORM(COCOA)
+ void scaleViewAndUpdateGeometryFenced(double scale, WebCore::IntSize viewSize, const WebCore::MachSendRight& fencePort);
+#endif
</ins><span class="cx">
</span><span class="cx"> float deviceScaleFactor() const;
</span><span class="cx"> void setIntrinsicDeviceScaleFactor(float);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -93,7 +93,6 @@
</span><span class="cx"> bool m_isWaitingForDidUpdateGeometry;
</span><span class="cx">
</span><span class="cx"> WebCore::IntSize m_lastSentSize;
</span><del>- WebCore::IntSize m_lastSentLayerPosition;
</del><span class="cx">
</span><span class="cx"> std::unique_ptr<RemoteLayerTreeHost> m_debugIndicatorLayerTreeHost;
</span><span class="cx"> RetainPtr<CALayer> m_tileMapHostLayer;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx">
</span><span class="cx"> // If the WKView was resized while we were waiting for a DidUpdateGeometry reply from the web process,
</span><span class="cx"> // we need to resend the new size here.
</span><del>- if (m_lastSentSize != m_size || m_lastSentLayerPosition != m_layerPosition)
</del><ins>+ if (m_lastSentSize != m_size)
</ins><span class="cx"> sendUpdateGeometry();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -174,8 +174,7 @@
</span><span class="cx"> void RemoteLayerTreeDrawingAreaProxy::sendUpdateGeometry()
</span><span class="cx"> {
</span><span class="cx"> m_lastSentSize = m_size;
</span><del>- m_lastSentLayerPosition = m_layerPosition;
- m_webPageProxy.process().send(Messages::DrawingArea::UpdateGeometry(m_size, m_layerPosition), m_webPageProxy.pageID());
</del><ins>+ m_webPageProxy.process().send(Messages::DrawingArea::UpdateGeometry(m_size, IntSize(), false), m_webPageProxy.pageID());
</ins><span class="cx"> m_isWaitingForDidUpdateGeometry = true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -54,6 +54,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void waitForDidUpdateViewState() override;
</span><span class="cx">
</span><ins>+ virtual void willSendUpdateGeometry() override;
+
</ins><span class="cx"> // Message handlers.
</span><span class="cx"> virtual void didUpdateGeometry() override;
</span><span class="cx"> virtual void intrinsicContentSizeDidChange(const WebCore::IntSize&) override;
</span><span class="lines">@@ -65,7 +67,6 @@
</span><span class="cx">
</span><span class="cx"> // The last size we sent to the web process.
</span><span class="cx"> WebCore::IntSize m_lastSentSize;
</span><del>- WebCore::IntSize m_lastSentLayerPosition;
</del><span class="cx">
</span><span class="cx"> // The last minimum layout size we sent to the web process.
</span><span class="cx"> WebCore::IntSize m_lastSentMinimumLayoutSize;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx">
</span><span class="cx"> // If the WKView was resized while we were waiting for a DidUpdateGeometry reply from the web process,
</span><span class="cx"> // we need to resend the new size here.
</span><del>- if (m_lastSentSize != m_size || m_lastSentLayerPosition != m_layerPosition || m_lastSentMinimumLayoutSize != minimumLayoutSize)
</del><ins>+ if (m_lastSentSize != m_size || m_lastSentMinimumLayoutSize != minimumLayoutSize)
</ins><span class="cx"> sendUpdateGeometry();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -139,17 +139,21 @@
</span><span class="cx"> m_webPageProxy.intrinsicContentSizeDidChange(newIntrinsicContentSize);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TiledCoreAnimationDrawingAreaProxy::sendUpdateGeometry()
</del><ins>+void TiledCoreAnimationDrawingAreaProxy::willSendUpdateGeometry()
</ins><span class="cx"> {
</span><del>- ASSERT(!m_isWaitingForDidUpdateGeometry);
-
</del><span class="cx"> m_lastSentMinimumLayoutSize = m_webPageProxy.minimumLayoutSize();
</span><span class="cx"> m_lastSentSize = m_size;
</span><del>- m_lastSentLayerPosition = m_layerPosition;
- m_webPageProxy.process().send(Messages::DrawingArea::UpdateGeometry(m_size, m_layerPosition), m_webPageProxy.pageID());
</del><span class="cx"> m_isWaitingForDidUpdateGeometry = true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TiledCoreAnimationDrawingAreaProxy::sendUpdateGeometry()
+{
+ ASSERT(!m_isWaitingForDidUpdateGeometry);
+
+ willSendUpdateGeometry();
+ m_webPageProxy.process().send(Messages::DrawingArea::UpdateGeometry(m_size, IntSize(), true), m_webPageProxy.pageID());
+}
+
</ins><span class="cx"> void TiledCoreAnimationDrawingAreaProxy::adjustTransientZoom(double scale, FloatPoint origin)
</span><span class="cx"> {
</span><span class="cx"> m_webPageProxy.process().send(Messages::DrawingArea::AdjustTransientZoom(scale, origin), m_webPageProxy.pageID());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKViewLayoutStrategyh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.h (0 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.h 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WKViewLayoutStrategy_h
+#define WKViewLayoutStrategy_h
+
+#if PLATFORM(MAC)
+
+#import "WKLayoutMode.h"
+
+namespace WebKit {
+class WebPageProxy;
+}
+
+@class WKView;
+
+@interface WKViewLayoutStrategy : NSObject {
+@package
+ WebKit::WebPageProxy *_page;
+ WKView *_wkView;
+
+ WKLayoutMode _layoutMode;
+ unsigned _frameSizeUpdatesDisabledCount;
+}
+
++ (instancetype)layoutStrategyWithPage:(WebKit::WebPageProxy&)page view:(WKView *)wkView mode:(WKLayoutMode)mode;
+
+- (void)willDestroyView:(WKView *)view;
+
+- (void)enableFrameSizeUpdates;
+- (void)disableFrameSizeUpdates;
+- (BOOL)frameSizeUpdatesDisabled;
+
+- (void)didChangeViewScale;
+- (void)didChangeMinimumViewSize;
+- (void)willStartLiveResize;
+- (void)didEndLiveResize;
+- (void)didChangeFrameSize;
+- (void)willChangeLayoutStrategy;
+
+@property (nonatomic, readonly) WKLayoutMode layoutMode;
+
+@end
+
+#endif // PLATFORM(MAC)
+
+#endif // WKViewLayoutStrategy_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKViewLayoutStrategymm"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm (0 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -0,0 +1,340 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "WKViewLayoutStrategy.h"
+
+#if PLATFORM(MAC)
+
+#import "WKViewInternal.h"
+#import "WebPageProxy.h"
+#import <WebCore/MachSendRight.h>
+#import <WebCore/QuartzCoreSPI.h>
+
+using namespace WebCore;
+using namespace WebKit;
+
+@interface WKViewViewSizeLayoutStrategy : WKViewLayoutStrategy
+@end
+
+@interface WKViewFixedSizeLayoutStrategy : WKViewLayoutStrategy
+@end
+
+@interface WKViewDynamicSizeComputedFromViewScaleLayoutStrategy : WKViewLayoutStrategy
+@end
+
+@interface WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy : WKViewLayoutStrategy
+@end
+
+@implementation WKViewLayoutStrategy
+
++ (instancetype)layoutStrategyWithPage:(WebPageProxy&)page view:(WKView *)wkView mode:(WKLayoutMode)mode
+{
+ WKViewLayoutStrategy *strategy;
+
+ switch (mode) {
+ case kWKLayoutModeFixedSize:
+ strategy = [[WKViewFixedSizeLayoutStrategy alloc] initWithPage:page view:wkView mode:mode];
+ break;
+ case kWKLayoutModeDynamicSizeComputedFromViewScale:
+ strategy = [[WKViewDynamicSizeComputedFromViewScaleLayoutStrategy alloc] initWithPage:page view:wkView mode:mode];
+ break;
+ case kWKLayoutModeDynamicSizeWithMinimumViewSize:
+ strategy = [[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy alloc] initWithPage:page view:wkView mode:mode];
+ break;
+ case kWKLayoutModeViewSize:
+ default:
+ strategy = [[WKViewViewSizeLayoutStrategy alloc] initWithPage:page view:wkView mode:mode];
+ break;
+ }
+
+ [strategy updateLayout];
+
+ return [strategy autorelease];
+}
+
+- (instancetype)initWithPage:(WebPageProxy&)page view:(WKView *)wkView mode:(WKLayoutMode)mode
+{
+ self = [super init];
+
+ if (!self)
+ return nil;
+
+ _page = &page;
+ _wkView = wkView;
+ _layoutMode = mode;
+
+ return self;
+}
+
+- (void)willDestroyView:(WKView *)view
+{
+ _page = nullptr;
+ _wkView = nil;
+}
+
+- (WKLayoutMode)layoutMode
+{
+ return _layoutMode;
+}
+
+- (void)updateLayout
+{
+}
+
+- (void)disableFrameSizeUpdates
+{
+ _frameSizeUpdatesDisabledCount++;
+}
+
+- (void)enableFrameSizeUpdates
+{
+ if (!_frameSizeUpdatesDisabledCount)
+ return;
+
+ if (!(--_frameSizeUpdatesDisabledCount))
+ [self didChangeFrameSize];
+}
+
+- (BOOL)frameSizeUpdatesDisabled
+{
+ return _frameSizeUpdatesDisabledCount > 0;
+}
+
+- (void)didChangeViewScale
+{
+}
+
+- (void)didChangeMinimumViewSize
+{
+}
+
+- (void)willStartLiveResize
+{
+}
+
+- (void)didEndLiveResize
+{
+}
+
+- (void)didChangeFrameSize
+{
+ if ([self frameSizeUpdatesDisabled])
+ return;
+
+ if (_wkView.shouldClipToVisibleRect)
+ [_wkView _updateViewExposedRect];
+ [_wkView _setDrawingAreaSize:_wkView.frame.size];
+}
+
+- (void)willChangeLayoutStrategy
+{
+}
+
+@end
+
+@implementation WKViewViewSizeLayoutStrategy
+
+- (instancetype)initWithPage:(WebPageProxy&)page view:(WKView *)wkView mode:(WKLayoutMode)mode
+{
+ self = [super initWithPage:page view:wkView mode:mode];
+
+ if (!self)
+ return nil;
+
+ page.setUseFixedLayout(false);
+
+ return self;
+}
+
+- (void)updateLayout
+{
+}
+
+@end
+
+@implementation WKViewFixedSizeLayoutStrategy
+
+- (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);
+
+ return self;
+}
+
+- (void)updateLayout
+{
+}
+
+@end
+
+@implementation WKViewDynamicSizeComputedFromViewScaleLayoutStrategy
+
+- (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);
+
+ return self;
+}
+
+- (void)updateLayout
+{
+ CGFloat inverseScale = 1 / _page->viewScaleFactor();
+ [_wkView _setFixedLayoutSize:CGSizeMake(_wkView.frame.size.width * inverseScale, _wkView.frame.size.height * inverseScale)];
+}
+
+- (void)didChangeViewScale
+{
+ [super didChangeViewScale];
+
+ [self updateLayout];
+}
+
+- (void)didChangeFrameSize
+{
+ [super didChangeFrameSize];
+
+ if ([_wkView frameSizeUpdatesDisabled])
+ return;
+
+ [self updateLayout];
+}
+
+@end
+
+@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);
+
+ return self;
+}
+
+- (void)updateLayout
+{
+ 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 (CGRectIsEmpty(_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;
+ }
+
+ // 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 inLiveResize] && scale == 1 && _frameSizeUpdatesDisabledCount == 1) {
+ if (_wkView.shouldClipToVisibleRect)
+ [_wkView _updateViewExposedRect];
+ [_wkView _setDrawingAreaSize:[_wkView frame].size];
+ }
+
+ _page->setFixedLayoutSize(IntSize(fixedLayoutWidth, fixedLayoutHeight));
+
+ if ([_wkView inLiveResize]) {
+ float topContentInset = _page->topContentInset();
+
+ CGFloat relativeScale = scale / _page->viewScaleFactor();
+
+ CATransform3D transform = CATransform3DMakeTranslation(0, topContentInset - (topContentInset * relativeScale), 0);
+ transform = CATransform3DScale(transform, relativeScale, relativeScale, 1);
+
+ _wkView._rootLayer.transform = transform;
+ } else if (scale != _page->viewScaleFactor()) {
+ CAContext *context = [_wkView.layer context];
+ MachSendRight fencePort = MachSendRight::adopt([context createFencePort]);
+ _page->scaleViewAndUpdateGeometryFenced(scale, IntSize(_wkView.frame.size), fencePort);
+ [context setFencePort:fencePort.sendRight() commitHandler:^{
+ _wkView._rootLayer.transform = CATransform3DIdentity;
+ }];
+ }
+}
+
+- (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;
+}
+
+@end
+
+#endif // PLATFORM(MAC)
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -590,6 +590,8 @@
</span><span class="cx"> 2D125C5F1857EA05003BA3CB /* ViewGestureControllerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D125C5D1857EA05003BA3CB /* ViewGestureControllerMac.mm */; };
</span><span class="cx"> 2D1B5D5D185869C8006C6596 /* ViewGestureControllerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D1B5D5B185869C8006C6596 /* ViewGestureControllerMessageReceiver.cpp */; };
</span><span class="cx"> 2D1B5D5E185869C8006C6596 /* ViewGestureControllerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D1B5D5C185869C8006C6596 /* ViewGestureControllerMessages.h */; };
</span><ins>+ 2D28A4971AF965A100F190C9 /* WKViewLayoutStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D28A4951AF965A100F190C9 /* WKViewLayoutStrategy.h */; };
+ 2D28A4981AF965A200F190C9 /* WKViewLayoutStrategy.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D28A4961AF965A100F190C9 /* WKViewLayoutStrategy.mm */; };
</ins><span class="cx"> 2D28F3E41885CCC1004B9EAE /* WebChromeClientIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D28F3E01885CCC1004B9EAE /* WebChromeClientIOS.mm */; };
</span><span class="cx"> 2D28F3E51885CCC1004B9EAE /* WebDatabaseManagerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D28F3E11885CCC1004B9EAE /* WebDatabaseManagerIOS.mm */; };
</span><span class="cx"> 2D28F3E61885CCC1004B9EAE /* WebEditorClientIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D28F3E21885CCC1004B9EAE /* WebEditorClientIOS.mm */; };
</span><span class="lines">@@ -2746,6 +2748,8 @@
</span><span class="cx"> 2D1B5D5A18586599006C6596 /* ViewGestureController.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = ViewGestureController.messages.in; sourceTree = "<group>"; };
</span><span class="cx"> 2D1B5D5B185869C8006C6596 /* ViewGestureControllerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewGestureControllerMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2D1B5D5C185869C8006C6596 /* ViewGestureControllerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewGestureControllerMessages.h; sourceTree = "<group>"; };
</span><ins>+ 2D28A4951AF965A100F190C9 /* WKViewLayoutStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKViewLayoutStrategy.h; sourceTree = "<group>"; };
+ 2D28A4961AF965A100F190C9 /* WKViewLayoutStrategy.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKViewLayoutStrategy.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 2D28F3E01885CCC1004B9EAE /* WebChromeClientIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebChromeClientIOS.mm; path = ios/WebChromeClientIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2D28F3E11885CCC1004B9EAE /* WebDatabaseManagerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebDatabaseManagerIOS.mm; path = ios/WebDatabaseManagerIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2D28F3E21885CCC1004B9EAE /* WebEditorClientIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebEditorClientIOS.mm; path = ios/WebEditorClientIOS.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -7076,6 +7080,8 @@
</span><span class="cx"> 513E462C1AD837560016234A /* WKSharingServicePickerDelegate.mm */,
</span><span class="cx"> 0FCB4E5E18BBE3D9000FCFC9 /* WKTextInputWindowController.h */,
</span><span class="cx"> 0FCB4E5F18BBE3D9000FCFC9 /* WKTextInputWindowController.mm */,
</span><ins>+ 2D28A4951AF965A100F190C9 /* WKViewLayoutStrategy.h */,
+ 2D28A4961AF965A100F190C9 /* WKViewLayoutStrategy.mm */,
</ins><span class="cx"> );
</span><span class="cx"> path = mac;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -8171,6 +8177,7 @@
</span><span class="cx"> BC646C1D11DD399F006455B0 /* WKBackForwardListItemRef.h in Headers */,
</span><span class="cx"> 528C37C1195CBB1A00D8B9CC /* WKBackForwardListPrivate.h in Headers */,
</span><span class="cx"> BC646C1B11DD399F006455B0 /* WKBackForwardListRef.h in Headers */,
</span><ins>+ 2D28A4971AF965A100F190C9 /* WKViewLayoutStrategy.h in Headers */,
</ins><span class="cx"> BCDDB317124EBD130048D13C /* WKBase.h in Headers */,
</span><span class="cx"> 7CD5EBBB1746A83E000C1C45 /* WKBaseMac.h in Headers */,
</span><span class="cx"> BCBAAC73144E619E0053F82F /* WKBrowsingContextController.h in Headers */,
</span><span class="lines">@@ -9838,6 +9845,7 @@
</span><span class="cx"> 51AD35731AD2F3940057B38E /* WebHitTestResult.mm in Sources */,
</span><span class="cx"> 511B24AA132E097200065A0C /* WebIconDatabase.cpp in Sources */,
</span><span class="cx"> 51834592134532E90092B696 /* WebIconDatabaseClient.cpp in Sources */,
</span><ins>+ 2D28A4981AF965A200F190C9 /* WKViewLayoutStrategy.mm in Sources */,
</ins><span class="cx"> 51D02F64132EC5B900BEAA96 /* WebIconDatabaseMessageReceiver.cpp in Sources */,
</span><span class="cx"> 511B24A6132E095700065A0C /* WebIconDatabaseProxy.cpp in Sources */,
</span><span class="cx"> 51D02F6B132EC73700BEAA96 /* WebIconDatabaseProxyMessageReceiver.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> class FrameView;
</span><span class="cx"> class GraphicsLayer;
</span><span class="cx"> class GraphicsLayerFactory;
</span><ins>+class MachSendRight;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -90,6 +91,7 @@
</span><span class="cx"> virtual WebCore::FloatRect exposedRect() const = 0;
</span><span class="cx"> virtual void acceleratedAnimationDidStart(uint64_t /*layerID*/, const String& /*key*/, double /*startTime*/) { }
</span><span class="cx"> virtual void acceleratedAnimationDidEnd(uint64_t /*layerID*/, const String& /*key*/) { }
</span><ins>+ virtual void addFence(const WebCore::MachSendRight&) { }
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> virtual void setExposedContentRect(const WebCore::FloatRect&) = 0;
</span><span class="lines">@@ -124,6 +126,11 @@
</span><span class="cx">
</span><span class="cx"> virtual void attachViewOverlayGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) { }
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+ // Used by TiledCoreAnimationDrawingArea.
+ virtual void updateGeometry(const WebCore::IntSize& viewSize, const WebCore::IntSize& layerPosition, bool flushSynchronously) { }
+#endif
+
</ins><span class="cx"> protected:
</span><span class="cx"> DrawingArea(DrawingAreaType, WebPage&);
</span><span class="cx">
</span><span class="lines">@@ -146,7 +153,6 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> // Used by TiledCoreAnimationDrawingArea.
</span><del>- virtual void updateGeometry(const WebCore::IntSize& viewSize, const WebCore::IntSize& layerPosition) { }
</del><span class="cx"> virtual void setDeviceScaleFactor(float) { }
</span><span class="cx"> virtual void setColorSpace(const ColorSpaceData&) { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreamessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> // Used by TiledCoreAnimationDrawingArea.
</span><del>- UpdateGeometry(WebCore::IntSize viewSize, WebCore::IntSize layerPosition)
</del><ins>+ UpdateGeometry(WebCore::IntSize viewSize, WebCore::IntSize layerPosition, bool flushSynchronously)
</ins><span class="cx"> SetDeviceScaleFactor(float deviceScaleFactor)
</span><span class="cx"> SetColorSpace(struct WebKit::ColorSpaceData colorSpace)
</span><span class="cx"> SetExposedRect(WebCore::FloatRect exposedRect)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -1447,6 +1447,16 @@
</span><span class="cx"> scalePage(pageScale, scrollPositionAtNewScale);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+#if PLATFORM(COCOA)
+void WebPage::scaleViewAndUpdateGeometryFenced(double scale, IntSize viewSize, const MachSendRight& fencePort)
+{
+ scaleView(scale);
+ m_drawingArea->updateGeometry(viewSize, IntSize(), false);
+ m_drawingArea->addFence(fencePort);
+}
+#endif
+
</ins><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 (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -361,6 +361,9 @@
</span><span class="cx"> double totalScaleFactor() const;
</span><span class="cx"> double viewScaleFactor() const { return m_viewScaleFactor; }
</span><span class="cx"> void scaleView(double scale);
</span><ins>+#if PLATFORM(COCOA)
+ void scaleViewAndUpdateGeometryFenced(double scale, WebCore::IntSize viewSize, const WebCore::MachSendRight& fencePort);
+#endif
</ins><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 (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -199,6 +199,9 @@
</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><ins>+#if PLATFORM(COCOA)
+ ScaleViewAndUpdateGeometryFenced(double scale, WebCore::IntSize viewSize, WebCore::MachSendRight fencePort)
+#endif
</ins><span class="cx">
</span><span class="cx"> SetUseFixedLayout(bool fixed)
</span><span class="cx"> SetFixedLayoutSize(WebCore::IntSize size)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> virtual void setNeedsDisplay() override;
</span><span class="cx"> virtual void setNeedsDisplayInRect(const WebCore::IntRect&) override;
</span><span class="cx"> virtual void scroll(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollDelta) override;
</span><del>- virtual void updateGeometry(const WebCore::IntSize& viewSize, const WebCore::IntSize& layerPosition) override;
</del><ins>+ virtual void updateGeometry(const WebCore::IntSize& viewSize, const WebCore::IntSize& layerPosition, bool flushSynchronously) override;
</ins><span class="cx">
</span><span class="cx"> virtual WebCore::GraphicsLayerFactory* graphicsLayerFactory() override;
</span><span class="cx"> virtual void setRootCompositingLayer(WebCore::GraphicsLayer*) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> scheduleCompositingLayerFlush();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RemoteLayerTreeDrawingArea::updateGeometry(const IntSize& viewSize, const IntSize& layerPosition)
</del><ins>+void RemoteLayerTreeDrawingArea::updateGeometry(const IntSize& viewSize, const IntSize& layerPosition, bool flushSynchronously)
</ins><span class="cx"> {
</span><span class="cx"> m_viewSize = viewSize;
</span><span class="cx"> m_webPage.setSize(viewSize);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -90,12 +90,13 @@
</span><span class="cx"> virtual bool flushLayers() override;
</span><span class="cx">
</span><span class="cx"> // Message handlers.
</span><del>- virtual void updateGeometry(const WebCore::IntSize& viewSize, const WebCore::IntSize& layerPosition) override;
</del><ins>+ virtual void updateGeometry(const WebCore::IntSize& viewSize, const WebCore::IntSize& layerPosition, bool flushSynchronously) override;
</ins><span class="cx"> virtual void setDeviceScaleFactor(float) override;
</span><span class="cx"> void suspendPainting();
</span><span class="cx"> void resumePainting();
</span><span class="cx"> void setLayerHostingMode(LayerHostingMode) override;
</span><span class="cx"> virtual void setColorSpace(const ColorSpaceData&) override;
</span><ins>+ virtual void addFence(const WebCore::MachSendRight&) override;
</ins><span class="cx">
</span><span class="cx"> virtual void adjustTransientZoom(double scale, WebCore::FloatPoint origin) override;
</span><span class="cx"> virtual void commitTransientZoom(double scale, WebCore::FloatPoint origin) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #import <WebCore/FrameView.h>
</span><span class="cx"> #import <WebCore/GraphicsContext.h>
</span><span class="cx"> #import <WebCore/GraphicsLayerCA.h>
</span><ins>+#import <WebCore/MachSendRight.h>
</ins><span class="cx"> #import <WebCore/MainFrame.h>
</span><span class="cx"> #import <WebCore/Page.h>
</span><span class="cx"> #import <WebCore/PlatformCAAnimationMac.h>
</span><span class="lines">@@ -408,7 +409,7 @@
</span><span class="cx"> frameView->setExposedRect(m_scrolledExposedRect);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TiledCoreAnimationDrawingArea::updateGeometry(const IntSize& viewSize, const IntSize& layerPosition)
</del><ins>+void TiledCoreAnimationDrawingArea::updateGeometry(const IntSize& viewSize, const IntSize& layerPosition, bool flushSynchronously)
</ins><span class="cx"> {
</span><span class="cx"> m_inUpdateGeometry = true;
</span><span class="cx">
</span><span class="lines">@@ -439,10 +440,12 @@
</span><span class="cx"> [m_hostingLayer setFrame:CGRectMake(layerPosition.width(), layerPosition.height(), viewSize.width(), viewSize.height())];
</span><span class="cx">
</span><span class="cx"> [CATransaction commit];
</span><del>-
- [CATransaction flush];
- [CATransaction synchronize];
</del><span class="cx">
</span><ins>+ if (flushSynchronously) {
+ [CATransaction flush];
+ [CATransaction synchronize];
+ }
+
</ins><span class="cx"> m_webPage.send(Messages::DrawingAreaProxy::DidUpdateGeometry());
</span><span class="cx">
</span><span class="cx"> m_inUpdateGeometry = false;
</span><span class="lines">@@ -738,6 +741,11 @@
</span><span class="cx"> flushLayers();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TiledCoreAnimationDrawingArea::addFence(const MachSendRight& fencePort)
+{
+ m_layerHostingContext->setFencePort(fencePort.sendRight());
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Tools/ChangeLog 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-05-05 Timothy Horton <timothy_horton@apple.com>
+
+ Add a layout mode for computing fixed layout size from a minimum size
+ https://bugs.webkit.org/show_bug.cgi?id=144610
+ <rdar://problem/19790341>
+
+ Reviewed by Simon Fraser.
+
+ * MiniBrowser/mac/BrowserWindow.xib:
+ * MiniBrowser/mac/BrowserWindowController.h:
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController toggleUseMinimumViewSize:]):
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController toggleUseMinimumViewSize:]):
+ Add a optional toolbar item to toggle a minimum view size of 1024x0.
+
</ins><span class="cx"> 2015-05-05 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] Release input NSString when finished copying it.
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacBrowserWindowxib"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/BrowserWindow.xib (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/BrowserWindow.xib 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Tools/MiniBrowser/mac/BrowserWindow.xib 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -1,1558 +1,175 @@
</span><del>-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
- <data>
- <int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">10H545</string>
- <string key="IBDocument.InterfaceBuilderVersion">820</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">820</string>
- </object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="9"/>
- <integer value="71"/>
- </object>
- <object class="NSArray" key="IBDocument.PluginDependencies">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSCustomObject" id="1001">
- <string key="NSClassName">BrowserWindowController</string>
- </object>
- <object class="NSCustomObject" id="1003">
- <string key="NSClassName">FirstResponder</string>
- </object>
- <object class="NSCustomObject" id="1004">
- <string key="NSClassName">NSApplication</string>
- </object>
- <object class="NSWindowTemplate" id="1005">
- <int key="NSWindowStyleMask">4111</int>
- <int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{517, 330}, {776, 608}}</string>
- <int key="NSWTFlags">544735232</int>
- <string key="NSWindowTitle">Window</string>
- <string key="NSWindowClass">NSWindow</string>
- <object class="NSToolbar" key="NSViewClass" id="726585754">
- <object class="NSMutableString" key="NSToolbarIdentifier">
- <characters key="NS.bytes">994A0CB1-7575-4F39-A65B-7165AB1E8015</characters>
- </object>
- <nil key="NSToolbarDelegate"/>
- <bool key="NSToolbarPrefersToBeShown">YES</bool>
- <bool key="NSToolbarShowsBaselineSeparator">YES</bool>
- <bool key="NSToolbarAllowsUserCustomization">YES</bool>
- <bool key="NSToolbarAutosavesConfiguration">NO</bool>
- <int key="NSToolbarDisplayMode">2</int>
- <int key="NSToolbarSizeMode">1</int>
- <object class="NSMutableDictionary" key="NSToolbarIBIdentifiedItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>255D29F2-C9AA-4B4B-BB43-B38FCD6A0BBB</string>
- <string>6BDC61B7-F1A8-425A-A212-9CAC59C56385</string>
- <string>73DE9F4B-73E2-4036-A134-2D9E029DA980</string>
- <string>88C16109-D40F-4682-BCE4-CBEE2EDE32D2</string>
- <string>E1A9D32A-59E3-467B-9ABA-A95780416E69</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSToolbarItem" id="16289946">
- <object class="NSMutableString" key="NSToolbarItemIdentifier">
- <characters key="NS.bytes">255D29F2-C9AA-4B4B-BB43-B38FCD6A0BBB</characters>
- </object>
- <string key="NSToolbarItemLabel">Location</string>
- <string key="NSToolbarItemPaletteLabel">Location</string>
- <nil key="NSToolbarItemToolTip"/>
- <object class="NSTextField" key="NSToolbarItemView" id="690456651">
- <nil key="NSNextResponder"/>
- <int key="NSvFlags">266</int>
- <string key="NSFrame">{{0, 14}, {565, 22}}</string>
- <int key="NSViewLayerContentsRedrawPolicy">2</int>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="1023147716">
- <int key="NSCellFlags">-1804468671</int>
- <int key="NSCellFlags2">268436480</int>
- <string key="NSContents"/>
- <object class="NSFont" key="NSSupport" id="1064395332">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">13</double>
- <int key="NSfFlags">1044</int>
- </object>
- <reference key="NSControlView" ref="690456651"/>
- <bool key="NSDrawsBackground">YES</bool>
- <object class="NSColor" key="NSBackgroundColor" id="1032961300">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">textBackgroundColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- </object>
- <object class="NSColor" key="NSTextColor">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">textColor</string>
- <object class="NSColor" key="NSColor" id="365730878">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MAA</bytes>
- </object>
- </object>
- </object>
- </object>
- <nil key="NSToolbarItemImage"/>
- <nil key="NSToolbarItemTarget"/>
- <nil key="NSToolbarItemAction"/>
- <string key="NSToolbarItemMinSize">{200, 22}</string>
- <string key="NSToolbarItemMaxSize">{800, 22}</string>
- <bool key="NSToolbarItemEnabled">YES</bool>
- <bool key="NSToolbarItemAutovalidates">YES</bool>
- <int key="NSToolbarItemTag">0</int>
- <bool key="NSToolbarIsUserRemovable">YES</bool>
- <int key="NSToolbarItemVisibilityPriority">0</int>
- </object>
- <object class="NSToolbarItem" id="457655522">
- <object class="NSMutableString" key="NSToolbarItemIdentifier">
- <characters key="NS.bytes">6BDC61B7-F1A8-425A-A212-9CAC59C56385</characters>
- </object>
- <string key="NSToolbarItemLabel">Progress</string>
- <string key="NSToolbarItemPaletteLabel">Progress</string>
- <nil key="NSToolbarItemToolTip"/>
- <object class="NSProgressIndicator" key="NSToolbarItemView" id="128750774">
- <nil key="NSNextResponder"/>
- <int key="NSvFlags">1289</int>
- <object class="NSPSMatrix" key="NSDrawMatrix"/>
- <string key="NSFrame">{{19, 14}, {16, 16}}</string>
- <int key="NSpiFlags">28936</int>
- <double key="NSMaxValue">1</double>
- </object>
- <nil key="NSToolbarItemImage"/>
- <nil key="NSToolbarItemTarget"/>
- <nil key="NSToolbarItemAction"/>
- <string key="NSToolbarItemMinSize">{16, 16}</string>
- <string key="NSToolbarItemMaxSize">{16, 16}</string>
- <bool key="NSToolbarItemEnabled">YES</bool>
- <bool key="NSToolbarItemAutovalidates">YES</bool>
- <int key="NSToolbarItemTag">-1</int>
- <bool key="NSToolbarIsUserRemovable">YES</bool>
- <int key="NSToolbarItemVisibilityPriority">0</int>
- </object>
- <object class="NSToolbarItem" id="332491395">
- <object class="NSMutableString" key="NSToolbarItemIdentifier">
- <characters key="NS.bytes">73DE9F4B-73E2-4036-A134-2D9E029DA980</characters>
- </object>
- <string key="NSToolbarItemLabel">Go Back</string>
- <string key="NSToolbarItemPaletteLabel">Go Back</string>
- <nil key="NSToolbarItemToolTip"/>
- <object class="NSButton" key="NSToolbarItemView" id="777930419">
- <nil key="NSNextResponder"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{9, 14}, {32, 25}}</string>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="663899880">
- <int key="NSCellFlags">-2080244224</int>
- <int key="NSCellFlags2">134217728</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="1064395332"/>
- <reference key="NSControlView" ref="777930419"/>
- <int key="NSButtonFlags">-2033434369</int>
- <int key="NSButtonFlags2">163</int>
- <object class="NSCustomResource" key="NSNormalImage" id="206098440">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSGoLeftTemplate</string>
- </object>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- </object>
- </object>
- <reference key="NSToolbarItemImage" ref="206098440"/>
- <nil key="NSToolbarItemTarget"/>
- <nil key="NSToolbarItemAction"/>
- <string key="NSToolbarItemMinSize">{32, 25}</string>
- <string key="NSToolbarItemMaxSize">{32, 25}</string>
- <bool key="NSToolbarItemEnabled">YES</bool>
- <bool key="NSToolbarItemAutovalidates">YES</bool>
- <int key="NSToolbarItemTag">0</int>
- <bool key="NSToolbarIsUserRemovable">YES</bool>
- <int key="NSToolbarItemVisibilityPriority">0</int>
- </object>
- <object class="NSToolbarItem" id="818723416">
- <object class="NSMutableString" key="NSToolbarItemIdentifier">
- <characters key="NS.bytes">88C16109-D40F-4682-BCE4-CBEE2EDE32D2</characters>
- </object>
- <string key="NSToolbarItemLabel">Refresh</string>
- <string key="NSToolbarItemPaletteLabel">Refresh</string>
- <nil key="NSToolbarItemToolTip"/>
- <object class="NSButton" key="NSToolbarItemView" id="35464578">
- <nil key="NSNextResponder"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{10, 14}, {29, 25}}</string>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="366486485">
- <int key="NSCellFlags">-2080244224</int>
- <int key="NSCellFlags2">134217728</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="1064395332"/>
- <reference key="NSControlView" ref="35464578"/>
- <int key="NSButtonFlags">-2033434369</int>
- <int key="NSButtonFlags2">163</int>
- <object class="NSCustomResource" key="NSNormalImage" id="443763357">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSRefreshTemplate</string>
- </object>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- </object>
- </object>
- <reference key="NSToolbarItemImage" ref="443763357"/>
- <nil key="NSToolbarItemTarget"/>
- <nil key="NSToolbarItemAction"/>
- <string key="NSToolbarItemMinSize">{29, 25}</string>
- <string key="NSToolbarItemMaxSize">{29, 25}</string>
- <bool key="NSToolbarItemEnabled">YES</bool>
- <bool key="NSToolbarItemAutovalidates">YES</bool>
- <int key="NSToolbarItemTag">0</int>
- <bool key="NSToolbarIsUserRemovable">YES</bool>
- <int key="NSToolbarItemVisibilityPriority">0</int>
- </object>
- <object class="NSToolbarItem" id="928383107">
- <object class="NSMutableString" key="NSToolbarItemIdentifier">
- <characters key="NS.bytes">E1A9D32A-59E3-467B-9ABA-A95780416E69</characters>
- </object>
- <string key="NSToolbarItemLabel">Go Forward</string>
- <string key="NSToolbarItemPaletteLabel">Go Forward</string>
- <nil key="NSToolbarItemToolTip"/>
- <object class="NSButton" key="NSToolbarItemView" id="95415629">
- <nil key="NSNextResponder"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{19, 14}, {32, 25}}</string>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="767612038">
- <int key="NSCellFlags">-2080244224</int>
- <int key="NSCellFlags2">134217728</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="1064395332"/>
- <reference key="NSControlView" ref="95415629"/>
- <int key="NSButtonFlags">-2033434369</int>
- <int key="NSButtonFlags2">163</int>
- <object class="NSCustomResource" key="NSNormalImage" id="163672266">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSGoRightTemplate</string>
- </object>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- </object>
- </object>
- <reference key="NSToolbarItemImage" ref="163672266"/>
- <nil key="NSToolbarItemTarget"/>
- <nil key="NSToolbarItemAction"/>
- <string key="NSToolbarItemMinSize">{32, 25}</string>
- <string key="NSToolbarItemMaxSize">{32, 25}</string>
- <bool key="NSToolbarItemEnabled">YES</bool>
- <bool key="NSToolbarItemAutovalidates">YES</bool>
- <int key="NSToolbarItemTag">0</int>
- <bool key="NSToolbarIsUserRemovable">YES</bool>
- <int key="NSToolbarItemVisibilityPriority">0</int>
- </object>
- </object>
- </object>
- <object class="NSArray" key="NSToolbarIBAllowedItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="332491395"/>
- <reference ref="928383107"/>
- <reference ref="818723416"/>
- <reference ref="457655522"/>
- <reference ref="16289946"/>
- </object>
- <object class="NSMutableArray" key="NSToolbarIBDefaultItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="332491395"/>
- <reference ref="928383107"/>
- <reference ref="818723416"/>
- <reference ref="16289946"/>
- <reference ref="457655522"/>
- </object>
- <object class="NSMutableArray" key="NSToolbarIBSelectableItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
- <object class="NSView" key="NSWindowView" id="1006">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">256</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSCustomView" id="877383975">
- <reference key="NSNextResponder" ref="1006"/>
- <int key="NSvFlags">274</int>
- <string key="NSFrameSize">{776, 608}</string>
- <reference key="NSSuperview" ref="1006"/>
- <int key="NSViewLayerContentsRedrawPolicy">2</int>
- <string key="NSClassName">NSView</string>
- </object>
- </object>
- <string key="NSFrameSize">{776, 608}</string>
- <reference key="NSSuperview"/>
- <int key="NSViewLayerContentsRedrawPolicy">2</int>
- </object>
- <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
- <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
- <string key="NSFrameAutosaveName">Main Window</string>
- </object>
- <object class="NSWindowTemplate" id="833876351">
- <int key="NSWindowStyleMask">147</int>
- <int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{230, 479}, {452, 62}}</string>
- <int key="NSWTFlags">-461897728</int>
- <string key="NSWindowTitle">Find</string>
- <string key="NSWindowClass">NSPanel</string>
- <nil key="NSViewClass"/>
- <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
- <object class="NSView" key="NSWindowView" id="585866018">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">256</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSSearchField" id="841639270">
- <reference key="NSNextResponder" ref="585866018"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{20, 20}, {412, 22}}</string>
- <reference key="NSSuperview" ref="585866018"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSSearchFieldCell" key="NSCell" id="41426839">
- <int key="NSCellFlags">343014976</int>
- <int key="NSCellFlags2">268436544</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="1064395332"/>
- <reference key="NSControlView" ref="841639270"/>
- <bool key="NSDrawsBackground">YES</bool>
- <int key="NSTextBezelStyle">1</int>
- <reference key="NSBackgroundColor" ref="1032961300"/>
- <object class="NSColor" key="NSTextColor">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlTextColor</string>
- <reference key="NSColor" ref="365730878"/>
- </object>
- <object class="NSButtonCell" key="NSSearchButtonCell">
- <int key="NSCellFlags">130560</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">search</string>
- <reference key="NSControlView" ref="841639270"/>
- <string key="NSAction">_searchFieldSearch:</string>
- <reference key="NSTarget" ref="41426839"/>
- <int key="NSButtonFlags">138690815</int>
- <int key="NSButtonFlags2">0</int>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- </object>
- <object class="NSButtonCell" key="NSCancelButtonCell">
- <int key="NSCellFlags">130560</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">clear</string>
- <object class="NSMutableArray" key="NSAccessibilityOverriddenAttributes">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableDictionary">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>AXDescription</string>
- <string>NSAccessibilityEncodedAttributesValueType</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>cancel</string>
- <integer value="1"/>
- </object>
- </object>
- </object>
- <reference key="NSControlView" ref="841639270"/>
- <string key="NSAction">_searchFieldCancel:</string>
- <reference key="NSTarget" ref="41426839"/>
- <int key="NSButtonFlags">138690815</int>
- <int key="NSButtonFlags2">0</int>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- </object>
- <int key="NSMaximumRecents">255</int>
- </object>
- </object>
- </object>
- <string key="NSFrameSize">{452, 62}</string>
- <reference key="NSSuperview"/>
- </object>
- <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
- <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
- </object>
- </object>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <object class="NSMutableArray" key="connectionRecords">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">window</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="1005"/>
- </object>
- <int key="connectionID">3</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="1005"/>
- <reference key="destination" ref="1001"/>
- </object>
- <int key="connectionID">4</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">urlText</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="690456651"/>
- </object>
- <int key="connectionID">32</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">progressIndicator</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="128750774"/>
- </object>
- <int key="connectionID">33</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">reloadButton</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="35464578"/>
- </object>
- <int key="connectionID">34</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">reload:</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="35464578"/>
- </object>
- <int key="connectionID">35</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">fetch:</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="690456651"/>
- </object>
- <int key="connectionID">36</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">containerView</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="877383975"/>
- </object>
- <int key="connectionID">37</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">backButton</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="777930419"/>
- </object>
- <int key="connectionID">46</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">forwardButton</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="95415629"/>
- </object>
- <int key="connectionID">47</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">goBack:</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="332491395"/>
- </object>
- <int key="connectionID">61</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">goForward:</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="928383107"/>
- </object>
- <int key="connectionID">62</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">toolbar</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="726585754"/>
- </object>
- <int key="connectionID">67</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">find:</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="841639270"/>
- </object>
- <int key="connectionID">76</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">findPanelWindow</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="833876351"/>
- </object>
- <int key="connectionID">77</int>
- </object>
- </object>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <object class="NSArray" key="orderedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <reference key="object" ref="0"/>
- <reference key="children" ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="1001"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="1003"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">First Responder</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-3</int>
- <reference key="object" ref="1004"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">Application</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">1</int>
- <reference key="object" ref="1005"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="1006"/>
- <reference ref="726585754"/>
- </object>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">2</int>
- <reference key="object" ref="1006"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="877383975"/>
- </object>
- <reference key="parent" ref="1005"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">9</int>
- <reference key="object" ref="877383975"/>
- <reference key="parent" ref="1006"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">48</int>
- <reference key="object" ref="726585754"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="332491395"/>
- <reference ref="928383107"/>
- <reference ref="818723416"/>
- <reference ref="16289946"/>
- <reference ref="457655522"/>
- </object>
- <reference key="parent" ref="1005"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">56</int>
- <reference key="object" ref="332491395"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="777930419"/>
- </object>
- <reference key="parent" ref="726585754"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">40</int>
- <reference key="object" ref="777930419"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="663899880"/>
- </object>
- <reference key="parent" ref="332491395"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">41</int>
- <reference key="object" ref="663899880"/>
- <reference key="parent" ref="777930419"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">57</int>
- <reference key="object" ref="928383107"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="95415629"/>
- </object>
- <reference key="parent" ref="726585754"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">42</int>
- <reference key="object" ref="95415629"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="767612038"/>
- </object>
- <reference key="parent" ref="928383107"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">43</int>
- <reference key="object" ref="767612038"/>
- <reference key="parent" ref="95415629"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">58</int>
- <reference key="object" ref="818723416"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="35464578"/>
- </object>
- <reference key="parent" ref="726585754"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">23</int>
- <reference key="object" ref="35464578"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="366486485"/>
- </object>
- <reference key="parent" ref="818723416"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">24</int>
- <reference key="object" ref="366486485"/>
- <reference key="parent" ref="35464578"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">59</int>
- <reference key="object" ref="16289946"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="690456651"/>
- </object>
- <reference key="parent" ref="726585754"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">10</int>
- <reference key="object" ref="690456651"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="1023147716"/>
- </object>
- <reference key="parent" ref="16289946"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">11</int>
- <reference key="object" ref="1023147716"/>
- <reference key="parent" ref="690456651"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">60</int>
- <reference key="object" ref="457655522"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="128750774"/>
- </object>
- <reference key="parent" ref="726585754"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">21</int>
- <reference key="object" ref="128750774"/>
- <reference key="parent" ref="457655522"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">70</int>
- <reference key="object" ref="833876351"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="585866018"/>
- </object>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">71</int>
- <reference key="object" ref="585866018"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="841639270"/>
- </object>
- <reference key="parent" ref="833876351"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">74</int>
- <reference key="object" ref="841639270"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="41426839"/>
- </object>
- <reference key="parent" ref="585866018"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">75</int>
- <reference key="object" ref="41426839"/>
- <reference key="parent" ref="841639270"/>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="flattenedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>1.IBEditorWindowLastContentRect</string>
- <string>1.IBPluginDependency</string>
- <string>1.IBWindowTemplateEditedContentRect</string>
- <string>1.NSWindowTemplate.visibleAtLaunch</string>
- <string>1.WindowOrigin</string>
- <string>1.editorWindowContentRectSynchronizationRect</string>
- <string>10.IBPluginDependency</string>
- <string>11.IBPluginDependency</string>
- <string>2.IBPluginDependency</string>
- <string>21.IBPluginDependency</string>
- <string>21.IBViewIntegration.shadowBlurRadius</string>
- <string>21.IBViewIntegration.shadowColor</string>
- <string>21.IBViewIntegration.shadowOffsetHeight</string>
- <string>21.IBViewIntegration.shadowOffsetWidth</string>
- <string>23.IBPluginDependency</string>
- <string>24.IBPluginDependency</string>
- <string>40.IBPluginDependency</string>
- <string>41.IBPluginDependency</string>
- <string>42.IBPluginDependency</string>
- <string>43.IBPluginDependency</string>
- <string>48.IBEditorWindowLastContentRect</string>
- <string>48.IBPluginDependency</string>
- <string>56.CustomClassName</string>
- <string>57.CustomClassName</string>
- <string>58.CustomClassName</string>
- <string>70.IBEditorWindowLastContentRect</string>
- <string>70.IBPluginDependency</string>
- <string>70.IBWindowTemplateEditedContentRect</string>
- <string>70.NSWindowTemplate.visibleAtLaunch</string>
- <string>71.IBPluginDependency</string>
- <string>74.IBPluginDependency</string>
- <string>75.IBPluginDependency</string>
- <string>9.IBPluginDependency</string>
- <string>9.IBViewBoundsToFrameTransform</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>{{404, 157}, {776, 608}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{404, 157}, {776, 608}}</string>
- <integer value="1"/>
- <string>{196, 240}</string>
- <string>{{202, 428}, {480, 270}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <real value="0.0"/>
- <reference ref="365730878"/>
- <real value="0.0"/>
- <real value="0.0"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{422, 781}, {616, 0}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>MBToolbarItem</string>
- <string>MBToolbarItem</string>
- <string>MBToolbarItem</string>
- <string>{{558, 468}, {452, 62}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{558, 468}, {452, 62}}</string>
- <boolean value="NO"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <object class="NSAffineTransform"/>
- </object>
- </object>
- <object class="NSMutableDictionary" key="unlocalizedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="activeLocalization"/>
- <object class="NSMutableDictionary" key="localizations">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="sourceID"/>
- <int key="maxID">77</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray" key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">BrowserWindowController</string>
- <string key="superclassName">NSWindowController</string>
- <object class="NSMutableDictionary" key="actions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>dumpSourceToConsole:</string>
- <string>fetch:</string>
- <string>find:</string>
- <string>forceRepaint:</string>
- <string>goBack:</string>
- <string>goForward:</string>
- <string>reload:</string>
- <string>removeReinsertWebView:</string>
- <string>resetZoom:</string>
- <string>showHideWebView:</string>
- <string>toggleZoomMode:</string>
- <string>zoomIn:</string>
- <string>zoomOut:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>dumpSourceToConsole:</string>
- <string>fetch:</string>
- <string>find:</string>
- <string>forceRepaint:</string>
- <string>goBack:</string>
- <string>goForward:</string>
- <string>reload:</string>
- <string>removeReinsertWebView:</string>
- <string>resetZoom:</string>
- <string>showHideWebView:</string>
- <string>toggleZoomMode:</string>
- <string>zoomIn:</string>
- <string>zoomOut:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBActionInfo">
- <string key="name">dumpSourceToConsole:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">fetch:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">find:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">forceRepaint:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">goBack:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">goForward:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">reload:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">removeReinsertWebView:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">resetZoom:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">showHideWebView:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">toggleZoomMode:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">zoomIn:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">zoomOut:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>backButton</string>
- <string>containerView</string>
- <string>findPanelWindow</string>
- <string>forwardButton</string>
- <string>progressIndicator</string>
- <string>reloadButton</string>
- <string>toolbar</string>
- <string>urlText</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSButton</string>
- <string>NSView</string>
- <string>NSWindow</string>
- <string>NSButton</string>
- <string>NSProgressIndicator</string>
- <string>NSButton</string>
- <string>NSToolbar</string>
- <string>NSTextField</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>backButton</string>
- <string>containerView</string>
- <string>findPanelWindow</string>
- <string>forwardButton</string>
- <string>progressIndicator</string>
- <string>reloadButton</string>
- <string>toolbar</string>
- <string>urlText</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBToOneOutletInfo">
- <string key="name">backButton</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">containerView</string>
- <string key="candidateClassName">NSView</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">findPanelWindow</string>
- <string key="candidateClassName">NSWindow</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">forwardButton</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">progressIndicator</string>
- <string key="candidateClassName">NSProgressIndicator</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">reloadButton</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">toolbar</string>
- <string key="candidateClassName">NSToolbar</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">urlText</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">mac/BrowserWindowController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">BrowserWindowController</string>
- <string key="superclassName">NSWindowController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">MBToolbarItem</string>
- <string key="superclassName">NSToolbarItem</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">MBToolbarItem.h</string>
- </object>
- </object>
- </object>
- <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">NSActionCell</string>
- <string key="superclassName">NSCell</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <string key="superclassName">NSResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="558771426">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSApplication.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="344596456">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="428409299">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSHelpManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSPageLayout.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSUserInterfaceItemSearching.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSButton</string>
- <string key="superclassName">NSControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSButton.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSButtonCell</string>
- <string key="superclassName">NSActionCell</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSCell</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSControl</string>
- <string key="superclassName">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="297186634">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSControl.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSFormatter</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSMenu</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="808053469">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSMenu.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSAccessibility.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="558771426"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="344596456"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="428409299"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="297186634"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSDragging.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSKeyValueBinding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="808053469"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSPasteboard.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSSavePanel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSTableView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="335804019">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="555757547">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSArchiver.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSClassDescription.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSObjectScripting.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSPortCoder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSScriptClassDescription.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSScriptKeyValueCoding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSScriptObjectSpecifiers.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSScriptWhoseTests.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURLDownload.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSPanel</string>
- <string key="superclassName">NSWindow</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSPanel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSProgressIndicator</string>
- <string key="superclassName">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSProgressIndicator.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSInterfaceStyle.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSResponder</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSResponder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSSearchField</string>
- <string key="superclassName">NSTextField</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSSearchField.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSSearchFieldCell</string>
- <string key="superclassName">NSTextFieldCell</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSSearchFieldCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSTextField</string>
- <string key="superclassName">NSControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSTextField.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSTextFieldCell</string>
- <string key="superclassName">NSActionCell</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSTextFieldCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSToolbar</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSToolbar.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSToolbarItem</string>
- <string key="superclassName">NSObject</string>
- <reference key="sourceIdentifier" ref="335804019"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSClipView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSRulerView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSView</string>
- <string key="superclassName">NSResponder</string>
- <reference key="sourceIdentifier" ref="555757547"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSWindow</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSDrawer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSWindow</string>
- <string key="superclassName">NSResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSWindow.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSWindow</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSWindowScripting.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSWindowController</string>
- <string key="superclassName">NSResponder</string>
- <object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">showWindow:</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">showWindow:</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">showWindow:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string>
- </object>
- </object>
- </object>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
- <integer value="3000" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string key="IBDocument.LastKnownRelativeProjectPath">../MiniBrowser.xcodeproj</string>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSGoLeftTemplate</string>
- <string>NSGoRightTemplate</string>
- <string>NSRefreshTemplate</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>{9, 9}</string>
- <string>{9, 9}</string>
- <string>{10, 12}</string>
- </object>
- </object>
- </data>
-</archive>
</del><ins>+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="8068.4" systemVersion="14D136" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+ <dependencies>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8068.4"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="BrowserWindowController">
+ <connections>
+ <outlet property="backButton" destination="40" id="46"/>
+ <outlet property="containerView" destination="9" id="37"/>
+ <outlet property="findPanelWindow" destination="70" id="77"/>
+ <outlet property="forwardButton" destination="42" id="47"/>
+ <outlet property="progressIndicator" destination="21" id="33"/>
+ <outlet property="reloadButton" destination="23" id="34"/>
+ <outlet property="toggleUseMinimumViewSizeButton" destination="82" id="FTZ-YK-Ae5"/>
+ <outlet property="toolbar" destination="48" id="67"/>
+ <outlet property="urlText" destination="10" id="32"/>
+ <outlet property="window" destination="1" id="3"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+ <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" frameAutosaveName="Main Window" animationBehavior="default" id="1">
+ <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" unifiedTitleAndToolbar="YES"/>
+ <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+ <rect key="contentRect" x="517" y="330" width="776" height="608"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1177"/>
+ <view key="contentView" id="2">
+ <rect key="frame" x="0.0" y="0.0" width="776" height="608"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <customView id="9">
+ <rect key="frame" x="0.0" y="0.0" width="776" height="608"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ </customView>
+ </subviews>
+ </view>
+ <toolbar key="toolbar" implicitIdentifier="994A0CB1-7575-4F39-A65B-7165AB1E8015" autosavesConfiguration="NO" displayMode="iconOnly" sizeMode="regular" id="48">
+ <allowedToolbarItems>
+ <toolbarItem implicitItemIdentifier="73DE9F4B-73E2-4036-A134-2D9E029DA980" label="Go Back" paletteLabel="Go Back" image="NSGoLeftTemplate" id="56" customClass="MBToolbarItem">
+ <nil key="toolTip"/>
+ <size key="minSize" width="32" height="25"/>
+ <size key="maxSize" width="32" height="25"/>
+ <button key="view" verticalHuggingPriority="750" id="40">
+ <rect key="frame" x="11" y="14" width="32" height="25"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSGoLeftTemplate" imagePosition="overlaps" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="41">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ </button>
+ <connections>
+ <action selector="goBack:" target="-2" id="61"/>
+ </connections>
+ </toolbarItem>
+ <toolbarItem implicitItemIdentifier="E1A9D32A-59E3-467B-9ABA-A95780416E69" label="Go Forward" paletteLabel="Go Forward" image="NSGoRightTemplate" id="57" customClass="MBToolbarItem">
+ <nil key="toolTip"/>
+ <size key="minSize" width="32" height="25"/>
+ <size key="maxSize" width="32" height="25"/>
+ <button key="view" verticalHuggingPriority="750" id="42">
+ <rect key="frame" x="19" y="14" width="32" height="25"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSGoRightTemplate" imagePosition="overlaps" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="43">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ </button>
+ <connections>
+ <action selector="goForward:" target="-2" id="62"/>
+ </connections>
+ </toolbarItem>
+ <toolbarItem implicitItemIdentifier="88C16109-D40F-4682-BCE4-CBEE2EDE32D2" label="Refresh" paletteLabel="Refresh" image="NSRefreshTemplate" id="58" customClass="MBToolbarItem">
+ <nil key="toolTip"/>
+ <size key="minSize" width="29" height="25"/>
+ <size key="maxSize" width="29" height="25"/>
+ <button key="view" verticalHuggingPriority="750" id="23">
+ <rect key="frame" x="10" y="14" width="29" height="25"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSRefreshTemplate" imagePosition="overlaps" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="24">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <action selector="reload:" target="-2" id="35"/>
+ </connections>
+ </button>
+ </toolbarItem>
+ <toolbarItem implicitItemIdentifier="76DCF2B0-1DDE-47D2-9212-705E6E310CCE" label="Use Minimum View Size" paletteLabel="Use Minimum View Size" image="NSEnterFullScreenTemplate" id="81" customClass="MBToolbarItem">
+ <nil key="toolTip"/>
+ <size key="minSize" width="29" height="25"/>
+ <size key="maxSize" width="29" height="25"/>
+ <button key="view" verticalHuggingPriority="750" id="82">
+ <rect key="frame" x="19" y="14" width="29" height="25"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSEnterFullScreenTemplate" imagePosition="overlaps" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="83">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ </button>
+ <connections>
+ <action selector="toggleUseMinimumViewSize:" target="-2" id="gZA-yS-7L4"/>
+ </connections>
+ </toolbarItem>
+ <toolbarItem implicitItemIdentifier="6BDC61B7-F1A8-425A-A212-9CAC59C56385" label="Progress" paletteLabel="Progress" tag="-1" id="60">
+ <nil key="toolTip"/>
+ <size key="minSize" width="16" height="16"/>
+ <size key="maxSize" width="16" height="16"/>
+ <progressIndicator key="view" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="1" displayedWhenStopped="NO" bezeled="NO" controlSize="small" style="spinning" id="21">
+ <rect key="frame" x="19" y="14" width="16" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ </progressIndicator>
+ </toolbarItem>
+ <toolbarItem implicitItemIdentifier="255D29F2-C9AA-4B4B-BB43-B38FCD6A0BBB" label="Location" paletteLabel="Location" id="59">
+ <nil key="toolTip"/>
+ <size key="minSize" width="200" height="22"/>
+ <size key="maxSize" width="800" height="22"/>
+ <textField key="view" verticalHuggingPriority="750" id="10">
+ <rect key="frame" x="0.0" y="14" width="565" height="22"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="11">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <action selector="fetch:" target="-2" id="36"/>
+ </connections>
+ </textField>
+ </toolbarItem>
+ </allowedToolbarItems>
+ <defaultToolbarItems>
+ <toolbarItem reference="56"/>
+ <toolbarItem reference="57"/>
+ <toolbarItem reference="58"/>
+ <toolbarItem reference="81"/>
+ <toolbarItem reference="59"/>
+ <toolbarItem reference="60"/>
+ </defaultToolbarItems>
+ </toolbar>
+ <connections>
+ <outlet property="delegate" destination="-2" id="4"/>
+ </connections>
+ </window>
+ <window title="Find" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="70" customClass="NSPanel">
+ <windowStyleMask key="styleMask" titled="YES" closable="YES" utility="YES" nonactivatingPanel="YES"/>
+ <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+ <rect key="contentRect" x="230" y="479" width="452" height="62"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1177"/>
+ <view key="contentView" id="71">
+ <rect key="frame" x="0.0" y="0.0" width="452" height="62"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <searchField verticalHuggingPriority="750" id="74">
+ <rect key="frame" x="20" y="20" width="412" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" id="75">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </searchFieldCell>
+ <connections>
+ <action selector="find:" target="-2" id="76"/>
+ </connections>
+ </searchField>
+ </subviews>
+ </view>
+ </window>
+ </objects>
+ <resources>
+ <image name="NSEnterFullScreenTemplate" width="15" height="15"/>
+ <image name="NSGoLeftTemplate" width="9" height="12"/>
+ <image name="NSGoRightTemplate" width="9" height="12"/>
+ <image name="NSRefreshTemplate" width="11" height="15"/>
+ </resources>
+</document>
</ins></span></pre></div>
<a id="trunkToolsMiniBrowsermacBrowserWindowControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/BrowserWindowController.h (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/BrowserWindowController.h 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Tools/MiniBrowser/mac/BrowserWindowController.h 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -47,6 +47,8 @@
</span><span class="cx">
</span><span class="cx"> - (IBAction)setScale:(id)sender;
</span><span class="cx">
</span><ins>+- (IBAction)toggleUseMinimumViewSize:(id)sender;
+
</ins><span class="cx"> - (IBAction)dumpSourceToConsole:(id)sender;
</span><span class="cx"> - (IBAction)find:(id)sender;
</span><span class="cx">
</span><span class="lines">@@ -62,6 +64,7 @@
</span><span class="cx"> IBOutlet NSToolbar *toolbar;
</span><span class="cx"> IBOutlet NSTextField *urlText;
</span><span class="cx"> IBOutlet NSView *containerView;
</span><ins>+ IBOutlet NSButton *toggleUseMinimumViewSizeButton;
</ins><span class="cx">
</span><span class="cx"> IBOutlet NSWindow *findPanelWindow;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK1BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -229,6 +229,11 @@
</span><span class="cx"> _zoomTextOnly = !_zoomTextOnly;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (IBAction)toggleUseMinimumViewSize:(id)sender
+{
+
+}
+
</ins><span class="cx"> - (IBAction)find:(id)sender
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (183840 => 183841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2015-05-05 23:35:41 UTC (rev 183840)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2015-05-05 23:39:06 UTC (rev 183841)
</span><span class="lines">@@ -47,6 +47,8 @@
</span><span class="cx"> WKWebView *_webView;
</span><span class="cx"> BOOL _zoomTextOnly;
</span><span class="cx"> BOOL _isPrivateBrowsingWindow;
</span><ins>+
+ BOOL _useMinimumViewSize;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)awakeFromNib
</span><span class="lines">@@ -235,6 +237,14 @@
</span><span class="cx"> return _zoomTextOnly ? (_webView._textZoomFactor != 1) : (_webView._pageZoomFactor != 1);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (IBAction)toggleUseMinimumViewSize:(id)sender
+{
+ _useMinimumViewSize = !_useMinimumViewSize;
+ toggleUseMinimumViewSizeButton.image = _useMinimumViewSize ? [NSImage imageNamed:@"NSExitFullScreenTemplate"] : [NSImage imageNamed:@"NSEnterFullScreenTemplate"];
+ [_webView _setMinimumViewSize:CGSizeMake(1024, 0)];
+ [_webView _setLayoutMode:_useMinimumViewSize ? _WKLayoutModeDynamicSizeWithMinimumViewSize : _WKLayoutModeViewSize];
+}
+
</ins><span class="cx"> - (IBAction)dumpSourceToConsole:(id)sender
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>