Show
Ignore:
Timestamp:
08/13/08 13:49:09 (5 months ago)
Author:
odole
Message:

merge with webkit revision 35706

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/WebCore/svg/graphics/cg/SVGResourceMaskerCg.mm

    r243 r436  
    9797    if (!m_mask) 
    9898        m_mask.set(m_ownerElement->drawMaskerContent(boundingBox, m_maskRect).release()); 
     99 
    99100    if (!m_mask) 
    100101        return; 
    101      
     102 
    102103    IntSize maskSize(static_cast<int>(m_maskRect.width()), static_cast<int>(m_maskRect.height())); 
    103104    clampImageBufferSizeToViewport(m_ownerElement->document()->renderer(), maskSize); 
    …… 
    107108    if (!grayScaleImage.get()) 
    108109        return; 
    109      
     110 
    110111    BEGIN_BLOCK_OBJC_EXCEPTIONS 
    111112    CGContextRef grayScaleContext = grayScaleImage->context()->platformContext(); 
    …… 
    116117    if (!colorMask) 
    117118        return; 
     119 
    118120    CIImage* grayScaleMask = transformImageIntoGrayscaleMask(colorMask); 
    119121    [ciGrayscaleContext drawImage:grayScaleMask atPoint:CGPointZero fromRect:CGRectMake(0, 0, maskSize.width(), maskSize.height())]; 
    120122 
    121     context->clipToImageBuffer(m_maskRect, grayScaleImage.get()); 
     123    CGContextClipToMask(context->platformContext(), m_maskRect, grayScaleImage->cgImage()); 
    122124    END_BLOCK_OBJC_EXCEPTIONS 
    123125}