Changeset 102185 in webkit

Timestamp:

Dec 6, 2011, 3:38:37 PM (15 years ago)

Author:

jchaffraix@webkit.org

Message:

Inline RenderObject::view()
​https://bugs.webkit.org/show_bug.cgi?id=73733

Reviewed by Darin Adler.

Micro-performance optimization, no change in behavior.

RenderObject::view() is super hot and is taking ~4-5% of the time in some
benchmarks as it is called several hundred thousands times. For some reason,
the compiler did not inline it even though it is very simple in release builds.

• WebCore.exp.in: Removed RenderObject::view() as it is inlined now.

• rendering/RenderObject.cpp: Moved the implementation from here ...
• rendering/RenderView.h:

(WebCore::RenderObject::view): ... to here to avoid a cyclic
dependency between RenderObject and RenderView. Also marked the
function as ALWAYS_INLINE.

• rendering/RenderObject.h:
• rendering/svg/RenderSVGResourceContainer.cpp:

Added #include "RenderView.h" as the code checks for view() during repaint.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.exp.in (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (1 diff)
• rendering/RenderObject.h (modified) (1 diff)
• rendering/RenderView.h (modified) (1 diff)
• rendering/svg/RenderSVGResourceContainer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-06  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Inline RenderObject::view()
+        https://bugs.webkit.org/show_bug.cgi?id=73733
+
+        Reviewed by Darin Adler.
+
+        Micro-performance optimization, no change in behavior.
+
+        RenderObject::view() is super hot and is taking ~4-5% of the time in some
+        benchmarks as it is called several hundred thousands times. For some reason,
+        the compiler did not inline it even though it is very simple in release builds.
+
+        * WebCore.exp.in: Removed RenderObject::view() as it is inlined now.
+
+        * rendering/RenderObject.cpp: Moved the implementation from here ...
+        * rendering/RenderView.h:
+        (WebCore::RenderObject::view): ... to here to avoid a cyclic
+        dependency between RenderObject and RenderView. Also marked the
+        function as ALWAYS_INLINE.
+
+        * rendering/RenderObject.h:
+        * rendering/svg/RenderSVGResourceContainer.cpp:
+        Added #include "RenderView.h" as the code checks for view() during repaint.
+
 2011-12-06  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -1180 +1180 @@
 __ZNK7WebCore12RenderObject14enclosingLayerEv
 __ZNK7WebCore12RenderObject15localToAbsoluteERKNS_10FloatPointEbb
-__ZNK7WebCore12RenderObject4viewEv
 __ZNK7WebCore12RenderObject7childAtEj
 __ZNK7WebCore12RenderWidget14windowClipRectEv

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -2123 +2123 @@
 }
 
-RenderView* RenderObject::view() const
-{
-    return toRenderView(document()->renderer());
-}
-
 bool RenderObject::isRooted(RenderView** view)
 {

trunk/Source/WebCore/rendering/RenderObject.h

@@ -517 +517 @@
     virtual void updateDragState(bool dragOn);
 
+    // Inlined into RenderView.h for performance and to avoid a cyclic dependency.
     RenderView* view() const;
 

trunk/Source/WebCore/rendering/RenderView.h

@@ -292 +292 @@
 
 
+ALWAYS_INLINE RenderView* RenderObject::view() const
+{
+    return toRenderView(document()->renderer());
+}
+
 // Stack-based class to assist with LayoutState push/pop
 class LayoutStateMaintainer {

trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp

@@ -24 +24 @@
 
 #include "RenderSVGShadowTreeRootContainer.h"
+#include "RenderView.h"
 #include "SVGResourcesCache.h"
 #include "SVGStyledTransformableElement.h"