<!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>[162947] 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/162947">162947</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-01-28 11:40:05 -0800 (Tue, 28 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/162837">r162837</a>): 5% regression on html5-full-render and 3% regression in DoYouEvenBench
https://bugs.webkit.org/show_bug.cgi?id=127722
Reviewed by Darin Adler.
Accumulate repaint region in RendeView instead of flushing rects directly to the system.
* dom/Document.cpp:
(WebCore::Document::recalcStyle):
(WebCore::Document::updateLayout):
(WebCore::Document::topDocument):
Make less silly.
* page/FrameView.cpp:
(WebCore::FrameView::layout):
* rendering/RenderView.cpp:
(WebCore::RenderView::repaintViewRectangle):
(WebCore::RenderView::flushAccumulatedRepaintRegion):
(WebCore::RenderView::RepaintRegionAccumulator::RepaintRegionAccumulator):
(WebCore::RenderView::RepaintRegionAccumulator::~RepaintRegionAccumulator):
* rendering/RenderView.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewh">trunk/Source/WebCore/rendering/RenderView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162946 => 162947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-28 19:33:49 UTC (rev 162946)
+++ trunk/Source/WebCore/ChangeLog 2014-01-28 19:40:05 UTC (rev 162947)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-01-28 Antti Koivisto <antti@apple.com>
+
+ REGRESSION(r162837): 5% regression on html5-full-render and 3% regression in DoYouEvenBench
+ https://bugs.webkit.org/show_bug.cgi?id=127722
+
+ Reviewed by Darin Adler.
+
+ Accumulate repaint region in RendeView instead of flushing rects directly to the system.
+
+ * dom/Document.cpp:
+ (WebCore::Document::recalcStyle):
+ (WebCore::Document::updateLayout):
+ (WebCore::Document::topDocument):
+
+ Make less silly.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::layout):
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::repaintViewRectangle):
+ (WebCore::RenderView::flushAccumulatedRepaintRegion):
+ (WebCore::RenderView::RepaintRegionAccumulator::RepaintRegionAccumulator):
+ (WebCore::RenderView::RepaintRegionAccumulator::~RepaintRegionAccumulator):
+ * rendering/RenderView.h:
+
</ins><span class="cx"> 2014-01-28 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> HTMLMediaElement::m_platformLayerBorrowed is uninitialized.
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (162946 => 162947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-01-28 19:33:49 UTC (rev 162946)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-01-28 19:40:05 UTC (rev 162947)
</span><span class="lines">@@ -1720,6 +1720,8 @@
</span><span class="cx"> if (m_inStyleRecalc)
</span><span class="cx"> return; // Guard against re-entrancy. -dwh
</span><span class="cx">
</span><ins>+ RenderView::RepaintRegionAccumulator repaintRegionAccumulator(renderView());
+
</ins><span class="cx"> // FIXME: We should update style on our ancestor chain before proceeding (especially for seamless),
</span><span class="cx"> // however doing so currently causes several tests to crash, as Frame::setDocument calls Document::attach
</span><span class="cx"> // before setting the DOMWindow on the Frame, or the SecurityOrigin on the document. The attach, in turn
</span><span class="lines">@@ -1811,6 +1813,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ RenderView::RepaintRegionAccumulator repaintRegionAccumulator(renderView());
+
</ins><span class="cx"> if (Element* oe = ownerElement())
</span><span class="cx"> oe->document().updateLayout();
</span><span class="cx">
</span><span class="lines">@@ -4309,12 +4313,7 @@
</span><span class="cx">
</span><span class="cx"> Document* Document::topDocument() const
</span><span class="cx"> {
</span><del>- // FIXME: Why does this walk up owner elements instead using the frame tree as parentDocument does?
- // The frame tree even has a top() function.
- Document* document = const_cast<Document*>(this);
- while (Element* element = document->ownerElement())
- document = &element->document();
- return document;
</del><ins>+ return m_frame ? m_frame->mainFrame().document() : const_cast<Document*>(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Attr> Document::createAttribute(const String& name, ExceptionCode& ec)
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (162946 => 162947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-01-28 19:33:49 UTC (rev 162946)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-01-28 19:40:05 UTC (rev 162947)
</span><span class="lines">@@ -1276,6 +1276,7 @@
</span><span class="cx"> root->view().pushLayoutState(*root);
</span><span class="cx"> }
</span><span class="cx"> LayoutStateDisabler layoutStateDisabler(disableLayoutState ? &root->view() : 0);
</span><ins>+ RenderView::RepaintRegionAccumulator repaintRegionAccumulator(&root->view());
</ins><span class="cx">
</span><span class="cx"> ASSERT(m_layoutPhase == InPreLayout);
</span><span class="cx"> m_layoutPhase = InLayout;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (162946 => 162947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2014-01-28 19:33:49 UTC (rev 162946)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2014-01-28 19:40:05 UTC (rev 162947)
</span><span class="lines">@@ -605,35 +605,47 @@
</span><span class="cx"> repaint();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderView::repaintViewRectangle(const LayoutRect& ur, bool immediate) const
</del><ins>+void RenderView::repaintViewRectangle(const LayoutRect& repaintRect, bool immediate) const
</ins><span class="cx"> {
</span><del>- if (!shouldRepaint(ur))
</del><ins>+ // FIXME: Get rid of the 'immediate' argument. It only works on Mac WK1 and should never be used.
+ if (!shouldRepaint(repaintRect))
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- // We always just invalidate the root view, since we could be an iframe that is clipped out
- // or even invisible.
- Element* elt = document().ownerElement();
- if (!elt)
- frameView().repaintContentRectangle(pixelSnappedIntRect(ur), immediate);
- else if (RenderBox* obj = elt->renderBox()) {
- LayoutRect vr = viewRect();
</del><ins>+ if (auto ownerElement = document().ownerElement()) {
+ if (!ownerElement->renderer())
+ return;
+ auto& ownerBox = toRenderBox(*ownerElement->renderer());
+ LayoutRect viewRect = this->viewRect();
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // Don't clip using the visible rect since clipping is handled at a higher level on iPhone.
</span><del>- LayoutRect r = ur;
</del><ins>+ LayoutRect adjustedRect = repaintRect;
</ins><span class="cx"> #else
</span><del>- LayoutRect r = intersection(ur, vr);
</del><ins>+ LayoutRect adjustedRect = intersection(repaintRect, viewRect);
</ins><span class="cx"> #endif
</span><del>-
- // Subtract out the contentsX and contentsY offsets to get our coords within the viewing
- // rectangle.
- r.moveBy(-vr.location());
</del><ins>+ adjustedRect.moveBy(-viewRect.location());
+ adjustedRect.moveBy(ownerBox.contentBoxRect().location());
+ ownerBox.repaintRectangle(adjustedRect, immediate);
+ return;
+ }
</ins><span class="cx">
</span><del>- // FIXME: Hardcoded offsets here are not good.
- r.moveBy(obj->contentBoxRect().location());
- obj->repaintRectangle(r, immediate);
</del><ins>+ IntRect pixelSnappedRect = pixelSnappedIntRect(repaintRect);
+ if (!m_accumulatedRepaintRegion || immediate) {
+ frameView().repaintContentRectangle(pixelSnappedRect, immediate);
+ return;
</ins><span class="cx"> }
</span><ins>+ m_accumulatedRepaintRegion->unite(pixelSnappedRect);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderView::flushAccumulatedRepaintRegion() const
+{
+ ASSERT(!document().ownerElement());
+ ASSERT(m_accumulatedRepaintRegion);
+ auto repaintRects = m_accumulatedRepaintRegion->rects();
+ for (auto& rect : repaintRects)
+ frameView().repaintContentRectangle(rect, false);
+ m_accumulatedRepaintRegion = nullptr;
+}
+
</ins><span class="cx"> void RenderView::repaintRectangleInViewAndCompositedLayers(const LayoutRect& ur, bool immediate)
</span><span class="cx"> {
</span><span class="cx"> if (!shouldRepaint(ur))
</span><span class="lines">@@ -1253,4 +1265,23 @@
</span><span class="cx"> return *m_imageQualityController;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RenderView::RepaintRegionAccumulator::RepaintRegionAccumulator(RenderView* view)
+ : m_rootView(view ? view->document().topDocument()->renderView() : nullptr)
+{
+ if (!m_rootView)
+ return;
+ m_wasAccumulatingRepaintRegion = !!m_rootView->m_accumulatedRepaintRegion;
+ if (!m_wasAccumulatingRepaintRegion)
+ m_rootView->m_accumulatedRepaintRegion = std::make_unique<Region>();
+}
+
+RenderView::RepaintRegionAccumulator::~RepaintRegionAccumulator()
+{
+ if (!m_rootView)
+ return;
+ if (m_wasAccumulatingRepaintRegion)
+ return;
+ m_rootView->flushAccumulatedRepaintRegion();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (162946 => 162947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h 2014-01-28 19:33:49 UTC (rev 162946)
+++ trunk/Source/WebCore/rendering/RenderView.h 2014-01-28 19:40:05 UTC (rev 162947)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> #include "FrameView.h"
</span><span class="cx"> #include "LayoutState.h"
</span><span class="cx"> #include "PODFreeListArena.h"
</span><ins>+#include "Region.h"
</ins><span class="cx"> #include "RenderBlockFlow.h"
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -234,6 +235,17 @@
</span><span class="cx"> void didCreateRenderer() { ++m_rendererCount; }
</span><span class="cx"> void didDestroyRenderer() { --m_rendererCount; }
</span><span class="cx">
</span><ins>+ class RepaintRegionAccumulator {
+ WTF_MAKE_NONCOPYABLE(RepaintRegionAccumulator);
+ public:
+ RepaintRegionAccumulator(RenderView*);
+ ~RepaintRegionAccumulator();
+
+ private:
+ RenderView* m_rootView;
+ bool m_wasAccumulatingRepaintRegion;
+ };
+
</ins><span class="cx"> protected:
</span><span class="cx"> virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0) const override;
</span><span class="cx"> virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const override;
</span><span class="lines">@@ -247,6 +259,7 @@
</span><span class="cx"> virtual ColumnInfo::PaginationUnit paginationUnit() const override;
</span><span class="cx">
</span><span class="cx"> bool shouldRepaint(const LayoutRect&) const;
</span><ins>+ void flushAccumulatedRepaintRegion() const;
</ins><span class="cx">
</span><span class="cx"> // These functions may only be accessed by LayoutStateMaintainer.
</span><span class="cx"> bool pushLayoutState(RenderBox& renderer, const LayoutSize& offset, LayoutUnit pageHeight = 0, bool pageHeightChanged = false, ColumnInfo* colInfo = nullptr)
</span><span class="lines">@@ -303,6 +316,8 @@
</span><span class="cx">
</span><span class="cx"> uint64_t m_rendererCount;
</span><span class="cx">
</span><ins>+ mutable std::unique_ptr<Region> m_accumulatedRepaintRegion;
+
</ins><span class="cx"> // FIXME: Only used by embedded WebViews inside AppKit NSViews. Find a way to remove.
</span><span class="cx"> struct LegacyPrinting {
</span><span class="cx"> LegacyPrinting()
</span></span></pre>
</div>
</div>
</body>
</html>