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

Side by Side Diff: Source/core/rendering/RenderBlock.h

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/InlineTextBox.cpp ('k') | Source/core/rendering/RenderBlock.cpp » ('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 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 void setExclusionShapeInsideInfo(PassOwnPtr<ExclusionShapeInsideInfo> value) 459 void setExclusionShapeInsideInfo(PassOwnPtr<ExclusionShapeInsideInfo> value)
460 { 460 {
461 if (!m_rareData) 461 if (!m_rareData)
462 m_rareData = adoptPtr(new RenderBlockRareData(this)); 462 m_rareData = adoptPtr(new RenderBlockRareData(this));
463 m_rareData->m_shapeInsideInfo = value; 463 m_rareData->m_shapeInsideInfo = value;
464 } 464 }
465 ExclusionShapeInsideInfo* layoutExclusionShapeInsideInfo() const; 465 ExclusionShapeInsideInfo* layoutExclusionShapeInsideInfo() const;
466 bool allowsExclusionShapeInsideInfoSharing() const { return !isInline() && ! isFloating(); } 466 bool allowsExclusionShapeInsideInfoSharing() const { return !isInline() && ! isFloating(); }
467 #endif 467 #endif
468 468
469 virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
470 static void reportStaticMembersMemoryUsage(MemoryInstrumentation*);
471
472 protected: 469 protected:
473 virtual void willBeDestroyed(); 470 virtual void willBeDestroyed();
474 471
475 LayoutUnit maxPositiveMarginBefore() const { return m_rareData ? m_rareData- >m_margins.positiveMarginBefore() : RenderBlockRareData::positiveMarginBeforeDef ault(this); } 472 LayoutUnit maxPositiveMarginBefore() const { return m_rareData ? m_rareData- >m_margins.positiveMarginBefore() : RenderBlockRareData::positiveMarginBeforeDef ault(this); }
476 LayoutUnit maxNegativeMarginBefore() const { return m_rareData ? m_rareData- >m_margins.negativeMarginBefore() : RenderBlockRareData::negativeMarginBeforeDef ault(this); } 473 LayoutUnit maxNegativeMarginBefore() const { return m_rareData ? m_rareData- >m_margins.negativeMarginBefore() : RenderBlockRareData::negativeMarginBeforeDef ault(this); }
477 LayoutUnit maxPositiveMarginAfter() const { return m_rareData ? m_rareData-> m_margins.positiveMarginAfter() : RenderBlockRareData::positiveMarginAfterDefaul t(this); } 474 LayoutUnit maxPositiveMarginAfter() const { return m_rareData ? m_rareData-> m_margins.positiveMarginAfter() : RenderBlockRareData::positiveMarginAfterDefaul t(this); }
478 LayoutUnit maxNegativeMarginAfter() const { return m_rareData ? m_rareData-> m_margins.negativeMarginAfter() : RenderBlockRareData::negativeMarginAfterDefaul t(this); } 475 LayoutUnit maxNegativeMarginAfter() const { return m_rareData ? m_rareData-> m_margins.negativeMarginAfter() : RenderBlockRareData::negativeMarginAfterDefaul t(this); }
479 476
480 void setMaxMarginBeforeValues(LayoutUnit pos, LayoutUnit neg); 477 void setMaxMarginBeforeValues(LayoutUnit pos, LayoutUnit neg);
481 void setMaxMarginAfterValues(LayoutUnit pos, LayoutUnit neg); 478 void setMaxMarginAfterValues(LayoutUnit pos, LayoutUnit neg);
(...skipping 843 matching lines...) Expand 10 before | Expand all | Expand 10 after
1325 static String string(const int value); 1322 static String string(const int value);
1326 }; 1323 };
1327 template<> struct ValueToString<RenderBlock::FloatingObject*> { 1324 template<> struct ValueToString<RenderBlock::FloatingObject*> {
1328 static String string(const RenderBlock::FloatingObject*); 1325 static String string(const RenderBlock::FloatingObject*);
1329 }; 1326 };
1330 #endif 1327 #endif
1331 1328
1332 } // namespace WebCore 1329 } // namespace WebCore
1333 1330
1334 #endif // RenderBlock_h 1331 #endif // RenderBlock_h
OLDNEW
« no previous file with comments | « Source/core/rendering/InlineTextBox.cpp ('k') | Source/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698