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

Unified Diff: content/browser/renderer_host/render_widget_host_view_gtk.cc

Issue 10537037: Fix gcc 4.7 building problems - cont' (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Modified per Aaron's comment 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
Index: content/browser/renderer_host/render_widget_host_view_gtk.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_gtk.cc b/content/browser/renderer_host/render_widget_host_view_gtk.cc
index 71b476bfa90e7c4974c70391ba3dac31a32354af..310f2457933d87f90524cad36f94014d527dead9 100644
--- a/content/browser/renderer_host/render_widget_host_view_gtk.cc
+++ b/content/browser/renderer_host/render_widget_host_view_gtk.cc
@@ -82,10 +82,10 @@ GdkCursor* GetMozSpinningCursor() {
if (!moz_spinning_cursor) {
const GdkColor fg = { 0, 0, 0, 0 };
const GdkColor bg = { 65535, 65535, 65535, 65535 };
- GdkPixmap* source =
- gdk_bitmap_create_from_data(NULL, moz_spinning_bits, 32, 32);
- GdkPixmap* mask =
- gdk_bitmap_create_from_data(NULL, moz_spinning_mask_bits, 32, 32);
+ GdkPixmap* source = gdk_bitmap_create_from_data(
+ NULL, reinterpret_cast<const char*>(moz_spinning_bits), 32, 32);
Peter Kasting 2012/06/07 18:09:52 Nit: Use const gchar* (2 places)
Han Shen 2012/06/07 19:09:11 Done.
+ GdkPixmap* mask = gdk_bitmap_create_from_data(
+ NULL, reinterpret_cast<const char*>(moz_spinning_mask_bits), 32, 32);
moz_spinning_cursor =
gdk_cursor_new_from_pixmap(source, mask, &fg, &bg, 2, 2);
g_object_unref(source);

Powered by Google App Engine
This is Rietveld 408576698