Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(577)

Side by Side Diff: Source/core/page/Page.cpp

Issue 20231002: Replace RenderArena with PartitionAlloc (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase. Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/page/Page.h ('k') | Source/core/platform/Arena.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All R ights Reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All R ights Reserved.
3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "core/page/FrameTree.h" 43 #include "core/page/FrameTree.h"
44 #include "core/page/FrameView.h" 44 #include "core/page/FrameView.h"
45 #include "core/page/PageConsole.h" 45 #include "core/page/PageConsole.h"
46 #include "core/page/PageGroup.h" 46 #include "core/page/PageGroup.h"
47 #include "core/page/PageLifecycleNotifier.h" 47 #include "core/page/PageLifecycleNotifier.h"
48 #include "core/page/PointerLockController.h" 48 #include "core/page/PointerLockController.h"
49 #include "core/page/Settings.h" 49 #include "core/page/Settings.h"
50 #include "core/page/scrolling/ScrollingCoordinator.h" 50 #include "core/page/scrolling/ScrollingCoordinator.h"
51 #include "core/platform/network/NetworkStateNotifier.h" 51 #include "core/platform/network/NetworkStateNotifier.h"
52 #include "core/plugins/PluginData.h" 52 #include "core/plugins/PluginData.h"
53 #include "core/rendering/RenderArena.h"
54 #include "core/rendering/RenderTheme.h" 53 #include "core/rendering/RenderTheme.h"
55 #include "core/rendering/RenderView.h" 54 #include "core/rendering/RenderView.h"
56 #include "core/storage/StorageNamespace.h" 55 #include "core/storage/StorageNamespace.h"
57 #include "wtf/HashMap.h" 56 #include "wtf/HashMap.h"
58 #include "wtf/RefCountedLeakCounter.h" 57 #include "wtf/RefCountedLeakCounter.h"
59 #include "wtf/StdLibExtras.h" 58 #include "wtf/StdLibExtras.h"
60 #include "wtf/text/Base64.h" 59 #include "wtf/text/Base64.h"
61 60
62 namespace WebCore { 61 namespace WebCore {
63 62
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 if (m_scrollingCoordinator) 156 if (m_scrollingCoordinator)
158 m_scrollingCoordinator->pageDestroyed(); 157 m_scrollingCoordinator->pageDestroyed();
159 158
160 backForward()->close(); 159 backForward()->close();
161 160
162 #ifndef NDEBUG 161 #ifndef NDEBUG
163 pageCounter.decrement(); 162 pageCounter.decrement();
164 #endif 163 #endif
165 } 164 }
166 165
167 ArenaSize Page::renderTreeSize() const
168 {
169 ArenaSize total(0, 0);
170 for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext( )) {
171 if (!frame->document())
172 continue;
173 if (RenderArena* arena = frame->document()->renderArena()) {
174 total.treeSize += arena->totalRenderArenaSize();
175 total.allocated += arena->totalRenderArenaAllocatedBytes();
176 }
177 }
178 return total;
179 }
180
181 ViewportArguments Page::viewportArguments() const 166 ViewportArguments Page::viewportArguments() const
182 { 167 {
183 return mainFrame() && mainFrame()->document() ? mainFrame()->document()->vie wportArguments() : ViewportArguments(); 168 return mainFrame() && mainFrame()->document() ? mainFrame()->document()->vie wportArguments() : ViewportArguments();
184 } 169 }
185 170
186 bool Page::autoscrollInProgress() const 171 bool Page::autoscrollInProgress() const
187 { 172 {
188 return m_autoscrollController->autoscrollInProgress(); 173 return m_autoscrollController->autoscrollInProgress();
189 } 174 }
190 175
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 , dragClient(0) 741 , dragClient(0)
757 , inspectorClient(0) 742 , inspectorClient(0)
758 { 743 {
759 } 744 }
760 745
761 Page::PageClients::~PageClients() 746 Page::PageClients::~PageClients()
762 { 747 {
763 } 748 }
764 749
765 } // namespace WebCore 750 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/page/Page.h ('k') | Source/core/platform/Arena.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698