[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 3641e5ddf3725e1be2b1388a94060c55422f1007
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 4 07:12:39 2010 +0000

    2010-11-04  Adam Barth  <abarth at webkit.org>
    
            Enabled ICCJPEG on Chromium Mac
            https://bugs.webkit.org/show_bug.cgi?id=48977
    
            * wtf/Platform.h:
    2010-11-04  Adam Barth  <abarth at webkit.org>
    
            Enabled ICCJPEG on Chromium Mac
            https://bugs.webkit.org/show_bug.cgi?id=48977
    
            Add iccjpeg as a dependency.
    
            * WebCore.gyp/WebCore.gyp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71311 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 092fc36..aae828b 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-04  Adam Barth  <abarth at webkit.org>
+
+        Enabled ICCJPEG on Chromium Mac
+        https://bugs.webkit.org/show_bug.cgi?id=48977
+
+        * wtf/Platform.h:
+
 2010-11-03  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by Gavin Barraclough.
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 3b3acf4..7fdd800 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -526,6 +526,7 @@
 #define WTF_PLATFORM_CI 1
 #define WTF_USE_ATSUI 1
 #define WTF_USE_CORE_TEXT 1
+#define WTF_USE_ICCJPEG 1
 #else
 #define WTF_PLATFORM_SKIA 1
 #endif
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f0a77ed..3a925b9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-04  Adam Barth  <abarth at webkit.org>
+
+        Enabled ICCJPEG on Chromium Mac
+        https://bugs.webkit.org/show_bug.cgi?id=48977
+
+        Add iccjpeg as a dependency.
+
+        * WebCore.gyp/WebCore.gyp:
+
 2010-11-03  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index ce77c8f..6ebf0a0 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/WebCore/WebCore.gyp/WebCore.gyp
@@ -720,6 +720,7 @@
         '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
         '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(chromium_src_dir)/skia/skia.gyp:skia',
+        '<(chromium_src_dir)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
         '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp:libjpeg',
         '<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng',
         '<(chromium_src_dir)/third_party/libxml/libxml.gyp:libxml',
@@ -831,6 +832,7 @@
         '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
         '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(chromium_src_dir)/skia/skia.gyp:skia',
+        '<(chromium_src_dir)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
         '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp:libjpeg',
         '<(chromium_src_dir)/third_party/libwebp/libwebp.gyp:libwebp',
         '<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng',
@@ -847,6 +849,7 @@
         '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
         '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(chromium_src_dir)/skia/skia.gyp:skia',
+        '<(chromium_src_dir)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
         '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp:libjpeg',
         '<(chromium_src_dir)/third_party/libwebp/libwebp.gyp:libwebp',
         '<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng',

-- 
WebKit Debian packaging