Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(383)

Side by Side Diff: Source/web/WebFontImpl.cpp

Issue 20300002: Fix trailing whitespace in .cpp, .h, and .idl files (ex. Source/core) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/web/WebDOMActivityLogger.cpp ('k') | Source/web/WebHelperPluginImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 } 146 }
147 147
148 WebRect WebFontImpl::estimateTextBounds(const WebTextRun& run, const WebFloatPoi nt& leftBaseline) const 148 WebRect WebFontImpl::estimateTextBounds(const WebTextRun& run, const WebFloatPoi nt& leftBaseline) const
149 { 149 {
150 FontCachePurgePreventer fontCachePurgePreventer; 150 FontCachePurgePreventer fontCachePurgePreventer;
151 int totalWidth = m_font.width(run, 0); 151 int totalWidth = m_font.width(run, 0);
152 const WebCore::FontMetrics& fontMetrics = m_font.fontMetrics(); 152 const WebCore::FontMetrics& fontMetrics = m_font.fontMetrics();
153 return WebRect(leftBaseline.x - (fontMetrics.ascent() + fontMetrics.descent( )) / 2, 153 return WebRect(leftBaseline.x - (fontMetrics.ascent() + fontMetrics.descent( )) / 2,
154 leftBaseline.y - fontMetrics.ascent() - fontMetrics.lineGap() , 154 leftBaseline.y - fontMetrics.ascent() - fontMetrics.lineGap() ,
155 totalWidth + fontMetrics.ascent() + fontMetrics.descent(), 155 totalWidth + fontMetrics.ascent() + fontMetrics.descent(),
156 fontMetrics.lineSpacing()); 156 fontMetrics.lineSpacing());
157 } 157 }
158 158
159 } // namespace WebKit 159 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/web/WebDOMActivityLogger.cpp ('k') | Source/web/WebHelperPluginImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698