[webkit-changes] [134268] trunk/Source/WebCore

[commit-queue]

Title: [134268] trunk/Source/WebCore

Revision

134268

Author

commit-qu...@webkit.org

Date

2012-11-12 11:28:03 -0800 (Mon, 12 Nov 2012)

Log Message

Unreviewed, rolling out r126157.
http://trac.webkit.org/changeset/126157
https://bugs.webkit.org/show_bug.cgi?id=101954

This patch caused (untestable) regression of the volume
property on Mac, Win, and Blackberry ports. (Requested by
jernoble on #webkit).

Patch by Sheriff Bot <webkit.review....@gmail.com> on 2012-11-12

* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::loadWithNextMediaEngine):
(WebCore::MediaPlayer::setVolume):
(WebCore::MediaPlayer::setMuted):
(WebCore::MediaPlayer::setPreservesPitch):
(WebCore::MediaPlayer::setSize):
(WebCore::MediaPlayer::setVisible):
(WebCore::MediaPlayer::setPreload):

Modified Paths

• trunk/Source/WebCore/ChangeLog
• trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp

Diff

Modified: trunk/Source/WebCore/ChangeLog (134267 => 134268)

--- trunk/Source/WebCore/ChangeLog	2012-11-12 19:24:52 UTC (rev 134267)
+++ trunk/Source/WebCore/ChangeLog	2012-11-12 19:28:03 UTC (rev 134268)
@@ -1,3 +1,22 @@
+2012-11-12  Sheriff Bot  <webkit.review....@gmail.com>
+
+        Unreviewed, rolling out r126157.
+        http://trac.webkit.org/changeset/126157
+        https://bugs.webkit.org/show_bug.cgi?id=101954
+
+        This patch caused (untestable) regression of the volume
+        property on Mac, Win, and Blackberry ports. (Requested by
+        jernoble on #webkit).
+
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::MediaPlayer::loadWithNextMediaEngine):
+        (WebCore::MediaPlayer::setVolume):
+        (WebCore::MediaPlayer::setMuted):
+        (WebCore::MediaPlayer::setPreservesPitch):
+        (WebCore::MediaPlayer::setSize):
+        (WebCore::MediaPlayer::setVisible):
+        (WebCore::MediaPlayer::setPreload):
+
 2012-11-12  Arpita Bahuguna  <arpitabahug...@gmail.com>
 
         Specified width CSS tables should not include border and padding as part of that width.

Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (134267 => 134268)

--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp	2012-11-12 19:24:52 UTC (rev 134267)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp	2012-11-12 19:28:03 UTC (rev 134268)
@@ -407,7 +407,6 @@
         m_private->setPrivateBrowsingMode(m_privateBrowsing);
         m_private->setPreload(m_preload);
         m_private->setPreservesPitch(preservesPitch());
-        m_private->setRate(m_rate);
         if (m_shouldPrepareToRender)
             m_private->prepareForRendering();
     }
@@ -626,9 +625,6 @@
 
 void MediaPlayer::setVolume(float volume)
 {
-    if (volume == m_volume)
-        return;
-
     m_volume = volume;
 
     if (m_private->supportsMuting() || !m_muted)
@@ -642,9 +638,6 @@
 
 void MediaPlayer::setMuted(bool muted)
 {
-    if (muted == m_muted)
-        return;
-
     m_muted = muted;
 
     if (m_private->supportsMuting())
@@ -681,9 +674,6 @@
 
 void MediaPlayer::setPreservesPitch(bool preservesPitch)
 {
-    if (preservesPitch == m_preservesPitch)
-        return;
-
     m_preservesPitch = preservesPitch;
     m_private->setPreservesPitch(preservesPitch);
 }
@@ -709,10 +699,7 @@
 }
 
 void MediaPlayer::setSize(const IntSize& size)
-{
-    if (size == m_size)
-        return;
-
+{ 
     m_size = size;
     m_private->setSize(size);
 }
@@ -724,9 +711,6 @@
 
 void MediaPlayer::setVisible(bool b)
 {
-    if (b == m_visible)
-        return;
-
     m_visible = b;
     m_private->setVisible(b);
 }
@@ -738,9 +722,6 @@
 
 void MediaPlayer::setPreload(MediaPlayer::Preload preload)
 {
-    if (preload == m_preload)
-        return;
-
     m_preload = preload;
     m_private->setPreload(preload);
 }

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes