[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[mjs at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 3c26d6aa88953e98158b05686b45bb952486e1d9
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 4 13:18:51 2010 +0000

    2010-01-04  Maciej Stachowiak  <mjs at apple.com>
    
            Reviewed by Simon Hausmann.
    
            Fix some PLATFORM(*_ENDIAN) uses to CPU()
            https://bugs.webkit.org/show_bug.cgi?id=33148
    
            * runtime/JSCell.cpp:
            (JSC::):
            * runtime/JSValue.h:
            (JSC::JSValue::):
    2010-01-04  Maciej Stachowiak  <mjs at apple.com>
    
            Reviewed by Simon Hausmann.
    
            Fix some PLATFORM(*_ENDIAN) uses to CPU()
            https://bugs.webkit.org/show_bug.cgi?id=33148
    
            * platform/image-decoders/bmp/BMPImageReader.h:
            (WebCore::BMPImageReader::readUint16):
            (WebCore::BMPImageReader::readUint32):
            (WebCore::BMPImageReader::readCurrentPixel):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52731 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index dacacec..5d507e0 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,17 @@
 2010-01-04  Maciej Stachowiak  <mjs at apple.com>
 
+        Reviewed by Simon Hausmann.
+
+        Fix some PLATFORM(*_ENDIAN) uses to CPU()
+        https://bugs.webkit.org/show_bug.cgi?id=33148
+
+        * runtime/JSCell.cpp:
+        (JSC::):
+        * runtime/JSValue.h:
+        (JSC::JSValue::):
+
+2010-01-04  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by Adam Barth.
 
         Document CPU() macros in comments.
diff --git a/JavaScriptCore/runtime/JSCell.cpp b/JavaScriptCore/runtime/JSCell.cpp
index b2ba25b..869fbfc 100644
--- a/JavaScriptCore/runtime/JSCell.cpp
+++ b/JavaScriptCore/runtime/JSCell.cpp
@@ -59,10 +59,10 @@ static const union {
     } doubles;
     
 } NaNInf = { {
-#if PLATFORM(BIG_ENDIAN)
+#if CPU(BIG_ENDIAN)
     { 0x7f, 0xf8, 0, 0, 0, 0, 0, 0 },
     { 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 }
-#elif PLATFORM(MIDDLE_ENDIAN)
+#elif CPU(MIDDLE_ENDIAN)
     { 0, 0, 0xf8, 0x7f, 0, 0, 0, 0 },
     { 0, 0, 0xf0, 0x7f, 0, 0, 0, 0 }
 #else
diff --git a/JavaScriptCore/runtime/JSValue.h b/JavaScriptCore/runtime/JSValue.h
index aeffc0c..6da921f 100644
--- a/JavaScriptCore/runtime/JSValue.h
+++ b/JavaScriptCore/runtime/JSValue.h
@@ -235,7 +235,7 @@ namespace JSC {
         union {
             EncodedJSValue asEncodedJSValue;
             double asDouble;
-#if PLATFORM(BIG_ENDIAN)
+#if CPU(BIG_ENDIAN)
             struct {
                 int32_t tag;
                 int32_t payload;
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 972f630..910827f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,17 @@
 2010-01-04  Maciej Stachowiak  <mjs at apple.com>
 
+        Reviewed by Simon Hausmann.
+
+        Fix some PLATFORM(*_ENDIAN) uses to CPU()
+        https://bugs.webkit.org/show_bug.cgi?id=33148
+
+        * platform/image-decoders/bmp/BMPImageReader.h:
+        (WebCore::BMPImageReader::readUint16):
+        (WebCore::BMPImageReader::readUint32):
+        (WebCore::BMPImageReader::readCurrentPixel):
+
+2010-01-04  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by Adam Barth.
 
         Reorganize, document and rename CPU() platform macros.
diff --git a/WebCore/platform/image-decoders/bmp/BMPImageReader.h b/WebCore/platform/image-decoders/bmp/BMPImageReader.h
index 1271172..3536e3b 100644
--- a/WebCore/platform/image-decoders/bmp/BMPImageReader.h
+++ b/WebCore/platform/image-decoders/bmp/BMPImageReader.h
@@ -46,7 +46,7 @@ namespace WebCore {
         {
             uint16_t result;
             memcpy(&result, &data->data()[offset], 2);
-        #if PLATFORM(BIG_ENDIAN)
+        #if CPU(BIG_ENDIAN)
             result = ((result & 0xff) << 8) | ((result & 0xff00) >> 8);
         #endif
             return result;
@@ -56,7 +56,7 @@ namespace WebCore {
         {
             uint32_t result;
             memcpy(&result, &data->data()[offset], 4);
-        #if PLATFORM(BIG_ENDIAN)
+        #if CPU(BIG_ENDIAN)
             result = ((result & 0xff) << 24) | ((result & 0xff00) << 8) |
                 ((result & 0xff0000) >> 8) | ((result & 0xff000000) >> 24);
         #endif
@@ -202,7 +202,7 @@ namespace WebCore {
                 // won't read it.
                 uint32_t pixel;
                 memcpy(&pixel, &m_data->data()[m_decodedOffset + offset], 3);
-        #if PLATFORM(BIG_ENDIAN)
+        #if CPU(BIG_ENDIAN)
                 pixel = ((pixel & 0xff00) << 8) | ((pixel & 0xff0000) >> 8) |
                     ((pixel & 0xff000000) >> 24);
         #endif

-- 
WebKit Debian packaging