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

Side by Side Diff: Source/core/rendering/RenderInline.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/RenderInline.h ('k') | Source/core/rendering/RenderLayer.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 22 matching lines...) Expand all
33 #include "RenderArena.h" 33 #include "RenderArena.h"
34 #include "RenderBlock.h" 34 #include "RenderBlock.h"
35 #include "RenderFlowThread.h" 35 #include "RenderFlowThread.h"
36 #include "RenderGeometryMap.h" 36 #include "RenderGeometryMap.h"
37 #include "RenderLayer.h" 37 #include "RenderLayer.h"
38 #include "RenderTheme.h" 38 #include "RenderTheme.h"
39 #include "RenderView.h" 39 #include "RenderView.h"
40 #include "StyleInheritedData.h" 40 #include "StyleInheritedData.h"
41 #include "TransformState.h" 41 #include "TransformState.h"
42 #include "VisiblePosition.h" 42 #include "VisiblePosition.h"
43 #include "WebCoreMemoryInstrumentation.h"
44 43
45 using namespace std; 44 using namespace std;
46 45
47 namespace WebCore { 46 namespace WebCore {
48 47
49 RenderInline::RenderInline(Element* element) 48 RenderInline::RenderInline(Element* element)
50 : RenderBoxModelObject(element) 49 : RenderBoxModelObject(element)
51 , m_alwaysCreateLineBoxes(false) 50 , m_alwaysCreateLineBoxes(false)
52 { 51 {
53 setChildrenInline(true); 52 setChildrenInline(true);
(...skipping 1516 matching lines...) Expand 10 before | Expand all | Expand 10 after
1570 if (!container) 1569 if (!container)
1571 container = this; 1570 container = this;
1572 1571
1573 FloatPoint absPos = container->localToAbsolute(); 1572 FloatPoint absPos = container->localToAbsolute();
1574 region.bounds.setX(absPos.x() + region.bounds.x()); 1573 region.bounds.setX(absPos.x() + region.bounds.x());
1575 region.bounds.setY(absPos.y() + region.bounds.y()); 1574 region.bounds.setY(absPos.y() + region.bounds.y());
1576 1575
1577 regions.append(region); 1576 regions.append(region);
1578 } 1577 }
1579 1578
1580 void RenderInline::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
1581 {
1582 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ;
1583 RenderBoxModelObject::reportMemoryUsage(memoryObjectInfo);
1584 info.addMember(m_children, "children");
1585 info.addMember(m_lineBoxes, "lineBoxes");
1586 }
1587
1588 } // namespace WebCore 1579 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderInline.h ('k') | Source/core/rendering/RenderLayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698