Map webkit glue when Mac build uses Skia.

webkit/glue/webthemeengine_impl_mac.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/glue/webthemeengine_impl_mac.h"
 
 #include <Carbon/Carbon.h>
 
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCanvas.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h"
 
+#if WEBKIT_USING_SKIA
+#include "skia/ext/platform_canvas.h"
+#include "skia/ext/skia_utils_mac.h"
+#endif
+
 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;
@@ skipping 23 matching lines @@
   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);
+#if WEBKIT_USING_SKIA
+  gfx::SkiaBitLocker bitLocker(canvas);
+  CGContextRef cgContext = bitLocker.cgContext();
+#else
+  CGContextRef cgContext = canvas;
+#endif

[Nico, 2011/04/14 17:04:45]

I assume you will end up with these 6 lines in many many places. How about
abstracting the #ifdef away? You could have a WebCanvasRAII class that takes a
WebCanvas in its constructor, give it a asCGContext() function, and put the
#ifdef in there. That way, all the client code would look like

  WebCanvasRAII canvasRAII(canvas);
  HITheemDrawTrack(..., canvasRAII.asCGContext(), ...)

[_cary, 2011/04/14 17:52:32]

Outside of this CL and http://codereview.chromium.org/6823081/ (4 occurrences)
the pattern is only in four other places. Even then, this pattern isn't reusable
in those places (e.g., the CGContext is the platformContext()).

The #if WEBKIT_USING_SKIA inside Chromium Mac files is temporary scaffolding
until it is demonstrable that we no longer want to maintain the current CG
drawing path -- then 4 of these 6 lines go away.

On 2011/04/14 17:04:45, Nico wrote:

[Nico, 2011/04/14 17:55:25]

I'd still prefer to not have them in a zillion places.

+  HIThemeDrawTrack(&trackInfo, 0, cgContext, kHIThemeOrientationNormal);
 }
 
 }  // namespace webkit_glue