diff options
Diffstat (limited to 'webkit/glue/plugins/pepper_scrollbar.cc')
-rw-r--r-- | webkit/glue/plugins/pepper_scrollbar.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/glue/plugins/pepper_scrollbar.cc b/webkit/glue/plugins/pepper_scrollbar.cc index a8943d2..88a3f9b 100644 --- a/webkit/glue/plugins/pepper_scrollbar.cc +++ b/webkit/glue/plugins/pepper_scrollbar.cc @@ -19,7 +19,7 @@ #include "webkit/glue/webkit_glue.h" #if defined(OS_WIN) -#include "base/win_util.h" +#include "base/win/windows_version.h" #endif using WebKit::WebInputEvent; @@ -31,7 +31,7 @@ namespace pepper { namespace { PP_Resource Create(PP_Instance instance_id, bool vertical) { - PluginInstance* instance = PluginInstance::FromPPInstance(instance_id); + PluginInstance* instance = ResourceTracker::Get()->GetInstance(instance_id); if (!instance) return 0; @@ -164,7 +164,7 @@ bool Scrollbar::Paint(const PP_Rect* rect, ImageData* image) { scrollbar_->paint(webkit_glue::ToWebCanvas(canvas), gfx_rect); #if defined(OS_WIN) - if (win_util::GetWinVersion() == win_util::WINVERSION_XP) { + if (base::win::GetVersion() == base::win::VERSION_XP) { canvas->getTopPlatformDevice().makeOpaque( gfx_rect.x(), gfx_rect.y(), gfx_rect.width(), gfx_rect.height()); } @@ -196,7 +196,7 @@ void Scrollbar::valueChanged(WebKit::WebScrollbar* scrollbar) { return; ScopedResourceId resource(this); ppp_scrollbar->ValueChanged( - instance()->GetPPInstance(), resource.id, scrollbar_->value()); + instance()->pp_instance(), resource.id, scrollbar_->value()); } void Scrollbar::invalidateScrollbarRect(WebKit::WebScrollbar* scrollbar, |