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

Side by Side Diff: Source/core/html/HTMLMediaElement.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/html/HTMLMediaElement.h ('k') | Source/core/html/HTMLTextFormControlElement.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) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 #include "RenderLayerCompositor.h" 74 #include "RenderLayerCompositor.h"
75 #include "RenderVideo.h" 75 #include "RenderVideo.h"
76 #include "RenderView.h" 76 #include "RenderView.h"
77 #include "ScriptController.h" 77 #include "ScriptController.h"
78 #include "ScriptEventListener.h" 78 #include "ScriptEventListener.h"
79 #include "SecurityOrigin.h" 79 #include "SecurityOrigin.h"
80 #include "SecurityPolicy.h" 80 #include "SecurityPolicy.h"
81 #include "Settings.h" 81 #include "Settings.h"
82 #include "ShadowRoot.h" 82 #include "ShadowRoot.h"
83 #include "TimeRanges.h" 83 #include "TimeRanges.h"
84 #include "WebCoreMemoryInstrumentation.h"
85 #include <limits> 84 #include <limits>
86 #include <wtf/CurrentTime.h> 85 #include <wtf/CurrentTime.h>
87 #include <wtf/MathExtras.h> 86 #include <wtf/MathExtras.h>
88 #include <wtf/MemoryInstrumentationVector.h>
89 #include <wtf/NonCopyingSort.h> 87 #include <wtf/NonCopyingSort.h>
90 #include <wtf/Uint8Array.h> 88 #include <wtf/Uint8Array.h>
91 #include <wtf/text/CString.h> 89 #include <wtf/text/CString.h>
92 90
93 #include "CaptionUserPreferences.h" 91 #include "CaptionUserPreferences.h"
94 #include "HTMLTrackElement.h" 92 #include "HTMLTrackElement.h"
95 #include "InbandTextTrack.h" 93 #include "InbandTextTrack.h"
96 #include "InbandTextTrackPrivate.h" 94 #include "InbandTextTrackPrivate.h"
97 #include "RuntimeEnabledFeatures.h" 95 #include "RuntimeEnabledFeatures.h"
98 #include "TextTrackCueList.h" 96 #include "TextTrackCueList.h"
(...skipping 4322 matching lines...) Expand 10 before | Expand all | Expand 10 after
4421 CachedResourceLoader* HTMLMediaElement::mediaPlayerCachedResourceLoader() 4419 CachedResourceLoader* HTMLMediaElement::mediaPlayerCachedResourceLoader()
4422 { 4420 {
4423 return mediaPlayerOwningDocument()->cachedResourceLoader(); 4421 return mediaPlayerOwningDocument()->cachedResourceLoader();
4424 } 4422 }
4425 4423
4426 void HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture() 4424 void HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture()
4427 { 4425 {
4428 m_restrictions = NoRestrictions; 4426 m_restrictions = NoRestrictions;
4429 } 4427 }
4430 4428
4431 void HTMLMediaElement::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) con st
4432 {
4433 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM);
4434 HTMLElement::reportMemoryUsage(memoryObjectInfo);
4435 ActiveDOMObject::reportMemoryUsage(memoryObjectInfo);
4436 info.addMember(m_loadTimer, "loadTimer");
4437 info.addMember(m_progressEventTimer, "progressEventTimer");
4438 info.addMember(m_playbackProgressTimer, "playbackProgressTimer");
4439 info.addMember(m_playedTimeRanges, "playedTimeRanges");
4440 info.addMember(m_asyncEventQueue, "asyncEventQueue");
4441 info.addMember(m_currentSrc, "currentSrc");
4442 info.addMember(m_error, "error");
4443 info.addMember(m_currentSourceNode, "currentSourceNode");
4444 info.addMember(m_nextChildNodeToConsider, "nextChildNodeToConsider");
4445 info.addMember(m_player, "player");
4446 info.addMember(m_mediaSource, "mediaSource");
4447 info.addMember(m_textTracks, "textTracks");
4448 info.addMember(m_textTracksWhenResourceSelectionBegan, "textTracksWhenResour ceSelectionBegan");
4449 info.addMember(m_cueTree, "cueTree");
4450 info.addMember(m_currentlyActiveCues, "currentlyActiveCues");
4451 info.addMember(m_mediaGroup, "mediaGroup");
4452 info.addMember(m_mediaController, "mediaController");
4453
4454 #if ENABLE(WEB_AUDIO)
4455 info.addMember(m_audioSourceNode, "audioSourceNode");
4456 #endif
4457
4458 }
4459
4460 } 4429 }
4461 #endif 4430 #endif
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMediaElement.h ('k') | Source/core/html/HTMLTextFormControlElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698