Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(616)

Unified Diff: webkit/plugins/ppapi/ppb_scrollbar_impl.cc

Issue 7669055: Remove webkit::ppapi::Resource. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix self-assignment Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/plugins/ppapi/ppb_scrollbar_impl.cc
diff --git a/webkit/plugins/ppapi/ppb_scrollbar_impl.cc b/webkit/plugins/ppapi/ppb_scrollbar_impl.cc
index 3407ba77735d8f15dca9d7d5e72a0f677d3620b3..6db43f241235271ee1a1ccbf782c200e0962fbef 100644
--- a/webkit/plugins/ppapi/ppb_scrollbar_impl.cc
+++ b/webkit/plugins/ppapi/ppb_scrollbar_impl.cc
@@ -18,6 +18,7 @@
#include "webkit/plugins/ppapi/plugin_module.h"
#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
#include "webkit/plugins/ppapi/ppb_image_data_impl.h"
+#include "webkit/plugins/ppapi/resource_helper.h"
#include "webkit/glue/webkit_glue.h"
#if defined(OS_WIN)
@@ -108,7 +109,7 @@ const PPB_Scrollbar_0_4_Dev ppb_scrollbar_0_4 = {
} // namespace
// static
-PP_Resource PPB_Scrollbar_Impl::Create(PluginInstance* instance,
+PP_Resource PPB_Scrollbar_Impl::Create(PP_Instance instance,
bool vertical) {
scoped_refptr<PPB_Scrollbar_Impl> scrollbar(
new PPB_Scrollbar_Impl(instance));
@@ -116,7 +117,7 @@ PP_Resource PPB_Scrollbar_Impl::Create(PluginInstance* instance,
return scrollbar->GetReference();
}
-PPB_Scrollbar_Impl::PPB_Scrollbar_Impl(PluginInstance* instance)
+PPB_Scrollbar_Impl::PPB_Scrollbar_Impl(PP_Instance instance)
: PPB_Widget_Impl(instance),
ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
}
@@ -127,7 +128,7 @@ PPB_Scrollbar_Impl::~PPB_Scrollbar_Impl() {
void PPB_Scrollbar_Impl::Init(bool vertical) {
scrollbar_.reset(WebScrollbar::createForPlugin(
vertical ? WebScrollbar::Vertical : WebScrollbar::Horizontal,
- instance()->container(),
+ ResourceHelper::GetPluginInstance(this)->container(),
static_cast<WebKit::WebScrollbarClient*>(this)));
}
@@ -232,33 +233,32 @@ void PPB_Scrollbar_Impl::SetLocationInternal(const PP_Rect* location) {
}
void PPB_Scrollbar_Impl::valueChanged(WebKit::WebScrollbar* scrollbar) {
+ PluginModule* module = ResourceHelper::GetPluginModule(this);
const PPP_Scrollbar_Dev* ppp_scrollbar =
- static_cast<const PPP_Scrollbar_Dev*>(instance()->module()->
- GetPluginInterface(PPP_SCROLLBAR_DEV_INTERFACE));
+ static_cast<const PPP_Scrollbar_Dev*>(module->GetPluginInterface(
+ PPP_SCROLLBAR_DEV_INTERFACE));
if (!ppp_scrollbar) {
// Try the old version. This is ok because the old interface is a subset of
// the new one, and ValueChanged didn't change.
ppp_scrollbar =
- static_cast<const PPP_Scrollbar_Dev*>(instance()->module()->
- GetPluginInterface(PPP_SCROLLBAR_DEV_INTERFACE_0_2));
+ static_cast<const PPP_Scrollbar_Dev*>(module->GetPluginInterface(
+ PPP_SCROLLBAR_DEV_INTERFACE_0_2));
if (!ppp_scrollbar)
return;
}
- ScopedResourceId resource(this);
- ppp_scrollbar->ValueChanged(
- instance()->pp_instance(), resource.id, scrollbar_->value());
+ ppp_scrollbar->ValueChanged(pp_instance(), pp_resource(),
+ scrollbar_->value());
}
void PPB_Scrollbar_Impl::overlayChanged(WebScrollbar* scrollbar) {
+ PluginModule* module = ResourceHelper::GetPluginModule(this);
const PPP_Scrollbar_Dev* ppp_scrollbar =
- static_cast<const PPP_Scrollbar_Dev*>(instance()->module()->
- GetPluginInterface(PPP_SCROLLBAR_DEV_INTERFACE));
+ static_cast<const PPP_Scrollbar_Dev*>(module->GetPluginInterface(
+ PPP_SCROLLBAR_DEV_INTERFACE));
if (!ppp_scrollbar)
return;
- ScopedResourceId resource(this);
- ppp_scrollbar->OverlayChanged(
- instance()->pp_instance(), resource.id,
- PP_FromBool(IsOverlay()));
+ ppp_scrollbar->OverlayChanged(pp_instance(), pp_resource(),
+ PP_FromBool(IsOverlay()));
}
void PPB_Scrollbar_Impl::invalidateScrollbarRect(

Powered by Google App Engine
This is Rietveld 408576698