diff options
-rw-r--r-- | chrome/browser/policy/url_blacklist_manager.cc | 2 | ||||
-rw-r--r-- | content/browser/gamepad/platform_data_fetcher_win.cc | 2 | ||||
-rw-r--r-- | content/common/gpu/media/vaapi_h264_decoder.cc | 6 | ||||
-rw-r--r-- | content/common/gpu/media/vaapi_h264_decoder.h | 2 | ||||
-rw-r--r-- | content/common/gpu/media/vaapi_video_decode_accelerator.cc | 2 | ||||
-rw-r--r-- | dbus/property.cc | 2 | ||||
-rw-r--r-- | gpu/command_buffer/service/program_manager.cc | 7 | ||||
-rw-r--r-- | media/base/audio_renderer_mixer_input.cc | 1 | ||||
-rw-r--r-- | remoting/client/plugin/pepper_view.cc | 1 | ||||
-rw-r--r-- | webkit/dom_storage/dom_storage_session.cc | 3 | ||||
-rw-r--r-- | webkit/fileapi/obfuscated_file_util.cc | 3 |
11 files changed, 23 insertions, 8 deletions
diff --git a/chrome/browser/policy/url_blacklist_manager.cc b/chrome/browser/policy/url_blacklist_manager.cc index bcf49f9..9c7afb7 100644 --- a/chrome/browser/policy/url_blacklist_manager.cc +++ b/chrome/browser/policy/url_blacklist_manager.cc @@ -65,7 +65,7 @@ scoped_ptr<URLBlacklist> BuildBlacklist(scoped_ptr<base::ListValue> block, } // namespace struct URLBlacklist::FilterComponents { - FilterComponents() : match_subdomains(true), allow(true) {} + FilterComponents() : port(0), match_subdomains(true), allow(true) {} ~FilterComponents() {} std::string scheme; diff --git a/content/browser/gamepad/platform_data_fetcher_win.cc b/content/browser/gamepad/platform_data_fetcher_win.cc index 8a50a38..92587a4 100644 --- a/content/browser/gamepad/platform_data_fetcher_win.cc +++ b/content/browser/gamepad/platform_data_fetcher_win.cc @@ -147,6 +147,8 @@ void GamepadPlatformDataFetcherWin::GetGamepadData(WebGamepads* pads, } bool GamepadPlatformDataFetcherWin::GetXinputDllFunctions() { + xinput_get_capabilities_ = NULL; + xinput_get_state_ = NULL; xinput_enable_ = static_cast<XInputEnableFunc>( xinput_dll_.GetFunctionPointer("XInputEnable")); if (!xinput_enable_) diff --git a/content/common/gpu/media/vaapi_h264_decoder.cc b/content/common/gpu/media/vaapi_h264_decoder.cc index 29a11c4..64d2441 100644 --- a/content/common/gpu/media/vaapi_h264_decoder.cc +++ b/content/common/gpu/media/vaapi_h264_decoder.cc @@ -242,11 +242,13 @@ VaapiH264Decoder::DecodeSurface::DecodeSurface( va_display_(va_display), make_context_current_(make_context_current), va_surface_id_(va_surface_id), + input_id_(0), picture_buffer_id_(picture_buffer_id), texture_id_(texture_id), width_(width), height_(height), available_(false), + poc_(0), x_pixmap_(0), glx_pixmap_(0) { // Bind the surface to a texture of the given width and height, @@ -332,6 +334,10 @@ bool VaapiH264Decoder::DecodeSurface::Sync() { VaapiH264Decoder::VaapiH264Decoder() { Reset(); + curr_input_id_ = -1; + x_display_ = NULL; + fb_config_ = NULL; + va_display_ = NULL; curr_sps_id_ = -1; curr_pps_id_ = -1; pic_width_ = -1; diff --git a/content/common/gpu/media/vaapi_h264_decoder.h b/content/common/gpu/media/vaapi_h264_decoder.h index 3d73abf..a2f6ab0 100644 --- a/content/common/gpu/media/vaapi_h264_decoder.h +++ b/content/common/gpu/media/vaapi_h264_decoder.h @@ -274,7 +274,7 @@ class VaapiH264Decoder { int pic_width_; int pic_height_; - // Data queued up for HW decoder, to be commited on next HW decode. + // Data queued up for HW decoder, to be committed on next HW decode. std::queue<VABufferID> pending_slice_bufs_; std::queue<VABufferID> pending_va_bufs_; diff --git a/content/common/gpu/media/vaapi_video_decode_accelerator.cc b/content/common/gpu/media/vaapi_video_decode_accelerator.cc index a9bddee..75fc61d 100644 --- a/content/common/gpu/media/vaapi_video_decode_accelerator.cc +++ b/content/common/gpu/media/vaapi_video_decode_accelerator.cc @@ -28,7 +28,7 @@ using content::VaapiH264Decoder; -VaapiVideoDecodeAccelerator::InputBuffer::InputBuffer() { +VaapiVideoDecodeAccelerator::InputBuffer::InputBuffer() : id(0), size(0) { } VaapiVideoDecodeAccelerator::InputBuffer::~InputBuffer() { diff --git a/dbus/property.cc b/dbus/property.cc index 19683c7..e8dfe5d 100644 --- a/dbus/property.cc +++ b/dbus/property.cc @@ -323,7 +323,7 @@ void Property<uint32>::AppendSetValueToWriter(MessageWriter* writer) { // template <> -Property<int64>::Property() : value_(0) { +Property<int64>::Property() : value_(0), set_value_(0) { } template <> diff --git a/gpu/command_buffer/service/program_manager.cc b/gpu/command_buffer/service/program_manager.cc index 0dbd7b8..21b9238 100644 --- a/gpu/command_buffer/service/program_manager.cc +++ b/gpu/command_buffer/service/program_manager.cc @@ -91,7 +91,10 @@ bool GetUniformNameSansElement( } // anonymous namespace. ProgramManager::ProgramInfo::UniformInfo::UniformInfo() - : size(0) { + : size(0), + type(GL_NONE), + fake_location_base(0), + is_array(false) { } ProgramManager::ProgramInfo::UniformInfo::UniformInfo( @@ -233,7 +236,7 @@ void ProgramManager::ProgramInfo::ClearUniforms( namespace { struct UniformData { - UniformData() : size(-1), type(GL_NONE), added(false) { + UniformData() : size(-1), type(GL_NONE), location(0), added(false) { } std::string queried_name; std::string corrected_name; diff --git a/media/base/audio_renderer_mixer_input.cc b/media/base/audio_renderer_mixer_input.cc index ec0c019..a04d996 100644 --- a/media/base/audio_renderer_mixer_input.cc +++ b/media/base/audio_renderer_mixer_input.cc @@ -16,6 +16,7 @@ AudioRendererMixerInput::AudioRendererMixerInput( volume_(1.0f), get_mixer_cb_(get_mixer_cb), remove_mixer_cb_(remove_mixer_cb), + mixer_(NULL), callback_(NULL) { } diff --git a/remoting/client/plugin/pepper_view.cc b/remoting/client/plugin/pepper_view.cc index aabcba0..446201b 100644 --- a/remoting/client/plugin/pepper_view.cc +++ b/remoting/client/plugin/pepper_view.cc @@ -50,6 +50,7 @@ PepperView::PepperView(ChromotingInstance* instance, view_size_dips_(SkISize::Make(0, 0)), view_scale_(1.0f), flush_pending_(false), + is_initialized_(false), frame_received_(false) { InitiateDrawing(); } diff --git a/webkit/dom_storage/dom_storage_session.cc b/webkit/dom_storage/dom_storage_session.cc index 2961fa3..f305a06 100644 --- a/webkit/dom_storage/dom_storage_session.cc +++ b/webkit/dom_storage/dom_storage_session.cc @@ -61,7 +61,8 @@ DomStorageSession::DomStorageSession(DomStorageContext* context, const std::string& persistent_namespace_id) : context_(context), namespace_id_(namespace_id), - persistent_namespace_id_(persistent_namespace_id) { + persistent_namespace_id_(persistent_namespace_id), + should_persist_(false) { // This ctor is intended for use by the Clone() method. } diff --git a/webkit/fileapi/obfuscated_file_util.cc b/webkit/fileapi/obfuscated_file_util.cc index c6cd19a..ac11d2e 100644 --- a/webkit/fileapi/obfuscated_file_util.cc +++ b/webkit/fileapi/obfuscated_file_util.cc @@ -126,7 +126,8 @@ class ObfuscatedFileEnumerator obfuscated_file_util_(obfuscated_file_util), origin_(root_url.origin()), type_(root_url.type()), - recursive_(recursive) { + recursive_(recursive), + current_file_id_(0) { FilePath root_virtual_path = root_url.path(); FileId file_id; |