ChangeLog

2012-06-15  David Barr  <davidbarr@chromium.org>

        Add from-image to css3-images image-resolution

        https://bugs.webkit.org/show_bug.cgi?id=85451

        Reviewed by NOBODY (OOPS!).

        The css3-images module is at candidate recommendation.

        http://www.w3.org/TR/2012/CR-css3-images-20120417/#the-image-resolution

        No new tests; extended fast/css/image-resolution/image-resolution.html

        * css/CSSParser.cpp: Accept from-image identifier in image-resolution property.

        (WebCore::CSSParser::parseImageResolution): Map CSSValueFromImage to identifier value from cssValuePool.

        * css/CSSValueKeywords.in: Add from-image.

        * css/StyleBuilder.cpp: Extend ApplyPropertyImageResolution to apply RenderStyle::imageResolutionFlags.

        (WebCore::ApplyPropertyImageResolution::applyInheritValue): Apply RenderStyle::imageResolutionFlags.

        (WebCore::ApplyPropertyImageResolution::applyInitialValue): Apply RenderStyle::imageResolutionFlags.

        (WebCore::ApplyPropertyImageResolution::applyValue): Map CSSValueFromImage to ImageResolutionFromImage.

        * rendering/style/RenderStyle.cpp: Include StyleRareInheritedData::m_imageResolutionFlags in style diff.

        (WebCore::RenderStyle::diff): Map change in StyleRareInheritedData::m_imageResolutionFlags to StyleDifferenceLayout.

        * rendering/style/RenderStyle.h: Add RenderStyle::imageResolutionFlags, RenderStyle::setImageResolutionFlags, RenderStyle::initialImageResolutionFlags.

        * rendering/style/RenderStyleConstants.h: Add enum EImageResolution.

        * rendering/style/StyleRareInheritedData.cpp: Add StyleRareInheritedData::m_imageResolutionFlags.

        (WebCore::StyleRareInheritedData::StyleRareInheritedData): Add m_imageResolutionFlags to default and copy constructor.

        (WebCore::StyleRareInheritedData::operator==): Include m_imageResolutionFlags in comparison.

        * rendering/style/StyleRareInheritedData.h: Add StyleRareInheritedData::m_imageResolutionFlags.

        (StyleRareInheritedData): Add 1-bit field StyleRareInheritedData::m_imageResolutionFlags.

2012-06-14  David Barr  <davidbarr@chromium.org>

        Add dpcm to css3-images image-resolution

Source/WebCore/css/CSSParser.cpp

