diff options
| author | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-01 01:02:07 +0000 |
|---|---|---|
| committer | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-01 01:02:07 +0000 |
| commit | fb534c949f92bec8c6312b58ffcc04c5dc488f2d (patch) | |
| tree | 84384bdb8b06e62662ce1a5e9619ae455e9a69a8 /chrome/browser/themes/browser_theme_pack.cc | |
| parent | efeb669b05db99c54309771e4884b1a17d604a37 (diff) | |
| download | chromium_src-fb534c949f92bec8c6312b58ffcc04c5dc488f2d.zip chromium_src-fb534c949f92bec8c6312b58ffcc04c5dc488f2d.tar.gz chromium_src-fb534c949f92bec8c6312b58ffcc04c5dc488f2d.tar.bz2 | |
Rename Real* to Double* in values.* and dependent files
BUG=None
TEST=Compiles and passes all tests
Review URL: http://codereview.chromium.org/6248026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73232 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/themes/browser_theme_pack.cc')
| -rw-r--r-- | chrome/browser/themes/browser_theme_pack.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc index 517efd0..32c45aa 100644 --- a/chrome/browser/themes/browser_theme_pack.cc +++ b/chrome/browser/themes/browser_theme_pack.cc @@ -298,8 +298,8 @@ RefCountedMemory* ReadFileData(const FilePath& path) { // Does error checking for invalid incoming data while trying to read an // floating point value. -bool ValidRealValue(ListValue* tint_list, int index, double* out) { - if (tint_list->GetReal(index, out)) +bool ValidDoubleValue(ListValue* tint_list, int index, double* out) { + if (tint_list->GetDouble(index, out)) return true; int value = 0; @@ -619,9 +619,9 @@ void BrowserThemePack::BuildTintsFromJSON(DictionaryValue* tints_value) { (tint_list->GetSize() == 3)) { color_utils::HSL hsl = { -1, -1, -1 }; - if (ValidRealValue(tint_list, 0, &hsl.h) && - ValidRealValue(tint_list, 1, &hsl.s) && - ValidRealValue(tint_list, 2, &hsl.l)) { + if (ValidDoubleValue(tint_list, 0, &hsl.h) && + ValidDoubleValue(tint_list, 1, &hsl.s) && + ValidDoubleValue(tint_list, 2, &hsl.l)) { int id = GetIntForString(*iter, kTintTable); if (id != -1) { temp_tints[id] = hsl; @@ -680,7 +680,7 @@ void BrowserThemePack::ReadColorsFromJSON( if (color_list->GetSize() == 4) { double alpha; int alpha_int; - if (color_list->GetReal(3, &alpha)) { + if (color_list->GetDouble(3, &alpha)) { color = SkColorSetARGB(static_cast<int>(alpha * 255), r, g, b); } else if (color_list->GetInteger(3, &alpha_int) && (alpha_int == 0 || alpha_int == 1)) { |