commit 726a250195dce8f58044e80342e99ec8c0fa98df
author Grace Kloba <klobag@google.com> Fri Apr 02 11:05:18 2010 -0700
committer Grace Kloba <klobag@google.com> Fri Apr 02 11:05:18 2010 -0700
tree bf3c0ef70e81421ace36c30c79276cc316a2ea85
parent 9dbbb4da177ba7592aaf8d18fbd85a9525bbb5f7

Fix pluginstream delay timer as it is expecting seconds
instead of milliseconds.

While the timer is active, don't deliverData.

Fix http://b/issue?id=2567300

WebCore/plugins/PluginStream.cpp

diff --git a/WebCore/plugins/PluginStream.cpp b/WebCore/plugins/PluginStream.cpp
index 0f60fe3..9341c15 100644
--- a/WebCore/plugins/PluginStream.cpp
+++ b/WebCore/plugins/PluginStream.cpp
@@ -352,7 +352,7 @@
 
             // ask the plugin for a delay value.
             int delay = deliveryDelay();
-            m_delayDeliveryTimer.startOneShot(delay);
+            m_delayDeliveryTimer.startOneShot(delay * 0.001);
 #else
             m_delayDeliveryTimer.startOneShot(0);
 #endif
@@ -441,6 +441,10 @@
         m_deliveryData->resize(oldSize + length);
         memcpy(m_deliveryData->data() + oldSize, data, length);
 
+#if PLATFORM(ANDROID)
+//TODO: This needs to be upstreamed to WebKit.
+        if (!m_delayDeliveryTimer.isActive())
+#endif
         deliverData();
     }