<!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>[166349] 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/166349">166349</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-27 00:11:40 -0700 (Thu, 27 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/166296">r166296</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/166331">r166331</a>.
https://bugs.webkit.org/show_bug.cgi?id=130822
caused some crashes and frequent assertion failures, and the
fix is going to take a little while (Requested by thorton on
#webkit).
Reverted changesets:
"[iOS WebKit2] Flush all surfaces after painting into all of
them, instead of after painting into each one"
https://bugs.webkit.org/show_bug.cgi?id=130768
http://trac.webkit.org/changeset/166296
Source/WebCore:
"Assertion failure in RemoteLayerBackingStore::flush"
https://bugs.webkit.org/show_bug.cgi?id=130810
http://trac.webkit.org/changeset/166331
Source/WebKit2:
"Assertion failure in RemoteLayerBackingStore::flush"
https://bugs.webkit.org/show_bug.cgi?id=130810
http://trac.webkit.org/changeset/166331</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaIOSurfaceh">trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerBackingStoreh">trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerBackingStoremm">trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166348 => 166349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-27 06:50:40 UTC (rev 166348)
+++ trunk/Source/WebCore/ChangeLog 2014-03-27 07:11:40 UTC (rev 166349)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-03-27 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r166296 and r166331.
+ https://bugs.webkit.org/show_bug.cgi?id=130822
+
+ caused some crashes and frequent assertion failures, and the
+ fix is going to take a little while (Requested by thorton on
+ #webkit).
+
+ Reverted changesets:
+
+ "[iOS WebKit2] Flush all surfaces after painting into all of
+ them, instead of after painting into each one"
+ https://bugs.webkit.org/show_bug.cgi?id=130768
+ http://trac.webkit.org/changeset/166296
+
+ "Assertion failure in RemoteLayerBackingStore::flush"
+ https://bugs.webkit.org/show_bug.cgi?id=130810
+ http://trac.webkit.org/changeset/166331
+
</ins><span class="cx"> 2014-03-26 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix failing scrolling tests by reverting to previous behavior where
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaIOSurfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h (166348 => 166349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h 2014-03-27 06:50:40 UTC (rev 166348)
+++ trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h 2014-03-27 07:11:40 UTC (rev 166349)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx"> IOSurfaceRef surface() const { return m_surface.get(); }
</span><span class="cx"> GraphicsContext& ensureGraphicsContext();
</span><span class="cx"> CGContextRef ensurePlatformContext();
</span><del>- CGContextRef platformContext() { return m_cgContext.get(); }
</del><span class="cx">
</span><span class="cx"> enum class SurfaceState {
</span><span class="cx"> Valid,
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (166348 => 166349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-27 06:50:40 UTC (rev 166348)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-27 07:11:40 UTC (rev 166349)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-03-27 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r166296 and r166331.
+ https://bugs.webkit.org/show_bug.cgi?id=130822
+
+ caused some crashes and frequent assertion failures, and the
+ fix is going to take a little while (Requested by thorton on
+ #webkit).
+
+ Reverted changesets:
+
+ "[iOS WebKit2] Flush all surfaces after painting into all of
+ them, instead of after painting into each one"
+ https://bugs.webkit.org/show_bug.cgi?id=130768
+ http://trac.webkit.org/changeset/166296
+
+ "Assertion failure in RemoteLayerBackingStore::flush"
+ https://bugs.webkit.org/show_bug.cgi?id=130810
+ http://trac.webkit.org/changeset/166331
+
</ins><span class="cx"> 2014-03-26 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Blind speculative iOS build fix.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h (166348 => 166349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h 2014-03-27 06:50:40 UTC (rev 166348)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h 2014-03-27 07:11:40 UTC (rev 166349)
</span><span class="lines">@@ -75,14 +75,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> return !!m_frontBuffer;
</span><span class="cx"> }
</span><del>-
- void flush();
-
</del><span class="cx"> private:
</span><span class="cx"> void drawInContext(WebCore::GraphicsContext&, CGImageRef frontImage);
</span><span class="cx">
</span><span class="cx"> RetainPtr<CGImageRef> createImageForFrontBuffer() const;
</span><del>- void clearBackingStore();
</del><span class="cx">
</span><span class="cx"> PlatformCALayerRemote* m_layer;
</span><span class="cx">
</span><span class="lines">@@ -93,10 +89,8 @@
</span><span class="cx"> WebCore::Region m_dirtyRegion;
</span><span class="cx">
</span><span class="cx"> RefPtr<ShareableBitmap> m_frontBuffer;
</span><del>- RetainPtr<CGContextRef> m_bufferContextPendingFlush;
</del><span class="cx"> #if USE(IOSURFACE)
</span><span class="cx"> RefPtr<WebCore::IOSurface> m_frontSurface;
</span><del>- RefPtr<WebCore::IOSurface> m_backSurfacePendingFlush;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool m_acceleratesDrawing;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerBackingStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm (166348 => 166349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2014-03-27 06:50:40 UTC (rev 166348)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2014-03-27 07:11:40 UTC (rev 166349)
</span><span class="lines">@@ -68,16 +68,9 @@
</span><span class="cx"> m_acceleratesDrawing = acceleratesDrawing;
</span><span class="cx"> m_isOpaque = isOpaque;
</span><span class="cx">
</span><del>- clearBackingStore();
-}
-
-void RemoteLayerBackingStore::clearBackingStore()
-{
</del><span class="cx"> #if USE(IOSURFACE)
</span><span class="cx"> m_frontSurface = nullptr;
</span><del>- m_backSurfacePendingFlush = nullptr;
</del><span class="cx"> #endif
</span><del>- m_bufferContextPendingFlush = nullptr;
</del><span class="cx"> m_frontBuffer = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -159,8 +152,6 @@
</span><span class="cx">
</span><span class="cx"> bool RemoteLayerBackingStore::display()
</span><span class="cx"> {
</span><del>- ASSERT(!m_bufferContextPendingFlush);
-
</del><span class="cx"> if (!m_layer)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -168,7 +159,12 @@
</span><span class="cx"> // to note that our backing store has been cleared.
</span><span class="cx"> if (!m_layer->owner() || !m_layer->owner()->platformCALayerDrawsContent()) {
</span><span class="cx"> bool previouslyDrewContents = hasFrontBuffer();
</span><del>- clearBackingStore();
</del><ins>+
+ m_frontBuffer = nullptr;
+#if USE(IOSURFACE)
+ m_frontSurface = nullptr;
+#endif
+
</ins><span class="cx"> return previouslyDrewContents;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -188,7 +184,6 @@
</span><span class="cx"> IntSize expandedScaledSize = expandedIntSize(scaledSize);
</span><span class="cx">
</span><span class="cx"> #if USE(IOSURFACE)
</span><del>- ASSERT(!m_backSurfacePendingFlush);
</del><span class="cx"> if (m_acceleratesDrawing) {
</span><span class="cx"> RefPtr<IOSurface> backSurface = IOSurface::create(expandedScaledSize, ColorSpaceDeviceRGB);
</span><span class="cx"> GraphicsContext& context = backSurface->ensureGraphicsContext();
</span><span class="lines">@@ -201,11 +196,10 @@
</span><span class="cx"> frontImage = m_frontSurface->createImage();
</span><span class="cx"> drawInContext(context, frontImage.get());
</span><span class="cx">
</span><del>- // If our frontImage is derived from an IOSurface, we need to destroy the image before the
- // CGContext it's derived from, so that the context doesn't make a CPU copy of the surface data.
- // Since the flush will happen later, this means we need to hold on to the IOSurface
- // (and thus its context) until after the flush completes.
- m_backSurfacePendingFlush = m_frontSurface;
</del><ins>+ // If our frontImage is derived from an IOSurface, we need to
+ // destroy the image before the CGContext it's derived from,
+ // so that the context doesn't make a CPU copy of the surface data.
+ frontImage = nullptr;
</ins><span class="cx"> m_frontSurface = backSurface;
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -217,7 +211,6 @@
</span><span class="cx"> RetainPtr<CGImageRef> frontImage = createImageForFrontBuffer();
</span><span class="cx"> m_frontBuffer = ShareableBitmap::createShareable(expandedScaledSize, m_isOpaque ? ShareableBitmap::NoFlags : ShareableBitmap::SupportsAlpha);
</span><span class="cx"> std::unique_ptr<GraphicsContext> context = m_frontBuffer->createGraphicsContext();
</span><del>- m_bufferContextPendingFlush = context->platformContext();
</del><span class="cx"> drawInContext(*context, frontImage.get());
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -295,6 +288,8 @@
</span><span class="cx">
</span><span class="cx"> m_dirtyRegion = Region();
</span><span class="cx"> m_paintingRects.clear();
</span><ins>+
+ CGContextFlush(context.platformContext());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RemoteLayerBackingStore::enumerateRectsBeingDrawn(CGContextRef context, void (^block)(CGRect))
</span><span class="lines">@@ -314,37 +309,15 @@
</span><span class="cx">
</span><span class="cx"> void RemoteLayerBackingStore::applyBackingStoreToLayer(CALayer *layer)
</span><span class="cx"> {
</span><del>- layer.contentsOpaque = m_isOpaque;
-
</del><span class="cx"> #if USE(IOSURFACE)
</span><del>- if (acceleratesDrawing()) {
</del><ins>+ if (acceleratesDrawing())
</ins><span class="cx"> layer.contents = (id)m_frontSurface->surface();
</span><del>- return;
- }
-#endif
-
</del><ins>+ else
+ layer.contents = (id)createImageForFrontBuffer().get();
+#else
</ins><span class="cx"> ASSERT(!acceleratesDrawing());
</span><span class="cx"> layer.contents = (id)createImageForFrontBuffer().get();
</span><del>-}
-
-void RemoteLayerBackingStore::flush()
-{
-#if USE(IOSURFACE)
- if (acceleratesDrawing()) {
- if (m_frontSurface) {
- CGContextRef platformContext = m_frontSurface->platformContext();
- ASSERT(platformContext);
- CGContextFlush(platformContext);
- m_backSurfacePendingFlush = nullptr;
- }
- return;
- }
</del><span class="cx"> #endif
</span><span class="cx">
</span><del>- ASSERT(!acceleratesDrawing());
-
- if (m_bufferContextPendingFlush) {
- CGContextFlush(m_bufferContextPendingFlush.get());
- m_bufferContextPendingFlush = nullptr;
- }
</del><ins>+ layer.contentsOpaque = m_isOpaque;
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (166348 => 166349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2014-03-27 06:50:40 UTC (rev 166348)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2014-03-27 07:11:40 UTC (rev 166349)
</span><span class="lines">@@ -302,17 +302,6 @@
</span><span class="cx"> flushLayers();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void flushBackingStoreChangesInTransaction(RemoteLayerTreeTransaction& transaction)
-{
- for (auto& layerProperties : transaction.changedLayers().values()) {
- if (!layerProperties->changedProperties & RemoteLayerTreeTransaction::BackingStoreChanged)
- return;
-
- if (RemoteLayerBackingStore* backingStore = layerProperties->backingStore.get())
- backingStore->flush();
- }
-}
-
</del><span class="cx"> void RemoteLayerTreeDrawingArea::flushLayers()
</span><span class="cx"> {
</span><span class="cx"> if (!m_rootLayer)
</span><span class="lines">@@ -328,6 +317,8 @@
</span><span class="cx">
</span><span class="cx"> m_remoteLayerTreeContext->flushOutOfTreeLayers();
</span><span class="cx">
</span><ins>+ ASSERT(m_rootLayer);
+
</ins><span class="cx"> // FIXME: minize these transactions if nothing changed.
</span><span class="cx"> RemoteLayerTreeTransaction layerTransaction;
</span><span class="cx"> m_remoteLayerTreeContext->buildTransaction(layerTransaction, *m_rootLayer);
</span><span class="lines">@@ -339,9 +330,6 @@
</span><span class="cx"> toRemoteScrollingCoordinator(m_webPage->scrollingCoordinator())->buildTransaction(scrollingTransaction);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- // FIXME: Move flushing backing store and sending CommitLayerTree onto a background thread.
- flushBackingStoreChangesInTransaction(layerTransaction);
-
</del><span class="cx"> m_webPage->send(Messages::RemoteLayerTreeDrawingAreaProxy::CommitLayerTree(layerTransaction, scrollingTransaction));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>