Fix Clang errors in the Windows screen capture code

media/video/capture/screen/screen_capturer_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/video/capture/screen/screen_capturer.h"
 
 #include <windows.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 199 matching lines @@
       set_thread_execution_state_failed_(false) {
   if (disable_aero) {
     // Load dwmapi.dll dynamically since it is not available on XP.
     if (!dwmapi_library_.is_valid()) {
       base::FilePath path(base::GetNativeLibraryName(
           UTF8ToUTF16(kDwmapiLibraryName)));
       dwmapi_library_.Reset(base::LoadNativeLibrary(path, NULL));
     }
 
     if (dwmapi_library_.is_valid() && composition_func_ == NULL) {
-      composition_func_ = static_cast<DwmEnableCompositionFunc>(
+      composition_func_ = reinterpret_cast<DwmEnableCompositionFunc>(
           dwmapi_library_.GetFunctionPointer("DwmEnableComposition"));
     }
   }
 }
 
 ScreenCapturerWin::~ScreenCapturerWin() {
 }
 
 void ScreenCapturerWin::InvalidateRegion(const SkRegion& invalid_region) {
   helper_.InvalidateRegion(invalid_region);
@@ skipping 304 matching lines @@
       return;
     }
     uint8* and_mask = mask.get();
     uint8* xor_mask = mask.get() + height * row_bytes;
     uint8* dst = cursor_dst_data;
     bool add_outline = false;
     for (int y = 0; y < height; y++) {
       for (int x = 0; x < width; x++) {
         int byte = y * row_bytes + x / 8;
         int bit = 7 - x % 8;
-        int and = and_mask[byte] & (1 << bit);
-        int xor = xor_mask[byte] & (1 << bit);
+        int and_ = and_mask[byte] & (1 << bit);
+        int xor_ = xor_mask[byte] & (1 << bit);

[alexeypa (please no reviews), 2013/04/18 18:56:03]

Could you please name them |and_bit| and |xor_bit| instead?

[Reid Kleckner, 2013/04/18 19:01:37]

Done.

 
         // The two cursor masks combine as follows:
-        //  AND  XOR   Windows Result  Our result   RGB  Alpha
+        //  and_  xor_   Windows Result  Our result   RGB  Alpha

[alexeypa (please no reviews), 2013/04/18 18:56:03]

This is a comment, so I don't think Clang cares about keywords in here. Could
you please restore AND and XOR?

[Reid Kleckner, 2013/04/18 19:01:37]

Oops, yeah that was totally unintented.  :)

         //   0    0    Black           Black         00    ff
         //   0    1    White           White         ff    ff
         //   1    0    Screen          Transparent   00    00
         //   1    1    Reverse-screen  Black         00    ff
-        // Since we don't support XOR cursors, we replace the "Reverse Screen"
+        // Since we don't support xor_ cursors, we replace the "Reverse Screen"

[alexeypa (please no reviews), 2013/04/18 18:56:03]

Same as above.

         // with black. In this case, we also add an outline around the cursor
         // so that it is visible against a dark background.
-        int rgb = (!and && xor) ? 0xff : 0x00;
-        int alpha = (and && !xor) ? 0x00 : 0xff;
+        int rgb = (!and_ && xor_) ? 0xff : 0x00;
+        int alpha = (and_ && !xor_) ? 0x00 : 0xff;
         *dst++ = rgb;
         *dst++ = rgb;
         *dst++ = rgb;
         *dst++ = alpha;
-        if (and && xor) {
+        if (and_ && xor_) {
           add_outline = true;
         }
       }
     }
     if (add_outline) {
       AddCursorOutline(width, height,
                        reinterpret_cast<uint32*>(cursor_dst_data));
     }
   }
 
@@ skipping 32 matching lines @@
   return CreateWithDisableAero(true);
 }
 
 // static
 scoped_ptr<ScreenCapturer> ScreenCapturer::CreateWithDisableAero(
     bool disable_aero) {
   return scoped_ptr<ScreenCapturer>(new ScreenCapturerWin(disable_aero));
 }
 
 }  // namespace media