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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

Issue 2014483003: Rename OwnPtr::clear() to reset() in core/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
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 3100 matching lines...) Expand 10 before | Expand all | Expand 10 after
3111 { 3111 {
3112 m_progressEventTimer.stop(); 3112 m_progressEventTimer.stop();
3113 m_playbackProgressTimer.stop(); 3113 m_playbackProgressTimer.stop();
3114 } 3114 }
3115 3115
3116 void HTMLMediaElement::clearMediaPlayerAndAudioSourceProviderClientWithoutLockin g() 3116 void HTMLMediaElement::clearMediaPlayerAndAudioSourceProviderClientWithoutLockin g()
3117 { 3117 {
3118 getAudioSourceProvider().setClient(nullptr); 3118 getAudioSourceProvider().setClient(nullptr);
3119 if (m_webMediaPlayer) { 3119 if (m_webMediaPlayer) {
3120 m_audioSourceProvider.wrap(nullptr); 3120 m_audioSourceProvider.wrap(nullptr);
3121 m_webMediaPlayer.clear(); 3121 m_webMediaPlayer.reset();
3122 } 3122 }
3123 } 3123 }
3124 3124
3125 void HTMLMediaElement::clearMediaPlayer() 3125 void HTMLMediaElement::clearMediaPlayer()
3126 { 3126 {
3127 forgetResourceSpecificTracks(); 3127 forgetResourceSpecificTracks();
3128 3128
3129 closeMediaSource(); 3129 closeMediaSource();
3130 3130
3131 cancelDeferredLoad(); 3131 cancelDeferredLoad();
(...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after
3878 3878
3879 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co nst 3879 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co nst
3880 { 3880 {
3881 IntRect result; 3881 IntRect result;
3882 if (LayoutObject* object = m_element->layoutObject()) 3882 if (LayoutObject* object = m_element->layoutObject())
3883 result = object->absoluteBoundingBoxRect(); 3883 result = object->absoluteBoundingBoxRect();
3884 return result; 3884 return result;
3885 } 3885 }
3886 3886
3887 } // namespace blink 3887 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698