Changeset 84088 in webkit


Ignore:
Timestamp:
Apr 16, 2011 3:37:01 AM (13 years ago)
Author:
Patrick Gansterer
Message:

2011-04-16 Patrick Gansterer <Patrick Gansterer>

Reviewed by Eric Seidel.

Rename PLATFORM(CAIRO) to USE(CAIRO)
​https://bugs.webkit.org/show_bug.cgi?id=55192

  • wtf/Platform.h:
  • wtf/gobject/GTypedefs.h:

2011-04-16 Patrick Gansterer <Patrick Gansterer>

Reviewed by Eric Seidel.

Rename PLATFORM(CAIRO) to USE(CAIRO)
​https://bugs.webkit.org/show_bug.cgi?id=55192

  • CMakeListsEfl.txt:
  • config.h:
  • platform/MIMETypeRegistry.cpp: (WebCore::initializeSupportedImageMIMETypesForEncoding):
  • platform/graphics/ContextShadow.h:
  • platform/graphics/DashArray.h:
  • platform/graphics/FloatRect.h:
  • platform/graphics/FontPlatformData.h: (WebCore::FontPlatformData::FontPlatformData): (WebCore::FontPlatformData::hash): (WebCore::FontPlatformData::isHashTableDeletedValue):
  • platform/graphics/GlyphBuffer.h: (WebCore::GlyphBuffer::glyphAt): (WebCore::GlyphBuffer::add):
  • platform/graphics/Gradient.cpp:
  • platform/graphics/Gradient.h:
  • platform/graphics/GraphicsContext.cpp:
  • platform/graphics/GraphicsContext.h: (WebCore::GraphicsContextState::GraphicsContextState):
  • platform/graphics/GraphicsContext3D.h:
  • platform/graphics/ImageBufferData.h:
  • platform/graphics/ImageSource.h:
  • platform/graphics/Path.h:
  • platform/graphics/Pattern.h:
  • platform/graphics/SimpleFontData.h:
  • platform/graphics/cairo/DrawErrorUnderline.h:
  • platform/graphics/cairo/GraphicsContextCairo.cpp:
  • platform/graphics/cairo/ImageCairo.cpp:
  • platform/graphics/gstreamer/ImageGStreamer.h:
  • platform/graphics/transforms/AffineTransform.h:
  • platform/graphics/transforms/TransformationMatrix.h:
  • platform/graphics/win/FontCacheWin.cpp: (WebCore::createGDIFont): (WebCore::FontCache::createFontPlatformData):
  • platform/graphics/win/FontPlatformDataWin.cpp: (WebCore::FontPlatformData::FontPlatformData):
  • platform/graphics/win/GraphicsContextWin.cpp:
  • plugins/win/PluginViewWin.cpp: (WebCore::PluginView::paintWindowedPluginIntoContext):
  • rendering/RenderObject.h:

2011-04-16 Patrick Gansterer <Patrick Gansterer>

Reviewed by Eric Seidel.

Rename PLATFORM(CAIRO) to USE(CAIRO)
​https://bugs.webkit.org/show_bug.cgi?id=55192

  • WebFrame.cpp: (WebFrame::spoolPages):
  • WebFrame.h:

2011-04-16 Patrick Gansterer <Patrick Gansterer>

Reviewed by Eric Seidel.

Rename PLATFORM(CAIRO) to USE(CAIRO)
​https://bugs.webkit.org/show_bug.cgi?id=55192

  • DumpRenderTree/PixelDumpSupport.cpp:
  • DumpRenderTree/config.h:
  • DumpRenderTree/win/PixelDumpSupportWin.cpp: (createBitmapContextFromWebView):
  • WebKitTestRunner/config.h:
