Changeset 133671 in webkit

Timestamp:

Nov 6, 2012 2:12:14 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Remove branch from inside RenderObject::view now that renderer() is more expensive
​https://bugs.webkit.org/show_bug.cgi?id=101277

Patch by Elliott Sprehn <​esprehn@chromium.org> on 2012-11-06
Reviewed by Eric Seidel.

It was observed in Bug 100057 that calling renderer() repeatedly now that it has a branch
can be a performance regression. Now that we no longer keep a separate pointer for rare data
in Document, we can use that space for a pointer to the RenderView making RenderObject::view()
faster and removing the branch.

This is a 1% improvement on Parser/html5-full-render.html

This also cleans up the code because it turns out we don't need to have RenderObject::view() in
RenderView.h because we can just call Document::renderView() and not do toRenderView. This makes
it easier to find this method as it exists in the right header file now.

No new tests, this is just a refactor.

• WebCore.exp.in: Remove export of Document::renderView since it's inline now.
• dom/Document.cpp:

(WebCore::Document::Document):
(WebCore::Document::setRenderer):
(WebCore):

• dom/Document.h:

(WebCore::Document::renderView):
(Document):

• rendering/RenderObject.h:

(WebCore::RenderObject::view):

• rendering/RenderView.h:

(WebCore):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.exp.in (modified) (1 diff)
• dom/Document.cpp (modified) (3 diffs)
• dom/Document.h (modified) (2 diffs)
• rendering/RenderObject.h (modified) (1 diff)
• rendering/RenderView.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-06  Elliott Sprehn  <esprehn@chromium.org>
+
+        Remove branch from inside RenderObject::view now that renderer() is more expensive
+        https://bugs.webkit.org/show_bug.cgi?id=101277
+
+        Reviewed by Eric Seidel.
+
+        It was observed in Bug 100057 that calling renderer() repeatedly now that it has a branch
+        can be a performance regression. Now that we no longer keep a separate pointer for rare data
+        in Document, we can use that space for a pointer to the RenderView making RenderObject::view()
+        faster and removing the branch.
+
+        This is a 1% improvement on Parser/html5-full-render.html
+
+        This also cleans up the code because it turns out we don't need to have RenderObject::view() in
+        RenderView.h because we can just call Document::renderView() and not do toRenderView. This makes
+        it easier to find this method as it exists in the right header file now.
+
+        No new tests, this is just a refactor.
+
+        * WebCore.exp.in: Remove export of Document::renderView since it's inline now.
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        (WebCore::Document::setRenderer):
+        (WebCore):
+        * dom/Document.h:
+        (WebCore::Document::renderView):
+        (Document):
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::view):
+        * rendering/RenderView.h:
+        (WebCore):
+
 2012-11-06  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -1448 +1448 @@
 __ZNK7WebCore7IntRectcv6CGRectEv
 __ZNK7WebCore7RunLoop9TimerBase8isActiveEv
-__ZNK7WebCore8Document10renderViewEv
 __ZNK7WebCore8Document11completeURLERKN3WTF6StringE
 __ZNK7WebCore8Document13axObjectCacheEv

trunk/Source/WebCore/dom/Document.cpp

@@ -479 +479 @@
     , m_sawElementsInKnownNamespaces(false)
     , m_isSrcdocDocument(false)
+    , m_renderView(0)
     , m_eventQueue(DocumentEventQueue::create(this))
     , m_weakReference(DocumentWeakReference::create(this))
@@ -2055 +2056 @@
 }
 
+void Document::setRenderer(RenderObject* renderer)
+{
+    m_renderView = toRenderView(renderer);
+    Node::setRenderer(renderer);
+}
+
 void Document::attach()
 {
@@ -2197 +2204 @@
         controller->resumeEventsForAllListeners(domWindow());
 #endif
-}
-
-RenderView* Document::renderView() const
-{
-    return toRenderView(renderer());
 }
 

trunk/Source/WebCore/dom/Document.h

@@ -557 +557 @@
     RenderArena* renderArena() { return m_renderArena.get(); }
 
-    RenderView* renderView() const;
+    RenderView* renderView() const { return m_renderView; }
+    void setRenderer(RenderObject*);
 
     void clearAXObjectCache();
@@ -1436 +1437 @@
     bool m_isSrcdocDocument;
 
+    RenderView* m_renderView;
     RefPtr<DocumentEventQueue> m_eventQueue;
 

trunk/Source/WebCore/rendering/RenderObject.h

@@ -616 +616 @@
     virtual void updateDragState(bool dragOn);
 
-    // Inlined into RenderView.h for performance and to avoid a cyclic dependency.
-    RenderView* view() const;
+    RenderView* view() const { return document()->renderView(); };
 
     // Returns true if this renderer is rooted, and optionally returns the hosting view (the root of the hierarchy).

trunk/Source/WebCore/rendering/RenderView.h

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