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

Side by Side Diff: Source/core/rendering/InlineBox.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/InlineBox.h ('k') | Source/core/rendering/InlineFlowBox.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 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007 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 11 matching lines...) Expand all
22 22
23 #include "FontMetrics.h" 23 #include "FontMetrics.h"
24 #include "Frame.h" 24 #include "Frame.h"
25 #include "HitTestResult.h" 25 #include "HitTestResult.h"
26 #include "InlineFlowBox.h" 26 #include "InlineFlowBox.h"
27 #include "Page.h" 27 #include "Page.h"
28 #include "PaintInfo.h" 28 #include "PaintInfo.h"
29 #include "RenderArena.h" 29 #include "RenderArena.h"
30 #include "RenderBlock.h" 30 #include "RenderBlock.h"
31 #include "RootInlineBox.h" 31 #include "RootInlineBox.h"
32 #include "WebCoreMemoryInstrumentation.h"
33 32
34 #ifndef NDEBUG 33 #ifndef NDEBUG
35 #include <stdio.h> 34 #include <stdio.h>
36 #endif 35 #endif
37 36
38 using namespace std; 37 using namespace std;
39 38
40 namespace WebCore { 39 namespace WebCore {
41 40
42 struct SameSizeAsInlineBox { 41 struct SameSizeAsInlineBox {
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 root()->block()->flipForWritingMode(rect); 384 root()->block()->flipForWritingMode(rect);
386 } 385 }
387 386
388 LayoutPoint InlineBox::flipForWritingMode(const LayoutPoint& point) 387 LayoutPoint InlineBox::flipForWritingMode(const LayoutPoint& point)
389 { 388 {
390 if (!renderer()->style()->isFlippedBlocksWritingMode()) 389 if (!renderer()->style()->isFlippedBlocksWritingMode())
391 return point; 390 return point;
392 return root()->block()->flipForWritingMode(point); 391 return root()->block()->flipForWritingMode(point);
393 } 392 }
394 393
395 void InlineBox::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
396 {
397 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Rendering);
398 info.addMember(m_next, "next");
399 info.addMember(m_prev, "prev");
400 info.addMember(m_parent, "parent");
401 info.addMember(m_renderer, "renderer");
402
403 info.setCustomAllocation(true);
404 }
405
406 } // namespace WebCore 394 } // namespace WebCore
407 395
408 #ifndef NDEBUG 396 #ifndef NDEBUG
409 397
410 void showTree(const WebCore::InlineBox* b) 398 void showTree(const WebCore::InlineBox* b)
411 { 399 {
412 if (b) 400 if (b)
413 b->showTreeForThis(); 401 b->showTreeForThis();
414 } 402 }
415 403
416 void showLineTree(const WebCore::InlineBox* b) 404 void showLineTree(const WebCore::InlineBox* b)
417 { 405 {
418 if (b) 406 if (b)
419 b->showLineTreeForThis(); 407 b->showLineTreeForThis();
420 } 408 }
421 409
422 #endif 410 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/InlineBox.h ('k') | Source/core/rendering/InlineFlowBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698