Mark skia.mojom.Color as a copyable passed by value type.

Change-Id: I4a0d6a554cbce5eecb25f6720f22d41919588a6d Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2521355 Reviewed-by: Nico Weber <thakis@chromium.org> Reviewed-by: Avi Drissman <avi@chromium.org> Commit-Queue: Daniel Cheng <dcheng@chromium.org> Cr-Commit-Position: refs/heads/master@{#824744}
qweri0p · Nov 6, 2020 · 9916760 · 9916760
1 parent a73fcf9
commit 9916760
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 19 deletions.
diff --git a/chrome/browser/ui/webui/customize_themes/chrome_customize_themes_handler.cc b/chrome/browser/ui/webui/customize_themes/chrome_customize_themes_handler.cc
@@ -49,7 +49,7 @@ ChromeCustomizeThemesHandler::~ChromeCustomizeThemesHandler() {
 }
 
 void ChromeCustomizeThemesHandler::ApplyAutogeneratedTheme(
-    const SkColor& frame_color) {
+    SkColor frame_color) {
   chrome_colors_service_->ApplyAutogeneratedTheme(frame_color, web_contents_);
 }
 

diff --git a/chrome/browser/ui/webui/customize_themes/chrome_customize_themes_handler.h b/chrome/browser/ui/webui/customize_themes/chrome_customize_themes_handler.h
@@ -44,7 +44,7 @@ class ChromeCustomizeThemesHandler
   ~ChromeCustomizeThemesHandler() override;
 
   // customize_themes::mojom::CustomizeThemesHandler:
-  void ApplyAutogeneratedTheme(const SkColor& frame_color) override;
+  void ApplyAutogeneratedTheme(SkColor frame_color) override;
   void ApplyDefaultTheme() override;
   void ApplyChromeTheme(int32_t id) override;
   void InitializeTheme() override;

diff --git a/chrome/browser/ui/webui/signin/profile_creation_customize_themes_handler.cc b/chrome/browser/ui/webui/signin/profile_creation_customize_themes_handler.cc
@@ -20,7 +20,7 @@ ProfileCreationCustomizeThemesHandler::
     ~ProfileCreationCustomizeThemesHandler() = default;
 
 void ProfileCreationCustomizeThemesHandler::ApplyAutogeneratedTheme(
-    const SkColor& frame_color) {
+    SkColor frame_color) {
   auto theme = customize_themes::mojom::Theme::New();
   theme->type = customize_themes::mojom::ThemeType::kAutogenerated;
   auto theme_colors = customize_themes::mojom::ThemeColors::New();

diff --git a/chrome/browser/ui/webui/signin/profile_creation_customize_themes_handler.h b/chrome/browser/ui/webui/signin/profile_creation_customize_themes_handler.h
@@ -24,7 +24,7 @@ class ProfileCreationCustomizeThemesHandler
   ~ProfileCreationCustomizeThemesHandler() override;
 
   // customize_themes::mojom::CustomizeThemesHandler:
-  void ApplyAutogeneratedTheme(const SkColor& frame_color) override;
+  void ApplyAutogeneratedTheme(SkColor frame_color) override;
   void ApplyDefaultTheme() override;
   void ApplyChromeTheme(int32_t id) override;
   void InitializeTheme() override;

diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -4274,13 +4274,12 @@ void RenderFrameHostImpl::VisibilityChanged(
 }
 
 void RenderFrameHostImpl::DidChangeThemeColor(
-    const base::Optional<SkColor>& theme_color) {
+    base::Optional<SkColor> theme_color) {
   render_view_host_->OnThemeColorChanged(this, theme_color);
 }
 
-void RenderFrameHostImpl::DidChangeBackgroundColor(
-    const SkColor& background_color,
-    bool color_adjust) {
+void RenderFrameHostImpl::DidChangeBackgroundColor(SkColor background_color,
+                                                   bool color_adjust) {
   render_view_host_->DidChangeBackgroundColor(this, background_color,
                                               color_adjust);
 }

diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/browser/renderer_host/render_frame_host_impl.h
@@ -1621,8 +1621,8 @@ class CONTENT_EXPORT RenderFrameHostImpl
   void SetVirtualKeyboardOverlayPolicy(bool vk_overlays_content) override;
   void EvictFromBackForwardCache() override;
   void VisibilityChanged(blink::mojom::FrameVisibility) override;
-  void DidChangeThemeColor(const base::Optional<SkColor>& theme_color) override;
-  void DidChangeBackgroundColor(const SkColor& background_color,
+  void DidChangeThemeColor(base::Optional<SkColor> theme_color) override;
+  void DidChangeBackgroundColor(SkColor background_color,
                                 bool color_adjust) override;
   void DidFailLoadWithError(const GURL& url, int32_t error_code) override;
   void DidFocusFrame() override;

diff --git a/skia/public/mojom/BUILD.gn b/skia/public/mojom/BUILD.gn
@@ -79,6 +79,7 @@ mojom("mojom") {
         {
           mojom = "skia.mojom.SkColor"
           cpp = "::SkColor"
+          copyable_pass_by_value = true
         },
       ]
       traits_headers = [ "skcolor_mojom_traits.h" ]

diff --git a/third_party/blink/renderer/core/frame/web_frame_test.cc b/third_party/blink/renderer/core/frame/web_frame_test.cc
@@ -8777,8 +8777,7 @@ class ThemeColorTestLocalFrameHost : public FakeLocalFrameHost {
 
  private:
   // FakeLocalFrameHost:
-  void DidChangeThemeColor(
-      const base::Optional<::SkColor>& theme_color) override {
+  void DidChangeThemeColor(base::Optional<::SkColor> theme_color) override {
     did_notify_ = true;
   }
 

diff --git a/third_party/blink/renderer/core/testing/fake_local_frame_host.cc b/third_party/blink/renderer/core/testing/fake_local_frame_host.cc
@@ -52,11 +52,10 @@ void FakeLocalFrameHost::VisibilityChanged(
     mojom::blink::FrameVisibility visibility) {}
 
 void FakeLocalFrameHost::DidChangeThemeColor(
-    const base::Optional<::SkColor>& theme_color) {}
+    base::Optional<::SkColor> theme_color) {}
 
-void FakeLocalFrameHost::DidChangeBackgroundColor(
-    const SkColor& background_color,
-    bool color_adjust) {}
+void FakeLocalFrameHost::DidChangeBackgroundColor(SkColor background_color,
+                                                  bool color_adjust) {}
 
 void FakeLocalFrameHost::DidFailLoadWithError(const ::blink::KURL& url,
                                               int32_t error_code) {}

diff --git a/third_party/blink/renderer/core/testing/fake_local_frame_host.h b/third_party/blink/renderer/core/testing/fake_local_frame_host.h
@@ -42,9 +42,8 @@ class FakeLocalFrameHost : public mojom::blink::LocalFrameHost {
   void SetNeedsOcclusionTracking(bool needs_tracking) override;
   void SetVirtualKeyboardOverlayPolicy(bool vk_overlays_content) override;
   void VisibilityChanged(mojom::blink::FrameVisibility visibility) override;
-  void DidChangeThemeColor(
-      const base::Optional<::SkColor>& theme_color) override;
-  void DidChangeBackgroundColor(const SkColor& background_color,
+  void DidChangeThemeColor(base::Optional<::SkColor> theme_color) override;
+  void DidChangeBackgroundColor(SkColor background_color,
                                 bool color_adjust) override;
   void DidFailLoadWithError(const ::blink::KURL& url,
                             int32_t error_code) override;