<!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>[199130] 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/199130">199130</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-04-06 18:20:52 -0700 (Wed, 06 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Page tiles are missing when graphics acceleration is unavailable
https://bugs.webkit.org/show_bug.cgi?id=156325
Source/WebCore:
rdar://problem/25587476
Reviewed by Tim Horton.
When graphics acceleration is unavailable on Mac (e.g. in a VM or when running from
the recovery partition), page contents were missing. This is because
IOSurfaceGetPropertyMaximum(kIOSurfaceWidth) and IOSurfaceGetPropertyMaximum(kIOSurfaceHeight)
returned INT_MAX, causing us to compute a tile size of 0x0.
Fix by changing IOSurface::maximumSize() to report a value between 1K x 1K and 32K x 32K.
Rename kGiantTileSize to better describe its purpose.
Add correct clamping in IOSurface::maximumSize().
* platform/graphics/ca/TileController.cpp:
(WebCore::TileController::tileSize):
* platform/graphics/ca/TileController.h:
* platform/graphics/cocoa/IOSurface.mm:
(IOSurface::maximumSize):
Source/WTF:
Reviewed by Tim Horton.
Add clampToInteger(size_t).
* wtf/MathExtras.h:
(clampToInteger):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfMathExtrash">trunk/Source/WTF/wtf/MathExtras.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileControllercpp">trunk/Source/WebCore/platform/graphics/ca/TileController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileControllerh">trunk/Source/WebCore/platform/graphics/ca/TileController.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaIOSurfacemm">trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (199129 => 199130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-04-07 01:11:47 UTC (rev 199129)
+++ trunk/Source/WTF/ChangeLog 2016-04-07 01:20:52 UTC (rev 199130)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-04-06 Simon Fraser <simon.fraser@apple.com>
+
+ Page tiles are missing when graphics acceleration is unavailable
+ https://bugs.webkit.org/show_bug.cgi?id=156325
+
+ Reviewed by Tim Horton.
+
+ Add clampToInteger(size_t).
+
+ * wtf/MathExtras.h:
+ (clampToInteger):
+
</ins><span class="cx"> 2016-04-05 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement operator== and operator!= for Optional<>
</span></span></pre></div>
<a id="trunkSourceWTFwtfMathExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MathExtras.h (199129 => 199130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MathExtras.h 2016-04-07 01:11:47 UTC (rev 199129)
+++ trunk/Source/WTF/wtf/MathExtras.h 2016-04-07 01:20:52 UTC (rev 199130)
</span><span class="lines">@@ -190,6 +190,15 @@
</span><span class="cx"> return static_cast<int>(x);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline int clampToInteger(size_t x)
+{
+ const size_t intMax = static_cast<size_t>(std::numeric_limits<int>::max());
+
+ if (x >= intMax)
+ return std::numeric_limits<int>::max();
+ return static_cast<int>(x);
+}
+
</ins><span class="cx"> inline bool isWithinIntRange(float x)
</span><span class="cx"> {
</span><span class="cx"> return x > static_cast<float>(std::numeric_limits<int>::min()) && x < static_cast<float>(std::numeric_limits<int>::max());
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199129 => 199130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-07 01:11:47 UTC (rev 199129)
+++ trunk/Source/WebCore/ChangeLog 2016-04-07 01:20:52 UTC (rev 199130)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-04-06 Simon Fraser <simon.fraser@apple.com>
+
+ Page tiles are missing when graphics acceleration is unavailable
+ https://bugs.webkit.org/show_bug.cgi?id=156325
+ rdar://problem/25587476
+
+ Reviewed by Tim Horton.
+
+ When graphics acceleration is unavailable on Mac (e.g. in a VM or when running from
+ the recovery partition), page contents were missing. This is because
+ IOSurfaceGetPropertyMaximum(kIOSurfaceWidth) and IOSurfaceGetPropertyMaximum(kIOSurfaceHeight)
+ returned INT_MAX, causing us to compute a tile size of 0x0.
+
+ Fix by changing IOSurface::maximumSize() to report a value between 1K x 1K and 32K x 32K.
+
+ Rename kGiantTileSize to better describe its purpose.
+
+ Add correct clamping in IOSurface::maximumSize().
+
+ * platform/graphics/ca/TileController.cpp:
+ (WebCore::TileController::tileSize):
+ * platform/graphics/ca/TileController.h:
+ * platform/graphics/cocoa/IOSurface.mm:
+ (IOSurface::maximumSize):
+
</ins><span class="cx"> 2016-03-29 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Add support for Symbol.isConcatSpreadable.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileController.cpp (199129 => 199130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileController.cpp 2016-04-07 01:11:47 UTC (rev 199129)
+++ trunk/Source/WebCore/platform/graphics/ca/TileController.cpp 2016-04-07 01:20:52 UTC (rev 199130)
</span><span class="lines">@@ -493,7 +493,9 @@
</span><span class="cx"> if (m_inLiveResize || m_tileSizeLocked)
</span><span class="cx"> return tileGrid().tileSize();
</span><span class="cx">
</span><del>- IntSize maxTileSize(kGiantTileSize, kGiantTileSize);
</del><ins>+ const int kLowestCommonDenominatorMaxTileSize = 4 * 1024;
+ IntSize maxTileSize(kLowestCommonDenominatorMaxTileSize, kLowestCommonDenominatorMaxTileSize);
+
</ins><span class="cx"> #if USE(IOSURFACE)
</span><span class="cx"> IntSize surfaceSizeLimit = IOSurface::maximumSize();
</span><span class="cx"> surfaceSizeLimit.scale(1 / m_deviceScaleFactor);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileController.h (199129 => 199130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileController.h 2016-04-07 01:11:47 UTC (rev 199129)
+++ trunk/Source/WebCore/platform/graphics/ca/TileController.h 2016-04-07 01:20:52 UTC (rev 199130)
</span><span class="lines">@@ -49,9 +49,6 @@
</span><span class="cx"> typedef Vector<RetainPtr<PlatformLayer>> PlatformLayerList;
</span><span class="cx">
</span><span class="cx"> const int kDefaultTileSize = 512;
</span><del>-// This is an experimental value for debugging and evaluating the overhead which may be
-// incurred due to a large tile size.
-const int kGiantTileSize = 4096;
</del><span class="cx">
</span><span class="cx"> class TileController final : public TiledBacking {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(TileController); WTF_MAKE_FAST_ALLOCATED;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaIOSurfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm (199129 => 199130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2016-04-07 01:11:47 UTC (rev 199129)
+++ trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2016-04-07 01:20:52 UTC (rev 199130)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #import "ImageBufferDataCG.h"
</span><span class="cx"> #import "MachSendRight.h"
</span><span class="cx"> #import <wtf/Assertions.h>
</span><ins>+#import <wtf/MathExtras.h>
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // Move this into the SPI header once it's possible to put inside the APPLE_INTERNAL_SDK block.
</span><span class="lines">@@ -239,13 +240,20 @@
</span><span class="cx">
</span><span class="cx"> IntSize IOSurface::maximumSize()
</span><span class="cx"> {
</span><del>- IntSize maxSize(IOSurfaceGetPropertyMaximum(kIOSurfaceWidth), IOSurfaceGetPropertyMaximum(kIOSurfaceHeight));
</del><ins>+ IntSize maxSize(clampToInteger(IOSurfaceGetPropertyMaximum(kIOSurfaceWidth)), clampToInteger(IOSurfaceGetPropertyMaximum(kIOSurfaceHeight)));
+
+ // Protect against maxSize being { 0, 0 }.
+ const int iOSMaxSurfaceDimensionLowerBound = 1024;
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- // Match limits imposed by CA. FIXME: should have API for this <rdar://problem/25454148>
</del><ins>+ // Match limits imposed by Core Animation. FIXME: should have API for this <rdar://problem/25454148>
</ins><span class="cx"> const int iOSMaxSurfaceDimension = 8 * 1024;
</span><del>- maxSize = maxSize.shrunkTo({ iOSMaxSurfaceDimension, iOSMaxSurfaceDimension });
</del><ins>+#else
+ // IOSurface::maximumSize() can return { INT_MAX, INT_MAX } when hardware acceleration is unavailable.
+ const int iOSMaxSurfaceDimension = 32 * 1024;
</ins><span class="cx"> #endif
</span><del>- return maxSize;
</del><ins>+
+ return maxSize.constrainedBetween({ iOSMaxSurfaceDimensionLowerBound, iOSMaxSurfaceDimensionLowerBound }, { iOSMaxSurfaceDimension, iOSMaxSurfaceDimension });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MachSendRight IOSurface::createSendRight() const
</span></span></pre>
</div>
</div>
</body>
</html>