Changeset 207214 in webkit

Timestamp:

Oct 12, 2016 7:41:59 AM (8 years ago)

Author:

Chris Dumez

Message:

Stop using PassRefPtr in platform/efl
​https://bugs.webkit.org/show_bug.cgi?id=163321

Reviewed by Laszlo Gombos.

Stop using PassRefPtr in platform/efl.

• platform/efl/BatteryProviderEfl.cpp:

(WebCore::batteryProperties):
(WebCore::BatteryProviderEfl::setBatteryStatus):
(WebCore::BatteryProviderEfl::dispatchEvent):

• platform/efl/BatteryProviderEfl.h:
• platform/efl/BatteryProviderEflClient.h:
• platform/efl/PlatformSpeechSynthesisProviderEfl.cpp:

(WebCore::PlatformSpeechSynthesisProviderEfl::voiceName):
(WebCore::PlatformSpeechSynthesisProviderEfl::speak):

• platform/efl/PlatformSpeechSynthesisProviderEfl.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/efl/BatteryProviderEfl.cpp (modified) (2 diffs)
• WebCore/platform/efl/BatteryProviderEfl.h (modified) (1 diff)
• WebCore/platform/efl/BatteryProviderEflClient.h (modified) (1 diff)
• WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.cpp (modified) (2 diffs)
• WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.h (modified) (1 diff)
• WebKit2/UIProcess/efl/BatteryProvider.cpp (modified) (1 diff)
• WebKit2/UIProcess/efl/BatteryProvider.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-12  Chris Dumez  <cdumez@apple.com>
+
+        Stop using PassRefPtr in platform/efl
+        https://bugs.webkit.org/show_bug.cgi?id=163321
+
+        Reviewed by Laszlo Gombos.
+
+        Stop using PassRefPtr in platform/efl.
+
+        * platform/efl/BatteryProviderEfl.cpp:
+        (WebCore::batteryProperties):
+        (WebCore::BatteryProviderEfl::setBatteryStatus):
+        (WebCore::BatteryProviderEfl::dispatchEvent):
+        * platform/efl/BatteryProviderEfl.h:
+        * platform/efl/BatteryProviderEflClient.h:
+        * platform/efl/PlatformSpeechSynthesisProviderEfl.cpp:
+        (WebCore::PlatformSpeechSynthesisProviderEfl::voiceName):
+        (WebCore::PlatformSpeechSynthesisProviderEfl::speak):
+        * platform/efl/PlatformSpeechSynthesisProviderEfl.h:
+
 2016-10-12  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/platform/efl/BatteryProviderEfl.cpp

@@ -125 +125 @@
     }
 
-    RefPtr<BatteryStatus> batteryStatus = BatteryStatus::create(charging, chargingTime, dischargingTime, level / 100);
+    auto batteryStatus = BatteryStatus::create(charging, chargingTime, dischargingTime, level / 100);
+    client->setBatteryStatus(WTFMove(batteryStatus));
     if (chargingChanged)
-        client->setBatteryStatus(eventNames().chargingchangeEvent, batteryStatus);
+        client->dispatchEvent(eventNames().chargingchangeEvent);
     if (chargingTimeChanged)
-        client->setBatteryStatus(eventNames().chargingtimechangeEvent, batteryStatus);
+        client->dispatchEvent(eventNames().chargingtimechangeEvent);
     if (dischargingTimeChanged)
-        client->setBatteryStatus(eventNames().dischargingtimechangeEvent, batteryStatus);
+        client->dispatchEvent(eventNames().dischargingtimechangeEvent);
     if (levelChanged)
-        client->setBatteryStatus(eventNames().levelchangeEvent, batteryStatus);
+        client->dispatchEvent(eventNames().levelchangeEvent);
 }
 
@@ -220 +221 @@
 }
 
