Changeset 73949 in webkit


Ignore:
Timestamp:
Dec 13, 2010 12:35:28 PM (13 years ago)
Author:
mdelaney@apple.com
Message:

2010-12-13 Matthew Delaney <​mdelaney@apple.com>

Reviewed by Simon Fraser.

​https://bugs.webkit.org/show_bug.cgi?id=50591 Adopt new CG API for canvas

No new tests necessary.

  • Configurations/WebCore.xcconfig: Added IOSurface framework link.
  • html/canvas/CanvasRenderingContext2D.cpp: Used IOSurface def. instead.
  • platform/graphics/ImageBuffer.h: Pushed renderingMode down into ctor.
  • platform/graphics/cairo/ImageBufferCairo.cpp:
  • platform/graphics/cg/ImageBufferCG.cpp:
  • platform/graphics/haiku/ImageBufferHaiku.cpp:
  • platform/graphics/qt/ImageBufferQt.cpp:
  • platform/graphics/skia/ImageBufferSkia.cpp:
  • platform/graphics/wince/ImageBufferWinCE.cpp:
  • platform/graphics/wx/ImageBufferWx.cpp:
Location:
trunk/WebCore
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r73942 r73949  
     12010-12-13  Matthew Delaney  <mdelaney@apple.com>
     2
     3        Reviewed by Simon Fraser.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=50591 Adopt new CG API for canvas
     6
     7        No new tests necessary.
     8
     9        * Configurations/WebCore.xcconfig: Added IOSurface framework link.
     10        * html/canvas/CanvasRenderingContext2D.cpp: Used IOSurface def. instead.
     11        * platform/graphics/ImageBuffer.h: Pushed renderingMode down into ctor.
     12        * platform/graphics/cairo/ImageBufferCairo.cpp:
     13        * platform/graphics/cg/ImageBufferCG.cpp:
     14        * platform/graphics/haiku/ImageBufferHaiku.cpp:
     15        * platform/graphics/qt/ImageBufferQt.cpp:
     16        * platform/graphics/skia/ImageBufferSkia.cpp:
     17        * platform/graphics/wince/ImageBufferWinCE.cpp:
     18        * platform/graphics/wx/ImageBufferWx.cpp:
     19
    1202010-12-13  Sheriff Bot  <webkit.review.bot@gmail.com>
    221

  • trunk/WebCore/Configurations/WebCore.xcconfig

    r72356 r73949  
    5656OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
    5757OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit $(WEBKIT2_LDFLAGS) $(OTHER_LDFLAGS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    58 OTHER_LDFLAGS_macosx_1070 = -Xlinker -objc_gc_compaction;
     58OTHER_LDFLAGS_macosx_1070 = -Xlinker -objc_gc_compaction -framework IOSurface;
    5959
    6060PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));

  • trunk/WebCore/html/canvas/CanvasRenderingContext2D.cpp

    r73926 r73949  
    145145bool CanvasRenderingContext2D::isAccelerated() const
    146146{
    147 #if PLATFORM(MAC) && PLATFORM(CA) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     147#if defined(USE_IOSURFACE)
    148148    return true;
    149149#elif ENABLE(ACCELERATED_2D_CANVAS)

  • trunk/WebCore/platform/graphics/ImageBuffer.h

    r73925 r73949  
    6767        {
    6868            bool success = false;
    69             OwnPtr<ImageBuffer> buf(new ImageBuffer(size, colorSpace, renderingMode == Accelerated, success));
     69            OwnPtr<ImageBuffer> buf(new ImageBuffer(size, colorSpace, renderingMode, success));
    7070            if (success)
    7171                return buf.release();
    … …  
    124124        // This constructor will place its success into the given out-variable
    125125        // so that create() knows when it should return failure.
    126         ImageBuffer(const IntSize&, ColorSpace colorSpace, bool accelerateRendering, bool& success);
     126        ImageBuffer(const IntSize&, ColorSpace colorSpace, RenderingMode renderingMode, bool& success);
    127127    };
    128128

  • trunk/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp

    r73925 r73949  
    7070}
    7171
    72 ImageBuffer::ImageBuffer(const IntSize& size, ColorSpace, bool, bool& success)
     72ImageBuffer::ImageBuffer(const IntSize& size, ColorSpace, RenderingMode, bool& success)
    7373    : m_data(size)
    7474    , m_size(size)

  • trunk/WebCore/platform/graphics/cg/ImageBufferCG.cpp

    r73925 r73949  
    107107}
    108108
    109 ImageBuffer::ImageBuffer(const IntSize& size, ColorSpace imageColorSpace, bool accelerateRendering, bool& success)
     109ImageBuffer::ImageBuffer(const IntSize& size, ColorSpace imageColorSpace, RenderingMode renderingMode, bool& success)
    110110    : m_data(size)
    111111    , m_size(size)
    112     , m_accelerateRendering(accelerateRendering)
    113 {
     112    , m_accelerateRendering(renderingMode == Accelerated)
     113{
     114#if !defined(USE_IOSURFACE)
     115    ASSERT(renderingMode == Unaccelerated);
     116#endif
    114117    success = false;  // Make early return mean failure.
    115118    if (size.width() < 0 || size.height() < 0)

  • trunk/WebCore/platform/graphics/haiku/ImageBufferHaiku.cpp

    r73925 r73949  
    6767}
    6868
    69 ImageBuffer::ImageBuffer(const IntSize& size, ImageColorSpace imageColorSpace, bool, bool& success)
     69ImageBuffer::ImageBuffer(const IntSize& size, ImageColorSpace imageColorSpace, RenderingMode, bool& success)
    7070    : m_data(size)
    7171    , m_size(size)

  • trunk/WebCore/platform/graphics/qt/ImageBufferQt.cpp

    r73925 r73949  
    8181}
    8282
    83 ImageBuffer::ImageBuffer(const IntSize& size, ColorSpace, bool, bool& success)
     83ImageBuffer::ImageBuffer(const IntSize& size, ColorSpace, RenderingMode, bool& success)
    8484    : m_data(size)
    8585    , m_size(size)

  • trunk/WebCore/platform/graphics/skia/ImageBufferSkia.cpp

    r73925 r73949  
    6363}
    6464
    65 ImageBuffer::ImageBuffer(const IntSize& size, ColorSpace, bool, bool& success)
     65ImageBuffer::ImageBuffer(const IntSize& size, ColorSpace, RenderingMode, bool& success)
    6666    : m_data(size)
    6767    , m_size(size)

  • trunk/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp

    r73925 r73949  
    7373}
    7474
    75 ImageBuffer::ImageBuffer(const IntSize& size, ColorSpace colorSpace, bool, bool& success)
     75ImageBuffer::ImageBuffer(const IntSize& size, ColorSpace colorSpace, RenderingMode, bool& success)
    7676    : m_data(size)
    7777    , m_size(size)

  • trunk/WebCore/platform/graphics/wx/ImageBufferWx.cpp

    r73925 r73949  
    3838}
    3939
    40 ImageBuffer::ImageBuffer(const IntSize&, ColorSpace imageColorSpace, bool, bool& success) :
     40ImageBuffer::ImageBuffer(const IntSize&, ColorSpace imageColorSpace, RenderingMode, bool& success) :
    4141    m_data(IntSize())
    4242{
Note: See TracChangeset for help on using the changeset viewer.