Show
Ignore:
Timestamp:
06/29/06 16:18:23 (3 years ago)
Author:
bdakin
Message:

Reviewed by Hyatt.

Fix for <rdar://problem/4450615> Add composite mode to background
styles

-webkit-background-composite will set a composite mode on a
background image.

  • css/CSSComputedStyleDeclaration.cpp: (WebCore::): (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
  • css/CSSPropertyNames.in: Add -webkit-background-composite
  • css/CSSValueKeywords.in: Add all possible values (clear, copy, source-over, source-in, source-out, source-atop, destination-over, destination-in, destination-out, destination-atop, xor, plus- darker, highlight, and plus-lighter)
  • css/cssparser.cpp: (WebCore::CSSParser::parseValue): (WebCore::CSSParser::parseBackgroundProperty):
  • css/cssstyleselector.cpp: (WebCore::CSSStyleSelector::applyProperty): (WebCore::CSSStyleSelector::mapBackgroundComposite):
  • css/cssstyleselector.h:
  • platform/GraphicsContext.cpp: (WebCore::GraphicsContext::drawTiledImage):
  • platform/GraphicsContext.h: drawTiledImage() now takes a composite operator.
  • platform/Image.h: drawTiled() now takes a composite operator.
  • platform/cairo/ImageCairo.cpp: (WebCore::Image::drawTiled): Set the composite operator.
  • platform/mac/ImageMac.mm: (WebCore::Image::drawTiled): Set the composite operator.
  • platform/win/TemporaryLinkStubs.cpp: (Image::drawTiled):
  • rendering/RenderBox.cpp: (WebCore::RenderBox::paintBackgroundExtended): Send the composite operator in the render style over to the graphics context.
  • rendering/render_style.cpp: (WebCore::BackgroundLayer::BackgroundLayer): (WebCore::BackgroundLayer::operator=): (WebCore::BackgroundLayer::operator==): (WebCore::BackgroundLayer::fillUnsetProperties): (WebCore::BackgroundLayer::cullEmptyLayers):
  • rendering/render_style.h: (WebCore::BackgroundLayer::backgroundComposite): (WebCore::BackgroundLayer::isBackgroundCompositeSet): (WebCore::BackgroundLayer::setBackgroundComposite): (WebCore::BackgroundLayer::clearBackgroundComposite): (WebCore::RenderStyle::backgroundComposite): (WebCore::RenderStyle::initialBackgroundComposite):
Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/css/CSSValueKeywords.in

    r15003 r15095  
    164164no-repeat 
    165165# 
     166# CSS_PROP__WEBKIT_BACKGROUND_COMPOSITE: 
     167# 
     168clear 
     169copy 
     170source-over 
     171source-in 
     172source-out 
     173source-atop 
     174destination-over 
     175destination-in 
     176destination-out 
     177destination-atop 
     178xor 
     179plus-darker 
     180# highlight 
     181plus-lighter 
     182# 
    166183# CSS_PROP_VERTICAL_ALIGN: 
    167184#