[gentoo-commits] gentoo-x86 commit in www-client/chromium/files: chromium-revert-jpeg-swizzle-r2.patch chromium-webkit-zlib-r0.patch chromium-gyp-settings-r0.patch

[PaweA Hajdan (phajdan.jr)]

phajdan.jr    12/02/01 20:11:58

  Added:                chromium-revert-jpeg-swizzle-r2.patch
                        chromium-webkit-zlib-r0.patch
                        chromium-gyp-settings-r0.patch
  Log:
  Version bump for dev channel release. Remove old.
  
  (Portage version: 2.1.10.44/cvs/Linux i686)

Revision  Changes    Path
1.1                  www-client/chromium/files/chromium-revert-jpeg-swizzle-r2.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-revert-jpeg-swizzle-r2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-revert-jpeg-swizzle-r2.patch?rev=1.1&content-type=text/plain

Index: chromium-revert-jpeg-swizzle-r2.patch
===================================================================
This reverts http://trac.webkit.org/changeset/101286
to fix Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=393471

Index: third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
===================================================================
--- third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp	(revision 96970)
+++ third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp	(revision 101286)
@@ -67,24 +67,6 @@
 
 #include <setjmp.h>
 
-#if CPU(BIG_ENDIAN) || CPU(MIDDLE_ENDIAN)
-#define ASSUME_LITTLE_ENDIAN 0
-#else
-#define ASSUME_LITTLE_ENDIAN 1
-#endif
-
-#if defined(JCS_ALPHA_EXTENSIONS) && ASSUME_LITTLE_ENDIAN
-#define TURBO_JPEG_RGB_SWIZZLE
-#if USE(SKIA) && (!SK_R32_SHIFT && SK_G32_SHIFT == 8 && SK_B32_SHIFT == 16)
-inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_RGBA; }
-#else
-inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_BGRA; }
-#endif
-inline bool turboSwizzled(J_COLOR_SPACE colorSpace) { return colorSpace == rgbOutputColorSpace(); }
-#else
-inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_RGB; }
-#endif
-
 namespace WebCore {
 
 struct decoder_error_mgr {
@@ -270,7 +252,7 @@
             case JCS_RGB:
             case JCS_YCbCr:
                 // libjpeg can convert GRAYSCALE and YCbCr image pixels to RGB.
-                m_info.out_color_space = rgbOutputColorSpace();
+                m_info.out_color_space = JCS_RGB;
                 break;
             case JCS_CMYK:
             case JCS_YCCK:
@@ -525,19 +507,6 @@
     }
 
     jpeg_decompress_struct* info = m_reader->info();
-
-#if !ENABLE(IMAGE_DECODER_DOWN_SAMPLING) && defined(TURBO_JPEG_RGB_SWIZZLE)
-    if (turboSwizzled(info->out_color_space)) {
-         ASSERT(!m_scaled);
-         while (info->output_scanline < info->output_height) {
-             unsigned char* row = reinterpret_cast<unsigned char*>(buffer.getAddr(0, info->output_scanline));
-             if (jpeg_read_scanlines(info, &row, 1) != 1)
-                  return false;
-         }
-         return true;
-     }
-#endif
-
     JSAMPARRAY samples = m_reader->samples();
 
     while (info->output_scanline < info->output_height) {



1.1                  www-client/chromium/files/chromium-webkit-zlib-r0.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-webkit-zlib-r0.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-webkit-zlib-r0.patch?rev=1.1&content-type=text/plain

Index: 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.1                  www-client/chromium/files/chromium-gyp-settings-r0.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-gyp-settings-r0.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-gyp-settings-r0.patch?rev=1.1&content-type=text/plain

Index: chromium-gyp-settings-r0.patch
===================================================================
--- third_party/flac/flac.gyp.orig	2012-02-01 09:48:17.000000000 +0100
+++ third_party/flac/flac.gyp	2012-02-01 09:51:21.000000000 +0100
@@ -93,7 +93,7 @@
       'targets': [
         {
           'target_name': 'libflac',
-          'type': 'settings',
+          'type': 'none',
           'direct_dependent_settings': {
             'defines': [
               'USE_SYSTEM_FLAC',