webkit/glue/webcursor_gtk_data.h - Issue 10451068: Fixing gcc 4.7 building problems.

Side by Side Diff: webkit/glue/webcursor_gtk_data.h

Issue 10451068: Fixing gcc 4.7 building problems. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Modified per Mattias' comments 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 unified diff | Download patch

« no previous file with comments | « ui/gfx/skia_utils_gtk.cc ('k') | webkit/plugins/ppapi/ppb_flash_impl.cc » ('j') | no next file with comments »

OLD	NEW
1 // This file is a cut'n'paste from WebKit/WebCore/platform/gtk/CursorGtk.h,	1 // This file is a cut'n'paste from WebKit/WebCore/platform/gtk/CursorGtk.h,

2 // with slight modifications to fit within Chrome. Its original	2 // with slight modifications to fit within Chrome. Its original

3 // copyright is below.	3 // copyright is below.

4	4

5 // This file intentionally doesn't have a header guard, since it is just	5 // This file intentionally doesn't have a header guard, since it is just

6 // data to be used within a C++ file.	6 // data to be used within a C++ file.

7	7

8 /*	8 /*

9 * Copyright (C) 2001 Tim Copperfield <timecop@network.email.ne.jp>	9 * Copyright (C) 2001 Tim Copperfield <timecop@network.email.ne.jp>

10 * Copyright (C) 2007 Christian Dywan <christian@twotoasts.de>	10 * Copyright (C) 2007 Christian Dywan <christian@twotoasts.de>

(...skipping 13 matching lines...) Expand all Loading...
24 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,	24 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

25 * Boston, MA 02110-1301, USA.	25 * Boston, MA 02110-1301, USA.

26 *	26 *

27 */	27 */

28	28

29 /*	29 /*

30 These cursors are copied from Mozilla code:	30 These cursors are copied from Mozilla code:

31 http://lxr.mozilla.org/mozilla1.8/source/widget/src/gtk2/nsGtkCursors.h	31 http://lxr.mozilla.org/mozilla1.8/source/widget/src/gtk2/nsGtkCursors.h

32 */	32 */

33	33

	34 #pragma GCC diagnostic push

	35 #pragma GCC diagnostic ignored "-Wnarrowing"
	jamesr 2012/05/31 17:33:41 This seems very weird to me - we normally control This seems very weird to me - we normally control compilation flags from the build system, not inline in the code. I can't find any other instances of this sort of thing today - why can't you set this in the gypi?
34 /* MOZ_CURSOR_VERTICAL_TEXT */	36 /* MOZ_CURSOR_VERTICAL_TEXT */

35 static const char moz_vertical_text_bits[] = {	37 static const char moz_vertical_text_bits[] = {

36 0x00, 0x00, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00,	38 0x00, 0x00, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00,

37 0x06, 0x60, 0x00, 0x00, 0xfc, 0x3f, 0x00, 0x00, 0x06, 0x60, 0x00, 0x00,	39 0x06, 0x60, 0x00, 0x00, 0xfc, 0x3f, 0x00, 0x00, 0x06, 0x60, 0x00, 0x00,

38 0x02, 0x40, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	40 0x02, 0x40, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

39 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	41 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

40 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	42 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

41 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	43 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

42 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	44 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

43 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	45 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

(...skipping 258 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
302 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00,	304 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00,

303 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x3b, 0x00, 0x00,	305 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x3b, 0x00, 0x00,

304 0xfe, 0x7f, 0x00, 0x00, 0xfe, 0x7f, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00,	306 0xfe, 0x7f, 0x00, 0x00, 0xfe, 0x7f, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00,

305 0xee, 0xff, 0x01, 0x00, 0xe4, 0xff, 0x00, 0x00, 0xc0, 0x7f, 0x00, 0x00,	307 0xee, 0xff, 0x01, 0x00, 0xe4, 0xff, 0x00, 0x00, 0xc0, 0x7f, 0x00, 0x00,

306 0xc0, 0x7f, 0x00, 0x00, 0x80, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	308 0xc0, 0x7f, 0x00, 0x00, 0x80, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

307 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	309 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

308 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	310 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

309 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	311 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

310 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	312 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

311 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };	313 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };

	314 #pragma GCC diagnostic pop

OLD	NEW