Location:
trunk
Files:
41 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r84081 r84088  
     12011-04-16  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename PLATFORM(CAIRO) to USE(CAIRO)
     6        https://bugs.webkit.org/show_bug.cgi?id=55192
     7
     8        * wtf/Platform.h:
     9        * wtf/gobject/GTypedefs.h:
     10
    1112011-04-15  Sheriff Bot  <webkit.review.bot@gmail.com>
    212

  • trunk/Source/JavaScriptCore/wtf/Platform.h

    r83997 r84088  
    566566
    567567#if PLATFORM(GTK)
    568 #define WTF_PLATFORM_CAIRO 1
     568#define WTF_USE_CAIRO 1
    569569#endif
    570570

  • trunk/Source/JavaScriptCore/wtf/gobject/GTypedefs.h

    r77148 r84088  
    6262typedef union _GdkEvent GdkEvent;
    6363
    64 #if PLATFORM(CAIRO)
     64#if USE(CAIRO)
    6565typedef struct _cairo_surface cairo_surface_t;
    6666#endif

  • trunk/Source/WebCore/CMakeListsEfl.txt

    r83945 r84088  
    7676)
    7777
    78 IF (WTF_PLATFORM_CAIRO)
     78IF (WTF_USE_CAIRO)
    7979  LIST(APPEND WebCore_INCLUDE_DIRECTORIES
    8080    "${WEBCORE_DIR}/platform/graphics/cairo"

  • trunk/Source/WebCore/ChangeLog

    r84087 r84088  
     12011-04-16  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename PLATFORM(CAIRO) to USE(CAIRO)
     6        https://bugs.webkit.org/show_bug.cgi?id=55192
     7
     8        * CMakeListsEfl.txt:
     9        * config.h:
     10        * platform/MIMETypeRegistry.cpp:
     11        (WebCore::initializeSupportedImageMIMETypesForEncoding):
     12        * platform/graphics/ContextShadow.h:
     13        * platform/graphics/DashArray.h:
     14        * platform/graphics/FloatRect.h:
     15        * platform/graphics/FontPlatformData.h:
     16        (WebCore::FontPlatformData::FontPlatformData):
     17        (WebCore::FontPlatformData::hash):
     18        (WebCore::FontPlatformData::isHashTableDeletedValue):
     19        * platform/graphics/GlyphBuffer.h:
     20        (WebCore::GlyphBuffer::glyphAt):
     21        (WebCore::GlyphBuffer::add):
     22        * platform/graphics/Gradient.cpp:
     23        * platform/graphics/Gradient.h:
     24        * platform/graphics/GraphicsContext.cpp:
     25        * platform/graphics/GraphicsContext.h:
     26        (WebCore::GraphicsContextState::GraphicsContextState):
     27        * platform/graphics/GraphicsContext3D.h:
     28        * platform/graphics/ImageBufferData.h:
     29        * platform/graphics/ImageSource.h:
     30        * platform/graphics/Path.h:
     31        * platform/graphics/Pattern.h:
     32        * platform/graphics/SimpleFontData.h:
     33        * platform/graphics/cairo/DrawErrorUnderline.h:
     34        * platform/graphics/cairo/GraphicsContextCairo.cpp:
     35        * platform/graphics/cairo/ImageCairo.cpp:
     36        * platform/graphics/gstreamer/ImageGStreamer.h:
     37        * platform/graphics/transforms/AffineTransform.h:
     38        * platform/graphics/transforms/TransformationMatrix.h:
     39        * platform/graphics/win/FontCacheWin.cpp:
     40        (WebCore::createGDIFont):
     41        (WebCore::FontCache::createFontPlatformData):
     42        * platform/graphics/win/FontPlatformDataWin.cpp:
     43        (WebCore::FontPlatformData::FontPlatformData):
     44        * platform/graphics/win/GraphicsContextWin.cpp:
     45        * plugins/win/PluginViewWin.cpp:
     46        (WebCore::PluginView::paintWindowedPluginIntoContext):
     47        * rendering/RenderObject.h:
     48
    1492011-04-16  Patrick Gansterer  <paroga@webkit.org>
    250

  • trunk/Source/WebCore/config.h

    r83121 r84088  
    179179#if defined(WIN_CAIRO)
    180180#undef WTF_PLATFORM_CG
    181 #define WTF_PLATFORM_CAIRO 1
     181#define WTF_USE_CAIRO 1
    182182#define WTF_USE_CURL 1
    183183#ifndef _WINSOCKAPI_
    … …  
    186186#elif !OS(WINCE)
    187187#define WTF_PLATFORM_CG 1
    188 #undef WTF_PLATFORM_CAIRO
     188#undef WTF_USE_CAIRO
    189189#undef WTF_USE_CURL
    190190#endif

  • trunk/Source/WebCore/platform/MIMETypeRegistry.cpp

    r82492 r84088  
    165165    supportedImageMIMETypesForEncoding->add("image/bmp");
    166166    supportedImageMIMETypesForEncoding->add("image/ico");
    167 #elif PLATFORM(CAIRO)
     167#elif USE(CAIRO)
    168168    supportedImageMIMETypesForEncoding->add("image/png");
    169169#endif

  • trunk/Source/WebCore/platform/graphics/ContextShadow.h

    r81230 r84088  
    3535#include <wtf/RefCounted.h>
    3636
    37 #if PLATFORM(CAIRO)
     37#if USE(CAIRO)
    3838typedef struct _cairo cairo_t;
    3939typedef struct _cairo_surface cairo_surface_t;
    … …  
    5050class GraphicsContext;
    5151
    52 #if PLATFORM(CAIRO)
     52#if USE(CAIRO)
    5353typedef cairo_surface_t* PlatformImage;
    5454typedef cairo_t* PlatformContext;
    … …  
    117117    void setShadowsIgnoreTransforms(bool enable) { m_shadowsIgnoreTransforms = enable; }
    118118    bool shadowsIgnoreTransforms() const { return m_shadowsIgnoreTransforms; }
    119 #if PLATFORM(CAIRO)
     119#if USE(CAIRO)
    120120    void drawRectShadow(GraphicsContext* context, const IntRect& rect, const IntSize& topLeftRadius = IntSize(), const IntSize& topRightRadius = IntSize(), const IntSize& bottomLeftRadius = IntSize(), const IntSize& bottomRightRadius = IntSize());
    121121#endif
    … …  
    136136    IntRect calculateLayerBoundingRect(GraphicsContext*, const FloatRect& layerArea, const IntRect& clipRect);
    137137
    138 #if PLATFORM(CAIRO)
     138#if USE(CAIRO)
    139139    void drawRectShadowWithoutTiling(GraphicsContext*, const IntRect& shadowRect, const IntSize& topLeftRadius, const IntSize& topRightRadius, const IntSize& bottomLeftRadius, const IntSize& bottomRightRadius, float alpha);
    140140#endif

  • trunk/Source/WebCore/platform/graphics/DashArray.h

    r36734 r84088  
    3131#if PLATFORM(CG)
    3232typedef Vector<CGFloat> DashArray;
    33 #elif PLATFORM(CAIRO)
     33#elif USE(CAIRO)
    3434typedef Vector<double> DashArray;
    3535#else

  • trunk/Source/WebCore/platform/graphics/FloatRect.h

    r83818 r84088  
    6060#endif
    6161
    62 #if PLATFORM(CAIRO)
     62#if USE(CAIRO)
    6363typedef struct _cairo_rectangle cairo_rectangle_t;
    6464#endif
    … …  
    174174#endif
    175175
    176 #if PLATFORM(CAIRO)
     176#if USE(CAIRO)
    177177    FloatRect(const cairo_rectangle_t&);
    178178    operator cairo_rectangle_t() const;

  • trunk/Source/WebCore/platform/graphics/FontPlatformData.h

    r83805 r84088  
    5050#endif
    5151
    52 #if PLATFORM(CAIRO)
     52#if USE(CAIRO)
    5353#include "HashFunctions.h"
    5454#include <cairo.h>
    … …  
    120120#if PLATFORM(CG) && (defined(BUILDING_ON_TIGER) || PLATFORM(WIN))
    121121        , m_cgFont(0)
    122 #elif PLATFORM(CAIRO)
     122#elif USE(CAIRO)
    123123        , m_scaledFont(hashTableDeletedFontValue())
    124124#endif
    … …  
    142142#if PLATFORM(CG) && (defined(BUILDING_ON_TIGER) || PLATFORM(WIN))
    143143        , m_cgFont(0)
    144 #elif PLATFORM(CAIRO)
     144#elif USE(CAIRO)
    145145        , m_scaledFont(0)
    146146#endif
    … …  
    167167#if PLATFORM(CG) && (defined(BUILDING_ON_TIGER) || PLATFORM(WIN))
    168168        , m_cgFont(0)
    169 #elif PLATFORM(CAIRO)
     169#elif USE(CAIRO)
    170170        , m_scaledFont(0)
    171171#endif
    … …  
    202202#endif
    203203#endif
    204 #if PLATFORM(CAIRO)
     204#if USE(CAIRO)
    205205    FontPlatformData(cairo_font_face_t*, float size, bool bold, bool italic);
    206206#endif
    … …  
    244244    void setOrientation(FontOrientation orientation) { m_orientation = orientation; }
    245245
    246 #if PLATFORM(CAIRO)
     246#if USE(CAIRO)
    247247    cairo_scaled_font_t* scaledFont() const { return m_scaledFont; }
    248248#endif
    … …  
    250250    unsigned hash() const
    251251    {
    252 #if PLATFORM(WIN) && !PLATFORM(CAIRO)
     252#if PLATFORM(WIN) && !USE(CAIRO)
    253253        return m_font ? m_font->hash() : 0;
    254254#elif OS(DARWIN)
    … …  
    258258        uintptr_t hashCodes[3] = { (uintptr_t)m_font, m_widthVariant, m_textOrientation << 3 | m_orientation << 2 | m_syntheticBold << 1 | m_syntheticOblique };
    259259        return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
    260 #elif PLATFORM(CAIRO)
     260#elif USE(CAIRO)
    261261        return PtrHash<cairo_scaled_font_t*>::hash(m_scaledFont);
    262262#endif
    … …  
    279279    bool isHashTableDeletedValue() const
    280280    {
    281 #if PLATFORM(WIN) && !PLATFORM(CAIRO)
     281#if PLATFORM(WIN) && !USE(CAIRO)
    282282        return m_font.isHashTableDeletedValue();
    283283#elif OS(DARWIN)
    284284        return m_font == hashTableDeletedFontValue();
    285 #elif PLATFORM(CAIRO)
     285#elif USE(CAIRO)
    286286        return m_scaledFont == hashTableDeletedFontValue();
    287287#endif
    … …  
    310310#endif
    311311
    312 #if PLATFORM(CAIRO)
     312#if USE(CAIRO)
    313313    static cairo_scaled_font_t* hashTableDeletedFontValue() { return reinterpret_cast<cairo_scaled_font_t*>(-1); }
    314314#endif
    … …  
    342342#endif
    343343
    344 #if PLATFORM(CAIRO)
     344#if USE(CAIRO)
    345345    cairo_scaled_font_t* m_scaledFont;
    346346#endif

  • trunk/Source/WebCore/platform/graphics/GlyphBuffer.h

    r83805 r84088  
    3939#endif
    4040
    41 #if PLATFORM(CAIRO) || (PLATFORM(WX) && defined(__WXGTK__))
     41#if USE(CAIRO) || (PLATFORM(WX) && defined(__WXGTK__))
    4242#include <cairo.h>
    4343#endif
    … …  
    4848class SimpleFontData;
    4949
    50 #if PLATFORM(CAIRO)
     50#if USE(CAIRO)
    5151// FIXME: Why does Cairo use such a huge struct instead of just an offset into an array?
    5252typedef cairo_glyph_t GlyphBufferGlyph;
    … …  
    114114    Glyph glyphAt(int index) const
    115115    {
    116 #if PLATFORM(CAIRO)
     116#if USE(CAIRO)
    117117        return m_glyphs[index].index;
    118118#else
    … …  
    146146        m_fontData.append(font);
    147147
    148 #if PLATFORM(CAIRO)
     148#if USE(CAIRO)
    149149        cairo_glyph_t cairoGlyph;
    150150        cairoGlyph.index = glyph;
    … …  
    177177    {
    178178        m_fontData.append(font);
    179 #if PLATFORM(CAIRO)
     179#if USE(CAIRO)
    180180        cairo_glyph_t cairoGlyph;
    181181        cairoGlyph.index = glyph;

  • trunk/Source/WebCore/platform/graphics/Gradient.cpp

    r79578 r84088  
    222222}
    223223
    224 #if !USE(SKIA) && !PLATFORM(CAIRO)
     224#if !USE(SKIA) && !USE(CAIRO)
    225225void Gradient::setPlatformGradientSpaceTransform(const AffineTransform&)
    226226{

  • trunk/Source/WebCore/platform/graphics/Gradient.h

    r79578 r84088  
    5555QT_END_NAMESPACE
    5656typedef QGradient* PlatformGradient;
    57 #elif PLATFORM(CAIRO)
     57#elif USE(CAIRO)
    5858typedef struct _cairo_pattern cairo_pattern_t;
    5959typedef cairo_pattern_t* PlatformGradient;

  • trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp

    r83240 r84088  
    687687#endif
    688688
    689 #if !PLATFORM(QT) && !PLATFORM(CAIRO) && !USE(SKIA) && !PLATFORM(HAIKU) && !PLATFORM(OPENVG)
     689#if !PLATFORM(QT) && !USE(CAIRO) && !USE(SKIA) && !PLATFORM(HAIKU) && !PLATFORM(OPENVG)
    690690void GraphicsContext::setPlatformStrokeStyle(StrokeStyle)
    691691{

  • trunk/Source/WebCore/platform/graphics/GraphicsContext.h

    r83216 r84088  
    4040#if PLATFORM(CG)
    4141typedef struct CGContext PlatformGraphicsContext;
    42 #elif PLATFORM(CAIRO)
     42#elif USE(CAIRO)
    4343namespace WebCore {
    4444class ContextShadow;
    … …  
    155155            : strokeThickness(0)
    156156            , shadowBlur(0)
    157 #if PLATFORM(CAIRO)
     157#if USE(CAIRO)
    158158            , globalAlpha(1)
    159159#endif
    … …  
    190190        float shadowBlur;
    191191
    192 #if PLATFORM(CAIRO)
     192#if USE(CAIRO)
    193193        float globalAlpha;
    194194#endif
    … …  
    391391
    392392        void setAlpha(float);
    393 #if PLATFORM(CAIRO)
     393#if USE(CAIRO)
    394394        float getAlpha();
    395395#endif
    … …  
    491491#endif
    492492
    493 #if PLATFORM(QT) || PLATFORM(CAIRO)
     493#if PLATFORM(QT) || USE(CAIRO)
    494494        ContextShadow* contextShadow();
    495495#endif
    496496
    497 #if PLATFORM(CAIRO)
     497#if USE(CAIRO)
    498498        GraphicsContext(cairo_t*);
    499499#endif

  • trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h

    r83745 r84088  
    9191class Image;
    9292class ImageData;
    93 #if PLATFORM(CAIRO)
     93#if USE(CAIRO)
    9494class PlatformContextCairo;
    9595#endif

  • trunk/Source/WebCore/platform/graphics/ImageBufferData.h

    r83786 r84088  
    2626#if PLATFORM(CG)
    2727#include "ImageBufferDataCG.h"
    28 #elif PLATFORM(CAIRO)
     28#elif USE(CAIRO)
    2929#include "ImageBufferDataCairo.h"
    3030#elif PLATFORM(QT)

  • trunk/Source/WebCore/platform/graphics/ImageSource.h

    r79578 r84088  
    4444class QPixmap;
    4545QT_END_NAMESPACE
    46 #elif PLATFORM(CAIRO)
     46#elif USE(CAIRO)
    4747struct _cairo_surface;
    4848typedef struct _cairo_surface cairo_surface_t;
    … …  
    8989typedef wxBitmap* NativeImagePtr;
    9090#endif
    91 #elif PLATFORM(CAIRO)
     91#elif USE(CAIRO)
    9292typedef cairo_surface_t* NativeImagePtr;
    9393#elif USE(SKIA)

  • trunk/Source/WebCore/platform/graphics/Path.h

    r80557 r84088  
    4545class wxGraphicsPath;
    4646typedef wxGraphicsPath PlatformPath;
    47 #elif PLATFORM(CAIRO)
     47#elif USE(CAIRO)
    4848namespace WebCore {
    4949class CairoPath;

  • trunk/Source/WebCore/platform/graphics/Pattern.h

    r79578 r84088  
    3939typedef struct CGPattern* CGPatternRef;
    4040typedef CGPatternRef PlatformPatternPtr;
    41 #elif PLATFORM(CAIRO)
     41#elif USE(CAIRO)
    4242#include <cairo.h>
    4343typedef cairo_pattern_t* PlatformPatternPtr;

  • trunk/Source/WebCore/platform/graphics/SimpleFontData.h

    r83805 r84088  
    4949#endif
    5050
    51 #if PLATFORM(CAIRO)
     51#if USE(CAIRO)
    5252#include <cairo.h>
    5353#endif
    … …  
    116116    float spaceWidth() const { return m_spaceWidth; }
    117117
    118 #if PLATFORM(CG) || PLATFORM(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROME)
     118#if PLATFORM(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROME)
    119119    float syntheticBoldOffset() const { return m_syntheticBoldOffset; }
    120120#endif
    … …  
    253253    mutable OwnPtr<DerivedFontData> m_derivedFontData;
    254254
    255 #if PLATFORM(CG) || PLATFORM(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROME)
     255#if PLATFORM(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROME)
    256256    float m_syntheticBoldOffset;
    257257#endif

  • trunk/Source/WebCore/platform/graphics/cairo/DrawErrorUnderline.h

    r75971 r84088  
    2222 */
    2323
    24 #if PLATFORM(CAIRO)
     24#if USE(CAIRO)
    2525
    2626#ifndef DrawErrorUnderline_h

  • trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp

    r83945 r84088  
    3333#include "GraphicsContext.h"
    3434
    35 #if PLATFORM(CAIRO)
     35#if USE(CAIRO)
    3636
    3737#include "AffineTransform.h"
    … …  
    11831183} // namespace WebCore
    11841184
    1185 #endif // PLATFORM(CAIRO)
     1185#endif // USE(CAIRO)

  • trunk/Source/WebCore/platform/graphics/cairo/ImageCairo.cpp

    r82962 r84088  
    2929#include "BitmapImage.h"
    3030
    31 #if PLATFORM(CAIRO)
     31#if USE(CAIRO)
    3232
    3333#include "AffineTransform.h"
    … …  
    206206}
    207207
    208 #endif // PLATFORM(CAIRO)
     208#endif // USE(CAIRO)

  • trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h

    r72184 r84088  
    2828#include <wtf/PassRefPtr.h>
    2929
    30 #if PLATFORM(CAIRO)
     30#if USE(CAIRO)
    3131#include <cairo.h>
    3232#endif
    … …  
    4949        RefPtr<BitmapImage> m_image;
    5050
    51 #if PLATFORM(CAIRO)
     51#if USE(CAIRO)
    5252        ImageGStreamer(GstBuffer*&, IntSize, cairo_format_t&);
    5353#endif

  • trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h

    r79578 r84088  
    3535#if PLATFORM(CG)
    3636#include <CoreGraphics/CGAffineTransform.h>
    37 #elif PLATFORM(CAIRO)
     37#elif USE(CAIRO)
    3838#include <cairo.h>
    3939#elif PLATFORM(OPENVG)
    … …  
    160160#if PLATFORM(CG)
    161161    operator CGAffineTransform() const;
    162 #elif PLATFORM(CAIRO)
     162#elif USE(CAIRO)
    163163    operator cairo_matrix_t() const;
    164164#elif PLATFORM(OPENVG)

  • trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h

    r80260 r84088  
    3737#if PLATFORM(CG)
    3838typedef struct CGAffineTransform CGAffineTransform;
    39 #elif PLATFORM(CAIRO)
     39#elif USE(CAIRO)
    4040#include <cairo.h>
    4141#elif PLATFORM(OPENVG)
    … …  
    316316    TransformationMatrix(const CGAffineTransform&);
    317317    operator CGAffineTransform() const;
    318 #elif PLATFORM(CAIRO)
     318#elif USE(CAIRO)
    319319    operator cairo_matrix_t() const;
    320320#elif PLATFORM(OPENVG)

  • trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp

    r82314 r84088  
    472472    matchData.m_chosen.lfStrikeOut = false;
    473473    matchData.m_chosen.lfCharSet = DEFAULT_CHARSET;
    474 #if PLATFORM(CG) || PLATFORM(CAIRO)
     474#if PLATFORM(CG) || USE(CAIRO)
    475475    matchData.m_chosen.lfOutPrecision = OUT_TT_ONLY_PRECIS;
    476476#else
    … …  
    584584#if PLATFORM(CG)
    585585    bool fontCreationFailed = !result->cgFont();
    586 #elif PLATFORM(CAIRO)
     586#elif USE(CAIRO)
    587587    bool fontCreationFailed = !result->scaledFont();
    588588#endif

  • trunk/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp

    r82314 r84088  
    4444#if PLATFORM(CG)
    4545    , m_cgFont(0)
    46 #elif PLATFORM(CAIRO)
     46#elif USE(CAIRO)
    4747    , m_scaledFont(0)
    4848#endif

  • trunk/Source/WebCore/platform/graphics/win/GraphicsContextWin.cpp

    r82640 r84088  
    2929#if PLATFORM(CG)
    3030#include "GraphicsContextPlatformPrivateCG.h"
    31 #elif PLATFORM(CAIRO)
     31#elif USE(CAIRO)
    3232#include "GraphicsContextPlatformPrivateCairo.h"
    3333#endif

  • trunk/Source/WebCore/plugins/win/PluginViewWin.cpp

    r82962 r84088  
    8383#endif
    8484
    85 #if PLATFORM(CAIRO)
     85#if USE(CAIRO)
    8686#include "PlatformContextCairo.h"
    8787#include <cairo-win32.h>
    … …  
    570570    LocalWindowsContext windowsContext(context, frameRect(), false);
    571571
    572 #if PLATFORM(CAIRO)
     572#if USE(CAIRO)
    573573    // Must flush drawings up to this point to the backing metafile, otherwise the
    574574    // plugin region will be overwritten with any clear regions specified in the

  • trunk/Source/WebCore/rendering/RenderObject.h

    r83221 r84088  
    3838#include <wtf/UnusedParam.h>
    3939
    40 #if PLATFORM(CG) || PLATFORM(CAIRO) || PLATFORM(QT)
     40#if PLATFORM(CG) || USE(CAIRO) || PLATFORM(QT)
    4141#define HAVE_PATH_BASED_BORDER_RADIUS_DRAWING 1
    4242#endif

  • trunk/Source/WebKit/win/ChangeLog

    r83852 r84088  
     12011-04-16  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename PLATFORM(CAIRO) to USE(CAIRO)
     6        https://bugs.webkit.org/show_bug.cgi?id=55192
     7
     8        * WebFrame.cpp:
     9        (WebFrame::spoolPages):
     10        * WebFrame.h:
     11
    1122011-04-14  Adam Roben  <aroben@apple.com>
    213

  • trunk/Source/WebKit/win/WebFrame.cpp

    r82962 r84088  
    107107#if PLATFORM(CG)
    108108#include <CoreGraphics/CoreGraphics.h>
    109 #elif PLATFORM(CAIRO)
     109#elif USE(CAIRO)
    110110#include "PlatformContextCairo.h"
    111111#include <cairo-win32.h>
    … …  
    21682168    CGContextRestoreGState(pctx);
    21692169}
    2170 #elif PLATFORM(CAIRO)
     2170#elif USE(CAIRO)
    21712171static float scaleFactor(HDC printDC, const IntRect& marginRect, const IntRect& pageRect)
    21722172{
    … …  
    23262326        return E_POINTER;
    23272327    }
    2328 #elif PLATFORM(CAIRO)
     2328#elif USE(CAIRO)
    23292329    if (!printDC) {
    23302330        ASSERT_NOT_REACHED();
    … …  
    23972397        spoolPage(pctx, &spoolCtx, printDC, ui.get(), headerHeight, footerHeight, ii, pageCount);
    23982398
    2399 #if PLATFORM(CAIRO)
     2399#if USE(CAIRO)
    24002400    cairo_surface_finish(printSurface);
    24012401    ASSERT(!cairo_surface_status(printSurface));

  • trunk/Source/WebKit/win/WebFrame.h

    r82962 r84088  
    6262#if PLATFORM(CG)
    6363typedef struct CGContext PlatformGraphicsContext;
    64 #elif PLATFORM(CAIRO)
     64#elif USE(CAIRO)
    6565namespace WebCore {
    6666class PlatformContextCairo;

  • trunk/Tools/ChangeLog

    r84086 r84088  
     12011-04-16  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename PLATFORM(CAIRO) to USE(CAIRO)
     6        https://bugs.webkit.org/show_bug.cgi?id=55192
     7
     8        * DumpRenderTree/PixelDumpSupport.cpp:
     9        * DumpRenderTree/config.h:
     10        * DumpRenderTree/win/PixelDumpSupportWin.cpp:
     11        (createBitmapContextFromWebView):
     12        * WebKitTestRunner/config.h:
     13
    1142011-04-16  Ojan Vafai  <ojan@chromium.org>
    215

  • trunk/Tools/DumpRenderTree/PixelDumpSupport.cpp

    r83461 r84088  
    4040#if PLATFORM(CG)
    4141#include "PixelDumpSupportCG.h"
    42 #elif PLATFORM(CAIRO)
     42#elif USE(CAIRO)
    4343#include "PixelDumpSupportCairo.h"
    4444#endif

  • trunk/Tools/DumpRenderTree/config.h

    r83121 r84088  
    7575#define WTF_USE_CF 1
    7676#if defined(WIN_CAIRO)
    77 #define WTF_PLATFORM_CAIRO 1
     77#define WTF_USE_CAIRO 1
    7878#define WTF_USE_CURL 1
    7979#else

  • trunk/Tools/DumpRenderTree/win/PixelDumpSupportWin.cpp

    r71516 r84088  
    3131#if PLATFORM(CG)
    3232#include "PixelDumpSupportCG.h"
    33 #elif PLATFORM(CAIRO)
     33#elif USE(CAIRO)
    3434#include "PixelDumpSupportCairo.h"
    3535#endif
    … …  
    7575    CGContextRef context = CGBitmapContextCreate(info.bmBits, info.bmWidth, info.bmHeight, 8,
    7676                                                info.bmWidthBytes, colorSpace.get(), kCGBitmapByteOrder32Host | kCGImageAlphaPremultipliedFirst);
    77 #elif PLATFORM(CAIRO)
     77#elif USE(CAIRO)
    7878    cairo_surface_t* image = cairo_image_surface_create_for_data((unsigned char*)info.bmBits, CAIRO_FORMAT_ARGB32,
    7979                                                      info.bmWidth, info.bmHeight, info.bmWidthBytes);

  • trunk/Tools/WebKitTestRunner/config.h

    r83121 r84088  
    5858#define WTF_USE_CF 1
    5959#if defined(WIN_CAIRO)
    60 #define WTF_PLATFORM_CAIRO 1
     60#define WTF_USE_CAIRO 1
    6161#define WTF_USE_CURL 1
    6262#else
Note: See TracChangeset for help on using the changeset viewer.