<!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>[169790] 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/169790">169790</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-10 20:35:43 -0700 (Tue, 10 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reduce the overhead of updating the animatable style on ARMv7
https://bugs.webkit.org/show_bug.cgi?id=133618
Reviewed by Simon Fraser.
While updating the style for animations, most of the time spent was pure calling overhead.
This patch should reduce this a bit on ARMv7:
1) Get the frame directly from the document instead of document->view->framview->frame.
2) Inline RenderObject::animation(). This is just 3 loads, setting up the registers on the call
site is more expensive than loading the values directly.
3) Inline RenderElement::setAnimatableStyle(). It has only one call site and the call is mostly
overhead.
* css/CSSComputedStyleDeclaration.cpp:
* rendering/RenderElement.cpp:
(WebCore::RenderElement::setAnimatableStyle): Deleted.
* rendering/RenderElement.h:
(WebCore::RenderElement::setAnimatableStyle):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::adjustRectForOutlineAndShadow):
(WebCore::RenderObject::animation): Deleted.
* rendering/RenderObject.h:
(WebCore::RenderObject::animation):
* rendering/RenderView.h:
(WebCore::RenderObject::frame):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</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 (169789 => 169790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-11 03:09:22 UTC (rev 169789)
+++ trunk/Source/WebCore/ChangeLog 2014-06-11 03:35:43 UTC (rev 169790)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-06-10 Benjamin Poulain <benjamin@webkit.org>
+
+ Reduce the overhead of updating the animatable style on ARMv7
+ https://bugs.webkit.org/show_bug.cgi?id=133618
+
+ Reviewed by Simon Fraser.
+
+ While updating the style for animations, most of the time spent was pure calling overhead.
+
+ This patch should reduce this a bit on ARMv7:
+ 1) Get the frame directly from the document instead of document->view->framview->frame.
+ 2) Inline RenderObject::animation(). This is just 3 loads, setting up the registers on the call
+ site is more expensive than loading the values directly.
+ 3) Inline RenderElement::setAnimatableStyle(). It has only one call site and the call is mostly
+ overhead.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::setAnimatableStyle): Deleted.
+ * rendering/RenderElement.h:
+ (WebCore::RenderElement::setAnimatableStyle):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::adjustRectForOutlineAndShadow):
+ (WebCore::RenderObject::animation): Deleted.
+ * rendering/RenderObject.h:
+ (WebCore::RenderObject::animation):
+ * rendering/RenderView.h:
+ (WebCore::RenderObject::frame):
+
</ins><span class="cx"> 2014-06-10 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Don't create a HashTable for JSObjects that use eager reification
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (169789 => 169790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2014-06-11 03:09:22 UTC (rev 169789)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2014-06-11 03:35:43 UTC (rev 169790)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #include "RenderElement.h"
</span><span class="cx">
</span><span class="cx"> #include "AXObjectCache.h"
</span><del>-#include "AnimationController.h"
</del><span class="cx"> #include "ContentData.h"
</span><span class="cx"> #include "ControlStates.h"
</span><span class="cx"> #include "CursorList.h"
</span><span class="lines">@@ -463,11 +462,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderElement::setAnimatableStyle(PassRef<RenderStyle> style)
-{
- setStyle(animation().updateAnimations(*this, std::move(style)));
-}
-
</del><span class="cx"> void RenderElement::addChild(RenderObject* newChild, RenderObject* beforeChild)
</span><span class="cx"> {
</span><span class="cx"> bool needsTable = false;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (169789 => 169790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h 2014-06-11 03:09:22 UTC (rev 169789)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2014-06-11 03:35:43 UTC (rev 169790)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> #ifndef RenderElement_h
</span><span class="cx"> #define RenderElement_h
</span><span class="cx">
</span><ins>+#include "AnimationController.h"
</ins><span class="cx"> #include "RenderObject.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -244,6 +245,11 @@
</span><span class="cx">
</span><span class="cx"> RENDER_OBJECT_TYPE_CASTS(RenderElement, isRenderElement())
</span><span class="cx">
</span><ins>+inline void RenderElement::setAnimatableStyle(PassRef<RenderStyle> style)
+{
+ setStyle(animation().updateAnimations(*this, std::move(style)));
+}
+
</ins><span class="cx"> inline RenderStyle& RenderElement::firstLineStyle() const
</span><span class="cx"> {
</span><span class="cx"> return document().styleSheetCollection().usesFirstLineRules() ? *cachedFirstLineStyle() : style();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (169789 => 169790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2014-06-11 03:09:22 UTC (rev 169789)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2014-06-11 03:35:43 UTC (rev 169790)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #include "FloatQuad.h"
</span><span class="cx"> #include "FlowThreadController.h"
</span><span class="cx"> #include "FocusController.h"
</span><del>-#include "Frame.h"
</del><span class="cx"> #include "FrameSelection.h"
</span><span class="cx"> #include "FrameView.h"
</span><span class="cx"> #include "GeometryUtilities.h"
</span><span class="lines">@@ -2315,11 +2314,6 @@
</span><span class="cx"> rect.inflate(outlineSize);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-AnimationController& RenderObject::animation() const
-{
- return frame().animation();
-}
-
</del><span class="cx"> void RenderObject::imageChanged(CachedImage* image, const IntRect* rect)
</span><span class="cx"> {
</span><span class="cx"> imageChanged(static_cast<WrappedImagePtr>(image), rect);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (169789 => 169790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2014-06-11 03:09:22 UTC (rev 169789)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2014-06-11 03:35:43 UTC (rev 169790)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "DocumentStyleSheetCollection.h"
</span><span class="cx"> #include "Element.h"
</span><span class="cx"> #include "FloatQuad.h"
</span><ins>+#include "Frame.h"
</ins><span class="cx"> #include "LayoutRect.h"
</span><span class="cx"> #include "PaintPhase.h"
</span><span class="cx"> #include "RenderStyle.h"
</span><span class="lines">@@ -1033,6 +1034,16 @@
</span><span class="cx"> template <typename Type> bool isRendererOfType(const RenderObject&);
</span><span class="cx"> template <> inline bool isRendererOfType<const RenderObject>(const RenderObject&) { return true; }
</span><span class="cx">
</span><ins>+inline Frame& RenderObject::frame() const
+{
+ return *document().frame();
+}
+
+inline AnimationController& RenderObject::animation() const
+{
+ return frame().animation();
+}
+
</ins><span class="cx"> inline bool RenderObject::documentBeingDestroyed() const
</span><span class="cx"> {
</span><span class="cx"> return document().renderTreeBeingDestroyed();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (169789 => 169790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h 2014-06-11 03:09:22 UTC (rev 169789)
+++ trunk/Source/WebCore/rendering/RenderView.h 2014-06-11 03:35:43 UTC (rev 169790)
</span><span class="lines">@@ -456,11 +456,6 @@
</span><span class="cx"> RenderView* m_view;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline Frame& RenderObject::frame() const
-{
- return view().frameView().frame();
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // RenderView_h
</span></span></pre>
</div>
</div>
</body>
</html>