Index: webkit/plugins/ppapi/ppb_widget_impl.cc |
diff --git a/webkit/plugins/ppapi/ppb_widget_impl.cc b/webkit/plugins/ppapi/ppb_widget_impl.cc |
index 241b2c2a6158d6e0931453db09adbcac3248858a..c071067b8afbf89b694605c127cc4cd362b336ff 100644 |
--- a/webkit/plugins/ppapi/ppb_widget_impl.cc |
+++ b/webkit/plugins/ppapi/ppb_widget_impl.cc |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2010 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
@@ -11,6 +11,7 @@ |
#include "webkit/plugins/ppapi/ppb_image_data_impl.h" |
#include "webkit/plugins/ppapi/ppapi_plugin_instance.h" |
#include "webkit/plugins/ppapi/plugin_module.h" |
+#include "webkit/plugins/ppapi/resource_helper.h" |
using ppapi::thunk::EnterResourceNoLock; |
using ppapi::thunk::PPB_ImageData_API; |
@@ -20,7 +21,7 @@ using ppapi::thunk::PPB_Widget_API; |
namespace webkit { |
namespace ppapi { |
-PPB_Widget_Impl::PPB_Widget_Impl(PluginInstance* instance) |
+PPB_Widget_Impl::PPB_Widget_Impl(PP_Instance instance) |
: Resource(instance) { |
memset(&location_, 0, sizeof(location_)); |
} |
@@ -59,14 +60,14 @@ void PPB_Widget_Impl::SetLocation(const PP_Rect* location) { |
} |
void PPB_Widget_Impl::Invalidate(const PP_Rect* dirty) { |
- if (!instance()) |
+ PluginInstance* plugin_instance = ResourceHelper::GetPluginInstance(this); |
+ if (!plugin_instance) |
return; |
const PPP_Widget_Dev* widget = static_cast<const PPP_Widget_Dev*>( |
- instance()->module()->GetPluginInterface(PPP_WIDGET_DEV_INTERFACE)); |
+ plugin_instance->module()->GetPluginInterface(PPP_WIDGET_DEV_INTERFACE)); |
if (!widget) |
return; |
- ScopedResourceId resource(this); |
- widget->Invalidate(instance()->pp_instance(), resource.id, dirty); |
+ widget->Invalidate(pp_instance(), pp_resource(), dirty); |
} |
} // namespace ppapi |