Replace Atomic32 with webrtc/base/atomicops.h.

webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc

 /*
  *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h"
 
 #include <assert.h>
 
+#include "webrtc/base/atomicops.h"
 #include "webrtc/modules/desktop_capture/desktop_capture_options.h"
 #include "webrtc/modules/desktop_capture/desktop_frame.h"
 #include "webrtc/modules/desktop_capture/desktop_frame_win.h"
 #include "webrtc/modules/desktop_capture/desktop_region.h"
 #include "webrtc/modules/desktop_capture/differ.h"
 #include "webrtc/modules/desktop_capture/mouse_cursor.h"
 #include "webrtc/modules/desktop_capture/win/cursor.h"
 #include "webrtc/modules/desktop_capture/win/desktop.h"
 #include "webrtc/modules/desktop_capture/win/screen_capture_utils.h"
 #include "webrtc/system_wrappers/interface/logging.h"
 #include "webrtc/system_wrappers/interface/tick_util.h"
 
 namespace webrtc {
 
 // kMagnifierWindowClass has to be "Magnifier" according to the Magnification
 // API. The other strings can be anything.
 static LPCTSTR kMagnifierHostClass = L"ScreenCapturerWinMagnifierHost";
 static LPCTSTR kHostWindowName = L"MagnifierHost";
 static LPCTSTR kMagnifierWindowClass = L"Magnifier";
 static LPCTSTR kMagnifierWindowName = L"MagnifierWindow";
 
-Atomic32 ScreenCapturerWinMagnifier::tls_index_(TLS_OUT_OF_INDEXES);
+volatile int ScreenCapturerWinMagnifier::tls_index_(TLS_OUT_OF_INDEXES);
 
 ScreenCapturerWinMagnifier::ScreenCapturerWinMagnifier(
     rtc::scoped_ptr<ScreenCapturer> fallback_capturer)
     : fallback_capturer_(fallback_capturer.Pass()),
       fallback_capturer_started_(false),
       callback_(NULL),
       current_screen_id_(kFullDesktopScreenId),
       excluded_window_(NULL),
       set_thread_execution_state_failed_(false),
       desktop_dc_(NULL),
@@ skipping 182 matching lines @@
 
 BOOL ScreenCapturerWinMagnifier::OnMagImageScalingCallback(
     HWND hwnd,
     void* srcdata,
     MAGIMAGEHEADER srcheader,
     void* destdata,
     MAGIMAGEHEADER destheader,
     RECT unclipped,
     RECT clipped,
     HRGN dirty) {
-  assert(tls_index_.Value() != TLS_OUT_OF_INDEXES);
+  assert(rtc::AtomicOps::AcquireLoad(&tls_index_) != TLS_OUT_OF_INDEXES);
 
   ScreenCapturerWinMagnifier* owner =
       reinterpret_cast<ScreenCapturerWinMagnifier*>(
-          TlsGetValue(tls_index_.Value()));
+          TlsGetValue(rtc::AtomicOps::AcquireLoad(&tls_index_)));
 
   owner->OnCaptured(srcdata, srcheader);
 
   return TRUE;
 }
 
 bool ScreenCapturerWinMagnifier::InitializeMagnifier() {
   assert(!magnifier_initialized_);
 
   desktop_dc_ = GetDC(NULL);
@@ skipping 108 matching lines @@
         magnifier_window_, MW_FILTERMODE_EXCLUDE, 1, &excluded_window_);
     if (!result) {
       mag_uninitialize_func_();
       LOG_F(LS_WARNING) << "Failed to initialize ScreenCapturerWinMagnifier: "
                         << "error from MagSetWindowFilterList "
                         << GetLastError();
       return false;
     }
   }
 
-  if (tls_index_.Value() == TLS_OUT_OF_INDEXES) {
+  if (rtc::AtomicOps::AcquireLoad(&tls_index_) == TLS_OUT_OF_INDEXES) {
     // More than one threads may get here at the same time, but only one will
-    // write to tls_index_ using CompareExchange.
+    // write to tls_index_ using CompareAndSwap.
     DWORD new_tls_index = TlsAlloc();
-    if (!tls_index_.CompareExchange(new_tls_index, TLS_OUT_OF_INDEXES))
+    if (rtc::AtomicOps::CompareAndSwap(&tls_index_, TLS_OUT_OF_INDEXES,
+                                       new_tls_index) != TLS_OUT_OF_INDEXES) {
+      // Another thread allocated TLS before us, remove additional allocation.
       TlsFree(new_tls_index);
+    }
   }
 
-  assert(tls_index_.Value() != TLS_OUT_OF_INDEXES);
-  TlsSetValue(tls_index_.Value(), this);
+  assert(rtc::AtomicOps::AcquireLoad(&tls_index_) != TLS_OUT_OF_INDEXES);
+  TlsSetValue(rtc::AtomicOps::AcquireLoad(&tls_index_), this);
 
   magnifier_initialized_ = true;
   return true;
 }
 
 void ScreenCapturerWinMagnifier::OnCaptured(void* data,
                                             const MAGIMAGEHEADER& header) {
   DesktopFrame* current_frame = queue_.current_frame();
 
   // Verify the format.
@@ skipping 48 matching lines @@
   assert(fallback_capturer_);
   if (!fallback_capturer_started_) {
     fallback_capturer_started_ = true;
 
     fallback_capturer_->Start(callback_);
     fallback_capturer_->SelectScreen(current_screen_id_);
   }
 }
 
 }  // namespace webrtc