<!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>[198875] trunk/Source/WebCore</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/198875">198875</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-03-30 19:07:47 -0700 (Wed, 30 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS WK2] Avoid creating tiles that are too large for rendering
https://bugs.webkit.org/show_bug.cgi?id=156050
rdar://problem/25424541
Reviewed by Darin Adler.
In the case of a WKWebView which is sized large enough to show an entire document
(for example, when enclosed inside a UIScrollView), we would create tiles that were
larger than CoreAnimation was willing to deal with.
* platform/graphics/ca/TileController.cpp:
(WebCore::TileController::tileSize): Take the device scale, and the max IOSurface size
into account when computing the max tile size.
* platform/graphics/cocoa/IOSurface.mm:
(IOSurface::maximumSize): CoreAnimation imposes limits in addition to the size reported
by IOSurfaceGetPropertyMaximum(), namely an 8k cap, so mimic that here.
(IOSurface::ensurePlatformContext): Typo.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebCoreplatformgraphicscocoaIOSurfacemm">trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198874 => 198875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-31 02:07:17 UTC (rev 198874)
+++ trunk/Source/WebCore/ChangeLog 2016-03-31 02:07:47 UTC (rev 198875)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-03-30 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS WK2] Avoid creating tiles that are too large for rendering
+ https://bugs.webkit.org/show_bug.cgi?id=156050
+ rdar://problem/25424541
+
+ Reviewed by Darin Adler.
+
+ In the case of a WKWebView which is sized large enough to show an entire document
+ (for example, when enclosed inside a UIScrollView), we would create tiles that were
+ larger than CoreAnimation was willing to deal with.
+
+ * platform/graphics/ca/TileController.cpp:
+ (WebCore::TileController::tileSize): Take the device scale, and the max IOSurface size
+ into account when computing the max tile size.
+ * platform/graphics/cocoa/IOSurface.mm:
+ (IOSurface::maximumSize): CoreAnimation imposes limits in addition to the size reported
+ by IOSurfaceGetPropertyMaximum(), namely an 8k cap, so mimic that here.
+ (IOSurface::ensurePlatformContext): Typo.
+
</ins><span class="cx"> 2016-03-30 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> [EFL][CMake] WebKit include path has been added to system include path
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileController.cpp (198874 => 198875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileController.cpp 2016-03-31 02:07:17 UTC (rev 198874)
+++ trunk/Source/WebCore/platform/graphics/ca/TileController.cpp 2016-03-31 02:07:47 UTC (rev 198875)
</span><span class="lines">@@ -36,6 +36,10 @@
</span><span class="cx"> #include <utility>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><ins>+#if USE(IOSURFACE)
+#include "IOSurface.h"
+#endif
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include "MemoryPressureHandler.h"
</span><span class="cx"> #include "TileControllerMemoryHandlerIOS.h"
</span><span class="lines">@@ -489,16 +493,23 @@
</span><span class="cx"> if (m_inLiveResize || m_tileSizeLocked)
</span><span class="cx"> return tileGrid().tileSize();
</span><span class="cx">
</span><ins>+ IntSize maxTileSize(kGiantTileSize, kGiantTileSize);
+#if USE(IOSURFACE)
+ IntSize surfaceSizeLimit = IOSurface::maximumSize();
+ surfaceSizeLimit.scale(1 / m_deviceScaleFactor);
+ maxTileSize = maxTileSize.shrunkTo(surfaceSizeLimit);
+#endif
+
</ins><span class="cx"> if (owningGraphicsLayer()->platformCALayerUseGiantTiles())
</span><del>- return IntSize(kGiantTileSize, kGiantTileSize);
</del><ins>+ return maxTileSize;
</ins><span class="cx">
</span><span class="cx"> IntSize tileSize(kDefaultTileSize, kDefaultTileSize);
</span><span class="cx">
</span><span class="cx"> if (m_scrollability == NotScrollable) {
</span><span class="cx"> IntSize scaledSize = expandedIntSize(boundsWithoutMargin().size() * tileGrid().scale());
</span><del>- tileSize = scaledSize.constrainedBetween(IntSize(kDefaultTileSize, kDefaultTileSize), IntSize(kGiantTileSize, kGiantTileSize));
</del><ins>+ tileSize = scaledSize.constrainedBetween(IntSize(kDefaultTileSize, kDefaultTileSize), maxTileSize);
</ins><span class="cx"> } else if (m_scrollability == VerticallyScrollable)
</span><del>- tileSize.setWidth(std::min(std::max<int>(ceilf(boundsWithoutMargin().width() * tileGrid().scale()), kDefaultTileSize), kGiantTileSize));
</del><ins>+ tileSize.setWidth(std::min(std::max<int>(ceilf(boundsWithoutMargin().width() * tileGrid().scale()), kDefaultTileSize), maxTileSize.width()));
</ins><span class="cx">
</span><span class="cx"> LOG_WITH_STREAM(Scrolling, stream << "TileController::tileSize newSize=" << tileSize);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaIOSurfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm (198874 => 198875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2016-03-31 02:07:17 UTC (rev 198874)
+++ trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2016-03-31 02:07:47 UTC (rev 198875)
</span><span class="lines">@@ -239,7 +239,13 @@
</span><span class="cx">
</span><span class="cx"> IntSize IOSurface::maximumSize()
</span><span class="cx"> {
</span><del>- return IntSize(IOSurfaceGetPropertyMaximum(kIOSurfaceWidth), IOSurfaceGetPropertyMaximum(kIOSurfaceHeight));
</del><ins>+ IntSize maxSize(IOSurfaceGetPropertyMaximum(kIOSurfaceWidth), IOSurfaceGetPropertyMaximum(kIOSurfaceHeight));
+#if PLATFORM(IOS)
+ // Match limits imposed by CA. FIXME: should have API for this <rdar://problem/25454148>
+ const int iOSMaxSurfaceDimension = 8 * 1024;
+ maxSize = maxSize.shrunkTo({ iOSMaxSurfaceDimension, iOSMaxSurfaceDimension });
+#endif
+ return maxSize;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MachSendRight IOSurface::createSendRight() const
</span><span class="lines">@@ -288,7 +294,7 @@
</span><span class="cx"> case Format::RGB10:
</span><span class="cx"> case Format::RGB10A8:
</span><span class="cx"> // A half-float format will be used if CG needs to read back the IOSurface contents,
</span><del>- // but for an IOSurface-to-IOSurface copy, there shoud be no conversion.
</del><ins>+ // but for an IOSurface-to-IOSurface copy, there should be no conversion.
</ins><span class="cx"> bitsPerComponent = 16;
</span><span class="cx"> bitsPerPixel = 64;
</span><span class="cx"> bitmapInfo = kCGImageAlphaPremultipliedLast | kCGBitmapByteOrder16Host | kCGBitmapFloatComponents;
</span></span></pre>
</div>
</div>
</body>
</html>