Allow constexpr, and use it in a few places.

chrome/browser/themes/theme_properties.cc

 // Copyright (c) 2013 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 "chrome/browser/themes/theme_properties.h"
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ skipping 53 matching lines @@
 const SkColor kDefaultColorToolbar[] = {
     SkColorSetRGB(223, 223, 223), SkColorSetRGB(242, 242, 242)};
 const SkColor kDefaultColorToolbarIncognito[] = {
     SkColorSetRGB(223, 223, 223), SkColorSetRGB(0x50, 0x50, 0x50)};
 #endif  // OS_MACOSX
 const SkColor kDefaultDetachedBookmarkBarBackground[] = {
     SkColorSetRGB(0xF1, 0xF1, 0xF1), SK_ColorWHITE};
 const SkColor kDefaultDetachedBookmarkBarBackgroundIncognito[] = {
     SkColorSetRGB(0xF1, 0xF1, 0xF1), SkColorSetRGB(0x32, 0x32, 0x32)};
 
-const SkColor kDefaultColorTabText = SK_ColorBLACK;
-const SkColor kDefaultColorTabTextIncognito[] = {SK_ColorBLACK, SK_ColorWHITE};
+constexpr SkColor kDefaultColorTabText = SK_ColorBLACK;
+constexpr SkColor kDefaultColorTabTextIncognito[] = {kDefaultColorTabText,
+                                                     SK_ColorWHITE};
 
 #if defined(OS_MACOSX)
-const SkColor kDefaultColorBackgroundTabText[] = {
-    SK_ColorBLACK, SK_ColorBLACK };
-const SkColor kDefaultColorBackgroundTabTextIncognito[] = {
-    SK_ColorBLACK, SK_ColorWHITE };
+constexpr SkColor kDefaultColorBackgroundTabText[] = {SK_ColorBLACK,
+                                                      SK_ColorBLACK};
+constexpr SkColor kDefaultColorBackgroundTabTextIncognito[] = {
+    kDefaultColorBackgroundTabText[0], SK_ColorWHITE};
 #else
 const SkColor kDefaultColorBackgroundTabText[] = {
     SkColorSetRGB(64, 64, 64), SK_ColorBLACK };
 const SkColor kDefaultColorBackgroundTabTextIncognito[] = {
     SkColorSetRGB(64, 64, 64), SK_ColorWHITE };
 #endif  // OS_MACOSX
 
-const SkColor kDefaultColorBookmarkText = SK_ColorBLACK;
-const SkColor kDefaultColorBookmarkTextIncognito[] = {SK_ColorBLACK,
-                                                      SK_ColorWHITE};
+constexpr SkColor kDefaultColorBookmarkText = SK_ColorBLACK;
+constexpr SkColor kDefaultColorBookmarkTextIncognito[] = {
+    kDefaultColorBookmarkText, SK_ColorWHITE};
 
 #if defined(OS_WIN)
 const SkColor kDefaultColorNTPBackground =
     color_utils::GetSysSkColor(COLOR_WINDOW);
 const SkColor kDefaultColorNTPText =
     color_utils::GetSysSkColor(COLOR_WINDOWTEXT);
 const SkColor kDefaultColorNTPLink =
     color_utils::GetSysSkColor(COLOR_HOTLIGHT);
 #else
 // TODO(beng): source from theme provider.
-const SkColor kDefaultColorNTPBackground = SK_ColorWHITE;
-const SkColor kDefaultColorNTPText = SK_ColorBLACK;
+constexpr SkColor kDefaultColorNTPBackground = SK_ColorWHITE;

[Nico, 2016/04/13 21:06:12]

Does this help any? const variables of integral type with initializer already
are constexpr, so this change doesn't really do anything, does it?

[Peter Kasting, 2016/04/13 21:25:09]

On this specific line, no, but it does for some of the other lines here (e.g.
the HSL stuff, allowing kDefaultTintButtonsIncognito to reference
kDefaultTintButtons without adding a static initializer) and I read both the
Google styleguide and Effective Modern C++ as saying to use constexpr
consistently when declaring compile-time constants, so it seemed to make sense
to me to change all such expressions atop this file at the same time.

[Nico, 2016/04/13 22:49:15]

Huh, are you sure kDefaultTintButtons adds a static initializer if you don't
make this constexpr?
There are lots other of non-constexpr const SkColors in this file.

[Peter Kasting, 2016/04/14 04:55:23]

