<!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>[168434] trunk</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/168434">168434</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-05-07 11:49:26 -0700 (Wed, 07 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebKit1 is flashy when compositing layers come and go
https://bugs.webkit.org/show_bug.cgi?id=132655
Source/WebKit/mac:
Reviewed by Sam Weinig.
In <a href="http://trac.webkit.org/projects/webkit/changeset/166117">r166117</a> I removed code to flush compositing layers in FrameView::paintContents(),
which caused problems when painting iframes. However, this removed a flush
that WebKit1 relied on to flush compositing layers when painting, which caused
flashing when compositing layers come and go, and broke WebView snapshotting
in some cases.
Fix by adding back compositing layer flushing, but this time in WebKit1's
-viewWillDraw code path. This allows removal of some flushing in DumpRenderTree.
* WebView/WebHTMLView.mm:
(-[WebHTMLView viewWillDraw]):
* WebView/WebView.mm:
(-[WebView _flushCompositingChanges]):
* WebView/WebViewInternal.h:
* WebView/WebViewPrivate.h:
Tools:
<rdar://problem/16830981&16788846>
Reviewed by Sam Weinig.
Revert the change from <a href="http://trac.webkit.org/projects/webkit/changeset/166117">r166117</a>.
* DumpRenderTree/mac/DumpRenderTree.mm:
(updateDisplay):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewInternalh">trunk/Source/WebKit/mac/WebView/WebViewInternal.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewPrivateh">trunk/Source/WebKit/mac/WebView/WebViewPrivate.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (168433 => 168434)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-05-07 18:42:53 UTC (rev 168433)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-05-07 18:49:26 UTC (rev 168434)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-05-07 Simon Fraser <simon.fraser@apple.com>
+
+ WebKit1 is flashy when compositing layers come and go
+ https://bugs.webkit.org/show_bug.cgi?id=132655
+
+ Reviewed by Sam Weinig.
+
+ In r166117 I removed code to flush compositing layers in FrameView::paintContents(),
+ which caused problems when painting iframes. However, this removed a flush
+ that WebKit1 relied on to flush compositing layers when painting, which caused
+ flashing when compositing layers come and go, and broke WebView snapshotting
+ in some cases.
+
+ Fix by adding back compositing layer flushing, but this time in WebKit1's
+ -viewWillDraw code path. This allows removal of some flushing in DumpRenderTree.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView viewWillDraw]):
+ * WebView/WebView.mm:
+ (-[WebView _flushCompositingChanges]):
+ * WebView/WebViewInternal.h:
+ * WebView/WebViewPrivate.h:
+
</ins><span class="cx"> 2014-05-07 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CSS Grid Layout] Remove runtime feature
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (168433 => 168434)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-05-07 18:42:53 UTC (rev 168433)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-05-07 18:49:26 UTC (rev 168434)
</span><span class="lines">@@ -1394,8 +1394,10 @@
</span><span class="cx"> // On window close we will be called when the datasource is nil, then hit an assert in _topHTMLView
</span><span class="cx"> // So check if the dataSource is nil before calling [self _isTopHTMLView], this can be removed
</span><span class="cx"> // once the FIXME in _isTopHTMLView is fixed.
</span><del>- if (_private->dataSource && [self _isTopHTMLView])
</del><ins>+ if (_private->dataSource && [self _isTopHTMLView]) {
</ins><span class="cx"> [self _web_updateLayoutAndStyleIfNeededRecursive];
</span><ins>+ [[self _webView] _flushCompositingChanges];
+ }
</ins><span class="cx">
</span><span class="cx"> [super viewWillDraw];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (168433 => 168434)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-05-07 18:42:53 UTC (rev 168433)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-05-07 18:49:26 UTC (rev 168434)
</span><span class="lines">@@ -3870,15 +3870,6 @@
</span><span class="cx"> return NO;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)_flushCompositingChanges
-{
- Frame* frame = [self _mainCoreFrame];
- if (frame && frame->view())
- return frame->view()->flushCompositingStateIncludingSubframes();
-
- return YES;
-}
-
</del><span class="cx"> - (void)_setBaseCTM:(CGAffineTransform)transform forContext:(CGContextRef)context
</span><span class="cx"> {
</span><span class="cx"> WKSetBaseCTM(context, transform);
</span><span class="lines">@@ -8420,6 +8411,15 @@
</span><span class="cx"> _private->layerFlushController->scheduleLayerFlush();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)_flushCompositingChanges
+{
+ Frame* frame = [self _mainCoreFrame];
+ if (frame && frame->view())
+ return frame->view()->flushCompositingStateIncludingSubframes();
+
+ return YES;
+}
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> - (void)_scheduleLayerFlushForPendingTileCacheRepaint
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewInternal.h (168433 => 168434)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewInternal.h 2014-05-07 18:42:53 UTC (rev 168433)
+++ trunk/Source/WebKit/mac/WebView/WebViewInternal.h 2014-05-07 18:49:26 UTC (rev 168434)
</span><span class="lines">@@ -102,6 +102,7 @@
</span><span class="cx"> - (BOOL)_needsOneShotDrawingSynchronization;
</span><span class="cx"> - (void)_setNeedsOneShotDrawingSynchronization:(BOOL)needsSynchronization;
</span><span class="cx"> - (void)_scheduleCompositingLayerFlush;
</span><ins>+- (BOOL)_flushCompositingChanges;
</ins><span class="cx">
</span><span class="cx"> #if USE(GLIB)
</span><span class="cx"> - (void)_scheduleGlibContextIterations;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewPrivate.h (168433 => 168434)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2014-05-07 18:42:53 UTC (rev 168433)
+++ trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2014-05-07 18:49:26 UTC (rev 168434)
</span><span class="lines">@@ -771,7 +771,6 @@
</span><span class="cx"> - (BOOL)_postsAcceleratedCompositingNotifications;
</span><span class="cx"> - (void)_setPostsAcceleratedCompositingNotifications:(BOOL)flag;
</span><span class="cx"> - (BOOL)_isUsingAcceleratedCompositing;
</span><del>-- (BOOL)_flushCompositingChanges;
</del><span class="cx"> - (void)_setBaseCTM:(CGAffineTransform)transform forContext:(CGContextRef)context;
</span><span class="cx">
</span><span class="cx"> // For DumpRenderTree
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (168433 => 168434)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-05-07 18:42:53 UTC (rev 168433)
+++ trunk/Tools/ChangeLog 2014-05-07 18:49:26 UTC (rev 168434)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-05-07 Simon Fraser <simon.fraser@apple.com>
+
+ WebKit1 is flashy when compositing layers come and go
+ https://bugs.webkit.org/show_bug.cgi?id=132655
+ <rdar://problem/16830981&16788846>
+
+ Reviewed by Sam Weinig.
+
+ Revert the change from r166117.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (updateDisplay):
+
</ins><span class="cx"> 2014-05-07 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: AXSelectTextWithCriteria should support capitalize/lowercase/uppercase
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (168433 => 168434)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-05-07 18:42:53 UTC (rev 168433)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-05-07 18:49:26 UTC (rev 168434)
</span><span class="lines">@@ -1521,8 +1521,6 @@
</span><span class="cx"> [webView display];
</span><span class="cx"> else
</span><span class="cx"> [webView displayIfNeeded];
</span><del>-
- [webView _flushCompositingChanges];
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void dump()
</span></span></pre>
</div>
</div>
</body>
</html>