@@PassRefPtr<CSSValue> CSSParser::parseImageResolution(CSSParserValueList* valueLi

{

    RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();

    bool haveResolution = false;

6888 bool haveFromImage = false;

    CSSParserValue* value = valueList->current();

    while (value) {

6891 if (!haveResolution && validUnit(value, FResolution | FNonNeg) && value->fValue > 0) {

        if (!haveFromImage && value->id == CSSValueFromImage) {

            list->append(cssValuePool().createIdentifierValue(value->id));

            haveFromImage = true;

        } else if (!haveResolution && validUnit(value, FResolution | FNonNeg) && value->fValue > 0) {

            list->append(createPrimitiveNumericValue(value));

            haveResolution = true;

        } else

Source/WebCore/css/CSSValueKeywords.in

@@filter-box

detached

#endif // CSS_SHADERS

#endif // CSS_FILTERS

#if defined(ENABLE_CSS_IMAGE_RESOLUTION) && ENABLE_CSS_IMAGE_RESOLUTION

from-image

#endif

Source/WebCore/css/StyleBuilder.cpp

@@class ApplyPropertyImageResolution {

public:

    static void applyInheritValue(StyleResolver* styleResolver)

    {

1775 ApplyPropertyDefaultBase<ImageResolution, &RenderStyle::imageResolutionFlags, ImageResolution, &RenderStyle::setImageResolutionFlags, ImageResolution, &RenderStyle::initialImageResolutionFlags>::applyInheritValue(styleResolver);

        ApplyPropertyDefaultBase<float, &RenderStyle::imageResolution, float, &RenderStyle::setImageResolution, float, &RenderStyle::initialImageResolution>::applyInheritValue(styleResolver);

    }

    static void applyInitialValue(StyleResolver* styleResolver)

    {

1781 ApplyPropertyDefaultBase<ImageResolution, &RenderStyle::imageResolutionFlags, ImageResolution, &RenderStyle::setImageResolutionFlags, ImageResolution, &RenderStyle::initialImageResolutionFlags>::applyInitialValue(styleResolver);

        ApplyPropertyDefaultBase<float, &RenderStyle::imageResolution, float, &RenderStyle::setImageResolution, float, &RenderStyle::initialImageResolution>::applyInitialValue(styleResolver);

    }

@@public:

        if (!value->isValueList())

            return;

        CSSValueList* valueList = static_cast<CSSValueList*>(value);

1790 ImageResolution flags = RenderStyle::initialImageResolutionFlags();

1791 double resolution = RenderStyle::initialImageResolution();

        for (size_t i = 0; i < valueList->length(); i++) {

            CSSValue* item = valueList->itemWithoutBoundsCheck(i);

            if (!item->isPrimitiveValue())

                continue;

            CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(item);

1793 styleResolver->style()->setImageResolution(primitiveValue->getDoubleValue(CSSPrimitiveValue::CSS_DPPX));

            if (primitiveValue->getIdent() == CSSValueFromImage)

                flags = ImageResolutionFromImage;

            else

                resolution = primitiveValue->getDoubleValue(CSSPrimitiveValue::CSS_DPPX);

17941801 }

1802 styleResolver->style()->setImageResolutionFlags(flags);

1803 styleResolver->style()->setImageResolution(resolution);

    }

    static PropertyHandler createHandler()

Source/WebCore/rendering/style/RenderStyle.cpp

@@StyleDifference RenderStyle::diff(const RenderStyle* other, unsigned& changedCon

            || rareInheritedData->m_lineBoxContain != other->rareInheritedData->m_lineBoxContain

            || rareInheritedData->m_lineGrid != other->rareInheritedData->m_lineGrid

#if ENABLE(CSS_IMAGE_RESOLUTION)

476 || rareInheritedData->m_imageResolutionFlags != other->rareInheritedData->m_imageResolutionFlags

            || rareInheritedData->m_imageResolution != other->rareInheritedData->m_imageResolution

#endif

            || rareInheritedData->m_lineSnap != other->rareInheritedData->m_lineSnap

Source/WebCore/rendering/style/RenderStyle.h

@@public:

    EImageRendering imageRendering() const { return static_cast<EImageRendering>(rareInheritedData->m_imageRendering); }

#if ENABLE(CSS_IMAGE_RESOLUTION)

985 ImageResolution imageResolutionFlags() const { return static_cast<ImageResolution>(rareInheritedData->m_imageResolutionFlags); }

    float imageResolution() const { return rareInheritedData->m_imageResolution; }

#endif

@@public:

    void setImageRendering(EImageRendering v) { SET_VAR(rareInheritedData, m_imageRendering, v) }

#if ENABLE(CSS_IMAGE_RESOLUTION)

1156 void setImageResolutionFlags(ImageResolution v) { SET_VAR(rareInheritedData, m_imageResolutionFlags, v) }

    void setImageResolution(float f) { SET_VAR(rareInheritedData, m_imageResolution, f) }

#endif

@@public:

    static TextEmphasisPosition initialTextEmphasisPosition() { return TextEmphasisPositionOver; }

    static LineBoxContain initialLineBoxContain() { return LineBoxContainBlock | LineBoxContainInline | LineBoxContainReplaced; }

    static EImageRendering initialImageRendering() { return ImageRenderingAuto; }

1669 static ImageResolution initialImageResolutionFlags() { return ImageResolutionNoFlags; }

    static float initialImageResolution() { return 1; }

    static StyleImage* initialBorderImageSource() { return 0; }

    static StyleImage* initialMaskBoxImageSource() { return 0; }

Source/WebCore/rendering/style/RenderStyleConstants.h

@@enum TextOverflow { TextOverflowClip = 0, TextOverflowEllipsis };

enum EImageRendering { ImageRenderingAuto, ImageRenderingOptimizeSpeed, ImageRenderingOptimizeQuality, ImageRenderingOptimizeContrast };

457enum ImageResolution { ImageResolutionNoFlags = 0, ImageResolutionFromImage };

458

enum Order { LogicalOrder = 0, VisualOrder };

enum RegionOverflow { AutoRegionOverflow, BreakRegionOverflow };

Source/WebCore/rendering/style/StyleRareInheritedData.cpp

@@StyleRareInheritedData::StyleRareInheritedData()

#if ENABLE(OVERFLOW_SCROLLING)

    , useTouchOverflowScrolling(RenderStyle::initialUseTouchOverflowScrolling())

#endif

#if ENABLE(CSS_IMAGE_RESOLUTION)

    , m_imageResolutionFlags(RenderStyle::initialImageResolutionFlags())

#endif

    , hyphenationLimitBefore(-1)

    , hyphenationLimitAfter(-1)

    , hyphenationLimitLines(-1)

@@StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)

#if ENABLE(OVERFLOW_SCROLLING)

    , useTouchOverflowScrolling(o.useTouchOverflowScrolling)

#endif

#if ENABLE(CSS_IMAGE_RESOLUTION)

    , m_imageResolutionFlags(o.m_imageResolutionFlags)

#endif

    , hyphenationString(o.hyphenationString)

    , hyphenationLimitBefore(o.hyphenationLimitBefore)

    , hyphenationLimitAfter(o.hyphenationLimitAfter)

@@bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const

        && m_lineGrid == o.m_lineGrid

        && m_imageRendering == o.m_imageRendering

#if ENABLE(CSS_IMAGE_RESOLUTION)

204 && m_imageResolutionFlags == o.m_imageResolutionFlags

        && m_imageResolution == o.m_imageResolution

#endif

        && m_lineSnap == o.m_lineSnap

Source/WebCore/rendering/style/StyleRareInheritedData.h

@@public:

#if ENABLE(OVERFLOW_SCROLLING)

    unsigned useTouchOverflowScrolling: 1;

#endif

#if ENABLE(CSS_IMAGE_RESOLUTION)

    unsigned m_imageResolutionFlags : 1; // ImageResolution

#endif

    AtomicString hyphenationString;

    short hyphenationLimitBefore;

LayoutTests/ChangeLog

2012-06-15  David Barr  <davidbarr@chromium.org>

        Add from-image to css3-images image-resolution

        https://bugs.webkit.org/show_bug.cgi?id=85451

        Reviewed by NOBODY (OOPS!).

        * fast/css/image-resolution/image-resolution-expected.txt:

        * fast/css/image-resolution/image-resolution.html:

2012-06-14  David Barr  <davidbarr@chromium.org>

        Add dpcm to css3-images image-resolution

LayoutTests/fast/css/image-resolution/image-resolution-expected.txt

1 Apply image-resolution property to a fixed image (16x16~~@0.75dppx~~).

1Apply image-resolution property to a fixed image (16x16).

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

@@PASS img.offsetWidth is 4

PASS img.offsetHeight is 4

TEST ""

PASS img.style.cssText is ""

TEST "0dppx from-image"

PASS img.style.cssText is ""

TEST "from-image 0dppx"

PASS img.style.cssText is ""

TEST "1dppx from-image"

PASS img.style.cssText is "image-resolution: 1dppx from-image; "

PASS img.offsetWidth is 16

PASS img.offsetHeight is 16

TEST "from-image 1dppx"

PASS img.style.cssText is "image-resolution: from-image 1dppx; "

PASS img.offsetWidth is 16

PASS img.offsetHeight is 16

TEST "2dppx from-image"

PASS img.style.cssText is "image-resolution: 2dppx from-image; "

PASS img.offsetWidth is 8

PASS img.offsetHeight is 8

TEST "from-image 2dppx"

PASS img.style.cssText is "image-resolution: from-image 2dppx; "

PASS img.offsetWidth is 8

PASS img.offsetHeight is 8

TEST "3dppx from-image"

PASS img.style.cssText is "image-resolution: 3dppx from-image; "

PASS img.offsetWidth is 5

PASS img.offsetHeight is 5

TEST "from-image 3dppx"

PASS img.style.cssText is "image-resolution: from-image 3dppx; "

PASS img.offsetWidth is 5

PASS img.offsetHeight is 5

TEST "4dppx from-image"

PASS img.style.cssText is "image-resolution: 4dppx from-image; "

PASS img.offsetWidth is 4

PASS img.offsetHeight is 4

TEST "from-image 4dppx"

PASS img.style.cssText is "image-resolution: from-image 4dppx; "

PASS img.offsetWidth is 4

PASS img.offsetHeight is 4

TEST "0dpi from-image"

PASS img.style.cssText is ""

TEST "from-image 0dpi"

PASS img.style.cssText is ""

TEST "96dpi from-image"

PASS img.style.cssText is "image-resolution: 96dpi from-image; "

PASS img.offsetWidth is 16

PASS img.offsetHeight is 16

TEST "from-image 96dpi"

PASS img.style.cssText is "image-resolution: from-image 96dpi; "

PASS img.offsetWidth is 16

PASS img.offsetHeight is 16

TEST "192dpi from-image"

PASS img.style.cssText is "image-resolution: 192dpi from-image; "

PASS img.offsetWidth is 8

PASS img.offsetHeight is 8

TEST "from-image 192dpi"

PASS img.style.cssText is "image-resolution: from-image 192dpi; "

PASS img.offsetWidth is 8

PASS img.offsetHeight is 8

TEST "288dpi from-image"

PASS img.style.cssText is "image-resolution: 288dpi from-image; "

PASS img.offsetWidth is 5

PASS img.offsetHeight is 5

TEST "from-image 288dpi"

PASS img.style.cssText is "image-resolution: from-image 288dpi; "

PASS img.offsetWidth is 5

PASS img.offsetHeight is 5

TEST "384dpi from-image"

PASS img.style.cssText is "image-resolution: 384dpi from-image; "

PASS img.offsetWidth is 4

PASS img.offsetHeight is 4

TEST "from-image 384dpi"

PASS img.style.cssText is "image-resolution: from-image 384dpi; "

PASS img.offsetWidth is 4

PASS img.offsetHeight is 4

TEST "150dpi from-image"

PASS img.style.cssText is "image-resolution: 150dpi from-image; "

PASS img.offsetWidth is 10

PASS img.offsetHeight is 10

TEST "from-image 150dpi"

PASS img.style.cssText is "image-resolution: from-image 150dpi; "

PASS img.offsetWidth is 10

PASS img.offsetHeight is 10

TEST "300dpi from-image"

PASS img.style.cssText is "image-resolution: 300dpi from-image; "

PASS img.offsetWidth is 5

PASS img.offsetHeight is 5

TEST "from-image 300dpi"

PASS img.style.cssText is "image-resolution: from-image 300dpi; "

PASS img.offsetWidth is 5

PASS img.offsetHeight is 5

TEST "450dpi from-image"

PASS img.style.cssText is "image-resolution: 450dpi from-image; "

PASS img.offsetWidth is 3

PASS img.offsetHeight is 3

TEST "from-image 450dpi"

PASS img.style.cssText is "image-resolution: from-image 450dpi; "

PASS img.offsetWidth is 3

PASS img.offsetHeight is 3

TEST "600dpi from-image"

PASS img.style.cssText is "image-resolution: 600dpi from-image; "

PASS img.offsetWidth is 2

PASS img.offsetHeight is 2

TEST "from-image 600dpi"

PASS img.style.cssText is "image-resolution: from-image 600dpi; "

PASS img.offsetWidth is 2

PASS img.offsetHeight is 2

TEST "0dpcm from-image"

PASS img.style.cssText is ""

TEST "from-image 0dpcm"

PASS img.style.cssText is ""

TEST "37.7dpcm from-image"

PASS img.style.cssText is "image-resolution: 37.7dpcm from-image; "

PASS img.offsetWidth is 16

PASS img.offsetHeight is 16

TEST "from-image 37.7dpcm"

PASS img.style.cssText is "image-resolution: from-image 37.7dpcm; "

PASS img.offsetWidth is 16

PASS img.offsetHeight is 16

TEST "75.5dpcm from-image"

PASS img.style.cssText is "image-resolution: 75.5dpcm from-image; "

PASS img.offsetWidth is 8

PASS img.offsetHeight is 8

TEST "from-image 75.5dpcm"

PASS img.style.cssText is "image-resolution: from-image 75.5dpcm; "

PASS img.offsetWidth is 8

PASS img.offsetHeight is 8

TEST "113.3dpcm from-image"

PASS img.style.cssText is "image-resolution: 113.3dpcm from-image; "

PASS img.offsetWidth is 5

PASS img.offsetHeight is 5

TEST "from-image 113.3dpcm"

PASS img.style.cssText is "image-resolution: from-image 113.3dpcm; "

PASS img.offsetWidth is 5

PASS img.offsetHeight is 5

TEST "151.1dpcm from-image"

PASS img.style.cssText is "image-resolution: 151.1dpcm from-image; "

PASS img.offsetWidth is 4

PASS img.offsetHeight is 4

TEST "from-image 151.1dpcm"

PASS img.style.cssText is "image-resolution: from-image 151.1dpcm; "

PASS img.offsetWidth is 4

PASS img.offsetHeight is 4

TEST "from-image"

PASS img.style.cssText is "image-resolution: from-image; "

PASS img.offsetWidth is 16

PASS img.offsetHeight is 16

PASS successfullyParsed is true

TEST COMPLETE

LayoutTests/fast/css/image-resolution/image-resolution.html

@@function computeResolution(resolution, imgResolutionDppx)

        else if (unit === 'dpcm')

            dppx = value / (cssPxPerIn / cmPerIn);

    }

42 if (fromImage)

42 if (fromImage && imgResolutionDppx)

        dppx = imgResolutionDppx;

    if (snap)

        dppx = Math.floor(dppx);

@@function computeResolution(resolution, imgResolutionDppx)

    return dppx;

}

function permute2(rule) {

    var s = rule.trim().split(' ');

    if (s.length == 1)

        return s;

    return [s.join(' '), [s[1], s[0]].join(' ')];

}

function generateTests(resolutions) {

    var tests = resolutions.slice();

    resolutions.forEach(function(resolution) {

        tests.push.apply(tests, permute2(resolution + ' from-image'));

    });

    return tests;

}

var imgUrl = '../../images/resources/green.jpg';

var imgWidthPx = 16;

var imgHeightPx = 16;

54 var imgResolutionDppx = 72 / ~~96;~~

55 var dimensions = imgWidthPx + 'x' + imgHeightPx ~~+ '@' + imgResolutionDppx + 'dppx'~~;

69var imgResolutionDppx = 0; /* Embedded image resolution data not plumbed yet. */

70var dimensions = imgWidthPx + 'x' + imgHeightPx;

description('Apply image-resolution property to a fixed image (' + dimensions + ').');

@@var resolutions = ['0dppx', '1dppx', '2dppx', '3dppx', '4dppx',

                   '0dpcm', '37.7dpcm', '75.5dpcm', '113.3dpcm', '151.1dpcm', ''];

img.onload = function() {

68 resolutions.forEach(function(test) {

83 generateTests(resolutions).forEach(function(test) {

        var dppx = computeResolution(test, imgResolutionDppx);

        img.style.imageResolution = '';

        img.style.imageResolution = test;