Changeset 112749 in webkit


Ignore:
Timestamp:
Mar 30, 2012 5:05:21 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Spec renamed Viewport-relative lengths to Viewport-percentage lengths
​https://bugs.webkit.org/show_bug.cgi?id=82773

Patch by Joe Thomas <​joethomas@motorola.com> on 2012-03-30
Reviewed by Antti Koivisto.

As per the latest version of CSS Values and Units Module Level 3 specification released on 29 March 2012
(​http://dev.w3.org/csswg/css3-values/#viewport-relative-lengths) Viewport-relative lengths is renamed to Viewport-percentage lengths.

Source/WebCore:

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::getPositionOffsetValue):
(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

  • css/CSSPrimitiveValue.cpp:

(WebCore::unitCategory):
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::canonicalUnitTypeForCategory):
(WebCore::CSSPrimitiveValue::viewportPercentageLength):

  • css/CSSPrimitiveValue.h:

(WebCore::CSSPrimitiveValue::isViewportPercentageLength):
(CSSPrimitiveValue):

  • css/CSSPrimitiveValueMappings.h:

(WebCore::CSSPrimitiveValue::convertToLength):

  • css/CSSStyleApplyProperty.cpp:

(WebCore::ApplyPropertyLength::applyValue):
(WebCore::ApplyPropertyBorderRadius::applyValue):
(WebCore::ApplyPropertyFontSize::applyValue):
(WebCore::ApplyPropertyLineHeight::applyValue):
(WebCore::ApplyPropertyVerticalAlign::applyValue):

  • css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::collectMatchingRulesForList):

  • css/LengthFunctions.cpp:

(WebCore::minimumValueForLength):
(WebCore::valueForLength):
(WebCore::floatValueForLength):

  • platform/Length.h:

(WebCore::Length::isViewportPercentage):
(WebCore::Length::viewportPercentageLength):

  • rendering/RenderBlock.cpp:

(WebCore::RenderBlock::textIndentOffset):

  • rendering/RenderBox.cpp:

(WebCore::RenderBox::computeContentLogicalHeightUsing):
(WebCore::RenderBox::computeReplacedLogicalHeightUsing):

  • rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::paddingTop):
(WebCore::RenderBoxModelObject::paddingBottom):
(WebCore::RenderBoxModelObject::paddingLeft):
(WebCore::RenderBoxModelObject::paddingRight):
(WebCore::RenderBoxModelObject::paddingBefore):
(WebCore::RenderBoxModelObject::paddingAfter):
(WebCore::RenderBoxModelObject::paddingStart):
(WebCore::RenderBoxModelObject::paddingEnd):
(WebCore::RenderBoxModelObject::calculateFillTileSize):

  • rendering/RenderInline.cpp:

(WebCore::computeMargin):

  • rendering/style/RenderStyle.h:

LayoutTests:

  • css3/viewport-percentage-lengths: Added.
  • css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-getStyle-expected.txt: Added.
  • css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-getStyle.html: Added.
  • css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vh-absolute-expected.html: Added.
  • css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vh-absolute.html: Added.
  • css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vh-expected.html: Added.
  • css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vh.html: Added.
  • css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vmin-absolute-expected.html: Added.
  • css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vmin-absolute.html: Added.
  • css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vmin-expected.html: Added.
  • css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vmin.html: Added.
  • css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vw-absolute-expected.html: Added.
  • css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vw-absolute.html: Added.
  • css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vw-expected.html: Added.
  • css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vw.html: Added.
  • css3/viewport-relative-lengths: Removed.
  • css3/viewport-relative-lengths/css3-viewport-relative-lengths-getStyle-expected.txt: Removed.
  • css3/viewport-relative-lengths/css3-viewport-relative-lengths-getStyle.html: Removed.
  • css3/viewport-relative-lengths/css3-viewport-relative-lengths-vh-absolute-expected.html: Removed.
  • css3/viewport-relative-lengths/css3-viewport-relative-lengths-vh-absolute.html: Removed.
  • css3/viewport-relative-lengths/css3-viewport-relative-lengths-vh-expected.html: Removed.
  • css3/viewport-relative-lengths/css3-viewport-relative-lengths-vh.html: Removed.
  • css3/viewport-relative-lengths/css3-viewport-relative-lengths-vmin-absolute-expected.html: Removed.
  • css3/viewport-relative-lengths/css3-viewport-relative-lengths-vmin-absolute.html: Removed.
  • css3/viewport-relative-lengths/css3-viewport-relative-lengths-vmin-expected.html: Removed.
  • css3/viewport-relative-lengths/css3-viewport-relative-lengths-vmin.html: Removed.
  • css3/viewport-relative-lengths/css3-viewport-relative-lengths-vw-absolute-expected.html: Removed.
  • css3/viewport-relative-lengths/css3-viewport-relative-lengths-vw-absolute.html: Removed.
  • css3/viewport-relative-lengths/css3-viewport-relative-lengths-vw-expected.html: Removed.
  • css3/viewport-relative-lengths/css3-viewport-relative-lengths-vw.html: Removed.
