Merge 54075 - Fix strange colors on scrollbars when using classic theme on XP...

webkit/glue/plugins/pepper_scrollbar.cc

 // Copyright (c) 2010 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/glue/plugins/pepper_scrollbar.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
+#include "skia/ext/platform_canvas.h"
 #include "third_party/ppapi/c/ppp_scrollbar.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebScrollbar.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
 #include "webkit/glue/plugins/pepper_event_conversion.h"
 #include "webkit/glue/plugins/pepper_image_data.h"
 #include "webkit/glue/plugins/pepper_plugin_instance.h"
 #include "webkit/glue/plugins/pepper_plugin_module.h"
 #include "webkit/glue/webkit_glue.h"
 
+#if defined(OS_WIN)
+#include "base/win_util.h"
+#endif
+
 using WebKit::WebInputEvent;
 using WebKit::WebRect;
 using WebKit::WebScrollbar;
 
 namespace pepper {
 
 namespace {
 
 PP_Resource Create(PP_Instance instance_id, bool vertical) {
   PluginInstance* instance = PluginInstance::FromPPInstance(instance_id);
@@ skipping 124 matching lines @@
 
 bool Scrollbar::Paint(const PP_Rect* rect, ImageData* image) {
   gfx::Rect gfx_rect(rect->point.x,
                      rect->point.y,
                      rect->size.width,
                      rect->size.height);
   skia::PlatformCanvas* canvas = image->mapped_canvas();
   if (!canvas)
     return false;
   scrollbar_->paint(webkit_glue::ToWebCanvas(canvas), gfx_rect);
+
+#if defined(OS_WIN)
+  if (win_util::GetWinVersion() == win_util::WINVERSION_XP) {
+    canvas->getTopPlatformDevice().makeOpaque(
+        gfx_rect.x(), gfx_rect.y(), gfx_rect.width(), gfx_rect.height());
+  }
+#endif
+
   return true;
 }
 
 bool Scrollbar::HandleEvent(const PP_Event* event) {
   scoped_ptr<WebInputEvent> web_input_event(CreateWebInputEvent(*event));
   if (!web_input_event.get())
     return false;
 
   return scrollbar_->handleInputEvent(*web_input_event.get());
 }
@@ skipping 46 matching lines @@
   PP_Rect pp_rect;
   pp_rect.point.x = dirty_.x();
   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 pepper