diff options
author | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 12:54:04 +0000 |
---|---|---|
committer | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 12:54:04 +0000 |
commit | f09c718082535c0de7f066cb63f95809070f35a6 (patch) | |
tree | 0c7bbd37cccef8748b8c6e1768d2d95f7989a1a0 /chrome/common/gfx | |
parent | 15567be3dd3dacb0abae800ede436eac8123482c (diff) | |
download | chromium_src-f09c718082535c0de7f066cb63f95809070f35a6.zip chromium_src-f09c718082535c0de7f066cb63f95809070f35a6.tar.gz chromium_src-f09c718082535c0de7f066cb63f95809070f35a6.tar.bz2 |
NO CODE CHANGE.
Fix files with lines > 80 cols. Part 2.
Review URL: http://codereview.chromium.org/40226
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11326 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/gfx')
-rw-r--r-- | chrome/common/gfx/chrome_font_skia.cc | 3 | ||||
-rw-r--r-- | chrome/common/gfx/color_utils.cc | 7 | ||||
-rw-r--r-- | chrome/common/gfx/text_elider.cc | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/chrome/common/gfx/chrome_font_skia.cc b/chrome/common/gfx/chrome_font_skia.cc index a309649..bd83a61 100644 --- a/chrome/common/gfx/chrome_font_skia.cc +++ b/chrome/common/gfx/chrome_font_skia.cc @@ -78,7 +78,8 @@ int ChromeFont::ave_char_width() const { return avg_width_; } -ChromeFont ChromeFont::CreateFont(const std::wstring& font_name, int font_size) { +ChromeFont ChromeFont::CreateFont(const std::wstring& font_name, + int font_size) { DCHECK_GT(font_size, 0); SkTypeface* tf = SkTypeface::Create(base::SysWideToUTF8(font_name).c_str(), diff --git a/chrome/common/gfx/color_utils.cc b/chrome/common/gfx/color_utils.cc index cdb4c0c..237e082 100644 --- a/chrome/common/gfx/color_utils.cc +++ b/chrome/common/gfx/color_utils.cc @@ -35,7 +35,8 @@ static const double kK = 903.3; static double CIEConvertNonLinear(uint8 color_component) { double color_component_d = static_cast<double>(color_component) / 255.0; if (color_component_d > 0.04045) { - double base = (color_component_d + kCIEConversionAlpha) / (1 + kCIEConversionAlpha); + double base = (color_component_d + kCIEConversionAlpha) / + (1 + kCIEConversionAlpha); return pow(base, kCIEConversionGamma); } else { return color_component_d / 12.92; @@ -86,7 +87,9 @@ static uint8 sRGBColorComponentFromLinearComponent(double component) { if (component <= 0.0031308) { result = 12.92 * component; } else { - result = (1 + kCIEConversionAlpha) * pow(component, (static_cast<double>(1) / 2.4)) - kCIEConversionAlpha; + result = (1 + kCIEConversionAlpha) * + pow(component, (static_cast<double>(1) / 2.4)) - + kCIEConversionAlpha; } return std::min(static_cast<uint8>(255), static_cast<uint8>(result * 255)); } diff --git a/chrome/common/gfx/text_elider.cc b/chrome/common/gfx/text_elider.cc index f4a6d4e..9510a8e 100644 --- a/chrome/common/gfx/text_elider.cc +++ b/chrome/common/gfx/text_elider.cc @@ -376,7 +376,8 @@ void AppendFormattedComponent(const std::string& spec, out_component->begin = static_cast<int>(output->length()); output->append(UnescapeAndDecodeUTF8URLComponent( - spec.substr(in_component.begin, in_component.len), UnescapeRule::NORMAL)); + spec.substr(in_component.begin, in_component.len), + UnescapeRule::NORMAL)); out_component->len = static_cast<int>(output->length()) - out_component->begin; |