[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 f0f7b374df3af5d7f42b808a76ccf0b30587cd66
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 29 09:21:09 2009 +0000

    Rubber-stamped by Mark Rowe.
    
    64-bit Leopard build fix after r50259
    
    * platform/graphics/mac/ComplexTextControllerATSUI.cpp:
    Declared ATSUTextInserted in 64-bit.
    (WebCore::fontHasMirroringInfo): Use %d format and cast to int.
    (WebCore::disableLigatures): Ditto.
    (WebCore::initializeATSUStyle): Ditto.
    (WebCore::ComplexTextController::collectComplexTextRunsForCharacters): Ditto.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50266 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 95bfe08..15383b6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,18 @@
 2009-10-29  Dan Bernstein  <mitz at apple.com>
 
+        Rubber-stamped by Mark Rowe.
+
+        64-bit Leopard build fix after r50259
+        
+        * platform/graphics/mac/ComplexTextControllerATSUI.cpp:
+        Declared ATSUTextInserted in 64-bit.
+        (WebCore::fontHasMirroringInfo): Use %d format and cast to int.
+        (WebCore::disableLigatures): Ditto.
+        (WebCore::initializeATSUStyle): Ditto.
+        (WebCore::ComplexTextController::collectComplexTextRunsForCharacters): Ditto.
+
+2009-10-29  Dan Bernstein  <mitz at apple.com>
+
         Tiger build fix after r50259
 
         * platform/graphics/mac/ComplexTextController.h:
diff --git a/WebCore/platform/graphics/mac/ComplexTextControllerATSUI.cpp b/WebCore/platform/graphics/mac/ComplexTextControllerATSUI.cpp
index 7da1737..dc4961f 100644
--- a/WebCore/platform/graphics/mac/ComplexTextControllerATSUI.cpp
+++ b/WebCore/platform/graphics/mac/ComplexTextControllerATSUI.cpp
@@ -29,6 +29,13 @@
 #include "Font.h"
 #include "ShapeArabic.h"
 
+#ifdef __LP64__
+// ATSUTextInserted() is SPI in 64-bit.
+extern "C" {
+OSStatus ATSUTextInserted(ATSUTextLayout iTextLayout,  UniCharArrayOffset iInsertionLocation, UniCharCount iInsertionLength);
+}
+#endif
+
 using namespace WTF::Unicode;
 
 namespace WebCore {
@@ -238,7 +245,7 @@ static bool fontHasMirroringInfo(ATSUFontID fontID)
     if (status == noErr)    // naively assume that if a 'prop' table exists then it contains mirroring info
         return true;
     else if (status != kATSInvalidFontTableAccess) // anything other than a missing table is logged as an error
-        LOG_ERROR("ATSFontGetTable failed (%ld)", status);
+        LOG_ERROR("ATSFontGetTable failed (%d)", static_cast<int>(status));
 
     return false;
 }
@@ -255,7 +262,7 @@ static void disableLigatures(const SimpleFontData* fontData, TextRenderingMode t
     ATSUFontFeatureSelector featureSelectors[] = { kCommonLigaturesOffSelector };
     OSStatus status = ATSUSetFontFeatures(fontData->m_ATSUStyle, 1, featureTypes, featureSelectors);
     if (status != noErr)
-        LOG_ERROR("ATSUSetFontFeatures failed (%ld) -- ligatures remain enabled", status);
+        LOG_ERROR("ATSUSetFontFeatures failed (%d) -- ligatures remain enabled", static_cast<int>(status));
 }
 
 static void initializeATSUStyle(const SimpleFontData* fontData, TextRenderingMode textMode)
@@ -271,7 +278,7 @@ static void initializeATSUStyle(const SimpleFontData* fontData, TextRenderingMod
 
     OSStatus status = ATSUCreateStyle(&fontData->m_ATSUStyle);
     if (status != noErr)
-        LOG_ERROR("ATSUCreateStyle failed (%ld)", status);
+        LOG_ERROR("ATSUCreateStyle failed (%d)", static_cast<int>(status));
 
     Fixed fontSize = FloatToFixed(fontData->platformData().m_size);
     Fract kerningInhibitFactor = FloatToFract(1);
@@ -284,7 +291,7 @@ static void initializeATSUStyle(const SimpleFontData* fontData, TextRenderingMod
     bool allowKerning = textMode == OptimizeLegibility || textMode == GeometricPrecision;
     status = ATSUSetAttributes(fontData->m_ATSUStyle, allowKerning ? 3 : 4, styleTags, styleSizes, styleValues);
     if (status != noErr)
-        LOG_ERROR("ATSUSetAttributes failed (%ld)", status);
+        LOG_ERROR("ATSUSetAttributes failed (%d)", static_cast<int>(status));
 
     fontData->m_ATSUMirrors = fontHasMirroringInfo(fontID);
 
@@ -312,7 +319,7 @@ void ComplexTextController::collectComplexTextRunsForCharacters(const UChar* cp,
 
     status = ATSUCreateTextLayoutWithTextPtr(cp, 0, length, length, 1, &runLength, &fontData->m_ATSUStyle, &atsuTextLayout);
     if (status != noErr) {
-        LOG_ERROR("ATSUCreateTextLayoutWithTextPtr failed with error %ld", status);
+        LOG_ERROR("ATSUCreateTextLayoutWithTextPtr failed with error %d", static_cast<int>(status));
         return;
     }
     m_complexTextRuns.append(ComplexTextRun::create(atsuTextLayout, fontData, cp, stringLocation, length, m_run.ltr(), m_run.directionalOverride()));

-- 
WebKit Debian packaging