Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / media / audio / audio_device_thread.cc

diff --git a/src/media/audio/audio_device_thread.cc b/src/media/audio/audio_device_thread.cc
index 172033f..24ba509 100644 (file)
--- a/src/media/audio/audio_device_thread.cc
+++ b/src/media/audio/audio_device_thread.cc
@@ -10,6 +10,7 @@
 #include "base/logging.h"
 #include "base/memory/aligned_memory.h"
 #include "base/message_loop/message_loop.h"
+#include "base/numerics/safe_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "media/base/audio_bus.h"
@@ -41,10 +42,10 @@ class AudioDeviceThread::Thread
 
  private:
   friend class base::RefCountedThreadSafe<AudioDeviceThread::Thread>;
-  virtual ~Thread();
+  ~Thread() override;
 
   // Overrides from PlatformThread::Delegate.
-  virtual void ThreadMain() OVERRIDE;
+  void ThreadMain() override;
 
   // Runs the loop that reads from the socket.
   void Run();
@@ -164,7 +165,7 @@ void AudioDeviceThread::Thread::ThreadMain() {
 void AudioDeviceThread::Thread::Run() {
   uint32 buffer_index = 0;
   while (true) {
-    int pending_data = 0;
+    uint32 pending_data = 0;
     size_t bytes_read = socket_.Receive(&pending_data, sizeof(pending_data));
     if (bytes_read != sizeof(pending_data))
       break;