<!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>[184487] branches/safari-601.1.32-branch</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/184487">184487</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-05-18 07:24:34 -0700 (Mon, 18 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/184358">r184358</a>. rdar://problem/19790341</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601132branchSourceWebKit2ChangeLog">branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2SharedWebPageCreationParameterscpp">branches/safari-601.1.32-branch/Source/WebKit2/Shared/WebPageCreationParameters.cpp</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2SharedWebPageCreationParametersh">branches/safari-601.1.32-branch/Source/WebKit2/Shared/WebPageCreationParameters.h</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2UIProcessAPICWKLayoutModeh">branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/C/WKLayoutMode.h</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2UIProcessAPICocoaWKWebViewmm">branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2UIProcessAPICocoa_WKLayoutModeh">branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKLayoutMode.h</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2UIProcessWebPageProxycpp">branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2UIProcessWebPageProxyh">branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2UIProcessmacWKViewLayoutStrategymm">branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2WebProcessWebPageDrawingAreah">branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/DrawingArea.h</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2WebProcessWebPageWebPagecpp">branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2WebProcessWebPageWebPageh">branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2WebProcessWebPageWebPagemessagesin">branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah">branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
<li><a href="#branchessafari601132branchToolsChangeLog">branches/safari-601.1.32-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari601132branchToolsMiniBrowsermacBrowserWindowxib">branches/safari-601.1.32-branch/Tools/MiniBrowser/mac/BrowserWindow.xib</a></li>
<li><a href="#branchessafari601132branchToolsMiniBrowsermacBrowserWindowControllerh">branches/safari-601.1.32-branch/Tools/MiniBrowser/mac/BrowserWindowController.h</a></li>
<li><a href="#branchessafari601132branchToolsMiniBrowsermacWK1BrowserWindowControllerm">branches/safari-601.1.32-branch/Tools/MiniBrowser/mac/WK1BrowserWindowController.m</a></li>
<li><a href="#branchessafari601132branchToolsMiniBrowsermacWK2BrowserWindowControllerm">branches/safari-601.1.32-branch/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601132branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (184486 => 184487)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-18 14:24:13 UTC (rev 184486)
+++ branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-18 14:24:34 UTC (rev 184487)
</span><span class="lines">@@ -1,5 +1,55 @@
</span><span class="cx"> 2015-05-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r184358. rdar://problem/19790341
+
+ 2015-05-14 Timothy Horton <timothy_horton@apple.com>
+
+ Add a layout mode that scales down the view to try to fit the document
+ https://bugs.webkit.org/show_bug.cgi?id=145022
+ <rdar://problem/19790341>
+
+ Reviewed by Dean Jackson.
+
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::creationParameters):
+ (WebKit::WebPageProxy::setShouldScaleViewToFitDocument):
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebPage/DrawingArea.h:
+ (WebKit::DrawingArea::setShouldScaleViewToFitDocument):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ (WebKit::WebPage::setShouldScaleViewToFitDocument):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+ Plumb shouldScaleViewToFitDocument through to the DrawingArea.
+
+ * UIProcess/mac/WKViewLayoutStrategy.mm:
+ (+[WKViewLayoutStrategy layoutStrategyWithPage:view:mode:]):
+ (-[WKViewDynamicSizeComputedFromMinimumDocumentSizeLayoutStrategy initWithPage:view:mode:]):
+ (-[WKViewDynamicSizeComputedFromMinimumDocumentSizeLayoutStrategy updateLayout]):
+ (-[WKViewDynamicSizeComputedFromMinimumDocumentSizeLayoutStrategy willChangeLayoutStrategy]):
+ * UIProcess/API/C/WKLayoutMode.h:
+ * UIProcess/API/Cocoa/_WKLayoutMode.h:
+ Add a new layout mode, which just turns on shouldScaleViewToFitDocument,
+ and otherwise behaves as normal.
+
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::setShouldScaleViewToFitDocument):
+ (WebKit::TiledCoreAnimationDrawingArea::scaleViewToFitDocumentIfNeeded):
+ (WebKit::TiledCoreAnimationDrawingArea::flushLayers):
+ On every flush where either the document size or view size has changed,
+ or layout is outstanding, do a layout with fixed layout off to determine
+ whether the document fits inside the view. If it doesn't, scale it down
+ to fit. This will require an extra layout for every resize while in the
+ scaled-down state, but there is potential for future optimization.
+
+2015-05-18 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r184290. rdar://problem/19790341
</span><span class="cx">
</span><span class="cx"> 2015-05-13 Timothy Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2SharedWebPageCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/Shared/WebPageCreationParameters.cpp (184486 => 184487)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2015-05-18 14:24:13 UTC (rev 184486)
+++ branches/safari-601.1.32-branch/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2015-05-18 14:24:34 UTC (rev 184487)
</span><span class="lines">@@ -82,6 +82,7 @@
</span><span class="cx"> encoder << textAutosizingWidth;
</span><span class="cx"> #endif
</span><span class="cx"> encoder << appleMailPaginationQuirkEnabled;
</span><ins>+ encoder << shouldScaleViewToFitDocument;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebPageCreationParameters::decode(IPC::ArgumentDecoder& decoder, WebPageCreationParameters& parameters)
</span><span class="lines">@@ -181,6 +182,9 @@
</span><span class="cx"> if (!decoder.decode(parameters.appleMailPaginationQuirkEnabled))
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (!decoder.decode(parameters.shouldScaleViewToFitDocument))
+ return false;
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2SharedWebPageCreationParametersh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/Shared/WebPageCreationParameters.h (184486 => 184487)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/Shared/WebPageCreationParameters.h 2015-05-18 14:24:13 UTC (rev 184486)
+++ branches/safari-601.1.32-branch/Source/WebKit2/Shared/WebPageCreationParameters.h 2015-05-18 14:24:34 UTC (rev 184487)
</span><span class="lines">@@ -125,6 +125,7 @@
</span><span class="cx"> float textAutosizingWidth;
</span><span class="cx"> #endif
</span><span class="cx"> bool appleMailPaginationQuirkEnabled;
</span><ins>+ bool shouldScaleViewToFitDocument;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2UIProcessAPICWKLayoutModeh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/C/WKLayoutMode.h (184486 => 184487)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/C/WKLayoutMode.h 2015-05-18 14:24:13 UTC (rev 184486)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/C/WKLayoutMode.h 2015-05-18 14:24:34 UTC (rev 184487)
</span><span class="lines">@@ -36,7 +36,8 @@
</span><span class="cx"> kWKLayoutModeViewSize,
</span><span class="cx"> kWKLayoutModeFixedSize,
</span><span class="cx"> kWKLayoutModeDynamicSizeComputedFromViewScale,
</span><del>- kWKLayoutModeDynamicSizeWithMinimumViewSize
</del><ins>+ kWKLayoutModeDynamicSizeWithMinimumViewSize,
+ kWKLayoutModeDynamicSizeComputedFromMinimumDocumentSize
</ins><span class="cx"> };
</span><span class="cx"> typedef uint32_t WKLayoutMode;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (184486 => 184487)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-05-18 14:24:13 UTC (rev 184486)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-05-18 14:24:34 UTC (rev 184487)
</span><span class="lines">@@ -2301,6 +2301,8 @@
</span><span class="cx"> return _WKLayoutModeDynamicSizeComputedFromViewScale;
</span><span class="cx"> case kWKLayoutModeDynamicSizeWithMinimumViewSize:
</span><span class="cx"> return _WKLayoutModeDynamicSizeWithMinimumViewSize;
</span><ins>+ case kWKLayoutModeDynamicSizeComputedFromMinimumDocumentSize:
+ return _WKLayoutModeDynamicSizeComputedFromMinimumDocumentSize;
</ins><span class="cx"> case kWKLayoutModeViewSize:
</span><span class="cx"> default:
</span><span class="cx"> return _WKLayoutModeViewSize;
</span><span class="lines">@@ -2324,6 +2326,9 @@
</span><span class="cx"> case _WKLayoutModeDynamicSizeWithMinimumViewSize:
</span><span class="cx"> wkViewLayoutMode = kWKLayoutModeDynamicSizeWithMinimumViewSize;
</span><span class="cx"> break;
</span><ins>+ case _WKLayoutModeDynamicSizeComputedFromMinimumDocumentSize:
+ wkViewLayoutMode = kWKLayoutModeDynamicSizeComputedFromMinimumDocumentSize;
+ break;
</ins><span class="cx"> case _WKLayoutModeViewSize:
</span><span class="cx"> default:
</span><span class="cx"> wkViewLayoutMode = kWKLayoutModeViewSize;
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2UIProcessAPICocoa_WKLayoutModeh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKLayoutMode.h (184486 => 184487)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKLayoutMode.h 2015-05-18 14:24:13 UTC (rev 184486)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKLayoutMode.h 2015-05-18 14:24:34 UTC (rev 184487)
</span><span class="lines">@@ -35,8 +35,11 @@
</span><span class="cx"> _WKLayoutModeDynamicSizeComputedFromViewScale,
</span><span class="cx">
</span><span class="cx"> // Lay out the view at a heuristically-determined size based on the minimum view size.
</span><del>- _WKLayoutModeDynamicSizeWithMinimumViewSize
</del><ins>+ _WKLayoutModeDynamicSizeWithMinimumViewSize,
</ins><span class="cx">
</span><ins>+ // Lay out the view at a heuristically-determined size based on the minimum size of the document.
+ _WKLayoutModeDynamicSizeComputedFromMinimumDocumentSize,
+
</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="branchessafari601132branchSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (184486 => 184487)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-05-18 14:24:13 UTC (rev 184486)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-05-18 14:24:34 UTC (rev 184487)
</span><span class="lines">@@ -5003,6 +5003,7 @@
</span><span class="cx"> #else
</span><span class="cx"> parameters.appleMailPaginationQuirkEnabled = false;
</span><span class="cx"> #endif
</span><ins>+ parameters.shouldScaleViewToFitDocument = m_shouldScaleViewToFitDocument;
</ins><span class="cx">
</span><span class="cx"> return parameters;
</span><span class="cx"> }
</span><span class="lines">@@ -5842,4 +5843,17 @@
</span><span class="cx"> m_process->send(Messages::WebPage::ClearWheelEventTestTrigger(), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::setShouldScaleViewToFitDocument(bool shouldScaleViewToFitDocument)
+{
+ if (m_shouldScaleViewToFitDocument == shouldScaleViewToFitDocument)
+ return;
+
+ m_shouldScaleViewToFitDocument = shouldScaleViewToFitDocument;
+
+ if (!isValid())
+ return;
+
+ m_process->send(Messages::WebPage::SetShouldScaleViewToFitDocument(shouldScaleViewToFitDocument), m_pageID);
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/WebPageProxy.h (184486 => 184487)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2015-05-18 14:24:13 UTC (rev 184486)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2015-05-18 14:24:34 UTC (rev 184487)
</span><span class="lines">@@ -655,6 +655,7 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> void scaleViewAndUpdateGeometryFenced(double scale, WebCore::IntSize viewSize, std::function<void (const WebCore::MachSendRight&, CallbackBase::Error)>);
</span><span class="cx"> #endif
</span><ins>+ void setShouldScaleViewToFitDocument(bool);
</ins><span class="cx">
</span><span class="cx"> float deviceScaleFactor() const;
</span><span class="cx"> void setIntrinsicDeviceScaleFactor(float);
</span><span class="lines">@@ -1706,7 +1707,9 @@
</span><span class="cx"> bool m_mayStartMediaWhenInWindow;
</span><span class="cx">
</span><span class="cx"> bool m_waitingForDidUpdateViewState;
</span><del>-
</del><ins>+
+ bool m_shouldScaleViewToFitDocument { false };
+
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> HashMap<String, String> m_temporaryPDFFiles;
</span><span class="cx"> std::unique_ptr<WebCore::RunLoopObserver> m_viewStateChangeDispatcher;
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2UIProcessmacWKViewLayoutStrategymm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm (184486 => 184487)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm 2015-05-18 14:24:13 UTC (rev 184486)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm 2015-05-18 14:24:34 UTC (rev 184487)
</span><span class="lines">@@ -52,6 +52,9 @@
</span><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@interface WKViewDynamicSizeComputedFromMinimumDocumentSizeLayoutStrategy : WKViewLayoutStrategy
+@end
+
</ins><span class="cx"> @implementation WKViewLayoutStrategy
</span><span class="cx">
</span><span class="cx"> + (instancetype)layoutStrategyWithPage:(WebPageProxy&)page view:(WKView *)wkView mode:(WKLayoutMode)mode
</span><span class="lines">@@ -68,6 +71,9 @@
</span><span class="cx"> case kWKLayoutModeDynamicSizeWithMinimumViewSize:
</span><span class="cx"> strategy = [[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy alloc] initWithPage:page view:wkView mode:mode];
</span><span class="cx"> break;
</span><ins>+ case kWKLayoutModeDynamicSizeComputedFromMinimumDocumentSize:
+ strategy = [[WKViewDynamicSizeComputedFromMinimumDocumentSizeLayoutStrategy alloc] initWithPage:page view:wkView mode:mode];
+ break;
</ins><span class="cx"> case kWKLayoutModeViewSize:
</span><span class="cx"> default:
</span><span class="cx"> strategy = [[WKViewViewSizeLayoutStrategy alloc] initWithPage:page view:wkView mode:mode];
</span><span class="lines">@@ -374,4 +380,29 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@implementation WKViewDynamicSizeComputedFromMinimumDocumentSizeLayoutStrategy
+
+- (instancetype)initWithPage:(WebPageProxy&)page view:(WKView *)wkView mode:(WKLayoutMode)mode
+{
+ self = [super initWithPage:page view:wkView mode:mode];
+
+ if (!self)
+ return nil;
+
+ _page->setShouldScaleViewToFitDocument(true);
+
+ return self;
+}
+
+- (void)updateLayout
+{
+}
+
+- (void)willChangeLayoutStrategy
+{
+ _page->setShouldScaleViewToFitDocument(false);
+}
+
+@end
+
</ins><span class="cx"> #endif // PLATFORM(MAC)
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2WebProcessWebPageDrawingAreah"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (184486 => 184487)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2015-05-18 14:24:13 UTC (rev 184486)
+++ branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2015-05-18 14:24:34 UTC (rev 184487)
</span><span class="lines">@@ -126,6 +126,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void attachViewOverlayGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) { }
</span><span class="cx">
</span><ins>+ virtual void setShouldScaleViewToFitDocument(bool) { }
+
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> // Used by TiledCoreAnimationDrawingArea.
</span><span class="cx"> virtual void updateGeometry(const WebCore::IntSize& viewSize, const WebCore::IntSize& layerPosition, bool flushSynchronously) { }
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (184486 => 184487)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-05-18 14:24:13 UTC (rev 184486)
+++ branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-05-18 14:24:34 UTC (rev 184487)
</span><span class="lines">@@ -381,6 +381,7 @@
</span><span class="cx">
</span><span class="cx"> m_drawingArea = DrawingArea::create(*this, parameters);
</span><span class="cx"> m_drawingArea->setPaintingEnabled(false);
</span><ins>+ m_drawingArea->setShouldScaleViewToFitDocument(parameters.shouldScaleViewToFitDocument);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><span class="cx"> m_useAsyncScrolling = parameters.store.getBoolValueForKey(WebPreferencesKey::threadedScrollingEnabledKey());
</span><span class="lines">@@ -4935,4 +4936,12 @@
</span><span class="cx"> m_page->clearTrigger();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPage::setShouldScaleViewToFitDocument(bool shouldScaleViewToFitDocument)
+{
+ if (!m_drawingArea)
+ return;
+
+ m_drawingArea->setShouldScaleViewToFitDocument(shouldScaleViewToFitDocument);
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h (184486 => 184487)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-05-18 14:24:13 UTC (rev 184486)
+++ branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-05-18 14:24:34 UTC (rev 184487)
</span><span class="lines">@@ -1126,6 +1126,8 @@
</span><span class="cx">
</span><span class="cx"> void clearWheelEventTestTrigger();
</span><span class="cx">
</span><ins>+ void setShouldScaleViewToFitDocument(bool);
+
</ins><span class="cx"> uint64_t m_pageID;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<WebCore::Page> m_page;
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (184486 => 184487)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-05-18 14:24:13 UTC (rev 184486)
+++ branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-05-18 14:24:34 UTC (rev 184487)
</span><span class="lines">@@ -432,4 +432,5 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ClearWheelEventTestTrigger()
</span><ins>+ SetShouldScaleViewToFitDocument(bool shouldScaleViewToFitDocument)
</ins><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (184486 => 184487)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2015-05-18 14:24:13 UTC (rev 184486)
+++ branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2015-05-18 14:24:34 UTC (rev 184487)
</span><span class="lines">@@ -100,6 +100,8 @@
</span><span class="cx"> virtual void setColorSpace(const ColorSpaceData&) override;
</span><span class="cx"> virtual void addFence(const WebCore::MachSendRight&) override;
</span><span class="cx">
</span><ins>+ virtual void setShouldScaleViewToFitDocument(bool) override;
+
</ins><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 class="cx"> void applyTransientZoomToPage(double scale, WebCore::FloatPoint origin);
</span><span class="lines">@@ -118,6 +120,7 @@
</span><span class="cx">
</span><span class="cx"> void updateIntrinsicContentSizeIfNeeded();
</span><span class="cx"> void updateScrolledExposedRect();
</span><ins>+ void scaleViewToFitDocumentIfNeeded();
</ins><span class="cx">
</span><span class="cx"> bool m_layerTreeStateIsFrozen;
</span><span class="cx"> WebCore::LayerFlushScheduler m_layerFlushScheduler;
</span><span class="lines">@@ -150,6 +153,10 @@
</span><span class="cx"> WebCore::GraphicsLayer* m_viewOverlayRootLayer;
</span><span class="cx">
</span><span class="cx"> Vector<uint64_t> m_fenceCallbacksForAfterNextFlush;
</span><ins>+ bool m_shouldScaleViewToFitDocument { false };
+
+ WebCore::IntSize m_lastViewSizeForScaleToFit;
+ WebCore::IntSize m_lastDocumentSizeForScaleToFit;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (184486 => 184487)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-05-18 14:24:13 UTC (rev 184486)
+++ branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-05-18 14:24:34 UTC (rev 184487)
</span><span class="lines">@@ -261,6 +261,54 @@
</span><span class="cx"> m_webPage.send(Messages::DrawingAreaProxy::IntrinsicContentSizeDidChange(contentSize));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TiledCoreAnimationDrawingArea::setShouldScaleViewToFitDocument(bool shouldScaleView)
+{
+ if (m_shouldScaleViewToFitDocument == shouldScaleView)
+ return;
+
+ m_shouldScaleViewToFitDocument = shouldScaleView;
+ scheduleCompositingLayerFlush();
+}
+
+void TiledCoreAnimationDrawingArea::scaleViewToFitDocumentIfNeeded()
+{
+ // FIXME: Defer scrollbar flashing until after the second layout.
+
+ const int maximumDocumentWidthForScaling = 1440;
+ const float minimumViewScale = 0.1;
+
+ if (!m_shouldScaleViewToFitDocument)
+ return;
+
+ if (!m_webPage.mainFrame()->view()->needsLayout() && m_lastDocumentSizeForScaleToFit == m_webPage.mainFrameView()->renderView()->unscaledDocumentRect().size() && m_lastViewSizeForScaleToFit == m_webPage.size())
+ return;
+
+ // Lay out at the view size.
+ m_webPage.setUseFixedLayout(false);
+ m_webPage.layoutIfNeeded();
+
+ IntSize documentSize = m_webPage.mainFrameView()->renderView()->unscaledDocumentRect().size();
+ m_lastViewSizeForScaleToFit = m_webPage.size();
+ m_lastDocumentSizeForScaleToFit = documentSize;
+
+ int documentWidth = documentSize.width();
+ int viewWidth = m_webPage.size().width();
+
+ float viewScale = 1;
+
+ // Avoid scaling down documents that don't fit in a certain width, to allow
+ // sites that want horizontal scrollbars to continue to have them.
+ if (documentWidth && documentWidth < maximumDocumentWidthForScaling && viewWidth < documentWidth) {
+ // If the document doesn't fit in the view, scale it down but lay out at the view size.
+ m_webPage.setUseFixedLayout(true);
+ viewScale = (float)viewWidth / (float)documentWidth;
+ viewScale = std::max(viewScale, minimumViewScale);
+ m_webPage.setFixedLayoutSize(IntSize(ceilf(m_webPage.size().width() / viewScale), m_webPage.size().height()));
+ }
+
+ m_webPage.scaleView(viewScale);
+}
+
</ins><span class="cx"> void TiledCoreAnimationDrawingArea::dispatchAfterEnsuringUpdatedScrollPosition(std::function<void ()> function)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><span class="lines">@@ -302,6 +350,8 @@
</span><span class="cx"> ASSERT(!m_layerTreeStateIsFrozen);
</span><span class="cx">
</span><span class="cx"> @autoreleasepool {
</span><ins>+ scaleViewToFitDocumentIfNeeded();
+
</ins><span class="cx"> m_webPage.layoutIfNeeded();
</span><span class="cx">
</span><span class="cx"> updateIntrinsicContentSizeIfNeeded();
</span></span></pre></div>
<a id="branchessafari601132branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Tools/ChangeLog (184486 => 184487)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Tools/ChangeLog 2015-05-18 14:24:13 UTC (rev 184486)
+++ branches/safari-601.1.32-branch/Tools/ChangeLog 2015-05-18 14:24:34 UTC (rev 184487)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-05-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r184358. rdar://problem/19790341
+
+ 2015-05-14 Timothy Horton <timothy_horton@apple.com>
+
+ Add a layout mode that scales down the view to try to fit the document
+ https://bugs.webkit.org/show_bug.cgi?id=145022
+ <rdar://problem/19790341>
+
+ Reviewed by Dean Jackson.
+
+ * MiniBrowser/mac/BrowserWindow.xib:
+ * MiniBrowser/mac/BrowserWindowController.h:
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController toggleShrinkToFit:]):
+ (-[WK2BrowserWindowController toggleUseMinimumViewSize:]): Deleted.
+ Switch to _WKLayoutModeDynamicSizeComputedFromMinimumDocumentSize.
+
+2015-05-18 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r184341. rdar://problem/20809399
</span><span class="cx">
</span><span class="cx"> 2015-05-14 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari601132branchToolsMiniBrowsermacBrowserWindowxib"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Tools/MiniBrowser/mac/BrowserWindow.xib (184486 => 184487)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Tools/MiniBrowser/mac/BrowserWindow.xib 2015-05-18 14:24:13 UTC (rev 184486)
+++ branches/safari-601.1.32-branch/Tools/MiniBrowser/mac/BrowserWindow.xib 2015-05-18 14:24:34 UTC (rev 184487)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> <outlet property="forwardButton" destination="42" id="47"/>
</span><span class="cx"> <outlet property="progressIndicator" destination="21" id="33"/>
</span><span class="cx"> <outlet property="reloadButton" destination="23" id="34"/>
</span><del>- <outlet property="toggleUseMinimumViewSizeButton" destination="82" id="FTZ-YK-Ae5"/>
</del><ins>+ <outlet property="toggleUseShrinkToFitButton" destination="82" id="9w7-AB-Ye3"/>
</ins><span class="cx"> <outlet property="toolbar" destination="48" id="67"/>
</span><span class="cx"> <outlet property="urlText" destination="10" id="32"/>
</span><span class="cx"> <outlet property="window" destination="1" id="3"/>
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> </connections>
</span><span class="cx"> </button>
</span><span class="cx"> </toolbarItem>
</span><del>- <toolbarItem implicitItemIdentifier="76DCF2B0-1DDE-47D2-9212-705E6E310CCE" label="Use Minimum View Size" paletteLabel="Use Minimum View Size" image="NSEnterFullScreenTemplate" id="81" customClass="MBToolbarItem">
</del><ins>+ <toolbarItem implicitItemIdentifier="76DCF2B0-1DDE-47D2-9212-705E6E310CCE" label="Use Shrink To Fit" paletteLabel="Use Shrink To Fit" image="NSEnterFullScreenTemplate" id="81" customClass="MBToolbarItem">
</ins><span class="cx"> <nil key="toolTip"/>
</span><span class="cx"> <size key="minSize" width="29" height="25"/>
</span><span class="cx"> <size key="maxSize" width="29" height="25"/>
</span><span class="lines">@@ -96,6 +96,9 @@
</span><span class="cx"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
</span><span class="cx"> <font key="font" metaFont="system"/>
</span><span class="cx"> </buttonCell>
</span><ins>+ <connections>
+ <action selector="toggleShrinkToFit:" target="-2" id="gp7-Vk-KTI"/>
+ </connections>
</ins><span class="cx"> </button>
</span><span class="cx"> <connections>
</span><span class="cx"> <action selector="toggleUseMinimumViewSize:" target="-2" id="gZA-yS-7L4"/>
</span></span></pre></div>
<a id="branchessafari601132branchToolsMiniBrowsermacBrowserWindowControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Tools/MiniBrowser/mac/BrowserWindowController.h (184486 => 184487)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Tools/MiniBrowser/mac/BrowserWindowController.h 2015-05-18 14:24:13 UTC (rev 184486)
+++ branches/safari-601.1.32-branch/Tools/MiniBrowser/mac/BrowserWindowController.h 2015-05-18 14:24:34 UTC (rev 184487)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> - (IBAction)setScale:(id)sender;
</span><span class="cx">
</span><del>-- (IBAction)toggleUseMinimumViewSize:(id)sender;
</del><ins>+- (IBAction)toggleShrinkToFit:(id)sender;
</ins><span class="cx">
</span><span class="cx"> - (IBAction)dumpSourceToConsole:(id)sender;
</span><span class="cx"> - (IBAction)find:(id)sender;
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> IBOutlet NSToolbar *toolbar;
</span><span class="cx"> IBOutlet NSTextField *urlText;
</span><span class="cx"> IBOutlet NSView *containerView;
</span><del>- IBOutlet NSButton *toggleUseMinimumViewSizeButton;
</del><ins>+ IBOutlet NSButton *toggleUseShrinkToFitButton;
</ins><span class="cx">
</span><span class="cx"> IBOutlet NSWindow *findPanelWindow;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601132branchToolsMiniBrowsermacWK1BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (184486 => 184487)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2015-05-18 14:24:13 UTC (rev 184486)
+++ branches/safari-601.1.32-branch/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2015-05-18 14:24:34 UTC (rev 184487)
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx"> _zoomTextOnly = !_zoomTextOnly;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (IBAction)toggleUseMinimumViewSize:(id)sender
</del><ins>+- (IBAction)toggleShrinkToFit:(id)sender
</ins><span class="cx"> {
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601132branchToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (184486 => 184487)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2015-05-18 14:24:13 UTC (rev 184486)
+++ branches/safari-601.1.32-branch/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2015-05-18 14:24:34 UTC (rev 184487)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> BOOL _zoomTextOnly;
</span><span class="cx"> BOOL _isPrivateBrowsingWindow;
</span><span class="cx">
</span><del>- BOOL _useMinimumViewSize;
</del><ins>+ BOOL _useShrinkToFit;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)awakeFromNib
</span><span class="lines">@@ -237,12 +237,11 @@
</span><span class="cx"> return _zoomTextOnly ? (_webView._textZoomFactor != 1) : (_webView._pageZoomFactor != 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (IBAction)toggleUseMinimumViewSize:(id)sender
</del><ins>+- (IBAction)toggleShrinkToFit:(id)sender
</ins><span class="cx"> {
</span><del>- _useMinimumViewSize = !_useMinimumViewSize;
- toggleUseMinimumViewSizeButton.image = _useMinimumViewSize ? [NSImage imageNamed:@"NSExitFullScreenTemplate"] : [NSImage imageNamed:@"NSEnterFullScreenTemplate"];
- [_webView _setMinimumViewSize:CGSizeMake(1024, 0)];
- [_webView _setLayoutMode:_useMinimumViewSize ? _WKLayoutModeDynamicSizeWithMinimumViewSize : _WKLayoutModeViewSize];
</del><ins>+ _useShrinkToFit = !_useShrinkToFit;
+ toggleUseShrinkToFitButton.image = _useShrinkToFit ? [NSImage imageNamed:@"NSExitFullScreenTemplate"] : [NSImage imageNamed:@"NSEnterFullScreenTemplate"];
+ [_webView _setLayoutMode:_useShrinkToFit ? _WKLayoutModeDynamicSizeComputedFromMinimumDocumentSize : _WKLayoutModeViewSize];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (IBAction)dumpSourceToConsole:(id)sender
</span></span></pre>
</div>
</div>
</body>
</html>