Yes, because we landed it that way originally, caused a static initializer, and
had to fix.  My comment saying "constexpr might have saved us" on the fix CL is
what I looked up to find a file where some constexprs might do some good :)
Yes, but sadly none of those can be changed.  SkColorSet[A]RGB() is, in debug
mode, a function which in turn includes the code in SK_ASSERT, which is a
complicated macro that calls off to printf() and the like, so I can't make it a
constexpr function.

The implication of that is that, in debug mode, every const SkColor in our
codebase that's initialized using SkColorSet[A]RGB() probably incurs a static
initializer.  I found this depressing.  Luckily, it's a simple macro in release
mode, so it only affects debug builds.

+constexpr SkColor kDefaultColorNTPText = SK_ColorBLACK;
 const SkColor kDefaultColorNTPLink = SkColorSetRGB(6, 55, 116);
 #endif  // OS_WIN
 
 const SkColor kDefaultColorNTPHeader = SkColorSetRGB(150, 150, 150);
 const SkColor kDefaultColorNTPSection = SkColorSetRGB(229, 229, 229);
-const SkColor kDefaultColorNTPSectionText = SK_ColorBLACK;
+constexpr SkColor kDefaultColorNTPSectionText = SK_ColorBLACK;
 const SkColor kDefaultColorNTPSectionLink = SkColorSetRGB(6, 55, 116);
-const SkColor kDefaultColorButtonBackground = SkColorSetARGB(0, 0, 0, 0);
+constexpr SkColor kDefaultColorButtonBackground = SK_ColorTRANSPARENT;
 
 // Default tints.
-const color_utils::HSL kDefaultTintButtons = {-1, -1, -1};
-// In pre-md, reuse the normal tint for incognito.
-const color_utils::HSL kDefaultTintButtonsIncognito[] = {{-1, -1, -1},
-                                                         {-1, -1, 0.85}};
-const color_utils::HSL kDefaultTintFrame = {-1, -1, -1};
-const color_utils::HSL kDefaultTintFrameInactive = {-1, -1, 0.75};
-const color_utils::HSL kDefaultTintFrameIncognito = {-1, 0.2, 0.35};
-const color_utils::HSL kDefaultTintFrameIncognitoInactive = {-1, 0.3, 0.6};
-const color_utils::HSL kDefaultTintBackgroundTab = {-1, -1, 0.75};
+constexpr color_utils::HSL kDefaultTintButtons = {-1, -1, -1};
+constexpr color_utils::HSL kDefaultTintButtonsIncognito[] = {
+    kDefaultTintButtons, {-1, -1, 0.85}};
+constexpr color_utils::HSL kDefaultTintFrame = {-1, -1, -1};
+constexpr color_utils::HSL kDefaultTintFrameInactive = {-1, -1, 0.75};
+constexpr color_utils::HSL kDefaultTintFrameIncognito = {-1, 0.2, 0.35};
+constexpr color_utils::HSL kDefaultTintFrameIncognitoInactive = {-1, 0.3, 0.6};
+constexpr color_utils::HSL kDefaultTintBackgroundTab = {-1, -1, 0.75};
 
 // ----------------------------------------------------------------------------
 // Defaults for properties which are not stored in the browser theme pack.
 
