Changeset 152083 in webkit


Ignore:
Timestamp:
Jun 27, 2013 12:49:32 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Source/WebCore: Remove ENABLE_CSS_COMPOSITING guards around -webkit-background-blend mode related code. The same flag guards -webkit-blend-mode code, but those guards are not touched by this change.

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

Patch by Horia Iosif Olaru <​olaru@adobe.com> on 2013-06-27
Reviewed by Dean Jackson.

Test: css3/compositing/effect-background-blend-mode-tiled.html

  • WebCore.exp.in:
  • bindings/generic/RuntimeEnabledFeatures.h:
  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::propertyValue):

  • css/CSSParser.cpp:

(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseFillProperty):

  • css/CSSProperty.cpp:

(WebCore::CSSProperty::isInheritedProperty):

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

(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):

LayoutTests: Add an extra test to check if tiled background images get blended as expected. This test passed before this change. The tests for this change are the existing background-blend-mode tests.

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

Patch by Horia Iosif Olaru <​olaru@adobe.com> on 2013-06-27
Reviewed by Dean Jackson.

  • css3/compositing/effect-background-blend-mode-tiled-expected.txt: Added.
  • css3/compositing/effect-background-blend-mode-tiled.html: Added.
  • platform/mac/css3/compositing/effect-background-blend-mode-tiled-expected.png: Added.
