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

Side by Side Diff: Source/core/rendering/RenderText.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/RenderText.h ('k') | Source/core/rendering/RenderView.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 * (C) 1999 Lars Knoll (knoll@kde.org) 2 * (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Dirk Mueller (mueller@kde.org) 3 * (C) 2000 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 25 matching lines...) Expand all
36 #include "RenderArena.h" 36 #include "RenderArena.h"
37 #include "RenderBlock.h" 37 #include "RenderBlock.h"
38 #include "RenderCombineText.h" 38 #include "RenderCombineText.h"
39 #include "RenderLayer.h" 39 #include "RenderLayer.h"
40 #include "RenderView.h" 40 #include "RenderView.h"
41 #include "Settings.h" 41 #include "Settings.h"
42 #include "Text.h" 42 #include "Text.h"
43 #include "TextBreakIterator.h" 43 #include "TextBreakIterator.h"
44 #include "TextResourceDecoder.h" 44 #include "TextResourceDecoder.h"
45 #include "VisiblePosition.h" 45 #include "VisiblePosition.h"
46 #include "WebCoreMemoryInstrumentation.h"
47 #include "break_lines.h" 46 #include "break_lines.h"
48 #include <wtf/text/StringBuffer.h> 47 #include <wtf/text/StringBuffer.h>
49 #include <wtf/unicode/CharacterNames.h> 48 #include <wtf/unicode/CharacterNames.h>
50 49
51 using namespace std; 50 using namespace std;
52 using namespace WTF; 51 using namespace WTF;
53 using namespace Unicode; 52 using namespace Unicode;
54 53
55 namespace WebCore { 54 namespace WebCore {
56 55
(...skipping 1859 matching lines...) Expand 10 before | Expand all | Expand 10 after
1916 gSecureTextTimers = new SecureTextTimerMap; 1915 gSecureTextTimers = new SecureTextTimerMap;
1917 1916
1918 SecureTextTimer* secureTextTimer = gSecureTextTimers->get(this); 1917 SecureTextTimer* secureTextTimer = gSecureTextTimers->get(this);
1919 if (!secureTextTimer) { 1918 if (!secureTextTimer) {
1920 secureTextTimer = new SecureTextTimer(this); 1919 secureTextTimer = new SecureTextTimer(this);
1921 gSecureTextTimers->add(this, secureTextTimer); 1920 gSecureTextTimers->add(this, secureTextTimer);
1922 } 1921 }
1923 secureTextTimer->restartWithNewText(lastTypedCharacterOffset); 1922 secureTextTimer->restartWithNewText(lastTypedCharacterOffset);
1924 } 1923 }
1925 1924
1926 void RenderText::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
1927 {
1928 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ;
1929 RenderObject::reportMemoryUsage(memoryObjectInfo);
1930 info.addMember(m_text, "text");
1931 info.addMember(m_firstTextBox, "firstTextBox");
1932 info.addMember(m_lastTextBox, "lastTextBox");
1933 }
1934
1935 } // namespace WebCore 1925 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderText.h ('k') | Source/core/rendering/RenderView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698