Changeset 87028 in webkit


Ignore:
Timestamp:
May 22, 2011 3:13:54 AM (13 years ago)
Author:
krit@webkit.org
Message:

2011-05-22 Dirk Schulze <krit@webkit.org>

Reviewed by Nikolas Zimmermann.

Don't do manually style resolution for SVGElements with renderer
https://bugs.webkit.org/show_bug.cgi?id=59176

General clean-up.

Don't resolve style manually, instead ask the RenderObject for its style.

Cleanup svgattrs.in, some SVG element names were accidently listed there as attributes.

No new tests needed. No change of behavior.

  • svg/SVGFEDiffuseLightingElement.cpp: (WebCore::SVGFEDiffuseLightingElement::build):
  • svg/SVGFEDropShadowElement.cpp: (WebCore::SVGFEDropShadowElement::build):
  • svg/SVGFEFloodElement.cpp: (WebCore::SVGFEFloodElement::build):
  • svg/SVGFESpecularLightingElement.cpp: (WebCore::SVGFESpecularLightingElement::build):
  • svg/svgattrs.in:
Location:
trunk/Source/WebCore
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r87027 r87028  
     12011-05-22  Dirk Schulze  <krit@webkit.org>
     2
     3        Reviewed by Nikolas Zimmermann.
     4
     5        Don't do manually style resolution for SVGElements with renderer
     6        https://bugs.webkit.org/show_bug.cgi?id=59176
     7
     8        General clean-up.
     9
     10        Don't resolve style manually, instead ask the RenderObject for its style.
     11
     12        Cleanup svgattrs.in, some SVG element names were accidently listed there as attributes.
     13
     14        No new tests needed. No change of behavior.
     15
     16        * svg/SVGFEDiffuseLightingElement.cpp:
     17        (WebCore::SVGFEDiffuseLightingElement::build):
     18        * svg/SVGFEDropShadowElement.cpp:
     19        (WebCore::SVGFEDropShadowElement::build):
     20        * svg/SVGFEFloodElement.cpp:
     21        (WebCore::SVGFEFloodElement::build):
     22        * svg/SVGFESpecularLightingElement.cpp:
     23        (WebCore::SVGFESpecularLightingElement::build):
     24        * svg/svgattrs.in:
     25
    1262011-05-21  Dirk Schulze  <krit@webkit.org>
    227
  • trunk/Source/WebCore/svg/SVGFEDiffuseLightingElement.cpp

    r87010 r87028  
    267267        return 0;
    268268
    269     RefPtr<RenderStyle> filterStyle = styleForRenderer();
    270     Color color = filterStyle->svgStyle()->lightingColor();
     269    RenderObject* renderer = this->renderer();
     270    if (!renderer)
     271        return 0;
     272   
     273    ASSERT(renderer->style());
     274    Color color = renderer->style()->svgStyle()->lightingColor();
    271275
    272276    RefPtr<FilterEffect> effect = FEDiffuseLighting::create(filter, color, surfaceScale(), diffuseConstant(),
  • trunk/Source/WebCore/svg/SVGFEDropShadowElement.cpp

    r87010 r87028  
    189189   
    190190    ASSERT(renderer->style());
    191     ASSERT(renderer->style()->svgStyle());
    192191    const SVGRenderStyle* svgStyle = renderer->style()->svgStyle();
    193192   
  • trunk/Source/WebCore/svg/SVGFEFloodElement.cpp

    r86050 r87028  
    6262PassRefPtr<FilterEffect> SVGFEFloodElement::build(SVGFilterBuilder*, Filter* filter)
    6363{
    64     RefPtr<RenderStyle> filterStyle = styleForRenderer();
     64    RenderObject* renderer = this->renderer();
     65    if (!renderer)
     66        return 0;
     67   
     68    ASSERT(renderer->style());
     69    const SVGRenderStyle* svgStyle = renderer->style()->svgStyle();
    6570
    66     Color color = filterStyle->svgStyle()->floodColor();
    67     float opacity = filterStyle->svgStyle()->floodOpacity();
     71    Color color = svgStyle->floodColor();
     72    float opacity = svgStyle->floodOpacity();
    6873
    6974    return FEFlood::create(filter, color, opacity);
  • trunk/Source/WebCore/svg/SVGFESpecularLightingElement.cpp

    r87010 r87028  
    281281        return 0;
    282282
    283     RefPtr<RenderStyle> filterStyle = styleForRenderer();
    284 
    285     Color color = filterStyle->svgStyle()->lightingColor();
     283    RenderObject* renderer = this->renderer();
     284    if (!renderer)
     285        return 0;
     286   
     287    ASSERT(renderer->style());
     288    Color color = renderer->style()->svgStyle()->lightingColor();
    286289
    287290    RefPtr<FilterEffect> effect = FESpecularLighting::create(filter, color, surfaceScale(), specularConstant(),
  • trunk/Source/WebCore/svg/svgattrs.in

    r71508 r87028  
    5555exponent
    5656externalResourcesRequired
    57 feColorMatrix
    58 feComposite
    59 feGaussianBlur
    60 feMorphology
    61 feTile
    6257fill
    6358fill-opacity
Note: See TracChangeset for help on using the changeset viewer.