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

Unified Diff: ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc

Issue 25647004: Silence narrowing warning with XRectangle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 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: ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc
diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc b/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc
index 7d0277c68e75c725778283fd425903767121b789..d14e5b0e997a66b362946f5d5a89f0bce0ea6623 100644
--- a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc
+++ b/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc
@@ -1053,7 +1053,8 @@ void DesktopRootWindowHostX11::ResetWindowRegion() {
// If we didn't set the shape for any reason, reset the shaping information
// by ShapeSet-ing with our bounds rect.
- XRectangle r = { 0, 0, bounds_.width(), bounds_.height() };
+ XRectangle r = { 0, 0, static_cast<unsigned short>(bounds_.width()),
+ static_cast<unsigned short>(bounds_.height()) };
XShapeCombineRectangles(xdisplay_, xwindow_, ShapeBounding,
0, 0, &r, 1, ShapeSet, YXBanded);
}
« 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