summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webpreferences.cc1
-rw-r--r--webkit/glue/window_open_disposition.h1
-rw-r--r--webkit/plugins/ppapi/ppb_flash_menu_impl.cc3
-rw-r--r--webkit/plugins/ppapi/ppb_flash_net_connector_impl.cc5
4 files changed, 8 insertions, 2 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index cacfd4b..6bd15e5 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -75,6 +75,7 @@ WebPreferences::WebPreferences()
asynchronous_spell_checking_enabled(true),
accelerated_compositing_enabled(false),
force_compositing_mode(false),
+ allow_webui_compositing(false),
composite_to_texture_enabled(false),
accelerated_layers_enabled(false),
accelerated_video_enabled(false),
diff --git a/webkit/glue/window_open_disposition.h b/webkit/glue/window_open_disposition.h
index c9bfa0a..06bda03 100644
--- a/webkit/glue/window_open_disposition.h
+++ b/webkit/glue/window_open_disposition.h
@@ -8,6 +8,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebNavigationPolicy.h"
enum WindowOpenDisposition {
+ UNKNOWN,
SUPPRESS_OPEN,
CURRENT_TAB,
// Indicates that only one tab with the url should exist in the same window.
diff --git a/webkit/plugins/ppapi/ppb_flash_menu_impl.cc b/webkit/plugins/ppapi/ppb_flash_menu_impl.cc
index 2d64e8b..c82e362 100644
--- a/webkit/plugins/ppapi/ppb_flash_menu_impl.cc
+++ b/webkit/plugins/ppapi/ppb_flash_menu_impl.cc
@@ -96,7 +96,8 @@ bool ConvertMenuData(const PP_Flash_Menu* in_menu,
} // namespace
PPB_Flash_Menu_Impl::PPB_Flash_Menu_Impl(PP_Instance instance)
- : Resource(instance) {
+ : Resource(instance),
+ selected_id_out_(NULL) {
}
PPB_Flash_Menu_Impl::~PPB_Flash_Menu_Impl() {
diff --git a/webkit/plugins/ppapi/ppb_flash_net_connector_impl.cc b/webkit/plugins/ppapi/ppb_flash_net_connector_impl.cc
index e22cccf..5b85ec1 100644
--- a/webkit/plugins/ppapi/ppb_flash_net_connector_impl.cc
+++ b/webkit/plugins/ppapi/ppb_flash_net_connector_impl.cc
@@ -18,7 +18,10 @@ namespace webkit {
namespace ppapi {
PPB_Flash_NetConnector_Impl::PPB_Flash_NetConnector_Impl(PP_Instance instance)
- : Resource(instance) {
+ : Resource(instance),
+ socket_out_(NULL),
+ local_addr_out_(NULL),
+ remote_addr_out_(NULL) {
}
PPB_Flash_NetConnector_Impl::~PPB_Flash_NetConnector_Impl() {