Make use of ContextClient in modules/speech/

third_party/WebKit/Source/modules/speech/SpeechSynthesis.cpp

 /*
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 19 matching lines @@
 #include "platform/speech/PlatformSpeechSynthesisVoice.h"
 #include "wtf/CurrentTime.h"
 
 namespace blink {
 
 SpeechSynthesis* SpeechSynthesis::create(ExecutionContext* context) {
   return new SpeechSynthesis(context);
 }
 
 SpeechSynthesis::SpeechSynthesis(ExecutionContext* context)
-    : m_executionContext(context),
+    : ContextClient(context),
       m_platformSpeechSynthesizer(PlatformSpeechSynthesizer::create(this)),
       m_isPaused(false) {}
 
 void SpeechSynthesis::setPlatformSynthesizer(
     PlatformSpeechSynthesizer* synthesizer) {
   m_platformSpeechSynthesizer = synthesizer;
 }
 
 void SpeechSynthesis::voicesDidChange() {
   m_voiceList.clear();
-  if (!m_executionContext->isContextDestroyed())
+  if (getExecutionContext())
     dispatchEvent(Event::create(EventTypeNames::voiceschanged));
 }
 
 const HeapVector<Member<SpeechSynthesisVoice>>& SpeechSynthesis::getVoices() {
   if (m_voiceList.size())
     return m_voiceList;
 
   // If the voiceList is empty, that's the cue to get the voices from the
   // platform again.
   const Vector<RefPtr<PlatformSpeechSynthesisVoice>>& platformVoices =
@@ skipping 57 matching lines @@
 void SpeechSynthesis::resume() {
   if (!currentSpeechUtterance())
     return;
   m_platformSpeechSynthesizer->resume();
 }
 
 void SpeechSynthesis::fireEvent(const AtomicString& type,
                                 SpeechSynthesisUtterance* utterance,
                                 unsigned long charIndex,
                                 const String& name) {
-  if (!m_executionContext->isContextDestroyed()) {
-    double elapsedTimeMillis =
-        (monotonicallyIncreasingTime() - utterance->startTime()) * 1000.0;
-    utterance->dispatchEvent(SpeechSynthesisEvent::create(
-        type, utterance, charIndex, elapsedTimeMillis, name));
-  }
+  if (!getExecutionContext())
+    return;
+
+  double elapsedTimeMillis =
+      (monotonicallyIncreasingTime() - utterance->startTime()) * 1000.0;
+  utterance->dispatchEvent(SpeechSynthesisEvent::create(
+      type, utterance, charIndex, elapsedTimeMillis, name));
 }
 
 void SpeechSynthesis::handleSpeakingCompleted(
     SpeechSynthesisUtterance* utterance,
     bool errorOccurred) {
   ASSERT(utterance);
 
   bool shouldStartSpeaking = false;
   // If the utterance that completed was the one we're currently speaking,
   // remove it from the queue and start speaking the next one.
@@ skipping 82 matching lines @@
     return nullptr;
 
   return m_utteranceQueue.first();
 }
 
 const AtomicString& SpeechSynthesis::interfaceName() const {
   return EventTargetNames::SpeechSynthesis;
 }
 
 DEFINE_TRACE(SpeechSynthesis) {
-  visitor->trace(m_executionContext);
   visitor->trace(m_platformSpeechSynthesizer);
   visitor->trace(m_voiceList);
   visitor->trace(m_utteranceQueue);
   PlatformSpeechSynthesizerClient::trace(visitor);
+  ContextClient::trace(visitor);
   EventTargetWithInlineData::trace(visitor);
 }
 
 }  // namespace blink