summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2015-07-01 12:23:57 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-01 19:25:36 +0000
commitc72e98fac16cccc517ad3573d9fc2aed358ae633 (patch)
treec9605c17b9b7903b28376bbfbf35b88c1b1e1ac1
parentdb18a089432e97b4085d3396540e97602ae453bf (diff)
downloadchromium_src-c72e98fac16cccc517ad3573d9fc2aed358ae633.zip
chromium_src-c72e98fac16cccc517ad3573d9fc2aed358ae633.tar.gz
chromium_src-c72e98fac16cccc517ad3573d9fc2aed358ae633.tar.bz2
Fix some clang warnings with -Wmissing-braces in ui.
Clang warns if there are missing braces around a subobject initializer. The most common idiom that triggers this is: STRUCT s = {0}; if the first field of STRUCT is itself a struct. This can be more simply written as: STRUCT s = {}; which also prevents the warning from firing. BUG=505297 Review URL: https://codereview.chromium.org/1215343002 Cr-Commit-Position: refs/heads/master@{#337091}
-rw-r--r--ui/base/clipboard/clipboard_win.cc2
-rw-r--r--ui/base/test/ui_controls_internal_win.cc2
-rw-r--r--ui/gfx/font_render_params_win.cc2
-rw-r--r--ui/gfx/icon_util.cc2
-rw-r--r--ui/native_theme/native_theme_win.cc8
-rw-r--r--ui/views/corewm/cursor_height_provider_win.cc2
6 files changed, 9 insertions, 9 deletions
diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
index a58bb5a..e818f22 100644
--- a/ui/base/clipboard/clipboard_win.cc
+++ b/ui/base/clipboard/clipboard_win.cc
@@ -778,7 +778,7 @@ void ClipboardWin::WriteBitmap(const SkBitmap& bitmap) {
// pointer. Someone has to memcpy it into GDI, it might as well be us here.
// TODO(darin): share data in gfx/bitmap_header.cc somehow
- BITMAPINFO bm_info = {0};
+ BITMAPINFO bm_info = {};
bm_info.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
bm_info.bmiHeader.biWidth = bitmap.width();
bm_info.bmiHeader.biHeight = -bitmap.height(); // sets vertical orientation
diff --git a/ui/base/test/ui_controls_internal_win.cc b/ui/base/test/ui_controls_internal_win.cc
index 059c820..3667bcf 100644
--- a/ui/base/test/ui_controls_internal_win.cc
+++ b/ui/base/test/ui_controls_internal_win.cc
@@ -199,7 +199,7 @@ bool SendKeyPressImpl(HWND window,
return true;
}
- INPUT input[8] = { 0 }; // 8, assuming all the modifiers are activated.
+ INPUT input[8] = {}; // 8, assuming all the modifiers are activated.
UINT i = 0;
if (control) {
diff --git a/ui/gfx/font_render_params_win.cc b/ui/gfx/font_render_params_win.cc
index 54fb165..968f998 100644
--- a/ui/gfx/font_render_params_win.cc
+++ b/ui/gfx/font_render_params_win.cc
@@ -17,7 +17,7 @@ namespace gfx {
namespace {
FontRenderParams::SubpixelRendering GetSubpixelRenderingGeometry() {
- DISPLAY_DEVICE display_device = {sizeof(DISPLAY_DEVICE), 0};
+ DISPLAY_DEVICE display_device = {sizeof(DISPLAY_DEVICE)};
for (int i = 0; EnumDisplayDevices(nullptr, i, &display_device, 0); ++i) {
// TODO(scottmg): We only support the primary device currently.
if (display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) {
diff --git a/ui/gfx/icon_util.cc b/ui/gfx/icon_util.cc
index 8a9c0eb..94a77bb 100644
--- a/ui/gfx/icon_util.cc
+++ b/ui/gfx/icon_util.cc
@@ -322,7 +322,7 @@ HICON IconUtil::CreateCursorFromDIB(const gfx::Size& icon_size,
const gfx::Point& hotspot,
const void* dib_bits,
size_t dib_size) {
- BITMAPINFO icon_bitmap_info = {0};
+ BITMAPINFO icon_bitmap_info = {};
gfx::CreateBitmapHeader(
icon_size.width(),
icon_size.height(),
diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
index aee3c46..1f1aeed 100644
--- a/ui/native_theme/native_theme_win.cc
+++ b/ui/native_theme/native_theme_win.cc
@@ -1129,10 +1129,10 @@ HRESULT NativeThemeWin::PaintScrollbarArrow(
const gfx::Rect& rect,
const ScrollbarArrowExtraParams& extra) const {
static const int state_id_matrix[4][kNumStates] = {
- ABS_DOWNDISABLED, ABS_DOWNHOT, ABS_DOWNNORMAL, ABS_DOWNPRESSED,
- ABS_LEFTDISABLED, ABS_LEFTHOT, ABS_LEFTNORMAL, ABS_LEFTPRESSED,
- ABS_RIGHTDISABLED, ABS_RIGHTHOT, ABS_RIGHTNORMAL, ABS_RIGHTPRESSED,
- ABS_UPDISABLED, ABS_UPHOT, ABS_UPNORMAL, ABS_UPPRESSED
+ {ABS_DOWNDISABLED, ABS_DOWNHOT, ABS_DOWNNORMAL, ABS_DOWNPRESSED},
+ {ABS_LEFTDISABLED, ABS_LEFTHOT, ABS_LEFTNORMAL, ABS_LEFTPRESSED},
+ {ABS_RIGHTDISABLED, ABS_RIGHTHOT, ABS_RIGHTNORMAL, ABS_RIGHTPRESSED},
+ {ABS_UPDISABLED, ABS_UPHOT, ABS_UPNORMAL, ABS_UPPRESSED},
};
HANDLE handle = GetThemeHandle(SCROLLBAR);
RECT rect_win = rect.ToRECT();
diff --git a/ui/views/corewm/cursor_height_provider_win.cc b/ui/views/corewm/cursor_height_provider_win.cc
index 0d28d38..1fde647 100644
--- a/ui/views/corewm/cursor_height_provider_win.cc
+++ b/ui/views/corewm/cursor_height_provider_win.cc
@@ -83,7 +83,7 @@ int CalculateCursorHeight(HCURSOR cursor_handle) {
ICONINFO icon = {0};
GetIconInfo(cursor_handle, &icon);
- BITMAPINFO bitmap_info = {0};
+ BITMAPINFO bitmap_info = {};
bitmap_info.bmiHeader.biSize = sizeof(bitmap_info.bmiHeader);
if (GetDIBits(hdc, icon.hbmMask, 0, 0, NULL, &bitmap_info, DIB_RGB_COLORS) ==
0)