-const SkColor kDefaultColorControlBackground = SK_ColorWHITE;
+constexpr SkColor kDefaultColorControlBackground = SK_ColorWHITE;
 const SkColor kDefaultDetachedBookmarkBarSeparator[] = {
     SkColorSetRGB(170, 170, 171), SkColorSetRGB(182, 180, 182)};
 const SkColor kDefaultDetachedBookmarkBarSeparatorIncognito[] = {
     SkColorSetRGB(170, 170, 171), SkColorSetRGB(0x28, 0x28, 0x28)};
 const SkColor kDefaultToolbarTopSeparator = SkColorSetA(SK_ColorBLACK, 0x40);
 
 #if defined(OS_MACOSX)
 const SkColor kDefaultColorFrameVibrancyOverlay[] = {
     SkColorSetARGB(25, 0, 0, 0), SkColorSetARGB(230, 20, 22, 24)};
 const SkColor kDefaultColorToolbarInactive[] = {
@@ skipping 14 matching lines @@
 const SkColor kDefaultColorToolbarIncognitoStroke[] = {
     SkColorSetRGB(103, 103, 103), SkColorSetARGB(63, 0, 0, 0)};
 const SkColor kDefaultColorToolbarStrokeTheme =
     SkColorSetARGB(102, 255, 255, 255);
 const SkColor kDefaultColorToolbarStrokeThemeInactive =
     SkColorSetARGB(102, 76, 76, 76);
 #endif  // OS_MACOSX
 // ----------------------------------------------------------------------------
 
 // Strings used in alignment properties.
-const char kAlignmentCenter[] = "center";
-const char kAlignmentTop[] = "top";
-const char kAlignmentBottom[] = "bottom";
-const char kAlignmentLeft[] = "left";
-const char kAlignmentRight[] = "right";
+constexpr char kAlignmentCenter[] = "center";
+constexpr char kAlignmentTop[] = "top";
+constexpr char kAlignmentBottom[] = "bottom";
+constexpr char kAlignmentLeft[] = "left";
+constexpr char kAlignmentRight[] = "right";
 
 // Strings used in background tiling repetition properties.
-const char kTilingNoRepeat[] = "no-repeat";
-const char kTilingRepeatX[] = "repeat-x";
-const char kTilingRepeatY[] = "repeat-y";
-const char kTilingRepeat[] = "repeat";
+constexpr char kTilingNoRepeat[] = "no-repeat";
+constexpr char kTilingRepeatX[] = "repeat-x";
+constexpr char kTilingRepeatY[] = "repeat-y";
+constexpr char kTilingRepeat[] = "repeat";
 
 // The image resources that will be tinted by the 'button' tint value.
 // If you change this list, you must increment the version number in
 // browser_theme_pack.cc, and you should assign persistent IDs to the
 // data table at the start of said file or else tinted versions of
 // these resources will not be created.
 //
 // TODO(erg): The cocoa port is the last user of the IDR_*_[HP] variants. These
 // should be removed once the cocoa port no longer uses them.
-const int kToolbarButtonIDs[] = {
-  IDR_BACK, IDR_BACK_D, IDR_BACK_H, IDR_BACK_P,
-  IDR_FORWARD, IDR_FORWARD_D, IDR_FORWARD_H, IDR_FORWARD_P,
-  IDR_HOME, IDR_HOME_H, IDR_HOME_P,
-  IDR_RELOAD, IDR_RELOAD_H, IDR_RELOAD_P,
-  IDR_STOP, IDR_STOP_D, IDR_STOP_H, IDR_STOP_P,
-  IDR_BROWSER_ACTIONS_OVERFLOW, IDR_BROWSER_ACTIONS_OVERFLOW_H,
-  IDR_BROWSER_ACTIONS_OVERFLOW_P,
-  IDR_TOOLS, IDR_TOOLS_H, IDR_TOOLS_P,
-  IDR_MENU_DROPARROW,
-  IDR_TOOLBAR_BEZEL_HOVER, IDR_TOOLBAR_BEZEL_PRESSED, IDR_TOOLS_BAR,
+constexpr int kToolbarButtonIDs[] = {
+    IDR_BACK,
+    IDR_BACK_D,
+    IDR_BACK_H,
+    IDR_BACK_P,
+    IDR_FORWARD,
+    IDR_FORWARD_D,
+    IDR_FORWARD_H,
+    IDR_FORWARD_P,
+    IDR_HOME,
+    IDR_HOME_H,
+    IDR_HOME_P,
+    IDR_RELOAD,
+    IDR_RELOAD_H,
+    IDR_RELOAD_P,
+    IDR_STOP,
+    IDR_STOP_D,
+    IDR_STOP_H,
+    IDR_STOP_P,
+    IDR_BROWSER_ACTIONS_OVERFLOW,
+    IDR_BROWSER_ACTIONS_OVERFLOW_H,
+    IDR_BROWSER_ACTIONS_OVERFLOW_P,
+    IDR_TOOLS,
+    IDR_TOOLS_H,
+    IDR_TOOLS_P,
+    IDR_MENU_DROPARROW,
+    IDR_TOOLBAR_BEZEL_HOVER,
+    IDR_TOOLBAR_BEZEL_PRESSED,
+    IDR_TOOLS_BAR,
 };
 
 SkColor TintForUnderline(SkColor input) {
   return SkColorSetA(input, SkColorGetA(input) / 3);
 }
 
 }  // namespace
 
 // static
 int ThemeProperties::StringToAlignment(const std::string& alignment) {
@@ skipping 175 matching lines @@
 #endif
     case COLOR_FRAME_INCOGNITO:
     case COLOR_FRAME_INCOGNITO_INACTIVE:
       NOTREACHED() << "These values should be queried via their respective "
                       "non-incognito equivalents and an appropriate |otr| "
                       "value.";
     default:
       return gfx::kPlaceholderColor;
   }
 }