Add implementation of WebThemeEngine for the Mac (declared by

http://webkit.org/b/51507). This allows scrollbar thumb rendering to be
overridden, so that we can match the Mac port's when running under the DRT.

BUG=23498
TEST=Layout tests
Review URL: http://codereview.chromium.org/6041005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70278 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 91 insertions, 2 deletions

diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 44761ba..1126b2c 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -422,6 +422,7 @@
         'websocketstreamhandle_impl.cc',
         'websocketstreamhandle_impl.h',
         'webthemeengine_impl_linux.cc',
+        'webthemeengine_impl_mac.cc',
         'webthemeengine_impl_win.cc',
         'weburlloader_impl.cc',
         'weburlloader_impl.h',
@@ -465,6 +466,9 @@
         }],
         ['OS!="mac"', {
           'sources/': [['exclude', '_mac\\.(cc|mm)$']],
+          'sources!': [
+            'webthemeengine_impl_mac.cc',
+          ],          
         }, {  # else: OS=="mac"
           'sources/': [['exclude', 'plugin_(lib|list)_posix\\.cc$']],
           'link_settings': {
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index 844aae7..faf2926 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -204,7 +204,7 @@ WebKitClientImpl::~WebKitClientImpl() {
 }
 
 WebThemeEngine* WebKitClientImpl::themeEngine() {
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
   return &theme_engine_;
 #else
   return NULL;
diff --git a/webkit/glue/webkitclient_impl.h b/webkit/glue/webkitclient_impl.h
index cc361d3..42b436d 100644
--- a/webkit/glue/webkitclient_impl.h
+++ b/webkit/glue/webkitclient_impl.h
@@ -12,6 +12,8 @@
 #include "webkit/glue/webthemeengine_impl_win.h"
 #elif defined(OS_LINUX)
 #include "webkit/glue/webthemeengine_impl_linux.h"
+#elif defined(OS_MACOSX)
+#include "webkit/glue/webthemeengine_impl_mac.h"
 #endif
 
 
@@ -86,7 +88,7 @@ class WebKitClientImpl : public WebKit::WebKitClient {
   double shared_timer_fire_time_;
   int shared_timer_suspended_;  // counter
 
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
   WebThemeEngineImpl theme_engine_;
 #endif
 };
diff --git a/webkit/glue/webthemeengine_impl_mac.cc b/webkit/glue/webthemeengine_impl_mac.cc
new file mode 100644
index 0000000..ac28334
--- /dev/null
+++ b/webkit/glue/webthemeengine_impl_mac.cc
@@ -0,0 +1,58 @@
+// 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/webthemeengine_impl_mac.h"
+
+#include <Carbon/Carbon.h>
+
+#include "third_party/WebKit/WebKit/chromium/public/WebCanvas.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
+
+using WebKit::WebCanvas;
+using WebKit::WebRect;
+using WebKit::WebThemeEngine;
+
+namespace webkit_glue {
+
+static ThemeTrackEnableState stateToHIEnableState(WebThemeEngine::State state) {
+  switch (state) {
+    case WebThemeEngine::StateDisabled:
+      return kThemeTrackDisabled;
+    case WebThemeEngine::StateInactive:
+      return kThemeTrackInactive;
+    default:
+      return kThemeTrackActive;
+  }
+}
+
+void WebThemeEngineImpl::paintScrollbarThumb(
+    WebCanvas* canvas,
+    WebThemeEngine::State state,
+    WebThemeEngine::Size size,
+    const WebRect& rect,
+    const WebThemeEngine::ScrollbarInfo& scrollbarInfo) {
+  HIThemeTrackDrawInfo trackInfo;
+  trackInfo.version = 0;
+  trackInfo.kind = size == WebThemeEngine::SizeRegular ?
+      kThemeMediumScrollBar : kThemeSmallScrollBar;
+  trackInfo.bounds = CGRectMake(rect.x, rect.y, rect.width, rect.height);
+  trackInfo.min = 0;
+  trackInfo.max = scrollbarInfo.maxValue;
+  trackInfo.value = scrollbarInfo.currentValue;
+  trackInfo.trackInfo.scrollbar.viewsize = scrollbarInfo.visibleSize;
+  trackInfo.attributes = 0;
+  if (scrollbarInfo.orientation ==
+      WebThemeEngine::ScrollbarOrientationHorizontal) {
+    trackInfo.attributes |= kThemeTrackHorizontal;
+  }
+
+  trackInfo.enableState = stateToHIEnableState(state);
+
+  trackInfo.trackInfo.scrollbar.pressState =
+      state == WebThemeEngine::StatePressed ? kThemeThumbPressed : 0;
+  trackInfo.attributes |= (kThemeTrackShowThumb | kThemeTrackHideTrack);
+  HIThemeDrawTrack(&trackInfo, 0, canvas, kHIThemeOrientationNormal);
+}
+
+}  // namespace webkit_glue
diff --git a/webkit/glue/webthemeengine_impl_mac.h b/webkit/glue/webthemeengine_impl_mac.h
new file mode 100644
index 0000000..788cba3
--- /dev/null
+++ b/webkit/glue/webthemeengine_impl_mac.h
@@ -0,0 +1,25 @@
+// 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.
+
+#ifndef WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_MAC_H_
+#define WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_MAC_H_
+
+#include "third_party/WebKit/WebKit/chromium/public/mac/WebThemeEngine.h"
+
+namespace webkit_glue {
+
+class WebThemeEngineImpl : public WebKit::WebThemeEngine {
+ public:
+  // WebKit::WebThemeEngine implementation.
+  virtual void paintScrollbarThumb(
+      WebKit::WebCanvas*,
+      WebKit::WebThemeEngine::State,
+      WebKit::WebThemeEngine::Size,
+      const WebKit::WebRect&,
+      const WebKit::WebThemeEngine::ScrollbarInfo&);
+};
+
+}  // namespace webkit_glue
+
+#endif  // WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_MAC_H_