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

Side by Side Diff: Source/core/rendering/InlineFlowBox.cpp

Issue 13973026: remove memoryinstrumentation Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove the rest part of MemoryInstrumentation Created 7 years, 8 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/rendering/InlineFlowBox.h ('k') | Source/core/rendering/InlineTextBox.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) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
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 21 matching lines...) Expand all
32 #include "RenderInline.h" 32 #include "RenderInline.h"
33 #include "RenderLayer.h" 33 #include "RenderLayer.h"
34 #include "RenderListMarker.h" 34 #include "RenderListMarker.h"
35 #include "RenderRubyBase.h" 35 #include "RenderRubyBase.h"
36 #include "RenderRubyRun.h" 36 #include "RenderRubyRun.h"
37 #include "RenderRubyText.h" 37 #include "RenderRubyText.h"
38 #include "RenderTableCell.h" 38 #include "RenderTableCell.h"
39 #include "RenderView.h" 39 #include "RenderView.h"
40 #include "RootInlineBox.h" 40 #include "RootInlineBox.h"
41 #include "Text.h" 41 #include "Text.h"
42 #include "WebCoreMemoryInstrumentation.h"
43 42
44 #include <math.h> 43 #include <math.h>
45 44
46 using namespace std; 45 using namespace std;
47 46
48 namespace WebCore { 47 namespace WebCore {
49 48
50 struct SameSizeAsInlineFlowBox : public InlineBox { 49 struct SameSizeAsInlineFlowBox : public InlineBox {
51 void* pointers[5]; 50 void* pointers[5];
52 uint32_t bitfields : 23; 51 uint32_t bitfields : 23;
(...skipping 1586 matching lines...) Expand 10 before | Expand all | Expand 10 after
1639 ASSERT(child->parent() == this); 1638 ASSERT(child->parent() == this);
1640 ASSERT(child->prevOnLine() == prev); 1639 ASSERT(child->prevOnLine() == prev);
1641 prev = child; 1640 prev = child;
1642 } 1641 }
1643 ASSERT(prev == m_lastChild); 1642 ASSERT(prev == m_lastChild);
1644 #endif 1643 #endif
1645 } 1644 }
1646 1645
1647 #endif 1646 #endif
1648 1647
1649 void InlineFlowBox::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
1650 {
1651 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Rendering);
1652 InlineBox::reportMemoryUsage(memoryObjectInfo);
1653 info.addMember(m_overflow, "overflow");
1654 info.addMember(m_firstChild, "firstChild");
1655 info.addMember(m_lastChild, "lastChild");
1656 info.addMember(m_prevLineBox, "prevLineBox");
1657 info.addMember(m_nextLineBox, "nextLineBox");
1658 }
1659
1660 } // namespace WebCore 1648 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/InlineFlowBox.h ('k') | Source/core/rendering/InlineTextBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698