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

Unified Diff: chrome/browser/ui/views/constrained_window_frame_simple.cc

Issue 11148030: Fix gcc 4.7 building problem. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/constrained_window_frame_simple.cc
diff --git a/chrome/browser/ui/views/constrained_window_frame_simple.cc b/chrome/browser/ui/views/constrained_window_frame_simple.cc
index 3292b063b0b6272fbd35844ffffe0ff647aa05d9..0a6cbb539c8daa5eb6fabe4c6d517da9d7a45c8c 100644
--- a/chrome/browser/ui/views/constrained_window_frame_simple.cc
+++ b/chrome/browser/ui/views/constrained_window_frame_simple.cc
@@ -190,7 +190,8 @@ int ConstrainedWindowFrameSimple::NonClientHitTest(const gfx::Point& point) {
void ConstrainedWindowFrameSimple::GetWindowMask(const gfx::Size& size,
gfx::Path* window_mask) {
#if defined(USE_AURA)
- SkRect rect = {0, 0, size.width() - 1, size.height() - 1};
+ SkRect rect = {0, 0, static_cast<SkScalar>(size.width() - 1),
+ static_cast<SkScalar>(size.height() - 1)};
#else
// There appears to be a bug in the window mask calculation on Windows
// which causes the width, but not the height, to be off by one.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698