| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <gdk/gdk.h> | 7 #include <gdk/gdk.h> |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 custom_size_.width(), custom_size_.height()); | 175 custom_size_.width(), custom_size_.height()); |
| 176 bitmap.allocPixels(); | 176 bitmap.allocPixels(); |
| 177 memcpy(bitmap.getAddr32(0, 0), custom_data_.data(), custom_data_.size()); | 177 memcpy(bitmap.getAddr32(0, 0), custom_data_.data(), custom_data_.size()); |
| 178 | 178 |
| 179 GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&bitmap); | 179 GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&bitmap); |
| 180 GdkCursor* cursor = gdk_cursor_new_from_pixbuf(gdk_display_get_default(), | 180 GdkCursor* cursor = gdk_cursor_new_from_pixbuf(gdk_display_get_default(), |
| 181 pixbuf, | 181 pixbuf, |
| 182 hotspot_.x(), | 182 hotspot_.x(), |
| 183 hotspot_.y()); | 183 hotspot_.y()); |
| 184 | 184 |
| 185 gdk_pixbuf_unref(pixbuf); | 185 g_object_unref(pixbuf); |
| 186 | 186 |
| 187 if (unref_) | 187 if (unref_) |
| 188 gdk_cursor_unref(unref_); | 188 g_object_unref(unref_); |
| 189 unref_ = cursor; | 189 unref_ = cursor; |
| 190 return cursor; | 190 return cursor; |
| 191 } | 191 } |
| 192 | 192 |
| 193 void WebCursor::InitPlatformData() { | 193 void WebCursor::InitPlatformData() { |
| 194 unref_ = NULL; | 194 unref_ = NULL; |
| 195 return; | 195 return; |
| 196 } | 196 } |
| 197 | 197 |
| 198 bool WebCursor::SerializePlatformData(Pickle* pickle) const { | 198 bool WebCursor::SerializePlatformData(Pickle* pickle) const { |
| (...skipping 14 matching lines...) Expand all Loading... |
| 213 unref_ = NULL; | 213 unref_ = NULL; |
| 214 } | 214 } |
| 215 return; | 215 return; |
| 216 } | 216 } |
| 217 | 217 |
| 218 void WebCursor::CopyPlatformData(const WebCursor& other) { | 218 void WebCursor::CopyPlatformData(const WebCursor& other) { |
| 219 if (other.unref_) | 219 if (other.unref_) |
| 220 unref_ = gdk_cursor_ref(other.unref_); | 220 unref_ = gdk_cursor_ref(other.unref_); |
| 221 return; | 221 return; |
| 222 } | 222 } |
| OLD | NEW |