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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit d718591bc3d36ca2594445b5d5f7d3317767e994
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 8 14:36:32 2010 +0000

    2010-10-08  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Nikolas Zimmermann.
    
            SVGTextLayoutAttributesBuilder: "XValue" and "YValue" clash with X11 macros
            https://bugs.webkit.org/show_bug.cgi?id=47180
    
            Rename *Value to *ValueAttribute
    
            * rendering/svg/SVGTextLayoutAttributesBuilder.cpp:
            (WebCore::SVGTextLayoutAttributesBuilder::nextLayoutValue):
            (WebCore::SVGTextLayoutAttributesBuilder::assignLayoutAttributesForCharacter):
            * rendering/svg/SVGTextLayoutAttributesBuilder.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69399 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5fa9a61..73b7654 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-08  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        SVGTextLayoutAttributesBuilder: "XValue" and "YValue" clash with X11 macros
+        https://bugs.webkit.org/show_bug.cgi?id=47180
+
+        Rename *Value to *ValueAttribute
+
+        * rendering/svg/SVGTextLayoutAttributesBuilder.cpp:
+        (WebCore::SVGTextLayoutAttributesBuilder::nextLayoutValue):
+        (WebCore::SVGTextLayoutAttributesBuilder::assignLayoutAttributesForCharacter):
+        * rendering/svg/SVGTextLayoutAttributesBuilder.h:
+
 2010-10-08  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp b/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp
index 66fcb37..c3f4b6a 100644
--- a/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp
+++ b/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp
@@ -258,19 +258,19 @@ float SVGTextLayoutAttributesBuilder::nextLayoutValue(LayoutValueType type, unsi
 
         const Vector<float>* valuesPointer = 0;
         switch (type) {
-        case XValue:
+        case XValueAttribute:
             valuesPointer = &scope.attributes.xValues();
             break;
-        case YValue:
+        case YValueAttribute:
             valuesPointer = &scope.attributes.yValues();
             break;
-        case DxValue:
+        case DxValueAttribute:
             valuesPointer = &scope.attributes.dxValues();
             break;
-        case DyValue:
+        case DyValueAttribute:
             valuesPointer = &scope.attributes.dyValues();
             break;
-        case RotateValue:
+        case RotateValueAttribute:
             valuesPointer = &scope.attributes.rotateValues();
             break;
         default:
@@ -294,11 +294,11 @@ float SVGTextLayoutAttributesBuilder::nextLayoutValue(LayoutValueType type, unsi
 
 void SVGTextLayoutAttributesBuilder::assignLayoutAttributesForCharacter(SVGTextLayoutAttributes& attributes, SVGTextMetrics& metrics, unsigned valueListPosition) const
 {
-    attributes.xValues().append(nextLayoutValue(XValue, valueListPosition));
-    attributes.yValues().append(nextLayoutValue(YValue, valueListPosition));
-    attributes.dxValues().append(nextLayoutValue(DxValue, valueListPosition));
-    attributes.dyValues().append(nextLayoutValue(DyValue, valueListPosition));
-    attributes.rotateValues().append(nextLayoutValue(RotateValue, valueListPosition));
+    attributes.xValues().append(nextLayoutValue(XValueAttribute, valueListPosition));
+    attributes.yValues().append(nextLayoutValue(YValueAttribute, valueListPosition));
+    attributes.dxValues().append(nextLayoutValue(DxValueAttribute, valueListPosition));
+    attributes.dyValues().append(nextLayoutValue(DyValueAttribute, valueListPosition));
+    attributes.rotateValues().append(nextLayoutValue(RotateValueAttribute, valueListPosition));
     attributes.textMetricsValues().append(metrics);
 }
 
diff --git a/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.h b/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.h
index 336c4c3..f29ac64 100644
--- a/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.h
+++ b/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.h
@@ -62,11 +62,11 @@ private:
     void propagateLayoutAttributes(RenderObject*, unsigned& atCharacter, UChar& lastCharacter) const;
 
     enum LayoutValueType {
-        XValue,
-        YValue,
-        DxValue,
-        DyValue,
-        RotateValue
+        XValueAttribute,
+        YValueAttribute,
+        DxValueAttribute,
+        DyValueAttribute,
+        RotateValueAttribute
     };
 
     float nextLayoutValue(LayoutValueType, unsigned atCharacter) const;

-- 
WebKit Debian packaging