Location:
trunk
Files:
3 added
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r152070 r152083  
     12013-06-27  Horia Iosif Olaru  <olaru@adobe.com>
     2
     3        Add an extra test to check if tiled background images get blended as expected. This test passed before this change. The tests for this change are the existing background-blend-mode tests.
     4       
     5        https://bugs.webkit.org/show_bug.cgi?id=117619
     6
     7        Reviewed by Dean Jackson.
     8
     9        * css3/compositing/effect-background-blend-mode-tiled-expected.txt: Added.
     10        * css3/compositing/effect-background-blend-mode-tiled.html: Added.
     11        * platform/mac/css3/compositing/effect-background-blend-mode-tiled-expected.png: Added.
     12
    1132013-06-26  Kihong Kwon  <kihong.kwon@samsung.com>
    214

  • trunk/Source/WebCore/ChangeLog

    r152080 r152083  
     12013-06-27  Horia Iosif Olaru  <olaru@adobe.com>
     2
     3        Remove ENABLE_CSS_COMPOSITING guards around -webkit-background-blend mode related code. The same flag guards -webkit-blend-mode code, but those guards are not touched by this change.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=117619
     6
     7        Reviewed by Dean Jackson.
     8
     9        Test: css3/compositing/effect-background-blend-mode-tiled.html
     10
     11        * WebCore.exp.in:
     12        * bindings/generic/RuntimeEnabledFeatures.h:
     13        * css/CSSComputedStyleDeclaration.cpp:
     14        (WebCore::ComputedStyleExtractor::propertyValue):
     15        * css/CSSParser.cpp:
     16        (WebCore::CSSParser::parseValue):
     17        (WebCore::CSSParser::parseFillProperty):
     18        * css/CSSProperty.cpp:
     19        (WebCore::CSSProperty::isInheritedProperty):
     20        * css/CSSPropertyNames.in:
     21        * css/DeprecatedStyleBuilder.cpp:
     22        (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
     23
    1242013-06-26  Christophe Dumez  <ch.dumez@sisa.samsung.com>
    225

  • trunk/Source/WebCore/WebCore.exp.in

    r151929 r152083  
    732732__ZN7WebCore22HTMLPlugInImageElement24restartSnapshottedPlugInEv
    733733__ZN7WebCore22HTMLPlugInImageElement29setIsPrimarySnapshottedPlugInEb
     734__ZN7WebCore22RuntimeEnabledFeatures23isCSSCompositingEnabledE
    734735__ZN7WebCore22RuntimeEnabledFeatures22isCSSExclusionsEnabledE
    735736__ZN7WebCore22RuntimeEnabledFeatures18isCSSShapesEnabledE
    … …  
    27542755#endif
    27552756
    2756 #if ENABLE(CSS_COMPOSITING)
    2757 __ZN7WebCore22RuntimeEnabledFeatures23isCSSCompositingEnabledE
    2758 #endif
    2759 
    27602757#if ENABLE(IFRAME_SEAMLESS)
    27612758__ZN7WebCore22RuntimeEnabledFeatures25areSeamlessIFramesEnabledE

  • trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h

    r151832 r152083  
    9696#endif
    9797
    98 #if ENABLE(CSS_COMPOSITING)
    9998    static void setCSSCompositingEnabled(bool isEnabled) { isCSSCompositingEnabled = isEnabled; }
    10099    static bool cssCompositingEnabled() { return isCSSCompositingEnabled; }
    101 #else
    102     static void setCSSCompositingEnabled(bool) { }
    103     static bool cssCompositingEnabled() { return false; }
    104 #endif
    105100
    106101#if ENABLE(FONT_LOAD_EVENTS)

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

    r151964 r152083  
    229229    CSSPropertyWebkitAppearance,
    230230    CSSPropertyWebkitBackfaceVisibility,
     231    CSSPropertyWebkitBackgroundBlendMode,
    231232    CSSPropertyWebkitBackgroundClip,
    232233    CSSPropertyWebkitBackgroundComposite,
    … …  
    235236#if ENABLE(CSS_COMPOSITING)
    236237    CSSPropertyWebkitBlendMode,
    237     CSSPropertyWebkitBackgroundBlendMode,
    238238#endif
    239239    CSSPropertyWebkitBorderFit,
    … …  
    27272727        case CSSPropertyWebkitBlendMode:
    27282728            return cssValuePool().createValue(style->blendMode());
    2729            
     2729#endif
    27302730        case CSSPropertyWebkitBackgroundBlendMode: {
    27312731            const FillLayer* layers = style->backgroundLayers();
    … …  
    27392739            return list.release();
    27402740        }
    2741 #endif
    27422741        case CSSPropertyBackground:
    27432742            return getBackgroundShorthandValue();

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

    r151783 r152083  
    20992099
    21002100    case CSSPropertyBackgroundAttachment:
     2101    case CSSPropertyWebkitBackgroundBlendMode:
    21012102    case CSSPropertyBackgroundClip:
    21022103    case CSSPropertyWebkitBackgroundClip:
    … …  
    21242125    case CSSPropertyWebkitMaskRepeatX:
    21252126    case CSSPropertyWebkitMaskRepeatY:
    2126 #if ENABLE(CSS_COMPOSITING)
    2127     case CSSPropertyWebkitBackgroundBlendMode:
    2128 #endif
    21292127    {
    21302128        RefPtr<CSSValue> val1;
    … …  
    43804378                    }
    43814379                    break;
    4382 #if ENABLE(CSS_COMPOSITING)
    43834380                case CSSPropertyWebkitBackgroundBlendMode:
    43844381                    if (cssCompositingEnabled() && (val->id == CSSValueNormal || val->id == CSSValueMultiply
    … …  
    43924389                    }
    43934390                    break;
    4394 #endif
    43954391                case CSSPropertyBackgroundRepeat:
    43964392                case CSSPropertyWebkitMaskRepeat:

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

    r151394 r152083  
    517517    case CSSPropertyWebkitAppearance:
    518518    case CSSPropertyWebkitBackfaceVisibility:
     519    case CSSPropertyWebkitBackgroundBlendMode:
    519520    case CSSPropertyWebkitBackgroundClip:
    520521    case CSSPropertyWebkitBackgroundComposite:
    … …  
    572573#if ENABLE(CSS_COMPOSITING)
    573574    case CSSPropertyWebkitBlendMode:
    574     case CSSPropertyWebkitBackgroundBlendMode:
    575575#endif
    576576    case CSSPropertyWebkitAlignContent:

  • trunk/Source/WebCore/css/CSSPropertyNames.in

    r151394 r152083  
    222222-webkit-aspect-ratio
    223223-webkit-backface-visibility
     224-webkit-background-blend-mode
    224225-webkit-background-clip
    225226-webkit-background-composite
    … …  
    283284#if defined(ENABLE_CSS_COMPOSITING) && ENABLE_CSS_COMPOSITING
    284285-webkit-blend-mode
    285 -webkit-background-blend-mode
    286286#endif
    287287#if defined(ENABLE_CSS_FILTERS) && ENABLE_CSS_FILTERS

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

    r151783 r152083  
    22182218    setPropertyHandler(CSSPropertyWebkitAspectRatio, ApplyPropertyAspectRatio::createHandler());
    22192219    setPropertyHandler(CSSPropertyWebkitBackfaceVisibility, ApplyPropertyDefault<EBackfaceVisibility, &RenderStyle::backfaceVisibility, EBackfaceVisibility, &RenderStyle::setBackfaceVisibility, EBackfaceVisibility, &RenderStyle::initialBackfaceVisibility>::createHandler());
     2220    setPropertyHandler(CSSPropertyWebkitBackgroundBlendMode, ApplyPropertyFillLayer<BlendMode, CSSPropertyWebkitBackgroundBlendMode, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, &FillLayer::isBlendModeSet, &FillLayer::blendMode, &FillLayer::setBlendMode, &FillLayer::clearBlendMode, &FillLayer::initialFillBlendMode, &CSSToStyleMap::mapFillBlendMode>::createHandler());
    22202221    setPropertyHandler(CSSPropertyWebkitBackgroundClip, CSSPropertyBackgroundClip);
    22212222    setPropertyHandler(CSSPropertyWebkitBackgroundComposite, ApplyPropertyFillLayer<CompositeOperator, CSSPropertyWebkitBackgroundComposite, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, &FillLayer::isCompositeSet, &FillLayer::composite, &FillLayer::setComposite, &FillLayer::clearComposite, &FillLayer::initialFillComposite, &CSSToStyleMap::mapFillComposite>::createHandler());
    … …  
    22242225#if ENABLE(CSS_COMPOSITING)
    22252226    setPropertyHandler(CSSPropertyWebkitBlendMode, ApplyPropertyDefault<BlendMode, &RenderStyle::blendMode, BlendMode, &RenderStyle::setBlendMode, BlendMode, &RenderStyle::initialBlendMode>::createHandler());
    2226     setPropertyHandler(CSSPropertyWebkitBackgroundBlendMode, ApplyPropertyFillLayer<BlendMode, CSSPropertyWebkitBackgroundBlendMode, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, &FillLayer::isBlendModeSet, &FillLayer::blendMode, &FillLayer::setBlendMode, &FillLayer::clearBlendMode, &FillLayer::initialFillBlendMode, &CSSToStyleMap::mapFillBlendMode>::createHandler());
    22272227#endif
    22282228    setPropertyHandler(CSSPropertyWebkitBorderFit, ApplyPropertyDefault<EBorderFit, &RenderStyle::borderFit, EBorderFit, &RenderStyle::setBorderFit, EBorderFit, &RenderStyle::initialBorderFit>::createHandler());
Note: See TracChangeset for help on using the changeset viewer.