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

Side by Side Diff: Source/core/page/Page.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/page/Frame.cpp ('k') | Source/core/page/Page.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) 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 bool hasSeenAnyMediaEngine() const; 322 bool hasSeenAnyMediaEngine() const;
323 void sawMediaEngine(const String& engineName); 323 void sawMediaEngine(const String& engineName);
324 void resetSeenMediaEngines(); 324 void resetSeenMediaEngines();
325 325
326 PageConsole* console() { return m_console.get(); } 326 PageConsole* console() { return m_console.get(); }
327 327
328 #if ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING) 328 #if ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
329 void hiddenPageDOMTimerThrottlingStateChanged(); 329 void hiddenPageDOMTimerThrottlingStateChanged();
330 #endif 330 #endif
331 331
332 void reportMemoryUsage(MemoryObjectInfo*) const;
333
334 void captionPreferencesChanged(); 332 void captionPreferencesChanged();
335 333
336 private: 334 private:
337 void initGroup(); 335 void initGroup();
338 336
339 #if ASSERT_DISABLED 337 #if ASSERT_DISABLED
340 void checkSubframeCountConsistency() const { } 338 void checkSubframeCountConsistency() const { }
341 #else 339 #else
342 void checkSubframeCountConsistency() const; 340 void checkSubframeCountConsistency() const;
343 #endif 341 #endif
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 bool m_scriptedAnimationsSuspended; 435 bool m_scriptedAnimationsSuspended;
438 OwnPtr<PageConsole> m_console; 436 OwnPtr<PageConsole> m_console;
439 437
440 HashSet<String> m_seenPlugins; 438 HashSet<String> m_seenPlugins;
441 HashSet<String> m_seenMediaEngines; 439 HashSet<String> m_seenMediaEngines;
442 }; 440 };
443 441
444 } // namespace WebCore 442 } // namespace WebCore
445 443
446 #endif // Page_h 444 #endif // Page_h
OLDNEW
« no previous file with comments | « Source/core/page/Frame.cpp ('k') | Source/core/page/Page.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698