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

[morrita at google.com]

The following commit has been merged in the debian/experimental branch:
commit 19a84732e6d064387cbb20530bacf8fa34f18660
Author: morrita at google.com <morrita at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 30 02:34:02 2010 +0000

    2010-09-29  MORITA Hajime  <morrita at google.com>
    
            Unreviewed build fix.
    
            WebCore::ESpeak causes missing symbol with no ENABLE_SVG
            https://bugs.webkit.org/show_bug.cgi?id=46865
    
            Moves ESpeak related function definitions outside ENABLE_SVG block.
    
            * css/CSSPrimitiveValueMappings.h:
            (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
            (WebCore::CSSPrimitiveValue::operator ESpeak):
            (WebCore::CSSPrimitiveValue::operator EVectorEffect):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68738 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5622917..1cb5c6f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-29  MORITA Hajime  <morrita at google.com>
+
+        Unreviewed build fix.
+        
+        WebCore::ESpeak causes missing symbol with no ENABLE_SVG
+        https://bugs.webkit.org/show_bug.cgi?id=46865
+
+        Moves ESpeak related function definitions outside ENABLE_SVG block.
+
+        * css/CSSPrimitiveValueMappings.h:
+        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+        (WebCore::CSSPrimitiveValue::operator ESpeak):
+        (WebCore::CSSPrimitiveValue::operator EVectorEffect):
+
 2010-09-29  Chris Rogers  <crogers at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/css/CSSPrimitiveValueMappings.h b/WebCore/css/CSSPrimitiveValueMappings.h
index 8369155..070a5f6 100644
--- a/WebCore/css/CSSPrimitiveValueMappings.h
+++ b/WebCore/css/CSSPrimitiveValueMappings.h
@@ -2243,6 +2243,53 @@ template<> inline CSSPrimitiveValue::operator Hyphens() const
     }
 }
 
+template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ESpeak e)
+    : m_type(CSS_IDENT)
+    , m_hasCachedCSSText(false)
+{
+    switch (e) {
+    case SpeakNone:
+        m_value.ident = CSSValueNone;
+        break;
+    case SpeakNormal:
+        m_value.ident = CSSValueNormal;
+        break;
+    case SpeakSpellOut:
+        m_value.ident = CSSValueSpellOut;
+        break;
+    case SpeakDigits:
+        m_value.ident = CSSValueDigits;
+        break;
+    case SpeakLiteralPunctuation:
+        m_value.ident = CSSValueLiteralPunctuation;
+        break;
+    case SpeakNoPunctuation:
+        m_value.ident = CSSValueNoPunctuation;
+        break;
+    }
+}
+    
+template<> inline CSSPrimitiveValue::operator ESpeak() const
+{
+    switch (m_value.ident) {
+    case CSSValueNone:
+        return SpeakNone;
+    case CSSValueNormal:
+        return SpeakNormal;
+    case CSSValueSpellOut:
+        return SpeakSpellOut;
+    case CSSValueDigits:
+        return SpeakDigits;
+    case CSSValueLiteralPunctuation:
+        return SpeakLiteralPunctuation;
+    case CSSValueNoPunctuation:
+        return SpeakNoPunctuation;
+    default:
+        ASSERT_NOT_REACHED();
+        return SpeakNormal;
+    }
+}
+
 #if ENABLE(SVG)
 
 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(LineCap e)
@@ -2729,53 +2776,6 @@ template<> inline CSSPrimitiveValue::operator EVectorEffect() const
         return VE_NONE;
     }
 }
-
-template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ESpeak e)
-    : m_type(CSS_IDENT)
-    , m_hasCachedCSSText(false)
-{
-    switch (e) {
-    case SpeakNone:
-        m_value.ident = CSSValueNone;
-        break;
-    case SpeakNormal:
-        m_value.ident = CSSValueNormal;
-        break;
-    case SpeakSpellOut:
-        m_value.ident = CSSValueSpellOut;
-        break;
-    case SpeakDigits:
-        m_value.ident = CSSValueDigits;
-        break;
-    case SpeakLiteralPunctuation:
-        m_value.ident = CSSValueLiteralPunctuation;
-        break;
-    case SpeakNoPunctuation:
-        m_value.ident = CSSValueNoPunctuation;
-        break;
-    }
-}
-    
-template<> inline CSSPrimitiveValue::operator ESpeak() const
-{
-    switch (m_value.ident) {
-    case CSSValueNone:
-        return SpeakNone;
-    case CSSValueNormal:
-        return SpeakNormal;
-    case CSSValueSpellOut:
-        return SpeakSpellOut;
-    case CSSValueDigits:
-        return SpeakDigits;
-    case CSSValueLiteralPunctuation:
-        return SpeakLiteralPunctuation;
-    case CSSValueNoPunctuation:
-        return SpeakNoPunctuation;
-    default:
-        ASSERT_NOT_REACHED();
-        return SpeakNormal;
-    }
-}
     
 #endif
 

-- 
WebKit Debian packaging