Media Remoting Clean-up: Less-redundant naming, style consistency, etc.

media/remoting/remoting_interstitial_ui.cc

Index: media/remoting/remoting_interstitial_ui.cc
diff --git a/media/remoting/remoting_interstitial_ui.cc b/media/remoting/remoting_interstitial_ui.cc
deleted file mode 100644
index fc0e28c33400e020f76704cad9d3437fdec63fa7..0000000000000000000000000000000000000000
--- a/media/remoting/remoting_interstitial_ui.cc
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright 2016 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/remoting/remoting_interstitial_ui.h"
-
-#include "media/base/media_resources.h"
-#include "media/base/video_frame.h"
-#include "media/base/video_renderer_sink.h"
-#include "media/base/video_util.h"
-#include "skia/ext/image_operations.h"
-#include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkTypeface.h"
-#include "third_party/skia/include/effects/SkBlurImageFilter.h"
-#include "ui/gfx/color_palette.h"
-#include "ui/gfx/geometry/size.h"
-#include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/skbitmap_operations.h"
-#include "ui/gfx/vector_icons_public.h"
-
-namespace media {
-
-namespace {
-
-SkBitmap ResizeImage(const SkBitmap& image, const gfx::Size& scaled_size) {
-  DCHECK(!scaled_size.IsEmpty());
-
-  if (image.width() == scaled_size.width() &&
-      image.height() == scaled_size.height())
-    return image;
-
-  return skia::ImageOperations::Resize(
-      image, skia::ImageOperations::RESIZE_BEST, scaled_size.width(),
-      scaled_size.height());
-}
-
-void RenderCastMessage(const gfx::Size& canvas_size,
-                       RemotingInterstitialType type,
-                       SkCanvas* canvas) {
-  DCHECK(canvas);
-  if (type == RemotingInterstitialType::BETWEEN_SESSIONS)
-    return;
-
-  // Blur the background image.
-  SkScalar sigma = SkDoubleToScalar(10);
-  SkPaint paint_blur;
-  paint_blur.setImageFilter(SkBlurImageFilter::Make(sigma, sigma, nullptr));
-  canvas->saveLayer(0, &paint_blur);
-  canvas->restore();
-
-  // Create SkPaint for text and icon bitmap.
-  // After |paint| draws, the new canvas should look like this:
-  //       _________________________________
-  //       |                                |
-  //       |                                |
-  //       |             [   ]              |
-  //       |        Casting Video...        |
-  //       |                                |
-  //       |________________________________|
-  //
-  // Both text and icon are centered horizontally. Together, they are
-  // centered vertically.
-  SkPaint paint;
-  int text_size = SkIntToScalar(30);
-  paint.setAntiAlias(true);
-  paint.setFilterQuality(kHigh_SkFilterQuality);
-  paint.setColor(SK_ColorLTGRAY);
-  paint.setTypeface(SkTypeface::MakeFromName(
-      "sans", SkFontStyle::FromOldStyle(SkTypeface::kNormal)));
-  paint.setTextSize(text_size);
-
-  // Draw the appropriate text.
-  const std::string remote_playback_message =
-      (type == RemotingInterstitialType::IN_SESSION
-           ? GetLocalizedStringUTF8(MEDIA_REMOTING_CASTING_VIDEO_TEXT)
-           : GetLocalizedStringUTF8(MEDIA_REMOTING_CAST_ERROR_TEXT));
-  size_t display_text_width = paint.measureText(remote_playback_message.data(),
-                                                remote_playback_message.size());
-  SkScalar sk_text_offset_x = (canvas_size.width() - display_text_width) / 2.0;
-  SkScalar sk_text_offset_y = (canvas_size.height() / 2.0) + text_size;
-  canvas->drawText(remote_playback_message.data(),
-                   remote_playback_message.size(), sk_text_offset_x,
-                   sk_text_offset_y, paint);
-
-  // Draw the appropriate Cast icon.
-  gfx::VectorIconId current_icon =
-      (type == RemotingInterstitialType::IN_SESSION
-           ? gfx::VectorIconId::MEDIA_ROUTER_ACTIVE
-           : gfx::VectorIconId::MEDIA_ROUTER_WARNING);
-  gfx::ImageSkia icon_image =
-      gfx::CreateVectorIcon(current_icon, 65, SK_ColorLTGRAY);
-  const SkBitmap* icon_bitmap = icon_image.bitmap();
-  SkScalar sk_image_offset_x = (canvas_size.width() - icon_image.width()) / 2.0;
-  SkScalar sk_image_offset_y =
-      (canvas_size.height() / 2.0) - icon_image.height();
-  canvas->drawBitmap(*icon_bitmap, sk_image_offset_x, sk_image_offset_y,
-                     &paint);
-}
-
-scoped_refptr<VideoFrame> RenderInterstitialFrame(
-    const SkBitmap& image,
-    const gfx::Size& canvas_size,
-    RemotingInterstitialType type) {
-  SkBitmap canvas_bitmap;
-  canvas_bitmap.allocN32Pixels(canvas_size.width(), canvas_size.height());
-  canvas_bitmap.eraseColor(SK_ColorBLACK);
-  SkCanvas canvas(canvas_bitmap);
-
-  // Draw background image on the canvas.
-  if (!image.drawsNothing()) {
-    gfx::Rect centered_rect = ComputeLetterboxRegion(
-        gfx::Rect(canvas_size), gfx::Size(image.width(), image.height()));
-    SkBitmap processed_image = ResizeImage(image, centered_rect.size());
-    if (type != RemotingInterstitialType::BETWEEN_SESSIONS) {
-      color_utils::HSL shift = {-1, 0, 0.2};  // Make monochromatic.
-      processed_image =
-          SkBitmapOperations::CreateHSLShiftedBitmap(processed_image, shift);
-    }
-    canvas.writePixels(processed_image, centered_rect.x(), centered_rect.y());
-  }
-
-  RenderCastMessage(canvas_size, type, &canvas);
-
-  // Create a new VideoFrame, copy the bitmap, then return it.
-  scoped_refptr<media::VideoFrame> video_frame = media::VideoFrame::CreateFrame(
-      media::PIXEL_FORMAT_I420, canvas_size, gfx::Rect(canvas_size),
-      canvas_size, base::TimeDelta());
-  canvas_bitmap.lockPixels();
-  media::CopyRGBToVideoFrame(
-      reinterpret_cast<uint8_t*>(canvas_bitmap.getPixels()),
-      canvas_bitmap.rowBytes(),
-      gfx::Rect(canvas_size.width(), canvas_size.height()), video_frame.get());
-  canvas_bitmap.unlockPixels();
-  return video_frame;
-}
-
-}  // namespace
-
-void PaintRemotingInterstitial(const SkBitmap& image,
-                               const gfx::Size& canvas_size,
-                               RemotingInterstitialType interstitial_type,
-                               VideoRendererSink* video_renderer_sink) {
-  if (canvas_size.IsEmpty())
-    return;
-
-  const scoped_refptr<VideoFrame> interstitial =
-      RenderInterstitialFrame(image, canvas_size, interstitial_type);
-
-  if (!interstitial)
-    return;
-  video_renderer_sink->PaintSingleFrame(interstitial);
-}
-
-}  // namespace media