[ash-md] WIP Added wallpaper color caching.

ash/common/wallpaper/wallpaper_controller.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 "ash/common/wallpaper/wallpaper_controller.h"
 
 #include <string>
 #include <utility>
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/wallpaper/wallpaper_controller_observer.h"
 #include "ash/common/wallpaper/wallpaper_delegate.h"
 #include "ash/common/wallpaper/wallpaper_view.h"
 #include "ash/common/wallpaper/wallpaper_widget_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/task_runner.h"
+#include "components/wallpaper/wallpaper_color_cache.h"
 #include "components/wallpaper/wallpaper_color_calculator.h"
 #include "components/wallpaper/wallpaper_resizer.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/color_analysis.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 namespace {
@@ skipping 30 matching lines @@
   else if (switch_value.find("muted") != std::string::npos)
     *saturation = color_utils::SaturationRange::MUTED;
 
   return true;
 }
 
 WallpaperController::WallpaperController(
     const scoped_refptr<base::TaskRunner>& task_runner)
     : locked_(false),
       wallpaper_mode_(WALLPAPER_NONE),
+      color_cache_(nullptr),
       prominent_color_(SK_ColorTRANSPARENT),
       wallpaper_reload_delay_(kWallpaperReloadDelayMs),
       task_runner_(task_runner) {
   WmShell::Get()->AddDisplayObserver(this);
   Shell::GetInstance()->AddShellObserver(this);
 }
 
 WallpaperController::~WallpaperController() {
   if (current_wallpaper_)
     current_wallpaper_->RemoveObserver(this);
@@ skipping 154 matching lines @@
          current_wallpaper_->original_image_id();
 }
 
 void WallpaperController::OpenSetWallpaperPage() {
   if (wallpaper_picker_ &&
       Shell::Get()->wallpaper_delegate()->CanOpenSetWallpaperPage()) {
     wallpaper_picker_->Open();
   }
 }
 
+void WallpaperController::SetWallpaperColorCache(
+    wallpaper::WallpaperColorCache* color_cache) {
+  CHECK(!color_cache_);
+  color_cache_ = color_cache;
+}
+
 void WallpaperController::SetWallpaperPicker(mojom::WallpaperPickerPtr picker) {
   wallpaper_picker_ = std::move(picker);
 }
 
 void WallpaperController::SetWallpaper(const SkBitmap& wallpaper,
                                        wallpaper::WallpaperLayout layout) {
   if (wallpaper.isNull())
     return;
 
   SetWallpaperImage(gfx::ImageSkia::CreateFrom1xBitmap(wallpaper), layout);
 }
 
 void WallpaperController::OnWallpaperResized() {
   CalculateWallpaperColors();
 }
 
 void WallpaperController::OnColorCalculationComplete() {
   const SkColor color = color_calculator_->prominent_color();
+
+  if (color_cache_) {
+    // TODO(bruthig): GetWallpaperOriginalImageId() is insufficient!!
+    color_cache_->SetColor(GetWallpaperOriginalImageId(), color);
+  }
+
   color_calculator_.reset();
   SetProminentColor(color);
 }
 
 void WallpaperController::InstallDesktopController(WmWindow* root_window) {
   WallpaperWidgetController* component = nullptr;
   int container_id = GetWallpaperContainerId(locked_);
 
   switch (wallpaper_mode_) {
     case WALLPAPER_IMAGE: {
@@ skipping 70 matching lines @@
 
 void WallpaperController::CalculateWallpaperColors() {
   color_utils::LumaRange luma;
   color_utils::SaturationRange saturation;
   if (!GetProminentColorProfile(&luma, &saturation))
     return;
 
   if (color_calculator_)
     color_calculator_->RemoveObserver(this);
 
+  color_calculator_.reset();
+
+  if (color_cache_) {
+    SkColor color;
+    // TODO(bruthig): GetWallpaperOriginalImageId() is insufficient!!
+    if (color_cache_->GetColor(GetWallpaperOriginalImageId(), &color)) {
+      SetProminentColor(color);
+      return;
+    }
+  }
+
   color_calculator_ = base::MakeUnique<wallpaper::WallpaperColorCalculator>(
       GetWallpaper(), luma, saturation, task_runner_);
   color_calculator_->AddObserver(this);
   if (!color_calculator_->StartCalculation())
     SetProminentColor(SK_ColorTRANSPARENT);
 }
 
 }  // namespace ash