chromium/files/chromium-webkit-zlib-r0.patch

--- webkit/support/webkit_support_gfx.cc.orig   2012-02-01 11:00:50.000000000 +0100
+++ webkit/support/webkit_support_gfx.cc        2012-02-01 11:04:21.000000000 +0100
@@ -14,6 +14,12 @@
 #else
 #include "third_party/libpng/png.h"
 #endif
+
+#if defined(USE_SYSTEM_ZLIB)
+#include <zlib.h>
+#else
+#include "third_party/zlib/zlib.h"
+#endif
 }
 
 namespace webkit_support {
--- webkit/support/webkit_support.gypi.orig     2012-02-01 11:05:23.000000000 +0100
+++ webkit/support/webkit_support.gypi  2012-02-01 11:06:31.000000000 +0100
@@ -140,6 +140,7 @@
       'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
+        '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
       ],
       'sources': [
         'webkit_support_gfx.h',
--- webkit/support/webkit_support.gypi.orig     2012-02-01 12:46:29.000000000 +0100
+++ webkit/support/webkit_support.gypi  2012-02-01 12:47:09.000000000 +0100
@@ -89,6 +89,7 @@
         '<(DEPTH)/crypto/crypto.gyp:crypto',
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/skia/skia.gyp:skia',
+        '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
         '<(DEPTH)/ui/ui.gyp:ui',
         'glue',
         'webkit_support_gfx',
--- webkit/tools/test_shell/simple_clipboard_impl.cc.orig       2012-02-01 14:02:32.000000000 +0100
+++ webkit/tools/test_shell/simple_clipboard_impl.cc    2012-02-01 14:03:10.000000000 +0100
@@ -11,7 +11,11 @@
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#if defined(USE_SYSTEM_ZLIB)
+#include <zlib.h>
+#else
 #include "third_party/zlib/zlib.h"
+#endif
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/size.h"
1	--- webkit/support/webkit_support_gfx.cc.orig 2012-02-01 11:00:50.000000000 +0100
2	+++ webkit/support/webkit_support_gfx.cc 2012-02-01 11:04:21.000000000 +0100
3	@@ -14,6 +14,12 @@
4	#else
5	#include "third_party/libpng/png.h"
6	#endif
7	+
8	+#if defined(USE_SYSTEM_ZLIB)
9	+#include <zlib.h>
10	+#else
11	+#include "third_party/zlib/zlib.h"
12	+#endif
13	}
14
15	namespace webkit_support {
16	--- webkit/support/webkit_support.gypi.orig 2012-02-01 11:05:23.000000000 +0100
17	+++ webkit/support/webkit_support.gypi 2012-02-01 11:06:31.000000000 +0100
18	@@ -140,6 +140,7 @@
19	'variables': { 'enable_wexit_time_destructors': 1, },
20	'dependencies': [
21	'<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
22	+ '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
23	],
24	'sources': [
25	'webkit_support_gfx.h',
26	--- webkit/support/webkit_support.gypi.orig 2012-02-01 12:46:29.000000000 +0100
27	+++ webkit/support/webkit_support.gypi 2012-02-01 12:47:09.000000000 +0100
28	@@ -89,6 +89,7 @@
29	'<(DEPTH)/crypto/crypto.gyp:crypto',
30	'<(DEPTH)/net/net.gyp:net',
31	'<(DEPTH)/skia/skia.gyp:skia',
32	+ '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
33	'<(DEPTH)/ui/ui.gyp:ui',
34	'glue',
35	'webkit_support_gfx',
36	--- webkit/tools/test_shell/simple_clipboard_impl.cc.orig 2012-02-01 14:02:32.000000000 +0100
37	+++ webkit/tools/test_shell/simple_clipboard_impl.cc 2012-02-01 14:03:10.000000000 +0100
38	@@ -11,7 +11,11 @@
39	#include "base/string16.h"
40	#include "googleurl/src/gurl.h"
41	#include "third_party/skia/include/core/SkBitmap.h"
42	+#if defined(USE_SYSTEM_ZLIB)
43	+#include <zlib.h>
44	+#else
45	#include "third_party/zlib/zlib.h"
46	+#endif
47	#include "ui/base/clipboard/clipboard.h"
48	#include "ui/gfx/codec/png_codec.h"
49	#include "ui/gfx/size.h"