Changeset 61345 in webkit


Ignore:
Timestamp:
Jun 17, 2010 1:28:01 PM (14 years ago)
Author:
Dimitri Glazkov
Message:

2010-06-17 Dimitri Glazkov <Dimitri Glazkov>

Unreviewed, rolling out r61340.
http://trac.webkit.org/changeset/61340
https://bugs.webkit.org/show_bug.cgi?id=36282

Broke several editing tests.

  • fast/css/duplicate-property-in-rule-expected.txt: Removed.
  • fast/css/duplicate-property-in-rule.html: Removed.

2010-06-17 Dimitri Glazkov <Dimitri Glazkov>

Unreviewed, rolling out r61340.
http://trac.webkit.org/changeset/61340
https://bugs.webkit.org/show_bug.cgi?id=36282

Broke several editing tests.

  • css/CSSMutableStyleDeclaration.cpp: (WebCore::CSSMutableStyleDeclaration::CSSMutableStyleDeclaration):
  • css/CSSParser.cpp: (WebCore::CSSParser::parseValue):
  • css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::applyProperty):
Location:
trunk
Files:
2 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r61344 r61345  
     12010-06-17  Dimitri Glazkov  <dglazkov@chromium.org>
     2
     3        Unreviewed, rolling out r61340.
     4        http://trac.webkit.org/changeset/61340
     5        https://bugs.webkit.org/show_bug.cgi?id=36282
     6
     7        Broke several editing tests.
     8
     9        * fast/css/duplicate-property-in-rule-expected.txt: Removed.
     10        * fast/css/duplicate-property-in-rule.html: Removed.
     11
    1122010-06-17  Dimitri Glazkov  <dglazkov@chromium.org>
    213
  • trunk/WebCore/ChangeLog

    r61343 r61345  
     12010-06-17  Dimitri Glazkov  <dglazkov@chromium.org>
     2
     3        Unreviewed, rolling out r61340.
     4        http://trac.webkit.org/changeset/61340
     5        https://bugs.webkit.org/show_bug.cgi?id=36282
     6
     7        Broke several editing tests.
     8
     9        * css/CSSMutableStyleDeclaration.cpp:
     10        (WebCore::CSSMutableStyleDeclaration::CSSMutableStyleDeclaration):
     11        * css/CSSParser.cpp:
     12        (WebCore::CSSParser::parseValue):
     13        * css/CSSStyleSelector.cpp:
     14        (WebCore::CSSStyleSelector::applyProperty):
     15
    1162010-06-17  Jian Li  <jianli@chromium.org>
    217
  • trunk/WebCore/css/CSSMutableStyleDeclaration.cpp

    r61340 r61345  
    8383{
    8484    m_properties.reserveInitialCapacity(numProperties);
    85     HashSet<int> candidates;
    8685    for (int i = 0; i < numProperties; ++i) {
    8786        ASSERT(properties[i]);
     87        m_properties.append(*properties[i]);
    8888        if (properties[i]->value()->isVariableDependentValue())
    8989            m_variableDependentValueCount++;
    90         else if (candidates.contains(properties[i]->id()))
    91             removeProperty(properties[i]->id(), false);
    92         m_properties.append(*properties[i]);
    93         if (!getPropertyPriority(properties[i]->id()) && !properties[i]->isImportant())
    94             candidates.add(properties[i]->id());
    95     }
     90    }
     91    // FIXME: This allows duplicate properties.
    9692}
    9793
  • trunk/WebCore/css/CSSParser.cpp

    r61340 r61345  
    984984    case CSSPropertyPaddingLeft:         ////
    985985    case CSSPropertyWebkitPaddingStart:
    986         validPrimitive = (!id && validUnit(value, FLength | FPercent | FNonNeg, m_strict));
     986        validPrimitive = (!id && validUnit(value, FLength | FPercent, m_strict));
    987987        break;
    988988
  • trunk/WebCore/css/CSSStyleSelector.cpp

    r61340 r61345  
    38593859            else
    38603860                return;
    3861             apply = true;
     3861            if (id == CSSPropertyPaddingLeft || id == CSSPropertyPaddingRight ||
     3862                id == CSSPropertyPaddingTop || id == CSSPropertyPaddingBottom)
     3863                // Padding can't be negative
     3864                apply = !((l.isFixed() || l.isPercent()) && l.calcValue(100) < 0);
     3865            else
     3866                apply = true;
    38623867        }
    38633868        if (!apply) return;
Note: See TracChangeset for help on using the changeset viewer.