Show
Ignore:
Timestamp:
08/15/08 13:25:16 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35774

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/BAL/WKAL/Concretizations/Graphics/Cairo/BCImageBufferCairo.cpp

    r243 r437  
    3232#include "ImageData.h" 
    3333#include "NotImplemented.h" 
     34#include "Pattern.h" 
    3435 
    3536#include <cairo.h> 
    …… 
    7172} 
    7273 
    73 cairo_surface_t* ImageBuffer::surface() const 
    74 { 
    75     return m_surface; 
    76 } 
    77  
    7874Image* ImageBuffer::image() const 
    7975{ 
    …… 
    8379        ASSERT(context()); 
    8480        // BitmapImage will release the passed in surface on destruction 
    85         m_image.set(new BitmapImage(cairo_surface_reference(m_surface))); 
     81        m_image = BitmapImage::create(cairo_surface_reference(m_surface)); 
    8682    } 
    8783    return m_image.get();