Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(570)

Unified Diff: webkit/glue/webcursor_gtk.cc

Issue 10537037: Fix gcc 4.7 building problems - cont' (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Reverted "adding license header to webcursor_gtk_data.h" Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/simd/convert_rgb_to_yuv_sse2.cc ('k') | webkit/glue/webcursor_gtk_data.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webcursor_gtk.cc
diff --git a/webkit/glue/webcursor_gtk.cc b/webkit/glue/webcursor_gtk.cc
index b652eea3030b5553acd75765c47129c0d3f2fe48..0c6fe565dbe97a3b8fbfa600d6479004ffe8cd26 100644
--- a/webkit/glue/webcursor_gtk.cc
+++ b/webkit/glue/webcursor_gtk.cc
@@ -31,10 +31,10 @@ GdkCursor* GetInlineCustomCursor(CustomCursorType type) {
if (!cursor) {
const GdkColor fg = { 0, 0, 0, 0 };
const GdkColor bg = { 65535, 65535, 65535, 65535 };
- GdkPixmap* source = gdk_bitmap_create_from_data(NULL, custom.bits,
- 32, 32);
- GdkPixmap* mask = gdk_bitmap_create_from_data(NULL, custom.mask_bits,
- 32, 32);
+ GdkPixmap* source = gdk_bitmap_create_from_data(
+ NULL, reinterpret_cast<const gchar*>(custom.bits), 32, 32);
+ GdkPixmap* mask = gdk_bitmap_create_from_data(
+ NULL, reinterpret_cast<const gchar*>(custom.mask_bits), 32, 32);
cursor = gdk_cursor_new_from_pixmap(source, mask, &fg, &bg,
custom.hot_x, custom.hot_y);
g_object_unref(source);
« no previous file with comments | « media/base/simd/convert_rgb_to_yuv_sse2.cc ('k') | webkit/glue/webcursor_gtk_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698