<!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>[168993] 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/168993">168993</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-05-17 03:08:47 -0700 (Sat, 17 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/166422">r166422</a>): All RenderBox objects grew 104 bytes from adding repaint timers.
<https://webkit.org/b/133027>
<rdar://problem/16867410>
Instead of storing a rarely-used repaint timer on every RenderBox, store one
on the RenderView, and keep a hash set of renderers needing repaint.
Renderers get a flag tracking whether they have a pending lazy repaint.
This way we can avoid hash lookups in the common case.
Also added a static assertion to catch RenderBox growing in the future.
Reviewed by Antti Koivisto.
* rendering/RenderBox.cpp:
(WebCore::SameSizeAsRenderBox::~SameSizeAsRenderBox):
(WebCore::RenderBox::RenderBox):
(WebCore::RenderBox::~RenderBox):
(WebCore::RenderBox::paintBoxDecorations):
(WebCore::RenderBox::layoutOverflowRectForPropagation):
* rendering/RenderBox.h:
* rendering/RenderElement.cpp:
(WebCore::RenderElement::RenderElement):
* rendering/RenderElement.h:
(WebCore::RenderElement::setRenderBoxNeedsLazyRepaint):
(WebCore::RenderElement::renderBoxNeedsLazyRepaint):
* rendering/RenderView.cpp:
(WebCore::RenderView::RenderView):
(WebCore::RenderView::scheduleLazyRepaint):
(WebCore::RenderView::unscheduleLazyRepaint):
(WebCore::RenderView::lazyRepaintTimerFired):
* rendering/RenderView.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxh">trunk/Source/WebCore/rendering/RenderBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementh">trunk/Source/WebCore/rendering/RenderElement.h</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 (168992 => 168993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-17 06:23:46 UTC (rev 168992)
+++ trunk/Source/WebCore/ChangeLog 2014-05-17 10:08:47 UTC (rev 168993)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2014-05-17 Andreas Kling <akling@apple.com>
+
+ REGRESSION (r166422): All RenderBox objects grew 104 bytes from adding repaint timers.
+ <https://webkit.org/b/133027>
+ <rdar://problem/16867410>
+
+ Instead of storing a rarely-used repaint timer on every RenderBox, store one
+ on the RenderView, and keep a hash set of renderers needing repaint.
+
+ Renderers get a flag tracking whether they have a pending lazy repaint.
+ This way we can avoid hash lookups in the common case.
+
+ Also added a static assertion to catch RenderBox growing in the future.
+
+ Reviewed by Antti Koivisto.
+
+ * rendering/RenderBox.cpp:
+ (WebCore::SameSizeAsRenderBox::~SameSizeAsRenderBox):
+ (WebCore::RenderBox::RenderBox):
+ (WebCore::RenderBox::~RenderBox):
+ (WebCore::RenderBox::paintBoxDecorations):
+ (WebCore::RenderBox::layoutOverflowRectForPropagation):
+ * rendering/RenderBox.h:
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::RenderElement):
+ * rendering/RenderElement.h:
+ (WebCore::RenderElement::setRenderBoxNeedsLazyRepaint):
+ (WebCore::RenderElement::renderBoxNeedsLazyRepaint):
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::RenderView):
+ (WebCore::RenderView::scheduleLazyRepaint):
+ (WebCore::RenderView::unscheduleLazyRepaint):
+ (WebCore::RenderView::lazyRepaintTimerFired):
+ * rendering/RenderView.h:
+
</ins><span class="cx"> 2014-05-16 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac][MSE] setCurrentTime() goes down fastSeek path in MediaPlayerPrivateMediaSourceAVFObjC.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (168992 => 168993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-05-17 06:23:46 UTC (rev 168992)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-05-17 10:08:47 UTC (rev 168993)
</span><span class="lines">@@ -67,6 +67,16 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+struct SameSizeAsRenderBox : public RenderBoxModelObject {
+ virtual ~SameSizeAsRenderBox() { }
+ LayoutRect frameRect;
+ LayoutBoxExtent marginBox;
+ LayoutUnit preferredLogicalWidths[2];
+ void* pointers[2];
+};
+
+COMPILE_ASSERT(sizeof(RenderBox) == sizeof(SameSizeAsRenderBox), RenderBox_should_stay_small);
+
</ins><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><span class="cx"> // Used by flexible boxes when flexing this element and by table cells.
</span><span class="lines">@@ -103,7 +113,6 @@
</span><span class="cx"> , m_minPreferredLogicalWidth(-1)
</span><span class="cx"> , m_maxPreferredLogicalWidth(-1)
</span><span class="cx"> , m_inlineBoxWrapper(0)
</span><del>- , m_repaintTimer(this, &RenderBox::repaintTimerFired)
</del><span class="cx"> {
</span><span class="cx"> setIsBox();
</span><span class="cx"> }
</span><span class="lines">@@ -113,14 +122,13 @@
</span><span class="cx"> , m_minPreferredLogicalWidth(-1)
</span><span class="cx"> , m_maxPreferredLogicalWidth(-1)
</span><span class="cx"> , m_inlineBoxWrapper(0)
</span><del>- , m_repaintTimer(this, &RenderBox::repaintTimerFired)
</del><span class="cx"> {
</span><span class="cx"> setIsBox();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderBox::~RenderBox()
</span><span class="cx"> {
</span><del>- m_repaintTimer.stop();
</del><ins>+ view().unscheduleLazyRepaint(*this);
</ins><span class="cx"> if (hasControlStatesForRenderer(this))
</span><span class="cx"> removeControlStatesForRenderer(this);
</span><span class="cx"> }
</span><span class="lines">@@ -1255,7 +1263,7 @@
</span><span class="cx"> bool themePainted = style().hasAppearance() && !theme().paint(*this, controlStates, paintInfo, paintRect);
</span><span class="cx">
</span><span class="cx"> if (controlStates && controlStates->needsRepaint())
</span><del>- m_repaintTimer.startOneShot(0);
</del><ins>+ view().scheduleLazyRepaint(*this);
</ins><span class="cx">
</span><span class="cx"> if (!themePainted) {
</span><span class="cx"> if (bleedAvoidance == BackgroundBleedBackgroundOverBorder)
</span><span class="lines">@@ -4781,10 +4789,4 @@
</span><span class="cx"> return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderBox::repaintTimerFired(Timer<RenderBox>&)
-{
- if (!document().inPageCache())
- this->repaint();
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (168992 => 168993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2014-05-17 06:23:46 UTC (rev 168992)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2014-05-17 10:08:47 UTC (rev 168993)
</span><span class="lines">@@ -723,12 +723,8 @@
</span><span class="cx"> RefPtr<RenderOverflow> m_overflow;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void repaintTimerFired(Timer<RenderBox>&);
-
</del><span class="cx"> // Used to store state between styleWillChange and styleDidChange
</span><span class="cx"> static bool s_hadOverflowClip;
</span><del>-
- Timer<RenderBox> m_repaintTimer;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> RENDER_OBJECT_TYPE_CASTS(RenderBox, isBox())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (168992 => 168993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2014-05-17 06:23:46 UTC (rev 168992)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2014-05-17 10:08:47 UTC (rev 168993)
</span><span class="lines">@@ -83,6 +83,7 @@
</span><span class="cx"> , m_ancestorLineBoxDirty(false)
</span><span class="cx"> , m_hasInitializedStyle(false)
</span><span class="cx"> , m_renderInlineAlwaysCreatesLineBoxes(false)
</span><ins>+ , m_renderBoxNeedsLazyRepaint(false)
</ins><span class="cx"> , m_hasPausedImageAnimations(false)
</span><span class="cx"> , m_firstChild(nullptr)
</span><span class="cx"> , m_lastChild(nullptr)
</span><span class="lines">@@ -96,6 +97,7 @@
</span><span class="cx"> , m_ancestorLineBoxDirty(false)
</span><span class="cx"> , m_hasInitializedStyle(false)
</span><span class="cx"> , m_renderInlineAlwaysCreatesLineBoxes(false)
</span><ins>+ , m_renderBoxNeedsLazyRepaint(false)
</ins><span class="cx"> , m_hasPausedImageAnimations(false)
</span><span class="cx"> , m_firstChild(nullptr)
</span><span class="cx"> , m_lastChild(nullptr)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (168992 => 168993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h 2014-05-17 06:23:46 UTC (rev 168992)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2014-05-17 10:08:47 UTC (rev 168993)
</span><span class="lines">@@ -155,6 +155,9 @@
</span><span class="cx">
</span><span class="cx"> RenderNamedFlowThread* renderNamedFlowThreadWrapper();
</span><span class="cx">
</span><ins>+ void setRenderBoxNeedsLazyRepaint(bool b) { m_renderBoxNeedsLazyRepaint = b; }
+ bool renderBoxNeedsLazyRepaint() const { return m_renderBoxNeedsLazyRepaint; }
+
</ins><span class="cx"> protected:
</span><span class="cx"> enum BaseTypeFlags {
</span><span class="cx"> RenderLayerModelObjectFlag = 1 << 0,
</span><span class="lines">@@ -224,6 +227,7 @@
</span><span class="cx"> bool m_hasInitializedStyle : 1;
</span><span class="cx">
</span><span class="cx"> bool m_renderInlineAlwaysCreatesLineBoxes : 1;
</span><ins>+ bool m_renderBoxNeedsLazyRepaint : 1;
</ins><span class="cx"> bool m_hasPausedImageAnimations : 1;
</span><span class="cx">
</span><span class="cx"> RenderObject* m_firstChild;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (168992 => 168993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2014-05-17 06:23:46 UTC (rev 168992)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2014-05-17 10:08:47 UTC (rev 168993)
</span><span class="lines">@@ -102,6 +102,7 @@
</span><span class="cx"> , m_selectionEndPos(-1)
</span><span class="cx"> , m_rendererCount(0)
</span><span class="cx"> , m_maximalOutlineSize(0)
</span><ins>+ , m_lazyRepaintTimer(this, &RenderView::lazyRepaintTimerFired)
</ins><span class="cx"> , m_pageLogicalHeight(0)
</span><span class="cx"> , m_pageLogicalHeightChanged(false)
</span><span class="cx"> , m_layoutState(nullptr)
</span><span class="lines">@@ -136,6 +137,38 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderView::scheduleLazyRepaint(RenderBox& renderer)
+{
+ if (renderer.renderBoxNeedsLazyRepaint())
+ return;
+ renderer.setRenderBoxNeedsLazyRepaint(true);
+ m_renderersNeedingLazyRepaint.add(&renderer);
+ if (!m_lazyRepaintTimer.isActive())
+ m_lazyRepaintTimer.startOneShot(0);
+}
+
+void RenderView::unscheduleLazyRepaint(RenderBox& renderer)
+{
+ if (!renderer.renderBoxNeedsLazyRepaint())
+ return;
+ renderer.setRenderBoxNeedsLazyRepaint(false);
+ m_renderersNeedingLazyRepaint.remove(&renderer);
+ if (m_renderersNeedingLazyRepaint.isEmpty())
+ m_lazyRepaintTimer.stop();
+}
+
+void RenderView::lazyRepaintTimerFired(Timer<RenderView>&)
+{
+ bool shouldRepaint = !document().inPageCache();
+
+ for (auto& renderer : m_renderersNeedingLazyRepaint) {
+ if (shouldRepaint)
+ renderer->repaint();
+ renderer->setRenderBoxNeedsLazyRepaint(false);
+ }
+ m_renderersNeedingLazyRepaint.clear();
+}
+
</ins><span class="cx"> bool RenderView::hitTest(const HitTestRequest& request, HitTestResult& result)
</span><span class="cx"> {
</span><span class="cx"> return hitTest(request, result.hitTestLocation(), result);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (168992 => 168993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h 2014-05-17 06:23:46 UTC (rev 168992)
+++ trunk/Source/WebCore/rendering/RenderView.h 2014-05-17 10:08:47 UTC (rev 168993)
</span><span class="lines">@@ -246,6 +246,9 @@
</span><span class="cx"> bool m_wasAccumulatingRepaintRegion;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ void scheduleLazyRepaint(RenderBox&);
+ void unscheduleLazyRepaint(RenderBox&);
+
</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">@@ -339,6 +342,11 @@
</span><span class="cx">
</span><span class="cx"> bool shouldUsePrintingLayout() const;
</span><span class="cx">
</span><ins>+ void lazyRepaintTimerFired(Timer<RenderView>&);
+
+ Timer<RenderView> m_lazyRepaintTimer;
+ HashSet<RenderBox*> m_renderersNeedingLazyRepaint;
+
</ins><span class="cx"> std::unique_ptr<ImageQualityController> m_imageQualityController;
</span><span class="cx"> LayoutUnit m_pageLogicalHeight;
</span><span class="cx"> bool m_pageLogicalHeightChanged;
</span></span></pre>
</div>
</div>
</body>
</html>