Location:
trunk
Files:
1 added
15 edited
14 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r112748 r112749  
     12012-03-30  Joe Thomas  <joethomas@motorola.com>
     2
     3        Spec renamed Viewport-relative lengths to Viewport-percentage lengths
     4        https://bugs.webkit.org/show_bug.cgi?id=82773
     5
     6        Reviewed by Antti Koivisto.
     7
     8        As per the latest version of CSS Values and Units Module Level 3 specification released on 29 March 2012
     9        (http://dev.w3.org/csswg/css3-values/#viewport-relative-lengths) Viewport-relative lengths is renamed to Viewport-percentage lengths.
     10
     11        * css3/viewport-percentage-lengths: Added.
     12        * css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-getStyle-expected.txt: Added.
     13        * css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-getStyle.html: Added.
     14        * css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vh-absolute-expected.html: Added.
     15        * css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vh-absolute.html: Added.
     16        * css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vh-expected.html: Added.
     17        * css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vh.html: Added.
     18        * css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vmin-absolute-expected.html: Added.
     19        * css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vmin-absolute.html: Added.
     20        * css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vmin-expected.html: Added.
     21        * css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vmin.html: Added.
     22        * css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vw-absolute-expected.html: Added.
     23        * css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vw-absolute.html: Added.
     24        * css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vw-expected.html: Added.
     25        * css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-vw.html: Added.
     26        * css3/viewport-relative-lengths: Removed.
     27        * css3/viewport-relative-lengths/css3-viewport-relative-lengths-getStyle-expected.txt: Removed.
     28        * css3/viewport-relative-lengths/css3-viewport-relative-lengths-getStyle.html: Removed.
     29        * css3/viewport-relative-lengths/css3-viewport-relative-lengths-vh-absolute-expected.html: Removed.
     30        * css3/viewport-relative-lengths/css3-viewport-relative-lengths-vh-absolute.html: Removed.
     31        * css3/viewport-relative-lengths/css3-viewport-relative-lengths-vh-expected.html: Removed.
     32        * css3/viewport-relative-lengths/css3-viewport-relative-lengths-vh.html: Removed.
     33        * css3/viewport-relative-lengths/css3-viewport-relative-lengths-vmin-absolute-expected.html: Removed.
     34        * css3/viewport-relative-lengths/css3-viewport-relative-lengths-vmin-absolute.html: Removed.
     35        * css3/viewport-relative-lengths/css3-viewport-relative-lengths-vmin-expected.html: Removed.
     36        * css3/viewport-relative-lengths/css3-viewport-relative-lengths-vmin.html: Removed.
     37        * css3/viewport-relative-lengths/css3-viewport-relative-lengths-vw-absolute-expected.html: Removed.
     38        * css3/viewport-relative-lengths/css3-viewport-relative-lengths-vw-absolute.html: Removed.
     39        * css3/viewport-relative-lengths/css3-viewport-relative-lengths-vw-expected.html: Removed.
     40        * css3/viewport-relative-lengths/css3-viewport-relative-lengths-vw.html: Removed.
     41
    1422012-03-30  Dirk Pranke  <dpranke@chromium.org>
    243

  • trunk/Source/WebCore/ChangeLog

    r112745 r112749  
     12012-03-30  Joe Thomas  <joethomas@motorola.com>
     2
     3        Spec renamed Viewport-relative lengths to Viewport-percentage lengths
     4        https://bugs.webkit.org/show_bug.cgi?id=82773
     5
     6        Reviewed by Antti Koivisto.
     7
     8        As per the latest version of CSS Values and Units Module Level 3 specification released on 29 March 2012
     9        (http://dev.w3.org/csswg/css3-values/#viewport-relative-lengths) Viewport-relative lengths is renamed to Viewport-percentage lengths.
     10
     11        * css/CSSComputedStyleDeclaration.cpp:
     12        (WebCore::getPositionOffsetValue):
     13        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
     14        * css/CSSPrimitiveValue.cpp:
     15        (WebCore::unitCategory):
     16        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
     17        (WebCore::CSSPrimitiveValue::canonicalUnitTypeForCategory):
     18        (WebCore::CSSPrimitiveValue::viewportPercentageLength):
     19        * css/CSSPrimitiveValue.h:
     20        (WebCore::CSSPrimitiveValue::isViewportPercentageLength):
     21        (CSSPrimitiveValue):
     22        * css/CSSPrimitiveValueMappings.h:
     23        (WebCore::CSSPrimitiveValue::convertToLength):
     24        * css/CSSStyleApplyProperty.cpp:
     25        (WebCore::ApplyPropertyLength::applyValue):
     26        (WebCore::ApplyPropertyBorderRadius::applyValue):
     27        (WebCore::ApplyPropertyFontSize::applyValue):
     28        (WebCore::ApplyPropertyLineHeight::applyValue):
     29        (WebCore::ApplyPropertyVerticalAlign::applyValue):
     30        * css/CSSStyleSelector.cpp:
     31        (WebCore::CSSStyleSelector::collectMatchingRulesForList):
     32        * css/LengthFunctions.cpp:
     33        (WebCore::minimumValueForLength):
     34        (WebCore::valueForLength):
     35        (WebCore::floatValueForLength):
     36        * platform/Length.h:
     37        (WebCore::Length::isViewportPercentage):
     38        (WebCore::Length::viewportPercentageLength):
     39        * rendering/RenderBlock.cpp:
     40        (WebCore::RenderBlock::textIndentOffset):
     41        * rendering/RenderBox.cpp:
     42        (WebCore::RenderBox::computeContentLogicalHeightUsing):
     43        (WebCore::RenderBox::computeReplacedLogicalHeightUsing):
     44        * rendering/RenderBoxModelObject.cpp:
     45        (WebCore::RenderBoxModelObject::paddingTop):
     46        (WebCore::RenderBoxModelObject::paddingBottom):
     47        (WebCore::RenderBoxModelObject::paddingLeft):
     48        (WebCore::RenderBoxModelObject::paddingRight):
     49        (WebCore::RenderBoxModelObject::paddingBefore):
     50        (WebCore::RenderBoxModelObject::paddingAfter):
     51        (WebCore::RenderBoxModelObject::paddingStart):
     52        (WebCore::RenderBoxModelObject::paddingEnd):
     53        (WebCore::RenderBoxModelObject::calculateFillTileSize):
     54        * rendering/RenderInline.cpp:
     55        (WebCore::computeMargin):
     56        * rendering/style/RenderStyle.h:
     57
    1582012-03-30  Alexandru Chiculita  <achicu@adobe.com>
    259

  • trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

    r112629 r112749  
    573573        if (l.type() == WebCore::Fixed)
    574574            return zoomAdjustedPixelValue(l.value(), style, cssValuePool);
    575         else if (l.isViewportRelative())
     575        else if (l.isViewportPercentage())
    576576            return zoomAdjustedPixelValue(valueForLength(l, 0, renderView), style, cssValuePool);
    577577        return cssValuePool->createValue(l);
    … …  
    17781778                return zoomAdjustedPixelValueForLength(marginRight, style.get(), cssValuePool);
    17791779            int value;
    1780             if (marginRight.isPercent() || marginRight.isViewportRelative())
     1780            if (marginRight.isPercent() || marginRight.isViewportPercentage())
    17811781                // RenderBox gives a marginRight() that is the distance between the right-edge of the child box
    17821782                // and the right-edge of the containing box, when display == BLOCK. Let's calculate the absolute

  • trunk/Source/WebCore/css/CSSPrimitiveValue.cpp

    r112301 r112749  
    137137    case CSSPrimitiveValue::CSS_VH:
    138138    case CSSPrimitiveValue::CSS_VMIN:
    139         return CSSPrimitiveValue::UViewportRelativeLength;
     139        return CSSPrimitiveValue::UViewportPercentageLength;
    140140    default:
    141141        return CSSPrimitiveValue::UOther;
    … …  
    254254            m_value.num = length.percent();
    255255            break;
    256         case ViewportRelativeWidth:
     256        case ViewportPercentageWidth:
    257257            m_primitiveUnitType = CSS_VW;
    258             m_value.num = length.viewportRelativeLength();
    259             break;
    260         case ViewportRelativeHeight:
     258            m_value.num = length.viewportPercentageLength();
     259            break;
     260        case ViewportPercentageHeight:
    261261            m_primitiveUnitType = CSS_VH;
    262             m_value.num = length.viewportRelativeLength();
    263             break;
    264         case ViewportRelativeMin:
     262            m_value.num = length.viewportPercentageLength();
     263            break;
     264        case ViewportPercentageMin:
    265265            m_primitiveUnitType = CSS_VMIN;
    266             m_value.num = length.viewportRelativeLength();
     266            m_value.num = length.viewportPercentageLength();
    267267            break;
    268268        case Calculated:
    … …  
    594594    case UFrequency:
    595595        return CSS_HZ;
    596     case UViewportRelativeLength:
     596    case UViewportPercentageLength:
    597597        return CSS_UNKNOWN; // Cannot convert between numbers and relative lengths.
    598598    default:
    … …  
    10391039}
    10401040
    1041 Length CSSPrimitiveValue::viewportRelativeLength()
    1042 {
    1043     ASSERT(isViewportRelativeLength());
     1041Length CSSPrimitiveValue::viewportPercentageLength()
     1042{
     1043    ASSERT(isViewportPercentageLength());
    10441044    Length viewportLength;
    10451045    switch (m_primitiveUnitType) {
    10461046    case CSS_VW:
    1047         viewportLength = Length(getDoubleValue(), ViewportRelativeWidth);
     1047        viewportLength = Length(getDoubleValue(), ViewportPercentageWidth);
    10481048        break;
    10491049    case CSS_VH:
    1050         viewportLength = Length(getDoubleValue(), ViewportRelativeHeight);
     1050        viewportLength = Length(getDoubleValue(), ViewportPercentageHeight);
    10511051        break;
    10521052    case CSS_VMIN:
    1053         viewportLength = Length(getDoubleValue(), ViewportRelativeMin);
     1053        viewportLength = Length(getDoubleValue(), ViewportPercentageMin);
    10541054        break;
    10551055    default:

  • trunk/Source/WebCore/css/CSSPrimitiveValue.h

    r112301 r112749  
    8181        CSS_RECT = 24,
    8282        CSS_RGBCOLOR = 25,
    83         // From CSS Values and Units. Viewport Relative Lengths (vw/vh/vmin).
     83        // From CSS Values and Units. Viewport-percentage Lengths (vw/vh/vmin).
    8484        CSS_VW = 26,
    8585        CSS_VH = 27,
    … …  
    123123        UTime,
    124124        UFrequency,
    125         UViewportRelativeLength,
     125        UViewportPercentageLength,
    126126        UOther
    127127    };
    … …  
    159159    bool isCalculatedPercentageWithNumber() const { return primitiveType() == CSS_CALC_PERCENTAGE_WITH_NUMBER; }
    160160    bool isCalculatedPercentageWithLength() const { return primitiveType() == CSS_CALC_PERCENTAGE_WITH_LENGTH; }
    161     bool isViewportRelativeLength() const { return m_primitiveUnitType >= CSS_VW && m_primitiveUnitType <= CSS_VMIN; }
     161    bool isViewportPercentageLength() const { return m_primitiveUnitType >= CSS_VW && m_primitiveUnitType <= CSS_VMIN; }
    162162
    163163    static PassRefPtr<CSSPrimitiveValue> createIdentifier(int identifier) { return adoptRef(new CSSPrimitiveValue(identifier)); }
    … …  
    275275    void addSubresourceStyleURLs(ListHashSet<KURL>&, const CSSStyleSheet*);
    276276
    277     Length viewportRelativeLength();
     277    Length viewportPercentageLength();
    278278
    279279private:

  • trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h

    r112587 r112749  
    37763776    FractionConversion = 1 << 4,
    37773777    CalculatedConversion = 1 << 5,
    3778     ViewportRelativeConversion = 1 << 6
     3778    ViewportPercentageConversion = 1 << 6
    37793779};
    37803780
    … …  
    37953795    if ((supported & CalculatedConversion) && isCalculated())
    37963796        return Length(cssCalcValue()->toCalcValue(style, rootStyle, multiplier));
    3797     if ((supported & ViewportRelativeConversion) && isViewportRelativeLength())
    3798         return viewportRelativeLength();
     3797    if ((supported & ViewportPercentageConversion) && isViewportPercentageLength())
     3798        return viewportPercentageLength();
    37993799    return Length(Undefined);
    38003800}

  • trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp

    r112555 r112749  
    394394            else if (primitiveValue->isCalculatedPercentageWithLength())
    395395                setValue(selector->style(), Length(primitiveValue->cssCalcValue()->toCalcValue(selector->style(), selector->rootElementStyle(), selector->style()->effectiveZoom())));           
    396             else if (primitiveValue->isViewportRelativeLength())
    397                 setValue(selector->style(), primitiveValue->viewportRelativeLength());
     396            else if (primitiveValue->isViewportPercentageLength())
     397                setValue(selector->style(), primitiveValue->viewportPercentageLength());
    398398        }
    399399    }
    … …  
    447447        if (pair->first()->isPercentage())
    448448            radiusWidth = Length(pair->first()->getDoubleValue(), Percent);
    449         else if (pair->first()->isViewportRelativeLength())
    450             radiusWidth = pair->first()->viewportRelativeLength();
     449        else if (pair->first()->isViewportPercentageLength())
     450            radiusWidth = pair->first()->viewportPercentageLength();
    451451        else if (pair->first()->isCalculatedPercentageWithLength()) {
    452452            // FIXME calc(): http://webkit.org/b/16662
    … …  
    457457        if (pair->second()->isPercentage())
    458458            radiusHeight = Length(pair->second()->getDoubleValue(), Percent);
    459         else if (pair->second()->isViewportRelativeLength())
    460             radiusHeight = pair->second()->viewportRelativeLength();
     459        else if (pair->second()->isViewportPercentageLength())
     460            radiusHeight = pair->second()->viewportPercentageLength();
    461461        else if (pair->second()->isCalculatedPercentageWithLength()) {
    462462            // FIXME calc(): http://webkit.org/b/16662
    … …  
    753753            else if (primitiveValue->isCalculatedPercentageWithLength())
    754754                size = primitiveValue->cssCalcValue()->toCalcValue(selector->parentStyle(), selector->rootElementStyle())->evaluate(parentSize);               
    755             else if (primitiveValue->isViewportRelativeLength())
    756                 size = valueForLength(primitiveValue->viewportRelativeLength(), 0, selector->document()->renderView());
     755            else if (primitiveValue->isViewportPercentageLength())
     756                size = valueForLength(primitiveValue->viewportPercentageLength(), 0, selector->document()->renderView());
    757757            else
    758758                return;
    … …  
    12161216            // FIXME: number and percentage values should produce the same type of Length (ie. Fixed or Percent).
    12171217            lineHeight = Length(primitiveValue->getDoubleValue() * 100.0, Percent);
    1218         } else if (primitiveValue->isViewportRelativeLength()) {
    1219             lineHeight = primitiveValue->viewportRelativeLength();
     1218        } else if (primitiveValue->isViewportPercentageLength()) {
     1219            lineHeight = primitiveValue->viewportPercentageLength();
    12201220        } else
    12211221            return;
    … …  
    15791579            return selector->style()->setVerticalAlign(*primitiveValue);
    15801580
    1581         selector->style()->setVerticalAlignLength(primitiveValue->convertToLength<FixedIntegerConversion | PercentConversion | CalculatedConversion | ViewportRelativeConversion>(selector->style(), selector->rootElementStyle(), selector->style()->effectiveZoom()));
     1581        selector->style()->setVerticalAlignLength(primitiveValue->convertToLength<FixedIntegerConversion | PercentConversion | CalculatedConversion | ViewportPercentageConversion>(selector->style(), selector->rootElementStyle(), selector->style()->effectiveZoom()));
    15821582    }
    15831583

  • trunk/Source/WebCore/css/CSSStyleSelector.cpp

    r112730 r112749  
    25642564Length CSSStyleSelector::convertToIntLength(CSSPrimitiveValue* primitiveValue, RenderStyle* style, RenderStyle* rootStyle, double multiplier)
    25652565{
    2566     return primitiveValue ? primitiveValue->convertToLength<FixedIntegerConversion | PercentConversion | FractionConversion | ViewportRelativeConversion>(style, rootStyle, multiplier) : Length(Undefined);
     2566    return primitiveValue ? primitiveValue->convertToLength<FixedIntegerConversion | PercentConversion | FractionConversion | ViewportPercentageConversion>(style, rootStyle, multiplier) : Length(Undefined);
    25672567}
    25682568
    25692569Length CSSStyleSelector::convertToFloatLength(CSSPrimitiveValue* primitiveValue, RenderStyle* style, RenderStyle* rootStyle, double multiplier)
    25702570{
    2571     return primitiveValue ? primitiveValue->convertToLength<FixedFloatConversion | PercentConversion | FractionConversion | ViewportRelativeConversion>(style, rootStyle, multiplier) : Length(Undefined);
     2571    return primitiveValue ? primitiveValue->convertToLength<FixedFloatConversion | PercentConversion | FractionConversion | ViewportPercentageConversion>(style, rootStyle, multiplier) : Length(Undefined);
    25722572}
    25732573
    … …  
    29542954static bool createGridTrackBreadth(CSSPrimitiveValue* primitiveValue, CSSStyleSelector* selector, Length& length)
    29552955{
    2956     Length workingLength = primitiveValue->convertToLength<FixedIntegerConversion | PercentConversion | ViewportRelativeConversion | AutoConversion>(selector->style(), selector->rootElementStyle(), selector->style()->effectiveZoom());
     2956    Length workingLength = primitiveValue->convertToLength<FixedIntegerConversion | PercentConversion | ViewportPercentageConversion | AutoConversion>(selector->style(), selector->rootElementStyle(), selector->style()->effectiveZoom());
    29572957    if (workingLength.isUndefined())
    29582958        return false;
    … …  
    42984298    else if (primitiveValue->isCalculatedPercentageWithLength())
    42994299        l = Length(primitiveValue->cssCalcValue()->toCalcValue(style(), m_rootElementStyle, zoomFactor));
    4300     else if (primitiveValue->isViewportRelativeLength())
    4301         l = primitiveValue->viewportRelativeLength();
     4300    else if (primitiveValue->isViewportPercentageLength())
     4301        l = primitiveValue->viewportPercentageLength();
    43024302    else
    43034303        return;
    … …  
    43254325    else if (primitiveValue->isCalculatedPercentageWithLength())
    43264326        l = Length(primitiveValue->cssCalcValue()->toCalcValue(style(), m_rootElementStyle, zoomFactor));
    4327     else if (primitiveValue->isViewportRelativeLength())
    4328         l = primitiveValue->viewportRelativeLength();
     4327    else if (primitiveValue->isViewportPercentageLength())
     4328        l = primitiveValue->viewportPercentageLength();
    43294329    else
    43304330        return;

  • trunk/Source/WebCore/css/LengthFunctions.cpp

    r112472 r112749  
    4242    case Calculated:
    4343        return length.nonNanCalculatedValue(maximumValue);
    44     case ViewportRelativeWidth:
     44    case ViewportPercentageWidth:
    4545        if (renderView)
    46             return static_cast<int>(renderView->viewportSize().width() * length.viewportRelativeLength() / 100.0f);
     46            return static_cast<int>(renderView->viewportSize().width() * length.viewportPercentageLength() / 100.0f);
    4747        return 0;
    48     case ViewportRelativeHeight:
     48    case ViewportPercentageHeight:
    4949        if (renderView)
    50             return static_cast<int>(renderView->viewportSize().height() * length.viewportRelativeLength() / 100.0f);
     50            return static_cast<int>(renderView->viewportSize().height() * length.viewportPercentageLength() / 100.0f);
    5151        return 0;
    52     case ViewportRelativeMin:
     52    case ViewportPercentageMin:
    5353        if (renderView) {
    5454            IntSize viewportSize = renderView->viewportSize();
    55             return static_cast<int>(std::min(viewportSize.width(), viewportSize.height()) * length.viewportRelativeLength() / 100.0f);
     55            return static_cast<int>(std::min(viewportSize.width(), viewportSize.height()) * length.viewportPercentageLength() / 100.0f);
    5656        }
    5757        return 0;
    … …  
    7575    case Percent:
    7676    case Calculated:
    77     case ViewportRelativeWidth:
    78     case ViewportRelativeHeight:
    79     case ViewportRelativeMin:
     77    case ViewportPercentageWidth:
     78    case ViewportPercentageHeight:
     79    case ViewportPercentageMin:
    8080        return minimumValueForLength(length, maximumValue, renderView, roundPercentages);
    8181    case Auto:
    … …  
    108108    case Calculated:
    109109        return length.nonNanCalculatedValue(maximumValue);               
    110     case ViewportRelativeWidth:
     110    case ViewportPercentageWidth:
    111111        if (renderView)
    112             return static_cast<int>(renderView->viewportSize().width() * length.viewportRelativeLength() / 100.0f);
     112            return static_cast<int>(renderView->viewportSize().width() * length.viewportPercentageLength() / 100.0f);
    113113        return 0;
    114     case ViewportRelativeHeight:
     114    case ViewportPercentageHeight:
    115115        if (renderView)
    116             return static_cast<int>(renderView->viewportSize().height() * length.viewportRelativeLength() / 100.0f);
     116            return static_cast<int>(renderView->viewportSize().height() * length.viewportPercentageLength() / 100.0f);
    117117        return 0;
    118     case ViewportRelativeMin:
     118    case ViewportPercentageMin:
    119119        if (renderView) {
    120120            IntSize viewportSize = renderView->viewportSize();
    121             return static_cast<int>(std::min(viewportSize.width(), viewportSize.height()) * length.viewportRelativeLength() / 100.0f);
     121            return static_cast<int>(std::min(viewportSize.width(), viewportSize.height()) * length.viewportPercentageLength() / 100.0f);
    122122        }
    123123        return 0;
    … …  
    144144    case Calculated:
    145145        return length.nonNanCalculatedValue(maximumValue);
    146     case ViewportRelativeWidth:
     146    case ViewportPercentageWidth:
    147147        if (renderView)
    148             return static_cast<int>(renderView->viewportSize().width() * length.viewportRelativeLength() / 100.0f);
     148            return static_cast<int>(renderView->viewportSize().width() * length.viewportPercentageLength() / 100.0f);
    149149        return 0;
    150     case ViewportRelativeHeight:
     150    case ViewportPercentageHeight:
    151151        if (renderView)
    152             return static_cast<int>(renderView->viewportSize().height() * length.viewportRelativeLength() / 100.0f);
     152            return static_cast<int>(renderView->viewportSize().height() * length.viewportPercentageLength() / 100.0f);
    153153        return 0;
    154     case ViewportRelativeMin:
     154    case ViewportPercentageMin:
    155155        if (renderView) {
    156156            IntSize viewportSize = renderView->viewportSize();
    157             return static_cast<int>(std::min(viewportSize.width(), viewportSize.height()) * length.viewportRelativeLength() / 100.0f);
     157            return static_cast<int>(std::min(viewportSize.width(), viewportSize.height()) * length.viewportPercentageLength() / 100.0f);
    158158        }
    159159        return 0;

  • trunk/Source/WebCore/platform/Length.h

    r112301 r112749  
    3434namespace WebCore {
    3535
    36 enum LengthType { Auto, Relative, Percent, Fixed, Intrinsic, MinIntrinsic, Calculated, ViewportRelativeWidth, ViewportRelativeHeight, ViewportRelativeMin, Undefined };
     36enum LengthType { Auto, Relative, Percent, Fixed, Intrinsic, MinIntrinsic, Calculated, ViewportPercentageWidth, ViewportPercentageHeight, ViewportPercentageMin, Undefined };
    3737 
    3838class CalculationValue;   
    … …  
    227227    float nonNanCalculatedValue(int maxValue) const;
    228228
    229     bool isViewportRelative() const
     229    bool isViewportPercentage() const
    230230    {
    231231        LengthType lengthType = type();
    232         return lengthType >= ViewportRelativeWidth && lengthType <= ViewportRelativeMin;
    233     }
    234     float viewportRelativeLength() const
    235     {
    236         ASSERT(isViewportRelative());
     232        return lengthType >= ViewportPercentageWidth && lengthType <= ViewportPercentageMin;
     233    }
     234    float viewportPercentageLength() const
     235    {
     236        ASSERT(isViewportPercentage());
    237237        return getFloatValue();
    238238    }

  • trunk/Source/WebCore/rendering/RenderBlock.cpp

    r112566 r112749  
    39483948    if (style()->textIndent().isPercent())
    39493949        cw = containingBlock()->availableLogicalWidth();
    3950     else if (style()->textIndent().isViewportRelative())
     3950    else if (style()->textIndent().isViewportPercentage())
    39513951        renderView = view();
    39523952    return minimumValueForLength(style()->textIndent(), cw, renderView);

  • trunk/Source/WebCore/rendering/RenderBox.cpp

    r112745 r112749  
    21652165        else if (height.isPercent())
    21662166            logicalHeight = computePercentageLogicalHeight(height);
    2167         else if (height.isViewportRelative())
     2167        else if (height.isViewportPercentage())
    21682168            logicalHeight = valueForLength(height, 0, view());
    21692169    }
    … …  
    23522352            return computeContentBoxLogicalHeight(valueForLength(logicalHeight, availableHeight));
    23532353        }
    2354         case ViewportRelativeWidth:
    2355         case ViewportRelativeHeight:
    2356         case ViewportRelativeMin:
     2354        case ViewportPercentageWidth:
     2355        case ViewportPercentageHeight:
     2356        case ViewportPercentageMin:
    23572357            return computeContentBoxLogicalHeight(valueForLength(logicalHeight, 0, view()));
    23582358        default:

  • trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

    r112644 r112749  
    563563    if (padding.isPercent())
    564564        w = containingBlock()->availableLogicalWidth();
    565     else if (padding.isViewportRelative())
     565    else if (padding.isViewportPercentage())
    566566        renderView = view();
    567567    return minimumValueForLength(padding, w, renderView);
    … …  
    575575    if (padding.isPercent())
    576576        w = containingBlock()->availableLogicalWidth();
    577     else if (padding.isViewportRelative())
     577    else if (padding.isViewportPercentage())
    578578        renderView = view();
    579579    return minimumValueForLength(padding, w, renderView);
    … …  
    587587    if (padding.isPercent())
    588588        w = containingBlock()->availableLogicalWidth();
    589     else if (padding.isViewportRelative())
     589    else if (padding.isViewportPercentage())
    590590        renderView = view();
    591591    return minimumValueForLength(padding, w, renderView);
    … …  
    599599    if (padding.isPercent())
    600600        w = containingBlock()->availableLogicalWidth();
    601     else if (padding.isViewportRelative())
     601    else if (padding.isViewportPercentage())
    602602        renderView = view();
    603603    return minimumValueForLength(padding, w, renderView);
    … …  
    611611    if (padding.isPercent())
    612612        w = containingBlock()->availableLogicalWidth();
    613     else if (padding.isViewportRelative())
     613    else if (padding.isViewportPercentage())
    614614        renderView = view();
    615615    return minimumValueForLength(padding, w, renderView);
    … …  
    623623    if (padding.isPercent())
    624624        w = containingBlock()->availableLogicalWidth();
    625     else if (padding.isViewportRelative())
     625    else if (padding.isViewportPercentage())
    626626        renderView = view();
    627627    return minimumValueForLength(padding, w, renderView);
    … …  
    635635    if (padding.isPercent())
    636636        w = containingBlock()->availableLogicalWidth();
    637     else if (padding.isViewportRelative())
     637    else if (padding.isViewportPercentage())
    638638        renderView = view();
    639639    return minimumValueForLength(padding, w, renderView);
    … …  
    647647    if (padding.isPercent())
    648648        w = containingBlock()->availableLogicalWidth();
    649     else if (padding.isViewportRelative())
     649    else if (padding.isViewportPercentage())
    650650        renderView = view();
    651651    return minimumValueForLength(padding, w, renderView);
    … …  
    10281028            if (layerWidth.isFixed())
    10291029                w = layerWidth.value();
    1030             else if (layerWidth.isPercent() || layerHeight.isViewportRelative())
     1030            else if (layerWidth.isPercent() || layerHeight.isViewportPercentage())
    10311031                w = valueForLength(layerWidth, positioningAreaSize.width(), renderView);
    10321032           
    10331033            if (layerHeight.isFixed())
    10341034                h = layerHeight.value();
    1035             else if (layerHeight.isPercent() || layerHeight.isViewportRelative())
     1035            else if (layerHeight.isPercent() || layerHeight.isViewportPercentage())
    10361036                h = valueForLength(layerHeight, positioningAreaSize.height(), renderView);
    10371037           

  • trunk/Source/WebCore/rendering/RenderInline.cpp

    r112745 r112749  
    703703    if (margin.isPercent())
    704704        return minimumValueForLength(margin, max<LayoutUnit>(0, renderer->containingBlock()->availableLogicalWidth()));
    705     if (margin.isViewportRelative())
     705    if (margin.isViewportPercentage())
    706706        return valueForLength(margin, 0, renderer->view());
    707707    return 0;

  • trunk/Source/WebCore/rendering/style/RenderStyle.h

    r112475 r112749  
    634634            return minimumValueForLength(lh, fontSize());
    635635
    636         if (lh.isViewportRelative())
     636        if (lh.isViewportPercentage())
    637637            return valueForLength(lh, 0, renderView);
    638638
Note: See TracChangeset for help on using the changeset viewer.