summaryrefslogtreecommitdiffstats
path: root/webkit/glue/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/glue/plugins')
-rw-r--r--webkit/glue/plugins/plugin_host.cc2
-rw-r--r--webkit/glue/plugins/webplugin_impl.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/webkit/glue/plugins/plugin_host.cc b/webkit/glue/plugins/plugin_host.cc
index 41d2fa2..a6e0fde 100644
--- a/webkit/glue/plugins/plugin_host.cc
+++ b/webkit/glue/plugins/plugin_host.cc
@@ -656,7 +656,7 @@ NPError NPN_GetValue(NPP id, NPNVariable variable, void* value) {
NPError rv = NPERR_GENERIC_ERROR;
- switch (variable) {
+ switch (static_cast<int>(variable)) {
case NPNVWindowNPObject: {
scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id);
NPObject *np_object = plugin->webplugin()->GetWindowScriptNPObject();
diff --git a/webkit/glue/plugins/webplugin_impl.cc b/webkit/glue/plugins/webplugin_impl.cc
index 8a0e75e..693232b 100644
--- a/webkit/glue/plugins/webplugin_impl.cc
+++ b/webkit/glue/plugins/webplugin_impl.cc
@@ -412,7 +412,7 @@ WebPluginImpl::WebPluginImpl(
WebFrame* webframe, const WebPluginParams& params,
const base::WeakPtr<WebPluginPageDelegate>& page_delegate)
: windowless_(false),
- window_(0),
+ window_(gfx::kNullPluginWindow),
accepts_input_events_(false),
page_delegate_(page_delegate),
webframe_(webframe),
@@ -473,7 +473,7 @@ void WebPluginImpl::SetWindow(gfx::PluginWindowHandle window) {
void WebPluginImpl::WillDestroyWindow(gfx::PluginWindowHandle window) {
DCHECK_EQ(window, window_);
- window_ = 0;
+ window_ = gfx::kNullPluginWindow;
if (page_delegate_)
page_delegate_->WillDestroyPluginWindow(window);
}