[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[mitz at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 62ff1b68b7a4e3190bb7cad203fa16dbb503c356
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 29 07:23:35 2009 +0000

    Tiger build fix after r50259
    
    * platform/graphics/mac/ComplexTextController.h:
    * platform/graphics/mac/ComplexTextControllerATSUI.cpp:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50264 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 333d59b..95bfe08 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,13 @@
 
         Tiger build fix after r50259
 
+        * platform/graphics/mac/ComplexTextController.h:
+        * platform/graphics/mac/ComplexTextControllerATSUI.cpp:
+
+2009-10-29  Dan Bernstein  <mitz at apple.com>
+
+        Attempted Tiger build fix after r50259
+
         * platform/graphics/mac/ComplexTextControllerATSUI.cpp:
 
 2009-10-28  Steve Falkenburg  <sfalken at apple.com>
diff --git a/WebCore/platform/graphics/mac/ComplexTextController.h b/WebCore/platform/graphics/mac/ComplexTextController.h
index 7e4a439..94bb64f 100644
--- a/WebCore/platform/graphics/mac/ComplexTextController.h
+++ b/WebCore/platform/graphics/mac/ComplexTextController.h
@@ -94,6 +94,9 @@ private:
         ComplexTextRun(const SimpleFontData*, const UChar* characters, unsigned stringLocation, size_t stringLength, bool ltr);
 
 #if USE(ATSUI)
+#ifdef BUILDING_ON_TIGER
+        typedef UInt32 URefCon;
+#endif
         static OSStatus overrideLayoutOperation(ATSULayoutOperationSelector, ATSULineRef, URefCon, void*, ATSULayoutOperationCallbackStatus*);
 #endif
 
diff --git a/WebCore/platform/graphics/mac/ComplexTextControllerATSUI.cpp b/WebCore/platform/graphics/mac/ComplexTextControllerATSUI.cpp
index b784433..7da1737 100644
--- a/WebCore/platform/graphics/mac/ComplexTextControllerATSUI.cpp
+++ b/WebCore/platform/graphics/mac/ComplexTextControllerATSUI.cpp
@@ -29,14 +29,6 @@
 #include "Font.h"
 #include "ShapeArabic.h"
 
-#ifdef BUILDING_ON_TIGER
-#ifdef __LP64__
-#define URefCon void*
-#else
-#define URefCon UInt32
-#endif
-#endif
-
 using namespace WTF::Unicode;
 
 namespace WebCore {

-- 
WebKit Debian packaging