| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "webkit/glue/webcursor.h" | 5 #include "webkit/glue/webcursor.h" |
| 6 | 6 |
| 7 #import <AppKit/AppKit.h> | 7 #import <AppKit/AppKit.h> |
| 8 #include <Carbon/Carbon.h> | 8 #include <Carbon/Carbon.h> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/mac/mac_util.h" | 11 #include "base/mac/mac_util.h" |
| 12 #include "base/mac/scoped_cftyperef.h" | 12 #include "base/mac/scoped_cftyperef.h" |
| 13 #include "base/memory/scoped_nsobject.h" | 13 #include "base/memory/scoped_nsobject.h" |
| 14 #include "skia/ext/skia_utils_mac.h" | 14 #include "skia/ext/skia_utils_mac.h" |
| 15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" | 15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" |
| 16 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebImage.h" | 16 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebImage.h" |
| 17 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" | 17 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" |
| 18 #include "ui/gfx/mac/nsimage_cache.h" | 18 #include "ui/gfx/mac/nsimage_cache.h" |
| 19 | 19 |
| 20 using WebKit::WebCursorInfo; | 20 using WebKit::WebCursorInfo; |
| 21 using WebKit::WebImage; | 21 using WebKit::WebImage; |
| 22 using WebKit::WebSize; | 22 using WebKit::WebSize; |
| 23 | 23 |
| 24 // Declare symbols that are part of the 10.6 SDK. | |
| 25 #if !defined(MAC_OS_X_VERSION_10_6) || \ | |
| 26 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6 | |
| 27 | |
| 28 @interface NSCursor (SnowLeopardSDKDeclarations) | |
| 29 + (NSCursor*)contextualMenuCursor; | |
| 30 + (NSCursor*)dragCopyCursor; | |
| 31 + (NSCursor*)operationNotAllowedCursor; | |
| 32 @end | |
| 33 | |
| 34 #endif // MAC_OS_X_VERSION_10_6 | |
| 35 | |
| 36 // Declare symbols that are part of the 10.7 SDK. | 24 // Declare symbols that are part of the 10.7 SDK. |
| 37 #if !defined(MAC_OS_X_VERSION_10_7) || \ | 25 #if !defined(MAC_OS_X_VERSION_10_7) || \ |
| 38 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 | 26 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 |
| 39 | 27 |
| 40 @interface NSCursor (LionSDKDeclarations) | 28 @interface NSCursor (LionSDKDeclarations) |
| 41 + (NSCursor*)IBeamCursorForVerticalLayout; | 29 + (NSCursor*)IBeamCursorForVerticalLayout; |
| 42 @end | 30 @end |
| 43 | 31 |
| 44 #endif // MAC_OS_X_VERSION_10_7 | 32 #endif // MAC_OS_X_VERSION_10_7 |
| 45 | 33 |
| (...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 547 return true; | 535 return true; |
| 548 } | 536 } |
| 549 | 537 |
| 550 void WebCursor::CleanupPlatformData() { | 538 void WebCursor::CleanupPlatformData() { |
| 551 return; | 539 return; |
| 552 } | 540 } |
| 553 | 541 |
| 554 void WebCursor::CopyPlatformData(const WebCursor& other) { | 542 void WebCursor::CopyPlatformData(const WebCursor& other) { |
| 555 return; | 543 return; |
| 556 } | 544 } |
| OLD | NEW |