Bug 1328058 - part2 : rename function. r=baku
☠☠ backed out by 8c32b1b8aa92 ☠ ☠
authorAlastor Wu <alwu@mozilla.com>
Fri, 03 Feb 2017 11:25:06 +0800
changeset 332390 b369d9999b8a7dcaf4809ff9697f03e47d0ef393
parent 332389 61dbcbe35565c51cbc50f1123bee7c383731cd7c
child 332391 0c177bdf5ec302d937f1c428e78c3ad2a96ed838
push id86521
push usercbook@mozilla.com
push dateFri, 03 Feb 2017 12:32:52 +0000
treeherdermozilla-inbound@d3774f2ebaf2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbaku
bugs1328058
milestone54.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1328058 - part2 : rename function. r=baku Rename function MaybeNotifyMediaBlocked() to MaybeNotifyMediaBlockStart(). MozReview-Commit-ID: CJyWiKKkpwd
dom/audiochannel/AudioChannelService.cpp
dom/audiochannel/AudioChannelService.h
--- a/dom/audiochannel/AudioChannelService.cpp
+++ b/dom/audiochannel/AudioChannelService.cpp
@@ -1365,17 +1365,17 @@ AudioChannelService::AudioChannelWindow:
   if (aAudible == AudibleState::eAudible) {
     AppendAudibleAgentIfNotContained(aAgent, aReason);
   } else {
     RemoveAudibleAgentIfContained(aAgent, aReason);
   }
 
   NotifyAudioCompetingChanged(aAgent, aAudible == AudibleState::eAudible);
   if (aAudible != AudibleState::eNotAudible) {
-    MaybeNotifyMediaBlocked(aAgent);
+    MaybeNotifyMediaBlockStart(aAgent);
   }
 }
 
 void
 AudioChannelService::AudioChannelWindow::AppendAudibleAgentIfNotContained(AudioChannelAgent* aAgent,
                                                                           AudibleChangedReasons aReason)
 {
   MOZ_ASSERT(aAgent);
@@ -1442,17 +1442,17 @@ AudioChannelService::AudioChannelWindow:
 {
   RefPtr<NotifyChannelActiveRunnable> runnable =
     new NotifyChannelActiveRunnable(aWindowID, aChannel, aActive);
   DebugOnly<nsresult> rv = NS_DispatchToCurrentThread(runnable);
   NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "NS_DispatchToCurrentThread failed");
 }
 
 void
-AudioChannelService::AudioChannelWindow::MaybeNotifyMediaBlocked(AudioChannelAgent* aAgent)
+AudioChannelService::AudioChannelWindow::MaybeNotifyMediaBlockStart(AudioChannelAgent* aAgent)
 {
   nsCOMPtr<nsPIDOMWindowOuter> window = aAgent->Window();
   if (!window) {
     return;
   }
 
   MOZ_ASSERT(window->IsOuterWindow());
   nsCOMPtr<nsPIDOMWindowInner> inner = window->GetCurrentInnerWindow();
--- a/dom/audiochannel/AudioChannelService.h
+++ b/dom/audiochannel/AudioChannelService.h
@@ -294,17 +294,17 @@ private:
     bool IsLastAudibleAgent() const;
 
     void NotifyAudioAudibleChanged(nsPIDOMWindowOuter* aWindow,
                                    AudibleState aAudible,
                                    AudibleChangedReasons aReason);
 
     void NotifyChannelActive(uint64_t aWindowID, AudioChannel aChannel,
                              bool aActive);
-    void MaybeNotifyMediaBlocked(AudioChannelAgent* aAgent);
+    void MaybeNotifyMediaBlockStart(AudioChannelAgent* aAgent);
 
     void RequestAudioFocus(AudioChannelAgent* aAgent);
     void NotifyAudioCompetingChanged(AudioChannelAgent* aAgent, bool aActive);
 
     uint32_t GetCompetingBehavior(AudioChannelAgent* aAgent,
                                   int32_t aIncomingChannelType,
                                   bool aIncomingChannelActive) const;
     bool IsAgentInvolvingInAudioCompeting(AudioChannelAgent* aAgent) const;