Title: [201249] branches/safari-602.1.32-branch/Source/WebCore
Revision
201249
Author
[email protected]
Date
2016-05-22 09:51:40 -0700 (Sun, 22 May 2016)

Log Message

Merge r201233. rdar://problem/26397571

Modified Paths

Diff

Modified: branches/safari-602.1.32-branch/Source/WebCore/ChangeLog (201248 => 201249)


--- branches/safari-602.1.32-branch/Source/WebCore/ChangeLog	2016-05-22 16:45:17 UTC (rev 201248)
+++ branches/safari-602.1.32-branch/Source/WebCore/ChangeLog	2016-05-22 16:51:40 UTC (rev 201249)
@@ -1,3 +1,20 @@
+2016-05-22  Babak Shafiei  <[email protected]>
+
+        Merge r201233. rdar://problem/26397571
+
+    2016-05-20  Jer Noble  <[email protected]>
+
+            Inconsistent state in playback controls
+            https://bugs.webkit.org/show_bug.cgi?id=157962
+            <rdar://problem/26397571>
+
+            Reviewed by Beth Dakin.
+
+            Do not use the playbackSessionManager() as the model, that's what the model is for.
+
+            * platform/mac/WebPlaybackSessionInterfaceMac.mm:
+            (WebCore::WebPlaybackSessionInterfaceMac::setClient):
+
 2016-05-19  Babak Shafiei  <[email protected]>
 
         Merge r201187. rdar://problem/25314776

Modified: branches/safari-602.1.32-branch/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm (201248 => 201249)


--- branches/safari-602.1.32-branch/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm	2016-05-22 16:45:17 UTC (rev 201248)
+++ branches/safari-602.1.32-branch/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm	2016-05-22 16:51:40 UTC (rev 201249)
@@ -58,10 +58,8 @@
 {
     m_client = client;
 
-    if (m_client) {
-        float rate = [playBackControlsManager() rate];
-        m_client->rateChanged(!!rate, rate);
-    }
+    if (m_client && m_playbackSessionModel)
+        m_client->rateChanged(m_playbackSessionModel->isPlaying(), m_playbackSessionModel->playbackRate());
 }
 
 void WebPlaybackSessionInterfaceMac::setDuration(double duration)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to