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

[bfulgham at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit e9bcc996f0866927c8b3a14968f10182a46c1465
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 8 22:10:51 2010 +0000

    Unreviewed build correction after @70369/@70846.
    
    Please use PLATFORM(CG) to define CG-specific code, not
    PLATFORM(CF).
    
    * platform/image-decoders/ImageDecoder.cpp:
    * platform/image-decoders/ImageDecoder.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71569 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b7bb4b7..8ce6ab3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-08  Brent Fulgham  <bfulgham at webkit.org>
+
+        Unreviewed build correction after @70369/@70846.
+
+        Please use PLATFORM(CG) to define CG-specific code, not
+        PLATFORM(CF).
+
+        * platform/image-decoders/ImageDecoder.cpp:
+        * platform/image-decoders/ImageDecoder.h:
+
 2010-11-08  James Robinson  <jamesr at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/platform/image-decoders/ImageDecoder.cpp b/WebCore/platform/image-decoders/ImageDecoder.cpp
index a4aa630..204f3af 100644
--- a/WebCore/platform/image-decoders/ImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/ImageDecoder.cpp
@@ -143,7 +143,7 @@ void RGBA32Buffer::zeroFill()
     m_hasAlpha = true;
 }
 
-#if !PLATFORM(CF)
+#if !PLATFORM(CG)
 
 void RGBA32Buffer::copyReferenceToBitmapData(const RGBA32Buffer& other)
 {
diff --git a/WebCore/platform/image-decoders/ImageDecoder.h b/WebCore/platform/image-decoders/ImageDecoder.h
index 995b240..08ce854 100644
--- a/WebCore/platform/image-decoders/ImageDecoder.h
+++ b/WebCore/platform/image-decoders/ImageDecoder.h
@@ -145,7 +145,7 @@ namespace WebCore {
 #endif
 
     private:
-#if PLATFORM(CF)
+#if PLATFORM(CG)
         typedef RetainPtr<CFMutableDataRef> NativeBackingStore;
 #else
         typedef Vector<PixelData> NativeBackingStore;

-- 
WebKit Debian packaging