<!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>[201884] trunk/Source</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/201884">201884</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2016-06-09 14:34:25 -0700 (Thu, 09 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Define printing{Minimum,Maximum}ShrinkFactor in only one place
https://bugs.webkit.org/show_bug.cgi?id=158580
Reviewed by Tim Horton.
Source/WebCore:
* page/PrintContext.cpp: Removed printingMinimumShrinkFactor and printingMaximumShrinkFactor.
(WebCore::PrintContext::begin): Used minimumShrinkFactor() and maximumShrinkFactor() instead
of printingMinimumShrinkFactor and printingMaximumShrinkFactor.
(WebCore::PrintContext::computeAutomaticScaleFactor): Ditto.
* page/PrintContext.h:
(WebCore::PrintContext::minimumShrinkFactor): Added to return the same value as
printingMinimumShrinkFactor.
(WebCore::PrintContext::maximumShrinkFactor): Added to return the same value as
printingMaximumShrinkFactor.
Source/WebKit/mac:
* WebView/WebHTMLView.mm: Initialized _WebHTMLViewPrintingMinimumShrinkFactor and
_WebHTMLViewPrintingMaximumShrinkFactor with PrintContext::minimumShrinkFactor() and
PrintContext::maximumShrinkFactor() instead of with duplicated float literals.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagePrintContextcpp">trunk/Source/WebCore/page/PrintContext.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePrintContexth">trunk/Source/WebCore/page/PrintContext.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201883 => 201884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-09 21:30:35 UTC (rev 201883)
+++ trunk/Source/WebCore/ChangeLog 2016-06-09 21:34:25 UTC (rev 201884)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-06-09 Andy Estes <aestes@apple.com>
+
+ Define printing{Minimum,Maximum}ShrinkFactor in only one place
+ https://bugs.webkit.org/show_bug.cgi?id=158580
+
+ Reviewed by Tim Horton.
+
+ * page/PrintContext.cpp: Removed printingMinimumShrinkFactor and printingMaximumShrinkFactor.
+ (WebCore::PrintContext::begin): Used minimumShrinkFactor() and maximumShrinkFactor() instead
+ of printingMinimumShrinkFactor and printingMaximumShrinkFactor.
+ (WebCore::PrintContext::computeAutomaticScaleFactor): Ditto.
+ * page/PrintContext.h:
+ (WebCore::PrintContext::minimumShrinkFactor): Added to return the same value as
+ printingMinimumShrinkFactor.
+ (WebCore::PrintContext::maximumShrinkFactor): Added to return the same value as
+ printingMaximumShrinkFactor.
+
</ins><span class="cx"> 2016-06-09 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> Don't show the caption menu if a video has only forced tracks
</span></span></pre></div>
<a id="trunkSourceWebCorepagePrintContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PrintContext.cpp (201883 => 201884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PrintContext.cpp 2016-06-09 21:30:35 UTC (rev 201883)
+++ trunk/Source/WebCore/page/PrintContext.cpp 2016-06-09 21:34:25 UTC (rev 201884)
</span><span class="lines">@@ -31,19 +31,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-// By imaging to a width a little wider than the available pixels,
-// thin pages will be scaled down a little, matching the way they
-// print in IE and Camino. This lets them use fewer sheets than they
-// would otherwise, which is presumably why other browsers do this.
-// Wide pages will be scaled down more than this.
-const float printingMinimumShrinkFactor = 1.25f;
-
-// This number determines how small we are willing to reduce the page content
-// in order to accommodate the widest line. If the page would have to be
-// reduced smaller to make the widest line fit, we just clip instead (this
-// behavior matches MacIE and Mozilla, at least)
-const float printingMaximumShrinkFactor = 2;
-
</del><span class="cx"> PrintContext::PrintContext(Frame* frame)
</span><span class="cx"> : m_frame(frame)
</span><span class="cx"> , m_isPrinting(false)
</span><span class="lines">@@ -167,10 +154,10 @@
</span><span class="cx"> m_isPrinting = true;
</span><span class="cx">
</span><span class="cx"> FloatSize originalPageSize = FloatSize(width, height);
</span><del>- FloatSize minLayoutSize = m_frame->resizePageRectsKeepingRatio(originalPageSize, FloatSize(width * printingMinimumShrinkFactor, height * printingMinimumShrinkFactor));
</del><ins>+ FloatSize minLayoutSize = m_frame->resizePageRectsKeepingRatio(originalPageSize, FloatSize(width * minimumShrinkFactor(), height * minimumShrinkFactor()));
</ins><span class="cx">
</span><span class="cx"> // This changes layout, so callers need to make sure that they don't paint to screen while in printing mode.
</span><del>- m_frame->setPrinting(true, minLayoutSize, originalPageSize, printingMaximumShrinkFactor / printingMinimumShrinkFactor, AdjustViewSize);
</del><ins>+ m_frame->setPrinting(true, minLayoutSize, originalPageSize, maximumShrinkFactor() / minimumShrinkFactor(), AdjustViewSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float PrintContext::computeAutomaticScaleFactor(const FloatSize& availablePaperSize)
</span><span class="lines">@@ -186,7 +173,7 @@
</span><span class="cx"> if (viewLogicalWidth < 1)
</span><span class="cx"> return 1;
</span><span class="cx">
</span><del>- float maxShrinkToFitScaleFactor = 1 / printingMaximumShrinkFactor;
</del><ins>+ float maxShrinkToFitScaleFactor = 1 / maximumShrinkFactor();
</ins><span class="cx"> float shrinkToFitScaleFactor = (useViewWidth ? availablePaperSize.width() : availablePaperSize.height()) / viewLogicalWidth;
</span><span class="cx"> return std::max(maxShrinkToFitScaleFactor, shrinkToFitScaleFactor);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagePrintContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PrintContext.h (201883 => 201884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PrintContext.h 2016-06-09 21:30:35 UTC (rev 201883)
+++ trunk/Source/WebCore/page/PrintContext.h 2016-06-09 21:34:25 UTC (rev 201884)
</span><span class="lines">@@ -78,7 +78,20 @@
</span><span class="cx"> // The height of the graphics context should be
</span><span class="cx"> // (pageSizeInPixels.height() + 1) * number-of-pages - 1
</span><span class="cx"> WEBCORE_EXPORT static void spoolAllPagesWithBoundaries(Frame&, GraphicsContext&, const FloatSize& pageSizeInPixels);
</span><ins>+
+ // By imaging to a width a little wider than the available pixels,
+ // thin pages will be scaled down a little, matching the way they
+ // print in IE and Camino. This lets them use fewer sheets than they
+ // would otherwise, which is presumably why other browsers do this.
+ // Wide pages will be scaled down more than this.
+ static constexpr float minimumShrinkFactor() { return 1.25; }
</ins><span class="cx">
</span><ins>+ // This number determines how small we are willing to reduce the page content
+ // in order to accommodate the widest line. If the page would have to be
+ // reduced smaller to make the widest line fit, we just clip instead (this
+ // behavior matches MacIE and Mozilla, at least)
+ static constexpr float maximumShrinkFactor() { return 2; }
+
</ins><span class="cx"> protected:
</span><span class="cx"> Frame* m_frame;
</span><span class="cx"> Vector<IntRect> m_pageRects;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (201883 => 201884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-06-09 21:30:35 UTC (rev 201883)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-06-09 21:34:25 UTC (rev 201884)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-06-09 Andy Estes <aestes@apple.com>
+
+ Define printing{Minimum,Maximum}ShrinkFactor in only one place
+ https://bugs.webkit.org/show_bug.cgi?id=158580
+
+ Reviewed by Tim Horton.
+
+ * WebView/WebHTMLView.mm: Initialized _WebHTMLViewPrintingMinimumShrinkFactor and
+ _WebHTMLViewPrintingMaximumShrinkFactor with PrintContext::minimumShrinkFactor() and
+ PrintContext::maximumShrinkFactor() instead of with duplicated float literals.
+
</ins><span class="cx"> 2016-06-09 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r201810.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (201883 => 201884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-06-09 21:30:35 UTC (rev 201883)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-06-09 21:34:25 UTC (rev 201884)
</span><span class="lines">@@ -112,6 +112,7 @@
</span><span class="cx"> #import <WebCore/NSURLFileTypeMappingsSPI.h>
</span><span class="cx"> #import <WebCore/NSViewSPI.h>
</span><span class="cx"> #import <WebCore/Page.h>
</span><ins>+#import <WebCore/PrintContext.h>
</ins><span class="cx"> #import <WebCore/Range.h>
</span><span class="cx"> #import <WebCore/RenderView.h>
</span><span class="cx"> #import <WebCore/RenderWidget.h>
</span><span class="lines">@@ -760,19 +761,9 @@
</span><span class="cx"> @end
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span><del>-// By imaging to a width a little wider than the available pixels,
-// thin pages will be scaled down a little, matching the way they
-// print in IE and Camino. This lets them use fewer sheets than they
-// would otherwise, which is presumably why other browsers do this.
-// Wide pages will be scaled down more than this.
-const float _WebHTMLViewPrintingMinimumShrinkFactor = 1.25;
</del><ins>+const float _WebHTMLViewPrintingMinimumShrinkFactor = PrintContext::minimumShrinkFactor();
+const float _WebHTMLViewPrintingMaximumShrinkFactor = PrintContext::maximumShrinkFactor();
</ins><span class="cx">
</span><del>-// This number determines how small we are willing to reduce the page content
-// in order to accommodate the widest line. If the page would have to be
-// reduced smaller to make the widest line fit, we just clip instead (this
-// behavior matches MacIE and Mozilla, at least)
-const float _WebHTMLViewPrintingMaximumShrinkFactor = 2;
-
</del><span class="cx"> #define AUTOSCROLL_INTERVAL 0.1f
</span><span class="cx">
</span><span class="cx"> // Any non-zero value will do, but using something recognizable might help us debug some day.
</span></span></pre>
</div>
</div>
</body>
</html>