mac: Let panels get its resize cursors from WebKit.

chrome/browser/ui/panels/panel_window_controller_cocoa.mm

 // Copyright (c) 2012 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 "chrome/browser/ui/panels/panel_window_controller_cocoa.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
@@ skipping 18 matching lines @@
 #include "chrome/browser/ui/panels/panel_bounds_animation.h"
 #include "chrome/browser/ui/panels/panel_constants.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/panel_strip.h"
 #import "chrome/browser/ui/panels/panel_titlebar_view_cocoa.h"
 #import "chrome/browser/ui/panels/panel_utils_cocoa.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "grit/ui_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
-#include "ui/gfx/mac/nsimage_cache.h"
+#include "webkit/glue/webcursor.h"
 
 using content::WebContents;
 
 const int kMinimumWindowSize = 1;
 const double kBoundsAnimationSpeedPixelsPerSecond = 1000;
 const double kBoundsAnimationMaxDurationSeconds = 0.18;
 
 // Resize edge thickness, in screen pixels.
 const double kWidthOfMouseResizeArea = 4.0;
 // The distance the user has to move the mouse while keeping the left button
@@ skipping 66 matching lines @@
    NSRect rightCursorRect_;
    NSRect topCursorRect_;
    NSRect bottomCursorRect_;
    NSRect topLeftCursorRect_;
    NSRect topRightCursorRect_;
    NSRect bottomLeftCursorRect_;
    NSRect bottomRightCursorRect_;
 }
 @end
 
+namespace {
+NSCursor* LoadWebKitCursor(WebKit::WebCursorInfo::Type type) {
+    return WebCursor(WebKit::WebCursorInfo(type)).GetNativeCursor();
+}
+}
+
 @implementation PanelResizeByMouseOverlay
 - (PanelResizeByMouseOverlay*)initWithFrame:(NSRect)frame panel:(Panel*)panel {
   if ((self = [super initWithFrame:frame])) {
     panel_ = panel;
-    // Initialize resize cursors, they are very likely to be needed so it's
-    // better to pre-init them then stutter the mouse later when it hovers over
-    // a resize edge. We use WebKit cursors that look similar to what OSX Lion
-    // uses. NSCursor class does not yet have support for those new cursors.
-    NSImage* image = gfx::GetCachedImageWithName(@"eastWestResizeCursor.png");
-    DCHECK(image);
+
     eastWestCursor_.reset(
-        [[NSCursor alloc] initWithImage:image hotSpot:NSMakePoint(8,8)]);
-    image = gfx::GetCachedImageWithName(@"northSouthResizeCursor.png");
-    DCHECK(image);
+        [LoadWebKitCursor(WebKit::WebCursorInfo::TypeEastWestResize) retain]);
     northSouthCursor_.reset(
-        [[NSCursor alloc] initWithImage:image hotSpot:NSMakePoint(8,8)]);
-    image = gfx::GetCachedImageWithName(@"northEastSouthWestResizeCursor.png");
-    DCHECK(image);
+        [LoadWebKitCursor(WebKit::WebCursorInfo::TypeNorthSouthResize) retain]);
     northEastSouthWestCursor_.reset(
-        [[NSCursor alloc] initWithImage:image hotSpot:NSMakePoint(8,8)]);
-    image = gfx::GetCachedImageWithName(@"northWestSouthEastResizeCursor.png");
-    DCHECK(image);
+        [LoadWebKitCursor(WebKit::WebCursorInfo::TypeNorthEastSouthWestResize)
+        retain]);
     northWestSouthEastCursor_.reset(
-        [[NSCursor alloc] initWithImage:image hotSpot:NSMakePoint(8,8)]);
+        [LoadWebKitCursor(WebKit::WebCursorInfo::TypeNorthWestSouthEastResize)
+        retain]);
   }
   return self;
 }
 
 - (BOOL)acceptsFirstMouse:(NSEvent*)event {
   return YES;
 }
 
 // |pointInWindow| is in window coordinates.
 - (panel::ResizingSides)edgeHitTest:(NSPoint)pointInWindow {
@@ skipping 868 matching lines @@
 - (NSRect)contentRectForFrameRect:(NSRect)frameRect {
   NSRect contentRect = [[[self window] contentView] convertRect:frameRect
                                                        fromView:nil];
   contentRect.size.height -= panel::kTitlebarHeight;
   if (contentRect.size.height < 0)
     contentRect.size.height = 0;
   return contentRect;
 }
 
 @end