<!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>[174865] trunk/Source/WebKit/win</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/174865">174865</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-18 14:48:33 -0700 (Sat, 18 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WinCairo] Repaint issues with accelerated compositing.
https://bugs.webkit.org/show_bug.cgi?id=137850
Patch by peavo@outlook.com <peavo@outlook.com> on 2014-10-18
Reviewed by Brent Fulgham.
There is sometimes missing content in accelerated compositing mode.
This is caused by not invalidating the non composited layer,
and not rendering when a flush did not complete.
* WebCoreSupport/AcceleratedCompositingContext.cpp:
(AcceleratedCompositingContext::flushAndRenderLayers): Also render when flush did not complete.
(AcceleratedCompositingContext::setNeedsDisplayInRect): Deleted.
* WebCoreSupport/AcceleratedCompositingContext.h: Ditto.
* WebView.cpp:
(WebView::addToDirtyRegion): Invalidate non composited layer.
(WebView::flushPendingGraphicsLayerChanges): Flush layers.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportAcceleratedCompositingContextcpp">trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportAcceleratedCompositingContexth">trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.h</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (174864 => 174865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog        2014-10-18 19:04:31 UTC (rev 174864)
+++ trunk/Source/WebKit/win/ChangeLog        2014-10-18 21:48:33 UTC (rev 174865)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-10-18 peavo@outlook.com <peavo@outlook.com>
+
+ [WinCairo] Repaint issues with accelerated compositing.
+ https://bugs.webkit.org/show_bug.cgi?id=137850
+
+ Reviewed by Brent Fulgham.
+
+ There is sometimes missing content in accelerated compositing mode.
+ This is caused by not invalidating the non composited layer,
+ and not rendering when a flush did not complete.
+
+ * WebCoreSupport/AcceleratedCompositingContext.cpp:
+ (AcceleratedCompositingContext::flushAndRenderLayers): Also render when flush did not complete.
+ (AcceleratedCompositingContext::setNeedsDisplayInRect): Deleted.
+ * WebCoreSupport/AcceleratedCompositingContext.h: Ditto.
+ * WebView.cpp:
+ (WebView::addToDirtyRegion): Invalidate non composited layer.
+ (WebView::flushPendingGraphicsLayerChanges): Flush layers.
+
</ins><span class="cx"> 2014-10-17 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Use is<>() / downcast<>() for RenderBox
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportAcceleratedCompositingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp (174864 => 174865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp        2014-10-18 19:04:31 UTC (rev 174864)
+++ trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp        2014-10-18 21:48:33 UTC (rev 174865)
</span><span class="lines">@@ -216,18 +216,6 @@
</span><span class="cx"> scheduleLayerFlush();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AcceleratedCompositingContext::setNeedsDisplayInRect(const IntRect& rect)
-{
- if (!m_rootLayer)
- return;
- if (rect.isEmpty()) {
- m_rootLayer->setNeedsDisplay();
- return;
- }
- m_rootLayer->setNeedsDisplayInRect(rect);
- scheduleLayerFlush();
-}
-
</del><span class="cx"> void AcceleratedCompositingContext::resizeRootLayer(const IntSize& newSize)
</span><span class="cx"> {
</span><span class="cx"> if (!enabled())
</span><span class="lines">@@ -302,8 +290,7 @@
</span><span class="cx"> if (m_context && !m_context->makeContextCurrent())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!flushPendingLayerChanges())
- return;
</del><ins>+ flushPendingLayerChanges();
</ins><span class="cx">
</span><span class="cx"> compositeLayersToContext();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportAcceleratedCompositingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.h (174864 => 174865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.h        2014-10-18 19:04:31 UTC (rev 174864)
+++ trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.h        2014-10-18 21:48:33 UTC (rev 174865)
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx">
</span><span class="cx"> void setRootCompositingLayer(WebCore::GraphicsLayer*);
</span><span class="cx"> void setNonCompositedContentsNeedDisplay(const WebCore::IntRect&);
</span><del>- void setNeedsDisplayInRect(const WebCore::IntRect&);
</del><span class="cx"> void scheduleLayerFlush();
</span><span class="cx"> void resizeRootLayer(const WebCore::IntSize&);
</span><span class="cx"> bool enabled();
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (174864 => 174865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp        2014-10-18 19:04:31 UTC (rev 174864)
+++ trunk/Source/WebKit/win/WebView.cpp        2014-10-18 21:48:33 UTC (rev 174865)
</span><span class="lines">@@ -868,7 +868,7 @@
</span><span class="cx"> #if USE(CA)
</span><span class="cx"> m_backingLayer->setNeedsDisplayInRect(dirtyRect);
</span><span class="cx"> #elif USE(TEXTURE_MAPPER_GL)
</span><del>- m_acceleratedCompositingContext->setNeedsDisplayInRect(dirtyRect);
</del><ins>+ m_acceleratedCompositingContext->setNonCompositedContentsNeedDisplay(dirtyRect);
</ins><span class="cx"> #endif
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -6792,10 +6792,9 @@
</span><span class="cx"> FrameView* view = coreFrame->view();
</span><span class="cx"> if (!view)
</span><span class="cx"> return;
</span><del>-#if USE(CA)
- if (!m_backingLayer)
</del><ins>+
+ if (!isAcceleratedCompositing())
</ins><span class="cx"> return;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> view->updateLayoutAndStyleIfNeededRecursive();
</span><span class="cx">
</span><span class="lines">@@ -6803,9 +6802,12 @@
</span><span class="cx"> // Updating layout might have taken us out of compositing mode.
</span><span class="cx"> if (m_backingLayer)
</span><span class="cx"> m_backingLayer->flushCompositingStateForThisLayerOnly();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> view->flushCompositingStateIncludingSubframes();
</span><ins>+#elif USE(TEXTURE_MAPPER_GL)
+ if (isAcceleratedCompositing())
+ m_acceleratedCompositingContext->flushPendingLayerChanges();
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class EnumTextMatches : public IEnumTextMatches
</span></span></pre>
</div>
</div>
</body>
</html>