-void BatteryProviderEfl::setBatteryStatus(const AtomicString& eventType, PassRefPtr<BatteryStatus> batteryStatus)
-{
-    m_batteryStatus = batteryStatus;
-    m_client->didChangeBatteryStatus(eventType, m_batteryStatus);
+void BatteryProviderEfl::setBatteryStatus(Ref<BatteryStatus>&& batteryStatus)
+{
+    m_batteryStatus = WTFMove(batteryStatus);
+}
+
+void BatteryProviderEfl::dispatchEvent(const AtomicString& type)
+{
+    m_client->didChangeBatteryStatus(type, m_batteryStatus.copyRef());
 }
 

trunk/Source/WebCore/platform/efl/BatteryProviderEfl.h

@@ -40 +40 @@
     virtual void stopUpdating();
 
-    void setBatteryStatus(const AtomicString& eventType, PassRefPtr<BatteryStatus>);
+    void setBatteryStatus(Ref<BatteryStatus>&&);
     BatteryStatus* batteryStatus() const;
+
+    void dispatchEvent(const AtomicString& type);
 
 private:

trunk/Source/WebCore/platform/efl/BatteryProviderEflClient.h

@@ -31 +31 @@
 class BatteryProviderEflClient {
 public:
-    virtual void didChangeBatteryStatus(const AtomicString& eventType, PassRefPtr<BatteryStatus>) = 0;
+    virtual void didChangeBatteryStatus(const AtomicString& eventType, RefPtr<BatteryStatus>&&) = 0;
 };
 

trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.cpp

@@ -65 +65 @@
 }
 
-String PlatformSpeechSynthesisProviderEfl::voiceName(PassRefPtr<PlatformSpeechSynthesisUtterance> utterance) const
+String PlatformSpeechSynthesisProviderEfl::voiceName(PlatformSpeechSynthesisUtterance& utterance) const
 {
     if (!m_platformSpeechSynthesizer)
         return String();
 
-    if (!utterance->lang().isEmpty()) {
-        const String& language = utterance->lang();
+    if (!utterance.lang().isEmpty()) {
+        const String& language = utterance.lang();
         const Vector<RefPtr<PlatformSpeechSynthesisVoice>>& voiceList = m_platformSpeechSynthesizer->voiceList();
         for (const auto& voice : voiceList) {
@@ -145 +145 @@
 
     m_utterance = WTFMove(utterance);
-    String voice = voiceName(m_utterance);
+    String voice = voiceName(*m_utterance);
     espeak_SetVoiceByName(voice.utf8().data());
     espeak_SetParameter(espeakRATE, convertRateToEspeakValue(m_utterance->rate()), 0);

trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.h

@@ -66 +66 @@
 
     espeak_VOICE* currentVoice() const;
-    String voiceName(PassRefPtr<PlatformSpeechSynthesisUtterance>) const;
+    String voiceName(PlatformSpeechSynthesisUtterance&) const;
     void fireSpeechEvent(SpeechEvent);
 

trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.cpp

@@ -92 +92 @@
 }
 
-void BatteryProvider::didChangeBatteryStatus(const AtomicString& eventType, PassRefPtr<BatteryStatus> status)
+void BatteryProvider::didChangeBatteryStatus(const AtomicString& eventType, RefPtr<BatteryStatus>&& status)
 {
     WKRetainPtr<WKBatteryStatusRef> wkBatteryStatus = adoptWK(WKBatteryStatusCreate(status->charging(), status->chargingTime(), status->dischargingTime(), status->level()));

trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.h

@@ -50 +50 @@
 
     // BatteryProviderEflClient interface.
-    virtual void didChangeBatteryStatus(const AtomicString& eventType, PassRefPtr<WebCore::BatteryStatus>);
+    virtual void didChangeBatteryStatus(const AtomicString& eventType, RefPtr<WebCore::BatteryStatus>&&);
 
     WKRetainPtr<WKBatteryManagerRef> m_batteryManager;