Changeset 49003 in webkit


Ignore:
Timestamp:
Oct 1, 2009 4:00:22 PM (15 years ago)
Author:
Beth Dakin
Message:

WebCore: Fix for <rdar://problem/7264725> Re-add a vendor prefix to box-
shadow (29927)
-and corresponding-
​https://bugs.webkit.org/show_bug.cgi?id=29927

Reviewed by Dan Bernstein.

  • css/CSSComputedStyleDeclaration.cpp:

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

  • css/CSSParser.cpp:

(WebCore::CSSParser::parseValue):
(WebCore::ShadowParseContext::ShadowParseContext):
(WebCore::ShadowParseContext::commitValue):
(WebCore::ShadowParseContext::commitLength):
(WebCore::ShadowParseContext::commitColor):
(WebCore::cssPropertyID):

  • css/CSSPropertyNames.in:
  • css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::applyProperty):

  • page/animation/AnimationBase.cpp:

(WebCore::ensurePropertyMap):

LayoutTests: Updated test results for <rdar://problem/7264725> Re-add a vendor
prefix to box-shadow (29927)
-and corresponding-
​https://bugs.webkit.org/show_bug.cgi?id=29927

Reviewed by Dan Bernstein.

  • platform/mac/fast/css/getComputedStyle/computed-style-expected.txt:
  • platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • platform/qt/fast/css/getComputedStyle/computed-style-expected.txt:
  • platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • platform/win/fast/css/getComputedStyle/computed-style-expected.txt:
  • platform/win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • svg/css/getComputedStyle-basic-expected.txt:
Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r49001 r49003  
     12009-10-01  Beth Dakin  <bdakin@apple.com>
     2
     3        Reviewed by Dan Bernstein.
     4
     5        Updated test results for <rdar://problem/7264725> Re-add a vendor
     6        prefix to box-shadow (29927)
     7        -and corresponding-
     8        https://bugs.webkit.org/show_bug.cgi?id=29927
     9
     10        * platform/mac/fast/css/getComputedStyle/computed-style-expected.txt:
     11        * platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     12        * platform/qt/fast/css/getComputedStyle/computed-style-expected.txt:
     13        * platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     14        * platform/win/fast/css/getComputedStyle/computed-style-expected.txt:
     15        * platform/win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     16        * svg/css/getComputedStyle-basic-expected.txt:
     17
    1182009-10-01  Brian Weinstein  <bweinstein@apple.com>
    219

  • trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt

    r48989 r49003  
    2727border-top-width: 0px;
    2828bottom: auto;
    29 box-shadow: none;
    3029caption-side: top;
    3130clear: none;
    … …  
    120119-webkit-box-pack: start;
    121120-webkit-box-reflect: none;
     121-webkit-box-shadow: none;
    122122-webkit-box-sizing: content-box;
    123123-webkit-column-break-after: auto;

  • trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r48989 r49003  
    2626    border-top-width: 16px
    2727    bottom: auto
    28     box-shadow: none
    2928    caption-side: top
    3029    clear: none
    … …  
    119118    -webkit-box-pack: start
    120119    -webkit-box-reflect: none
     120    -webkit-box-shadow: none
    121121    -webkit-box-sizing: content-box
    122122    -webkit-column-break-after: auto

  • trunk/LayoutTests/platform/qt/fast/css/getComputedStyle/computed-style-expected.txt

    r48466 r49003  
    2727border-top-width: 0px;
    2828bottom: auto;
    29 box-shadow: none;
    3029caption-side: top;
    3130clear: none;
    … …  
    119118-webkit-box-pack: start;
    120119-webkit-box-reflect: none;
     120-webkit-box-shadow: none;
    121121-webkit-box-sizing: content-box;
    122122-webkit-column-break-after: auto;

  • trunk/LayoutTests/platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r48466 r49003  
    2626    border-top-width: 13px
    2727    bottom: auto
    28     box-shadow: none
    2928    caption-side: top
    3029    clear: none
    … …  
    118117    -webkit-box-pack: start
    119118    -webkit-box-reflect: none
     119    -webkit-box-shadow: none
    120120    -webkit-box-sizing: content-box
    121121    -webkit-column-break-after: auto

  • trunk/LayoutTests/platform/win/fast/css/getComputedStyle/computed-style-expected.txt

    r48999 r49003  
    2727border-top-width: 0px;
    2828bottom: auto;
    29 box-shadow: none;
    3029caption-side: top;
    3130clear: none;
    … …  
    120119-webkit-box-pack: start;
    121120-webkit-box-reflect: none;
     121-webkit-box-shadow: none;
    122122-webkit-box-sizing: content-box;
    123123-webkit-column-break-after: auto;

  • trunk/LayoutTests/platform/win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r48999 r49003  
    2626    border-top-width: 16px
    2727    bottom: auto
    28     box-shadow: none
    2928    caption-side: top
    3029    clear: none
    … …  
    119118    -webkit-box-pack: start
    120119    -webkit-box-reflect: none
     120    -webkit-box-shadow: none
    121121    -webkit-box-sizing: content-box
    122122    -webkit-column-break-after: auto

  • trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt

    r48989 r49003  
    5151rect: style.getPropertyValue(bottom) : auto
    5252rect: style.getPropertyCSSValue(bottom) : [object CSSPrimitiveValue]
    53 rect: style.getPropertyValue(box-shadow) : none
    54 rect: style.getPropertyCSSValue(box-shadow) : [object CSSPrimitiveValue]
    5553rect: style.getPropertyValue(caption-side) : top
    5654rect: style.getPropertyCSSValue(caption-side) : [object CSSPrimitiveValue]
    … …  
    237235rect: style.getPropertyValue(-webkit-box-reflect) : none
    238236rect: style.getPropertyCSSValue(-webkit-box-reflect) : [object CSSPrimitiveValue]
     237rect: style.getPropertyValue(-webkit-box-shadow) : none
     238rect: style.getPropertyCSSValue(-webkit-box-shadow) : [object CSSPrimitiveValue]
    239239rect: style.getPropertyValue(-webkit-box-sizing) : content-box
    240240rect: style.getPropertyCSSValue(-webkit-box-sizing) : [object CSSPrimitiveValue]
    … …  
    459459g: style.getPropertyValue(bottom) : auto
    460460g: style.getPropertyCSSValue(bottom) : [object CSSPrimitiveValue]
    461 g: style.getPropertyValue(box-shadow) : none
    462 g: style.getPropertyCSSValue(box-shadow) : [object CSSPrimitiveValue]
    463461g: style.getPropertyValue(caption-side) : top
    464462g: style.getPropertyCSSValue(caption-side) : [object CSSPrimitiveValue]
    … …  
    645643g: style.getPropertyValue(-webkit-box-reflect) : none
    646644g: style.getPropertyCSSValue(-webkit-box-reflect) : [object CSSPrimitiveValue]
     645g: style.getPropertyValue(-webkit-box-shadow) : none
     646g: style.getPropertyCSSValue(-webkit-box-shadow) : [object CSSPrimitiveValue]
    647647g: style.getPropertyValue(-webkit-box-sizing) : content-box
    648648g: style.getPropertyCSSValue(-webkit-box-sizing) : [object CSSPrimitiveValue]

  • trunk/WebCore/ChangeLog

    r48995 r49003  
     12009-10-01  Beth Dakin  <bdakin@apple.com>
     2
     3        Reviewed by Dan Bernstein.
     4
     5        Fix for <rdar://problem/7264725> Re-add a vendor prefix to box-
     6        shadow (29927)
     7        -and corresponding-
     8        https://bugs.webkit.org/show_bug.cgi?id=29927
     9
     10        * css/CSSComputedStyleDeclaration.cpp:
     11        (WebCore::):
     12        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
     13        * css/CSSParser.cpp:
     14        (WebCore::CSSParser::parseValue):
     15        (WebCore::ShadowParseContext::ShadowParseContext):
     16        (WebCore::ShadowParseContext::commitValue):
     17        (WebCore::ShadowParseContext::commitLength):
     18        (WebCore::ShadowParseContext::commitColor):
     19        (WebCore::cssPropertyID):
     20        * css/CSSPropertyNames.in:
     21        * css/CSSStyleSelector.cpp:
     22        (WebCore::CSSStyleSelector::applyProperty):
     23        * page/animation/AnimationBase.cpp:
     24        (WebCore::ensurePropertyMap):
     25
    1262009-10-01  Beth Dakin  <bdakin@apple.com>
    227

  • trunk/WebCore/css/CSSComputedStyleDeclaration.cpp

    r48989 r49003  
    7878    CSSPropertyBorderTopWidth,
    7979    CSSPropertyBottom,
    80     CSSPropertyBoxShadow,
    8180    CSSPropertyCaptionSide,
    8281    CSSPropertyClear,
    … …  
    172171    CSSPropertyWebkitBoxPack,
    173172    CSSPropertyWebkitBoxReflect,
     173    CSSPropertyWebkitBoxShadow,
    174174    CSSPropertyWebkitBoxSizing,
    175175    CSSPropertyWebkitColumnBreakAfter,
    … …  
    768768        case CSSPropertyWebkitBoxReflect:
    769769            return valueForReflection(style->boxReflect());
    770         case CSSPropertyBoxShadow:
     770        case CSSPropertyWebkitBoxShadow:
    771771            return valueForShadow(style->boxShadow(), static_cast<CSSPropertyID>(propertyID));
    772772        case CSSPropertyCaptionSide:

  • trunk/WebCore/css/CSSParser.cpp

    r48989 r49003  
    11911191        break;
    11921192    case CSSPropertyTextShadow: // CSS2 property, dropped in CSS2.1, back in CSS3, so treat as CSS3
    1193     case CSSPropertyBoxShadow:
     1193    case CSSPropertyWebkitBoxShadow:
    11941194        if (id == CSSValueNone)
    11951195            valid_primitive = true;
    … …  
    36113611        , allowSpread(false)
    36123612        , allowColor(true)
    3613         , allowStyle(prop == CSSPropertyBoxShadow)
     3613        , allowStyle(prop == CSSPropertyWebkitBoxShadow)
    36143614        , allowBreak(true)
    36153615    {
    … …  
    36433643        allowBlur = false;
    36443644        allowSpread = false;
    3645         allowStyle = property == CSSPropertyBoxShadow;
     3645        allowStyle = property == CSSPropertyWebkitBoxShadow;
    36463646    }
    36473647
    … …  
    36623662            allowBlur = true;
    36633663            allowColor = true;
    3664             allowStyle = property == CSSPropertyBoxShadow;
     3664            allowStyle = property == CSSPropertyWebkitBoxShadow;
    36653665            allowBreak = true;
    36663666        } else if (allowBlur) {
    36673667            blur = val.release();
    36683668            allowBlur = false;
    3669             allowSpread = property == CSSPropertyBoxShadow;
     3669            allowSpread = property == CSSPropertyWebkitBoxShadow;
    36703670        } else if (allowSpread) {
    36713671            spread = val.release();
    … …  
    36843684            allowBlur = false;
    36853685            allowSpread = false;
    3686             allowStyle = property == CSSPropertyBoxShadow;
     3686            allowStyle = property == CSSPropertyWebkitBoxShadow;
    36873687        }
    36883688    }
    … …  
    51775177                name = opacity;
    51785178                length = strlen(opacity);
    5179             } else if (strcmp(buffer, "-webkit-box-shadow") == 0) {
    5180                 // CSS Backgrounds/Borders.  -webkit-box-shadow worked in Safari 4 and earlier.
    5181                 const char* const boxShadow = "box-shadow";
    5182                 name = boxShadow;
    5183                 length = strlen(boxShadow);
    51845179            } else if (strcmp(buffer, "-webkit-background-size") == 0) {
    51855180                // CSS Backgrounds/Borders.  -webkit-background-size worked in Safari 4 and earlier.

  • trunk/WebCore/css/CSSPropertyNames.in

    r48989 r49003  
    5050border-width
    5151bottom
    52 box-shadow
    5352caption-side
    5453clear
    … …  
    181180-webkit-box-pack
    182181-webkit-box-reflect
     182-webkit-box-shadow
    183183-webkit-box-sizing
    184184-webkit-column-break-after

  • trunk/WebCore/css/CSSStyleSelector.cpp

    r48989 r49003  
    46514651    }
    46524652    case CSSPropertyTextShadow:
    4653     case CSSPropertyBoxShadow: {
     4653    case CSSPropertyWebkitBoxShadow: {
    46544654        if (isInherit) {
    46554655            if (id == CSSPropertyTextShadow)

  • trunk/WebCore/page/animation/AnimationBase.cpp

    r48982 r49003  
    644644
    645645        // These are for shadows
    646         gPropertyWrappers->append(new PropertyWrapperShadow(CSSPropertyBoxShadow, &RenderStyle::boxShadow, &RenderStyle::setBoxShadow));
     646        gPropertyWrappers->append(new PropertyWrapperShadow(CSSPropertyWebkitBoxShadow, &RenderStyle::boxShadow, &RenderStyle::setBoxShadow));
    647647        gPropertyWrappers->append(new PropertyWrapperShadow(CSSPropertyTextShadow, &RenderStyle::textShadow, &RenderStyle::setTextShadow));
    648648
Note: See TracChangeset for help on using the changeset viewer.