Merge 117748

Source/WebCore/platform/Length.h

 /*
     Copyright (C) 1999 Lars Knoll (knoll@kde.org)
     Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
     Copyright (C) 2011 Rik Cabanier (cabanier@adobe.com)
     Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
@@ skipping 210 matching lines @@
     Length blend(const Length& from, double progress) const
     {
         // Blend two lengths to produce a new length that is in between them.  Used for animation.
         if (!from.isZero() && !isZero() && from.type() != type())
             return *this;
 
         if (from.isZero() && isZero())
             return *this;
 
         // FIXME http://webkit.org/b/86160 - Blending doesn't work with calculated expressions
-        if (type() == Calculated)
+        if (from.type() == Calculated || type() == Calculated)
             return *this;
         
         LengthType resultType = type();
         if (isZero())
             resultType = from.type();
         
         if (resultType == Percent) {
             float fromPercent = from.isZero() ? 0 : from.percent();
             float toPercent = isZero() ? 0 : percent();
             return Length(WebCore::blend(fromPercent, toPercent, progress), Percent);
@@ skipping 58 matching lines @@
     unsigned char m_type;
     bool m_isFloat;
 };
 
 PassOwnArrayPtr<Length> newCoordsArray(const String&, int& len);
 PassOwnArrayPtr<Length> newLengthArray(const String&, int& len);
 
 } // namespace WebCore
 
 #endif // Length_h