Changeset 87639 in webkit

Timestamp:

May 29, 2011 12:00:11 PM (13 years ago)

Author:

Darin Adler

Message:

​https://bugs.webkit.org/show_bug.cgi?id=61700
Need WebKit2 API to get the size of the render tree
-and corresponding-
<rdar://problem/9512733>

Patch by Beth Dakin <Beth Dakin> on 2011-05-29
Reviewed by Darin Adler.

New member variable on RenderArena keeps track of the current amount of memory
allocated in the arena. The new client function sends this piece of data to
WebKit.

• page/ChromeClient.h:

(WebCore::ChromeClient::setRenderTreeSize):

• page/FrameView.cpp:

(WebCore::FrameView::performPostLayoutTasks):

• rendering/RenderArena.cpp:

(WebCore::RenderArena::RenderArena):
(WebCore::RenderArena::allocate):
(WebCore::RenderArena::free):

• rendering/RenderArena.h:

(WebCore::RenderArena::totalRenderArenaSize):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/ChromeClient.h (modified) (1 diff)
• page/FrameView.cpp (modified) (2 diffs)
• rendering/RenderArena.cpp (modified) (3 diffs)
• rendering/RenderArena.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-29  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=61700
+        Need WebKit2 API to get the size of the render tree
+        -and corresponding-
+        <rdar://problem/9512733>
+
+        New member variable on RenderArena keeps track of the current amount of memory 
+        allocated in the arena. The new client function sends this piece of data to 
+        WebKit.
+        * page/ChromeClient.h:
+        (WebCore::ChromeClient::setRenderTreeSize):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::performPostLayoutTasks):
+        * rendering/RenderArena.cpp:
+        (WebCore::RenderArena::RenderArena):
+        (WebCore::RenderArena::allocate):
+        (WebCore::RenderArena::free):
+        * rendering/RenderArena.h:
+        (WebCore::RenderArena::totalRenderArenaSize):
+
 2011-05-29  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/page/ChromeClient.h

@@ -325 +325 @@
 
         virtual void numWheelEventHandlersChanged(unsigned) = 0;
+
+        virtual void setRenderTreeSize(size_t) { }
         
     protected:

trunk/Source/WebCore/page/FrameView.cpp

@@ -51 +51 @@
 #include "InspectorInstrumentation.h"
 #include "OverflowEvent.h"
+#include "RenderArena.h"
 #include "RenderEmbeddedObject.h"
 #include "RenderFullScreen.h"
@@ -2062 +2063 @@
         if (resized)
             m_frame->eventHandler()->sendResizeEvent();
+
+        if (Page* page = m_frame->page()) {
+            if (m_frame->page()->mainFrame() == m_frame)
+                page->chrome()->client()->setRenderTreeSize(m_frame->document()->renderArena()->totalRenderArenaSize());
+        }
     }
 }

trunk/Source/WebCore/rendering/RenderArena.cpp

@@ -67 +67 @@
     // Zero out the recyclers array
     memset(m_recyclers, 0, sizeof(m_recyclers));
+
+    m_totalSize = 0;
 }
 
@@ -76 +78 @@
 void* RenderArena::allocate(size_t size)
 {
+    m_totalSize += size;
+
 #ifndef NDEBUG
     // Use standard malloc so that memory debugging tools work.
@@ -114 +118 @@
 void RenderArena::free(size_t size, void* ptr)
 {
+    m_totalSize -= size;
+
 #ifndef NDEBUG
     // Use standard free so that memory debugging tools work.

trunk/Source/WebCore/rendering/RenderArena.h

@@ -54 +54 @@
     void free(size_t, void*);
 
+    size_t totalRenderArenaSize() const { return m_totalSize; }
+
 private:
     // Underlying arena pool
@@ -61 +63 @@
     // i.e., 0, 4, 8, 12, 16, 20, ...
     void* m_recyclers[gMaxRecycledSize >> 2];
+
+    size_t m_totalSize;
 };