Changeset 99838 in webkit

Timestamp:

Nov 10, 2011, 4:26:32 AM (14 years ago)

Author:

Nikolas Zimmermann

Message:

2011-11-10 Nikolas Zimmermann <​nzimmermann@rim.com>

Deploy SVGLengthContext in more places
​https://bugs.webkit.org/show_bug.cgi?id=72012

Reviewed by Simon Hausmann.

Doesn't affect any tests.

• svg/SVGAnimatedLength.cpp: (WebCore::SVGAnimatedLengthAnimator::calculateFromAndByValues): (WebCore::SVGAnimatedLengthAnimator::calculateAnimatedValue): (WebCore::SVGAnimatedLengthAnimator::calculateDistance):
• svg/SVGAnimatedLengthList.cpp: (WebCore::SVGAnimatedLengthListAnimator::calculateFromAndByValues): (WebCore::SVGAnimatedLengthListAnimator::calculateAnimatedValue):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• svg/SVGAnimatedLength.cpp (modified) (3 diffs)
• svg/SVGAnimatedLengthList.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-10  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Deploy SVGLengthContext in more places
+        https://bugs.webkit.org/show_bug.cgi?id=72012
+
+        Reviewed by Simon Hausmann.
+
+        Doesn't affect any tests.
+
+        * svg/SVGAnimatedLength.cpp:
+        (WebCore::SVGAnimatedLengthAnimator::calculateFromAndByValues):
+        (WebCore::SVGAnimatedLengthAnimator::calculateAnimatedValue):
+        (WebCore::SVGAnimatedLengthAnimator::calculateDistance):
+        * svg/SVGAnimatedLengthList.cpp:
+        (WebCore::SVGAnimatedLengthListAnimator::calculateFromAndByValues):
+        (WebCore::SVGAnimatedLengthListAnimator::calculateAnimatedValue):
+
 2011-11-10  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/Source/WebCore/svg/SVGAnimatedLength.cpp

@@ -69 +69 @@
     to = constructFromString(byString);
     
+    SVGLengthContext lengthContext(m_contextElement);
     SVGLength& fromLength = from->length();
     SVGLength& toLength = to->length();
     ExceptionCode ec = 0;
-    toLength.setValue(toLength.value(m_contextElement) + fromLength.value(m_contextElement), m_contextElement, ec);
+    toLength.setValue(toLength.value(lengthContext) + fromLength.value(lengthContext), lengthContext, ec);
     ASSERT(!ec);
 }
@@ -104 +105 @@
     }
     
-    float result = animatedSVGLength.value(m_contextElement);
+    SVGLengthContext lengthContext(m_contextElement);
+    float result = animatedSVGLength.value(lengthContext);
     SVGLengthType unitType = percentage < 0.5 ? fromSVGLength.unitType() : toSVGLength.unitType();
-    SVGAnimatedNumberAnimator::calculateAnimatedNumber(animationElement, percentage, repeatCount, result, fromSVGLength.value(m_contextElement), toSVGLength.value(m_contextElement));
+    SVGAnimatedNumberAnimator::calculateAnimatedNumber(animationElement, percentage, repeatCount, result, fromSVGLength.value(lengthContext), toSVGLength.value(lengthContext));
 
     ExceptionCode ec = 0;
-    animatedSVGLength.setValue(m_contextElement, result, m_lengthMode, unitType, ec);
+    animatedSVGLength.setValue(lengthContext, result, m_lengthMode, unitType, ec);
     ASSERT(!ec);
 }
@@ -121 +123 @@
     SVGLength from = SVGLength(lengthMode, fromString);
     SVGLength to = SVGLength(lengthMode, toString);
-    return fabsf(to.value(m_contextElement) - from.value(m_contextElement));
+    SVGLengthContext lengthContext(m_contextElement);
+    return fabsf(to.value(lengthContext) - from.value(lengthContext));
 }
 

trunk/Source/WebCore/svg/SVGAnimatedLengthList.cpp

@@ -67 +67 @@
     if (itemsCount != toLengthList.size())
         return;
+    SVGLengthContext lengthContext(m_contextElement);
     ExceptionCode ec = 0;
     for (unsigned i = 0; i < itemsCount; ++i) {
-        toLengthList[i].setValue(toLengthList[i].value(m_contextElement) + fromLengthList[i].value(m_contextElement), m_contextElement, ec);
+        toLengthList[i].setValue(toLengthList[i].value(lengthContext) + fromLengthList[i].value(lengthContext), lengthContext, ec);
         ASSERT(!ec);
     }
@@ -115 +116 @@
     if (!animatedListSizeEqual)
         animatedLengthList.clear();
+    SVGLengthContext lengthContext(m_contextElement);
     ExceptionCode ec = 0;
     for (unsigned i = 0; i < itemsCount; ++i) {
-        float result = animatedListSizeEqual ? animatedLengthList[i].value(m_contextElement) : 0;
+        float result = animatedListSizeEqual ? animatedLengthList[i].value(lengthContext) : 0;
         SVGLengthType unitType = percentage < 0.5 ? fromLengthList[i].unitType() : toLengthList[i].unitType();
-        SVGAnimatedNumberAnimator::calculateAnimatedNumber(animationElement, percentage, repeatCount, result, fromLengthList[i].value(m_contextElement), toLengthList[i].value(m_contextElement));
+        SVGAnimatedNumberAnimator::calculateAnimatedNumber(animationElement, percentage, repeatCount, result, fromLengthList[i].value(lengthContext), toLengthList[i].value(lengthContext));
         if (!animatedListSizeEqual)
-            animatedLengthList.append(SVGLength(m_contextElement, result, m_lengthMode, unitType));
+            animatedLengthList.append(SVGLength(lengthContext, result, m_lengthMode, unitType));
         else {
-            animatedLengthList[i].setValue(m_contextElement, result, m_lengthMode, unitType, ec);
+            animatedLengthList[i].setValue(lengthContext, result, m_lengthMode, unitType, ec);
             ASSERT(!ec);
         }