diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/clipboard/clipboard_win.cc | 3 | ||||
| -rw-r--r-- | ui/gfx/canvas_skia_win.cc | 4 | ||||
| -rw-r--r-- | ui/gfx/gl/gl_context_egl.cc | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc index 4944bd7..ec3cd1e 100644 --- a/ui/base/clipboard/clipboard_win.cc +++ b/ui/base/clipboard/clipboard_win.cc @@ -160,7 +160,8 @@ void MakeBitmapOpaque(const SkBitmap& bitmap) { } // namespace -Clipboard::FormatType::FormatType() { +// '0' is not a valid clip board data format. +Clipboard::FormatType::FormatType() : data_(0) { } Clipboard::FormatType::FormatType(UINT native_format) : data_(native_format) { diff --git a/ui/gfx/canvas_skia_win.cc b/ui/gfx/canvas_skia_win.cc index 02a0cde..2d081a5 100644 --- a/ui/gfx/canvas_skia_win.cc +++ b/ui/gfx/canvas_skia_win.cc @@ -464,8 +464,8 @@ void CanvasSkia::DrawFadeTruncatingString( int flags = NO_ELLIPSIS; // If the whole string fits in the destination then just draw it directly. - int total_string_width; - int total_string_height; + int total_string_width = 0; + int total_string_height = 0; SizeStringInt(text, font, &total_string_width, &total_string_height, flags | TEXT_VALIGN_TOP); diff --git a/ui/gfx/gl/gl_context_egl.cc b/ui/gfx/gl/gl_context_egl.cc index d9b6950..7c94743 100644 --- a/ui/gfx/gl/gl_context_egl.cc +++ b/ui/gfx/gl/gl_context_egl.cc @@ -34,8 +34,9 @@ std::string GLContextEGL::GetExtensions() { GLContextEGL::GLContextEGL(GLShareGroup* share_group) : GLContext(share_group), - context_(NULL) -{ + context_(NULL), + display_(NULL), + config_(NULL) { } GLContextEGL::~GLContextEGL() { |