Relanding this with fixes to the mac dbg builder

webkit/plugins/ppapi/ppb_scrollbar_impl.cc

 // 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.
 
 #include "webkit/plugins/ppapi/ppb_scrollbar_impl.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "ppapi/c/dev/ppp_scrollbar_dev.h"
@@ skipping 116 matching lines @@
     fmultiplier = static_cast<float>(multiplier);
     if (fmultiplier < 0)
       fmultiplier *= -1;
   }
   scrollbar_->scroll(direction, granularity, fmultiplier);
 }
 
 PP_Bool PPB_Scrollbar_Impl::PaintInternal(const gfx::Rect& rect,
                                           PPB_ImageData_Impl* image) {
   ImageDataAutoMapper mapper(image);
-  skia::PlatformCanvas* canvas = image->mapped_canvas();
+  skia::PlatformCanvas* canvas = image->GetPlatformCanvas();
   if (!canvas || !scrollbar_.get())
     return PP_FALSE;
   scrollbar_->paint(webkit_glue::ToWebCanvas(canvas), rect);
 
 #if defined(OS_WIN)
   if (base::win::GetVersion() == base::win::VERSION_XP)
     skia::MakeOpaque(canvas, rect.x(), rect.y(), rect.width(), rect.height());
 #endif
 
   return PP_TRUE;
@@ skipping 91 matching lines @@
   pp_rect.point.y = dirty_.y();
   pp_rect.size.width = dirty_.width();
   pp_rect.size.height = dirty_.height();
   dirty_ = gfx::Rect();
   Invalidate(&pp_rect);
 }
 
 }  // namespace ppapi
 }  // namespace webkit