Use RgbaColor in DesktopFrameGenerator and add RgbaColorTest

webrtc/modules/desktop_capture/desktop_frame_generator.cc

 /*
  *  Copyright (c) 2016 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/desktop_frame_generator.h"
 
 #include <stdint.h>
 #include <string.h>
 
 #include <memory>
 
 #include "webrtc/base/random.h"
 #include "webrtc/base/timeutils.h"
+#include "webrtc/modules/desktop_capture/rgba_color.h"
 
 namespace webrtc {
 
 namespace {
 
 // Sets |updated_region| to |frame|. If |enlarge_updated_region| is
 // true, this function will randomly enlarge each DesktopRect in
 // |updated_region|. But the enlarged DesktopRegion won't excceed the
 // frame->size(). If |add_random_updated_region| is true, several random
 // rectangles will also be included in |frame|.
@@ skipping 23 matching lines @@
       const int top = random.Rand(0, frame->size().height() - 2);
       const int right = random.Rand(left + 1, frame->size().width());
       const int bottom = random.Rand(top + 1, frame->size().height());
       frame->mutable_updated_region()->AddRect(
           DesktopRect::MakeLTRB(left, top, right, bottom));
     }
   }
 }
 
 // Paints pixels in |rect| of |frame| to |color|.
-void PaintRect(DesktopFrame* frame, DesktopRect rect, uint32_t color) {
+void PaintRect(DesktopFrame* frame, DesktopRect rect, RgbaColor rgba_color) {
   static_assert(DesktopFrame::kBytesPerPixel == sizeof(uint32_t),
                 "kBytesPerPixel should be 4.");
   RTC_DCHECK(frame->size().width() >= rect.right() &&
              frame->size().height() >= rect.bottom());
+  uint32_t color = rgba_color.ToUInt32();
   uint8_t* row = frame->GetFrameDataAtPos(rect.top_left());
   for (int i = 0; i < rect.height(); i++) {
     uint32_t* column = reinterpret_cast<uint32_t*>(row);
     for (int j = 0; j < rect.width(); j++) {
       column[j] = color;
     }
     row += frame->stride();
   }
 }
 
 // Paints pixels in |region| of |frame| to |color|.
-void PaintRegion(DesktopFrame* frame, DesktopRegion* region, uint32_t color) {
+void PaintRegion(DesktopFrame* frame,
+                 DesktopRegion* region,
+                 RgbaColor rgba_color) {
   region->IntersectWith(DesktopRect::MakeSize(frame->size()));
   for (DesktopRegion::Iterator it(*region); !it.IsAtEnd(); it.Advance()) {
-    PaintRect(frame, it.rect(), color);
+    PaintRect(frame, it.rect(), rgba_color);
   }
 }
 
 }  // namespace
 
 DesktopFrameGenerator::DesktopFrameGenerator() {}
 DesktopFrameGenerator::~DesktopFrameGenerator() {}
 
 DesktopFramePainter::DesktopFramePainter() {}
 DesktopFramePainter::~DesktopFramePainter() {}
@@ skipping 71 matching lines @@
 BlackWhiteDesktopFramePainter::~BlackWhiteDesktopFramePainter() {}
 
 DesktopRegion* BlackWhiteDesktopFramePainter::updated_region() {
   return &updated_region_;
 }
 
 bool BlackWhiteDesktopFramePainter::Paint(DesktopFrame* frame,
                                           DesktopRegion* updated_region) {
   RTC_DCHECK(updated_region->is_empty());
   memset(frame->data(), 0, frame->stride() * frame->size().height());
-  PaintRegion(frame, &updated_region_, UINT32_MAX);
+  PaintRegion(frame, &updated_region_, RgbaColor(0xFFFFFFFF));
   updated_region_.Swap(updated_region);
   return true;
 }
 
 }  // namespace webrtc