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

Unified Diff: Source/modules/speech/SpeechSynthesis.cpp

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: Source/modules/speech/SpeechSynthesis.cpp
diff --git a/Source/modules/speech/SpeechSynthesis.cpp b/Source/modules/speech/SpeechSynthesis.cpp
index 5c60959595bc82f072253e395b84043edff84710..4bde0624e4fb2445a9678fcc189df7d38d666f1b 100644
--- a/Source/modules/speech/SpeechSynthesis.cpp
+++ b/Source/modules/speech/SpeechSynthesis.cpp
@@ -44,7 +44,7 @@ PassRefPtrWillBeRawPtr<SpeechSynthesis> SpeechSynthesis::create(ExecutionContext
SpeechSynthesis::SpeechSynthesis(ExecutionContext* context)
: ContextLifecycleObserver(context)
, m_platformSpeechSynthesizer(PlatformSpeechSynthesizer::create(this))
- , m_currentSpeechUtterance(0)
+ , m_currentSpeechUtterance(nullptr)
, m_isPaused(false)
{
ScriptWrappable::init(this);
@@ -130,7 +130,7 @@ void SpeechSynthesis::cancel()
RefPtrWillBeMember<SpeechSynthesisUtterance> current = m_currentSpeechUtterance;
m_utteranceQueue.clear();
m_platformSpeechSynthesizer->cancel();
- current = 0;
+ current = nullptr;
// The platform should have called back immediately and cleared the current utterance.
ASSERT(!m_currentSpeechUtterance);
@@ -159,7 +159,7 @@ void SpeechSynthesis::handleSpeakingCompleted(SpeechSynthesisUtterance* utteranc
{
ASSERT(utterance);
ASSERT(m_currentSpeechUtterance);
- m_currentSpeechUtterance = 0;
+ m_currentSpeechUtterance = nullptr;
fireEvent(errorOccurred ? EventTypeNames::error : EventTypeNames::end, utterance, 0, String());
« no previous file with comments | « Source/modules/speech/SpeechRecognitionEvent.cpp ('k') | Source/modules/speech/testing/PlatformSpeechSynthesizerMock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698