Use generated shim headers for zlib.

webkit/support/webkit_support_gfx.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
 #include "webkit/support/webkit_support_gfx.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 extern "C" {
 #include "third_party/libpng/png.h"
-
-#if defined(USE_SYSTEM_ZLIB)
-#include <zlib.h>
-#else
 #include "third_party/zlib/zlib.h"

[Mark Mentovai, 2012/12/18 19:48:17]

And here.

[Paweł Hajdan Jr., 2012/12/18 20:57:41]

Done.

-#endif
 }
 
 namespace webkit_support {
 
 // Define macro here to make webkit_support_gfx independent of target base.
 // Note that the NOTREACHED() macro will result in a crash. This is preferable
 // to calling exit() / abort(), since the latter may not surfce the problem as
 // crash reports, making it hard to tell where the problem is.
 #define NOTREACHED(msg) *((volatile int*)0) = 3
 #define DCHECK(condition) \
@@ skipping 651 matching lines @@
                                const std::string& checksum,
                                std::vector<unsigned char>* output) {
   std::vector<Comment> comments;
   comments.push_back(Comment("checksum", checksum));
   return Encode(input, FORMAT_RGBA,
       width, height, row_byte_width, discard_transparency,
       comments, output);
 }
 
 }  // namespace webkit_support