| OLD | NEW |
| 1 // Copyright (c) 2011 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 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" | 8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" |
| 9 #include "ui/aura/cursor.h" | 9 #include "ui/aura/cursor.h" |
| 10 | 10 |
| 11 using WebKit::WebCursorInfo; | 11 using WebKit::WebCursorInfo; |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 return aura::kCursorGrab; | 98 return aura::kCursorGrab; |
| 99 case WebCursorInfo::TypeGrabbing: | 99 case WebCursorInfo::TypeGrabbing: |
| 100 return aura::kCursorGrabbing; | 100 return aura::kCursorGrabbing; |
| 101 case WebCursorInfo::TypeCustom: | 101 case WebCursorInfo::TypeCustom: |
| 102 return aura::kCursorCustom; | 102 return aura::kCursorCustom; |
| 103 default: | 103 default: |
| 104 NOTREACHED(); | 104 NOTREACHED(); |
| 105 return gfx::kNullCursor; | 105 return gfx::kNullCursor; |
| 106 } | 106 } |
| 107 } | 107 } |
| 108 | |
| 109 void WebCursor::InitPlatformData() { | |
| 110 } | |
| 111 | |
| 112 bool WebCursor::SerializePlatformData(Pickle* pickle) const { | |
| 113 return true; | |
| 114 } | |
| 115 | |
| 116 bool WebCursor::DeserializePlatformData(const Pickle* pickle, void** iter) { | |
| 117 return true; | |
| 118 } | |
| 119 | |
| 120 bool WebCursor::IsPlatformDataEqual(const WebCursor& other) const { | |
| 121 return true; | |
| 122 } | |
| 123 | |
| 124 void WebCursor::CleanupPlatformData() { | |
| 125 } | |
| 126 | |
| 127 void WebCursor::CopyPlatformData(const WebCursor& other) { | |
| 128 } | |
| OLD | NEW |