Changeset 84101 in webkit


Ignore:
Timestamp:
Apr 17, 2011 3:04:48 AM (13 years ago)
Author:
Patrick Gansterer
Message:

2011-04-17 Patrick Gansterer <Patrick Gansterer>

Reviewed by Adam Barth.

Rename PLATFORM(CG) to USE(CG)
https://bugs.webkit.org/show_bug.cgi?id=58729

  • wtf/Platform.h:

2011-04-17 Patrick Gansterer <Patrick Gansterer>

Reviewed by Adam Barth.

Rename PLATFORM(CG) to USE(CG)
https://bugs.webkit.org/show_bug.cgi?id=58729

  • config.h:
  • html/HTMLCanvasElement.cpp: (WebCore::HTMLCanvasElement::toDataURL):
  • html/HTMLCanvasElement.h:
  • html/canvas/CanvasRenderingContext2D.cpp: (WebCore::CanvasRenderingContext2D::setShadow): (WebCore::CanvasRenderingContext2D::drawTextInternal):
  • html/canvas/CanvasRenderingContext2D.h:
  • html/canvas/CanvasStyle.cpp: (WebCore::CanvasStyle::applyStrokeColor): (WebCore::CanvasStyle::applyFillColor):
  • loader/cache/CachedFont.cpp:
  • loader/cache/CachedImage.cpp: (WebCore::CachedImage::createImage):
  • platform/FloatConversion.h:
  • platform/MIMETypeRegistry.cpp: (WebCore::initializeSupportedImageMIMETypes): (WebCore::initializeSupportedImageMIMETypesForEncoding):
  • platform/graphics/BitmapImage.h:
  • platform/graphics/Color.h:
  • platform/graphics/DashArray.h:
  • platform/graphics/FloatPoint.h:
  • platform/graphics/FloatRect.h:
  • platform/graphics/FloatSize.h:
  • platform/graphics/FontPlatformData.h: (WebCore::FontPlatformData::FontPlatformData): (WebCore::FontPlatformData::hash):
  • platform/graphics/GlyphBuffer.h: (WebCore::GlyphBuffer::advanceAt): (WebCore::GlyphBuffer::add): (WebCore::GlyphBuffer::expandLastAdvance):
  • platform/graphics/Gradient.h:
  • platform/graphics/GraphicsContext.cpp: (WebCore::GraphicsContext::setLegacyShadow):
  • platform/graphics/GraphicsContext.h: (WebCore::GraphicsContextState::GraphicsContextState):
  • platform/graphics/GraphicsContext3D.h:
  • platform/graphics/Image.cpp:
  • platform/graphics/Image.h:
  • platform/graphics/ImageBuffer.cpp:
  • platform/graphics/ImageBuffer.h:
  • platform/graphics/ImageBufferData.h:
  • platform/graphics/ImageSource.h:
  • platform/graphics/IntPoint.h:
  • platform/graphics/IntRect.h:
  • platform/graphics/IntSize.h:
  • platform/graphics/Path.h:
  • platform/graphics/Pattern.h:
  • platform/graphics/SimpleFontData.h:
  • platform/graphics/cg/ColorCG.cpp:
  • platform/graphics/cg/FloatPointCG.cpp:
  • platform/graphics/cg/FloatRectCG.cpp:
  • platform/graphics/cg/FloatSizeCG.cpp:
  • platform/graphics/cg/ImageCG.cpp:
  • platform/graphics/cg/ImageSourceCG.cpp:
  • platform/graphics/cg/IntPointCG.cpp:
  • platform/graphics/cg/IntRectCG.cpp:
  • platform/graphics/cg/IntSizeCG.cpp:
  • platform/graphics/cg/PDFDocumentImage.cpp:
  • platform/graphics/cg/PDFDocumentImage.h:
  • platform/graphics/cg/PathCG.cpp:
  • platform/graphics/cg/TransformationMatrixCG.cpp:
  • platform/graphics/chromium/ImageLayerChromium.h:
  • platform/graphics/chromium/LayerRendererChromium.cpp:
  • platform/graphics/chromium/LayerRendererChromium.h:
  • platform/graphics/chromium/PlatformCanvas.cpp: (WebCore::PlatformCanvas::resize): (WebCore::PlatformCanvas::AutoLocker::AutoLocker): (WebCore::PlatformCanvas::Painter::Painter):
  • platform/graphics/chromium/PlatformCanvas.h:
  • platform/graphics/chromium/PlatformImage.cpp: (WebCore::PlatformImage::updateFromImage):
  • platform/graphics/opentype/OpenTypeUtilities.cpp:
  • platform/graphics/transforms/AffineTransform.h:
  • platform/graphics/transforms/TransformationMatrix.h:
  • platform/graphics/win/DIBPixelData.h:
  • platform/graphics/win/FontCacheWin.cpp: (WebCore::FontCache::platformInit): (WebCore::createGDIFont): (WebCore::FontCache::createFontPlatformData):
  • platform/graphics/win/FontPlatformDataWin.cpp: (WebCore::FontPlatformData::FontPlatformData):
  • platform/graphics/win/GraphicsContextWin.cpp:
  • platform/graphics/win/MediaPlayerPrivateFullscreenWindow.cpp:
  • platform/graphics/win/SimpleFontDataWin.cpp:
  • platform/image-decoders/ImageDecoder.cpp:
  • platform/image-decoders/ImageDecoder.h:
  • rendering/RenderObject.h:
  • rendering/svg/RenderSVGResourceFilter.cpp: (WebCore::RenderSVGResourceFilter::postApplyResource):
  • rendering/svg/RenderSVGResourceGradient.cpp: (WebCore::RenderSVGResourceGradient::RenderSVGResourceGradient): (WebCore::RenderSVGResourceGradient::applyResource):
  • rendering/svg/RenderSVGResourceGradient.h:
  • rendering/svg/RenderSVGResourceMasker.cpp: (WebCore::RenderSVGResourceMasker::drawContentIntoMaskImage):
  • rendering/svg/RenderSVGResourcePattern.cpp: (WebCore::RenderSVGResourcePattern::applyResource):

2011-04-17 Patrick Gansterer <Patrick Gansterer>

Reviewed by Adam Barth.

Rename PLATFORM(CG) to USE(CG)
https://bugs.webkit.org/show_bug.cgi?id=58729

  • src/GraphicsContext3DChromium.cpp: (WebCore::GraphicsContext3DInternal::GraphicsContext3DInternal): (WebCore::GraphicsContext3DInternal::~GraphicsContext3DInternal): (WebCore::GraphicsContext3DInternal::paintRenderingResultsToCanvas): (WebCore::GraphicsContext3DInternal::reshape):
  • src/GraphicsContext3DInternal.h:
  • src/PlatformBridge.cpp:
  • src/WebViewImpl.cpp: (WebKit::WebViewImpl::doPixelReadbackToCanvas):

2011-04-17 Patrick Gansterer <Patrick Gansterer>

Reviewed by Adam Barth.

Rename PLATFORM(CG) to USE(CG)
https://bugs.webkit.org/show_bug.cgi?id=58729

  • WebFrame.cpp: (WebFrame::spoolPages):
  • WebFrame.h:
  • WebPreferences.cpp: (WebPreferences::setFontSmoothing): (WebPreferences::setFontSmoothingContrast):
  • WebView.cpp: (systemParameterChanged):

2011-04-17 Patrick Gansterer <Patrick Gansterer>

Reviewed by Adam Barth.

Rename PLATFORM(CG) to USE(CG)
https://bugs.webkit.org/show_bug.cgi?id=58729

  • Shared/ShareableBitmap.h:
  • Shared/WebCoreArgumentCoders.cpp:
  • Shared/WebCoreArgumentCoders.h:
  • Shared/WebGraphicsContext.cpp: (WebKit::WebGraphicsContext::WebGraphicsContext):
  • Shared/WebGraphicsContext.h:
  • Shared/win/PlatformCertificateInfo.cpp: (WebKit::PlatformCertificateInfo::PlatformCertificateInfo):
  • UIProcess/win/WebView.cpp: (WebKit::WebView::setFindIndicator):
  • WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRectToPDF): (WebKit::WebPage::drawPagesToPDF):
  • WebProcess/WebPage/win/WebPageWin.cpp: (WebKit::WebPage::platformPreferencesDidChange):
  • config.h:

2011-04-17 Patrick Gansterer <Patrick Gansterer>

Reviewed by Adam Barth.

Rename PLATFORM(CG) to USE(CG)
https://bugs.webkit.org/show_bug.cgi?id=58729

  • DumpRenderTree/PixelDumpSupport.cpp:
  • DumpRenderTree/chromium/WebViewHost.cpp: (WebViewHost::paintRect):
  • DumpRenderTree/config.h:
  • DumpRenderTree/win/PixelDumpSupportWin.cpp: (createBitmapContextFromWebView):
  • TestWebKitAPI/PlatformWebView.h:
  • WebKitTestRunner/config.h:
  • WebKitTestRunner/win/TestInvocationWin.cpp:
Location:
trunk
Files:
102 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r84088 r84101  
     12011-04-17  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Rename PLATFORM(CG) to USE(CG)
     6        https://bugs.webkit.org/show_bug.cgi?id=58729
     7
     8        * wtf/Platform.h:
     9
    1102011-04-16  Patrick Gansterer  <paroga@webkit.org>
    211
  • trunk/Source/JavaScriptCore/wtf/Platform.h

    r84088 r84101  
    540540/* Graphics engines */
    541541
    542 /* PLATFORM(CG) and PLATFORM(CI) */
     542/* USE(CG) and PLATFORM(CI) */
    543543#if PLATFORM(MAC) || PLATFORM(IOS)
    544 #define WTF_PLATFORM_CG 1
    545 #endif
    546 #if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WIN) && PLATFORM(CG))
     544#define WTF_USE_CG 1
     545#endif
     546#if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WIN) && USE(CG))
    547547#define WTF_PLATFORM_CA 1
    548548#endif
     
    551551#if PLATFORM(CHROMIUM)
    552552#if OS(DARWIN)
    553 #define WTF_PLATFORM_CG 1
     553#define WTF_USE_CG 1
    554554#define WTF_USE_ATSUI 1
    555555#define WTF_USE_CORE_TEXT 1
  • trunk/Source/WebCore/ChangeLog

    r84099 r84101  
     12011-04-17  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Rename PLATFORM(CG) to USE(CG)
     6        https://bugs.webkit.org/show_bug.cgi?id=58729
     7
     8        * config.h:
     9        * html/HTMLCanvasElement.cpp:
     10        (WebCore::HTMLCanvasElement::toDataURL):
     11        * html/HTMLCanvasElement.h:
     12        * html/canvas/CanvasRenderingContext2D.cpp:
     13        (WebCore::CanvasRenderingContext2D::setShadow):
     14        (WebCore::CanvasRenderingContext2D::drawTextInternal):
     15        * html/canvas/CanvasRenderingContext2D.h:
     16        * html/canvas/CanvasStyle.cpp:
     17        (WebCore::CanvasStyle::applyStrokeColor):
     18        (WebCore::CanvasStyle::applyFillColor):
     19        * loader/cache/CachedFont.cpp:
     20        * loader/cache/CachedImage.cpp:
     21        (WebCore::CachedImage::createImage):
     22        * platform/FloatConversion.h:
     23        * platform/MIMETypeRegistry.cpp:
     24        (WebCore::initializeSupportedImageMIMETypes):
     25        (WebCore::initializeSupportedImageMIMETypesForEncoding):
     26        * platform/graphics/BitmapImage.h:
     27        * platform/graphics/Color.h:
     28        * platform/graphics/DashArray.h:
     29        * platform/graphics/FloatPoint.h:
     30        * platform/graphics/FloatRect.h:
     31        * platform/graphics/FloatSize.h:
     32        * platform/graphics/FontPlatformData.h:
     33        (WebCore::FontPlatformData::FontPlatformData):
     34        (WebCore::FontPlatformData::hash):
     35        * platform/graphics/GlyphBuffer.h:
     36        (WebCore::GlyphBuffer::advanceAt):
     37        (WebCore::GlyphBuffer::add):
     38        (WebCore::GlyphBuffer::expandLastAdvance):
     39        * platform/graphics/Gradient.h:
     40        * platform/graphics/GraphicsContext.cpp:
     41        (WebCore::GraphicsContext::setLegacyShadow):
     42        * platform/graphics/GraphicsContext.h:
     43        (WebCore::GraphicsContextState::GraphicsContextState):
     44        * platform/graphics/GraphicsContext3D.h:
     45        * platform/graphics/Image.cpp:
     46        * platform/graphics/Image.h:
     47        * platform/graphics/ImageBuffer.cpp:
     48        * platform/graphics/ImageBuffer.h:
     49        * platform/graphics/ImageBufferData.h:
     50        * platform/graphics/ImageSource.h:
     51        * platform/graphics/IntPoint.h:
     52        * platform/graphics/IntRect.h:
     53        * platform/graphics/IntSize.h:
     54        * platform/graphics/Path.h:
     55        * platform/graphics/Pattern.h:
     56        * platform/graphics/SimpleFontData.h:
     57        * platform/graphics/cg/ColorCG.cpp:
     58        * platform/graphics/cg/FloatPointCG.cpp:
     59        * platform/graphics/cg/FloatRectCG.cpp:
     60        * platform/graphics/cg/FloatSizeCG.cpp:
     61        * platform/graphics/cg/ImageCG.cpp:
     62        * platform/graphics/cg/ImageSourceCG.cpp:
     63        * platform/graphics/cg/IntPointCG.cpp:
     64        * platform/graphics/cg/IntRectCG.cpp:
     65        * platform/graphics/cg/IntSizeCG.cpp:
     66        * platform/graphics/cg/PDFDocumentImage.cpp:
     67        * platform/graphics/cg/PDFDocumentImage.h:
     68        * platform/graphics/cg/PathCG.cpp:
     69        * platform/graphics/cg/TransformationMatrixCG.cpp:
     70        * platform/graphics/chromium/ImageLayerChromium.h:
     71        * platform/graphics/chromium/LayerRendererChromium.cpp:
     72        * platform/graphics/chromium/LayerRendererChromium.h:
     73        * platform/graphics/chromium/PlatformCanvas.cpp:
     74        (WebCore::PlatformCanvas::resize):
     75        (WebCore::PlatformCanvas::AutoLocker::AutoLocker):
     76        (WebCore::PlatformCanvas::Painter::Painter):
     77        * platform/graphics/chromium/PlatformCanvas.h:
     78        * platform/graphics/chromium/PlatformImage.cpp:
     79        (WebCore::PlatformImage::updateFromImage):
     80        * platform/graphics/opentype/OpenTypeUtilities.cpp:
     81        * platform/graphics/transforms/AffineTransform.h:
     82        * platform/graphics/transforms/TransformationMatrix.h:
     83        * platform/graphics/win/DIBPixelData.h:
     84        * platform/graphics/win/FontCacheWin.cpp:
     85        (WebCore::FontCache::platformInit):
     86        (WebCore::createGDIFont):
     87        (WebCore::FontCache::createFontPlatformData):
     88        * platform/graphics/win/FontPlatformDataWin.cpp:
     89        (WebCore::FontPlatformData::FontPlatformData):
     90        * platform/graphics/win/GraphicsContextWin.cpp:
     91        * platform/graphics/win/MediaPlayerPrivateFullscreenWindow.cpp:
     92        * platform/graphics/win/SimpleFontDataWin.cpp:
     93        * platform/image-decoders/ImageDecoder.cpp:
     94        * platform/image-decoders/ImageDecoder.h:
     95        * rendering/RenderObject.h:
     96        * rendering/svg/RenderSVGResourceFilter.cpp:
     97        (WebCore::RenderSVGResourceFilter::postApplyResource):
     98        * rendering/svg/RenderSVGResourceGradient.cpp:
     99        (WebCore::RenderSVGResourceGradient::RenderSVGResourceGradient):
     100        (WebCore::RenderSVGResourceGradient::applyResource):
     101        * rendering/svg/RenderSVGResourceGradient.h:
     102        * rendering/svg/RenderSVGResourceMasker.cpp:
     103        (WebCore::RenderSVGResourceMasker::drawContentIntoMaskImage):
     104        * rendering/svg/RenderSVGResourcePattern.cpp:
     105        (WebCore::RenderSVGResourcePattern::applyResource):
     106
    11072011-04-16  Adam Barth  <abarth@webkit.org>
    2108
  • trunk/Source/WebCore/config.h

    r84088 r84101  
    178178#if PLATFORM(WIN)
    179179#if defined(WIN_CAIRO)
    180 #undef WTF_PLATFORM_CG
     180#undef WTF_USE_CG
    181181#define WTF_USE_CAIRO 1
    182182#define WTF_USE_CURL 1
     
    185185#endif
    186186#elif !OS(WINCE)
    187 #define WTF_PLATFORM_CG 1
     187#define WTF_USE_CG 1
    188188#undef WTF_USE_CAIRO
    189189#undef WTF_USE_CURL
     
    228228#endif
    229229
    230 #if PLATFORM(CG)
     230#if USE(CG)
    231231#ifndef CGFLOAT_DEFINED
    232232#ifdef __LP64__
     
    237237#define CGFLOAT_DEFINED 1
    238238#endif
    239 #endif /* PLATFORM(CG) */
     239#endif /* USE(CG) */
    240240
    241241#ifdef BUILDING_ON_TIGER
     
    244244#endif
    245245
    246 #if PLATFORM(WIN) && PLATFORM(CG)
     246#if PLATFORM(WIN) && USE(CG)
    247247#define WTF_USE_SAFARI_THEME 1
    248248#endif
    249249
    250250// CoreAnimation is available to IOS, Mac and Windows if using CG
    251 #if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WIN) && PLATFORM(CG))
     251#if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WIN) && USE(CG))
    252252#define WTF_PLATFORM_CA 1
    253253#endif
  • trunk/Source/WebCore/html/HTMLCanvasElement.cpp

    r83990 r84101  
    343343        lowercaseMimeType = "image/png";
    344344
    345 #if PLATFORM(CG) || USE(SKIA)
     345#if USE(CG) || USE(SKIA)
    346346    // Try to get ImageData first, as that may avoid lossy conversions.
    347347    RefPtr<ImageData> imageData = getImageData();
  • trunk/Source/WebCore/html/HTMLCanvasElement.h

    r83396 r84101  
    3535#if PLATFORM(CHROMIUM) || PLATFORM(QT)
    3636#define DefaultInterpolationQuality InterpolationMedium
    37 #elif PLATFORM(CG)
     37#elif USE(CG)
    3838#define DefaultInterpolationQuality InterpolationLow
    3939#else
  • trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp

    r83888 r84101  
    10471047}
    10481048
    1049 #if PLATFORM(CG)
     1049#if USE(CG)
    10501050static inline CGSize adjustedShadowSize(CGFloat width, CGFloat height)
    10511051{
     
    11511151    if (!dc)
    11521152        return;
    1153 #if PLATFORM(CG)
     1153#if USE(CG)
    11541154    const CGFloat components[5] = { c, m, y, k, a };
    11551155    CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceCMYK();
     
    18921892        textRect.inflate(c->strokeThickness() / 2);
    18931893
    1894 #if PLATFORM(CG)
     1894#if USE(CG)
    18951895    CanvasStyle* drawStyle = fill ? state().m_fillStyle.get() : state().m_strokeStyle.get();
    18961896    if (drawStyle->canvasGradient() || drawStyle->canvasPattern()) {
  • trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h

    r83888 r84101  
    3838#include <wtf/Vector.h>
    3939
    40 #if PLATFORM(CG)
     40#if USE(CG)
    4141#include <ApplicationServices/ApplicationServices.h>
    4242#endif
  • trunk/Source/WebCore/html/canvas/CanvasStyle.cpp

    r78442 r84101  
    3939#include <wtf/PassRefPtr.h>
    4040
    41 #if PLATFORM(CG)
     41#if USE(CG)
    4242#include <CoreGraphics/CGContext.h>
    4343#endif
     
    239239        // FIXME: Do this through platform-independent GraphicsContext API.
    240240        // We'll need a fancier Color abstraction to support CMYKA correctly
    241 #if PLATFORM(CG)
     241#if USE(CG)
    242242        CGContextSetCMYKStrokeColor(context->platformContext(), m_cmyka.c, m_cmyka.m, m_cmyka.y, m_cmyka.k, m_cmyka.a);
    243243#elif PLATFORM(QT)
     
    276276        // FIXME: Do this through platform-independent GraphicsContext API.
    277277        // We'll need a fancier Color abstraction to support CMYKA correctly
    278 #if PLATFORM(CG)
     278#if USE(CG)
    279279        CGContextSetCMYKFillColor(context->platformContext(), m_cmyka.c, m_cmyka.m, m_cmyka.y, m_cmyka.k, m_cmyka.a);
    280280#elif PLATFORM(QT)
  • trunk/Source/WebCore/loader/cache/CachedFont.cpp

    r83896 r84101  
    2929
    3030// FIXME: This should really be a blacklist instead of a whitelist
    31 #if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (OS(WINDOWS) || OS(LINUX) || OS(FREEBSD) || USE(SKIA_MAC_ON_CHROME))) || PLATFORM(HAIKU) || OS(WINCE) || PLATFORM(ANDROID) || PLATFORM(BREWMP)
     31#if USE(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (OS(WINDOWS) || OS(LINUX) || OS(FREEBSD) || USE(SKIA_MAC_ON_CHROME))) || PLATFORM(HAIKU) || OS(WINCE) || PLATFORM(ANDROID) || PLATFORM(BREWMP)
    3232#define STORE_FONT_CUSTOM_PLATFORM_DATA
    3333#endif
  • trunk/Source/WebCore/loader/cache/CachedImage.cpp

    r82217 r84101  
    4141#include <wtf/Vector.h>
    4242
    43 #if PLATFORM(CG)
     43#if USE(CG)
    4444#include "PDFDocumentImage.h"
    4545#endif
     
    241241    if (m_image)
    242242        return;
    243 #if PLATFORM(CG) && !USE(WEBKIT_IMAGE_DECODERS)
     243#if USE(CG) && !USE(WEBKIT_IMAGE_DECODERS)
    244244    if (m_response.mimeType() == "application/pdf") {
    245245        m_image = PDFDocumentImage::create();
  • trunk/Source/WebCore/platform/FloatConversion.h

    r55633 r84101  
    3030#define FloatConversion_h
    3131
    32 #if PLATFORM(CG)
     32#if USE(CG)
    3333#include <CoreGraphics/CGBase.h>
    3434#endif
     
    4545    }
    4646
    47 #if PLATFORM(CG)
     47#if USE(CG)
    4848    template<typename T>
    4949    CGFloat narrowPrecisionToCGFloat(T);
  • trunk/Source/WebCore/platform/MIMETypeRegistry.cpp

    r84088 r84101  
    3434#include <wtf/text/StringHash.h>
    3535
    36 #if PLATFORM(CG)
     36#if USE(CG)
    3737#include "ImageSourceCG.h"
    3838#include <ApplicationServices/ApplicationServices.h>
     
    6262static void initializeSupportedImageMIMETypes()
    6363{
    64 #if PLATFORM(CG)
     64#if USE(CG)
    6565    RetainPtr<CFArrayRef> supportedTypes(AdoptCF, CGImageSourceCopyTypeIdentifiers());
    6666    CFIndex count = CFArrayGetCount(supportedTypes.get());
     
    135135    supportedImageMIMETypesForEncoding = new HashSet<String>;
    136136
    137 #if PLATFORM(CG)
     137#if USE(CG)
    138138#if PLATFORM(MAC)
    139139    RetainPtr<CFArrayRef> supportedTypes(AdoptCF, CGImageDestinationCopyTypeIdentifiers());
  • trunk/Source/WebCore/platform/graphics/BitmapImage.h

    r83637 r84101  
    140140#endif
    141141   
    142 #if PLATFORM(CG)
     142#if USE(CG)
    143143    virtual CGImageRef getCGImageRef();
    144144    virtual CGImageRef getFirstCGImageRefOfSize(const IntSize&);
  • trunk/Source/WebCore/platform/graphics/Color.h

    r78590 r84101  
    3131#include <wtf/unicode/Unicode.h>
    3232
    33 #if PLATFORM(CG)
     33#if USE(CG)
    3434#include "ColorSpace.h"
    3535typedef struct CGColor* CGColorRef;
     
    144144#endif
    145145
    146 #if PLATFORM(CG)
     146#if USE(CG)
    147147    Color(CGColorRef);
    148148#endif
     
    181181unsigned premultipliedARGBFromColor(const Color&);
    182182
    183 #if PLATFORM(CG)
     183#if USE(CG)
    184184CGColorRef cachedCGColor(const Color&, ColorSpace);
    185185#endif
  • trunk/Source/WebCore/platform/graphics/DashArray.h

    r84088 r84101  
    2929#include <wtf/Vector.h>
    3030
    31 #if PLATFORM(CG)
     31#if USE(CG)
    3232typedef Vector<CGFloat> DashArray;
    3333#elif USE(CAIRO)
  • trunk/Source/WebCore/platform/graphics/FloatPoint.h

    r83818 r84101  
    3232#include <wtf/MathExtras.h>
    3333
    34 #if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
     34#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    3535typedef struct CGPoint CGPoint;
    3636#endif
     
    110110    }
    111111
    112 #if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
     112#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    113113    FloatPoint(const CGPoint&);
    114114    operator CGPoint() const;
  • trunk/Source/WebCore/platform/graphics/FloatRect.h

    r84088 r84101  
    3030#include "FloatPoint.h"
    3131
    32 #if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
     32#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    3333typedef struct CGRect CGRect;
    3434#endif
     
    138138    void fitToPoints(const FloatPoint& p0, const FloatPoint& p1, const FloatPoint& p2, const FloatPoint& p3);
    139139
    140 #if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
     140#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    141141    FloatRect(const CGRect&);
    142142    operator CGRect() const;
  • trunk/Source/WebCore/platform/graphics/FloatSize.h

    r83818 r84101  
    3232#include <wtf/MathExtras.h>
    3333
    34 #if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
     34#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
    3535typedef struct CGSize CGSize;
    3636#endif
     
    9090    }
    9191
    92 #if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
     92#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
    9393    explicit FloatSize(const CGSize&); // don't do this implicitly since it's lossy
    9494    operator CGSize() const;
  • trunk/Source/WebCore/platform/graphics/FontPlatformData.h

    r84088 r84101  
    8585#endif
    8686
    87 #if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
     87#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    8888typedef struct CGFont* CGFontRef;
    8989#if OS(DARWIN)
     
    118118        , m_font(hashTableDeletedFontValue())
    119119#endif
    120 #if PLATFORM(CG) && (defined(BUILDING_ON_TIGER) || PLATFORM(WIN))
     120#if USE(CG) && (defined(BUILDING_ON_TIGER) || PLATFORM(WIN))
    121121        , m_cgFont(0)
    122122#elif USE(CAIRO)
     
    140140        , m_font(0)
    141141#endif
    142 #if PLATFORM(CG) && (defined(BUILDING_ON_TIGER) || PLATFORM(WIN))
     142#if USE(CG) && (defined(BUILDING_ON_TIGER) || PLATFORM(WIN))
    143143        , m_cgFont(0)
    144144#elif USE(CAIRO)
     
    165165        , m_font(0)
    166166#endif
    167 #if PLATFORM(CG) && (defined(BUILDING_ON_TIGER) || PLATFORM(WIN))
     167#if USE(CG) && (defined(BUILDING_ON_TIGER) || PLATFORM(WIN))
    168168        , m_cgFont(0)
    169169#elif USE(CAIRO)
     
    180180    FontPlatformData(NSFont*, float size, bool syntheticBold = false, bool syntheticOblique = false, FontOrientation = Horizontal,
    181181                     TextOrientation = TextOrientationVerticalRight, FontWidthVariant = RegularWidth);
    182 #if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
     182#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    183183    FontPlatformData(CGFontRef cgFont, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation,
    184184                     TextOrientation textOrientation, FontWidthVariant widthVariant)
     
    198198#if PLATFORM(WIN)
    199199    FontPlatformData(HFONT, float size, bool syntheticBold, bool syntheticOblique, bool useGDI);
    200 #if PLATFORM(CG)
     200#if USE(CG)
    201201    FontPlatformData(HFONT, CGFontRef, float size, bool syntheticBold, bool syntheticOblique, bool useGDI);
    202202#endif
     
    216216#endif
    217217
    218 #if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
     218#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    219219#if OS(DARWIN)
    220220#ifndef BUILDING_ON_TIGER
     
    253253        return m_font ? m_font->hash() : 0;
    254254#elif OS(DARWIN)
    255 #if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
     255#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    256256        ASSERT(m_font || !m_cgFont);
    257257#endif
     
    329329#endif
    330330
    331 #if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
     331#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    332332#if PLATFORM(WIN)
    333333    RetainPtr<CGFontRef> m_cgFont;
  • trunk/Source/WebCore/platform/graphics/GlyphBuffer.h

    r84088 r84101  
    3535#include <wtf/Vector.h>
    3636
    37 #if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
     37#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
    3838#include <ApplicationServices/ApplicationServices.h>
    3939#endif
     
    5959// CG uses CGSize instead of FloatSize so that the result of advances()
    6060// can be passed directly to CGContextShowGlyphsWithAdvances in FontMac.mm
    61 #if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
     61#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
    6262typedef CGSize GlyphBufferAdvance;
    6363#elif OS(WINCE)
     
    123123    float advanceAt(int index) const
    124124    {
    125 #if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
     125#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
    126126        return m_advances[index].width;
    127127#elif OS(WINCE)
     
    154154#endif
    155155
    156 #if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
     156#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
    157157        CGSize advance = { width, 0 };
    158158        m_advances.append(advance);
     
    193193        ASSERT(!isEmpty());
    194194        GlyphBufferAdvance& lastAdvance = m_advances.last();
    195 #if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
     195#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
    196196        lastAdvance.width += width;
    197197#elif OS(WINCE)
  • trunk/Source/WebCore/platform/graphics/Gradient.h

    r84088 r84101  
    3636#include <wtf/Vector.h>
    3737
    38 #if PLATFORM(CG)
     38#if USE(CG)
    3939
    4040typedef struct CGContext* CGContextRef;
     
    139139        void setPlatformGradientSpaceTransform(const AffineTransform& gradientSpaceTransformation);
    140140
    141 #if PLATFORM(CG)
     141#if USE(CG)
    142142        void paint(CGContextRef);
    143143        void paint(GraphicsContext*);
  • trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp

    r84088 r84101  
    149149    m_state.shadowColor = color;
    150150    m_state.shadowColorSpace = colorSpace;
    151 #if PLATFORM(CG)
     151#if USE(CG)
    152152    m_state.shadowsUseLegacyRadius = true;
    153153#endif
     
    589589}
    590590
    591 #if !PLATFORM(CG)
     591#if !USE(CG)
    592592IntRect GraphicsContext::clipBounds() const
    593593{
     
    622622}
    623623
    624 #if !PLATFORM(CG)
     624#if !USE(CG)
    625625void GraphicsContext::fillRectWithRoundedHole(const IntRect& rect, const RoundedIntRect& roundedHoleRect, const Color& color, ColorSpace colorSpace)
    626626{
     
    679679#endif
    680680
    681 #if !PLATFORM(CG) && !USE(SKIA)
     681#if !USE(CG) && !USE(SKIA)
    682682// Implement this if you want to go ahead and push the drawing mode into your native context
    683683// immediately.
     
    693693#endif
    694694
    695 #if !PLATFORM(CG)
     695#if !USE(CG)
    696696void GraphicsContext::setPlatformShouldSmoothFonts(bool)
    697697{
  • trunk/Source/WebCore/platform/graphics/GraphicsContext.h

    r84088 r84101  
    3838#include <wtf/PassOwnPtr.h>
    3939
    40 #if PLATFORM(CG)
     40#if USE(CG)
    4141typedef struct CGContext PlatformGraphicsContext;
    4242#elif USE(CAIRO)
     
    9494#include "DIBPixelData.h"
    9595typedef struct HDC__* HDC;
    96 #if !PLATFORM(CG)
     96#if !USE(CG)
    9797// UInt8 is defined in CoreFoundation/CFBase.h
    9898typedef unsigned char UInt8;
     
    171171            , paintingDisabled(false)
    172172            , shadowsIgnoreTransforms(false)
    173 #if PLATFORM(CG)
     173#if USE(CG)
    174174            // Core Graphics incorrectly renders shadows with radius > 8px (<rdar://problem/8103442>),
    175175            // but we need to preserve this buggy behavior for canvas and -webkit-box-shadow.
     
    212212        bool paintingDisabled : 1;
    213213        bool shadowsIgnoreTransforms : 1;
    214 #if PLATFORM(CG)
     214#if USE(CG)
    215215        bool shadowsUseLegacyRadius : 1;
    216216#endif
     
    264264        const GraphicsContextState& state() const;
    265265
    266 #if PLATFORM(CG)
     266#if USE(CG)
    267267        void applyStrokePattern();
    268268        void applyFillPattern();
  • trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h

    r84088 r84101  
    7777const Platform3DObject NullPlatform3DObject = 0;
    7878
    79 #if PLATFORM(CG)
     79#if USE(CG)
    8080#include <CoreGraphics/CGContext.h>
    8181#endif
     
    763763    void reshape(int width, int height);
    764764
    765 #if PLATFORM(CG)
     765#if USE(CG)
    766766    void paintToCanvas(const unsigned char* imagePixels, int imageWidth, int imageHeight,
    767767                       int canvasWidth, int canvasHeight, CGContextRef context);
  • trunk/Source/WebCore/platform/graphics/Image.cpp

    r73729 r84101  
    3737#include <wtf/StdLibExtras.h>
    3838
    39 #if PLATFORM(CG)
     39#if USE(CG)
    4040#include <CoreFoundation/CoreFoundation.h>
    4141#endif
  • trunk/Source/WebCore/platform/graphics/Image.h

    r83091 r84101  
    4646#endif
    4747
    48 #if PLATFORM(CG)
     48#if USE(CG)
    4949struct CGContext;
    5050#endif
     
    137137#endif
    138138
    139 #if PLATFORM(CG)
     139#if USE(CG)
    140140    virtual CGImageRef getCGImageRef() { return 0; }
    141141    virtual CGImageRef getFirstCGImageRefOfSize(const IntSize&) { return 0; }
  • trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp

    r70143 r84101  
    2727#include "ImageBuffer.h"
    2828
    29 #if !PLATFORM(CG)
     29#if !USE(CG)
    3030
    3131#include <math.h>
     
    7070}
    7171
    72 #endif // PLATFORM(CG)
     72#endif // USE(CG)
  • trunk/Source/WebCore/platform/graphics/ImageBuffer.h

    r83786 r84101  
    9494       
    9595        String toDataURL(const String& mimeType, const double* quality = 0) const;
    96 #if !PLATFORM(CG)
     96#if !USE(CG)
    9797        AffineTransform baseTransform() const { return AffineTransform(); }
    9898        void transformColorSpace(ColorSpace srcColorSpace, ColorSpace dstColorSpace);
     
    120120        OwnPtr<GraphicsContext> m_context;
    121121
    122 #if !PLATFORM(CG)
     122#if !USE(CG)
    123123        Vector<int> m_linearRgbLUT;
    124124        Vector<int> m_deviceRgbLUT;
     
    130130    };
    131131
    132 #if PLATFORM(CG) || USE(SKIA)
     132#if USE(CG) || USE(SKIA)
    133133    String ImageDataToDataURL(const ImageData& input, const String& mimeType, const double* quality);
    134134#endif
  • trunk/Source/WebCore/platform/graphics/ImageBufferData.h

    r84088 r84101  
    2424 */
    2525
    26 #if PLATFORM(CG)
     26#if USE(CG)
    2727#include "ImageBufferDataCG.h"
    2828#elif USE(CAIRO)
  • trunk/Source/WebCore/platform/graphics/ImageSource.h

    r84088 r84101  
    3535class wxBitmap;
    3636class wxGraphicsBitmap;
    37 #elif PLATFORM(CG)
     37#elif USE(CG)
    3838typedef struct CGImageSource* CGImageSourceRef;
    3939typedef struct CGImage* CGImageRef;
     
    6363class SharedBuffer;
    6464
    65 #if PLATFORM(CG)
     65#if USE(CG)
    6666#if USE(WEBKIT_IMAGE_DECODERS)
    6767class ImageDecoder;
  • trunk/Source/WebCore/platform/graphics/IntPoint.h

    r83818 r84101  
    3333#endif
    3434
    35 #if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
     35#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    3636typedef struct CGPoint CGPoint;
    3737#endif
     
    115115    }
    116116
    117 #if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
     117#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    118118    explicit IntPoint(const CGPoint&); // don't do this implicitly since it's lossy
    119119    operator CGPoint() const;
  • trunk/Source/WebCore/platform/graphics/IntRect.h

    r83818 r84101  
    3030#include <wtf/Vector.h>
    3131
    32 #if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
     32#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    3333typedef struct CGRect CGRect;
    3434#endif
     
    184184#endif
    185185
    186 #if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
     186#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    187187    operator CGRect() const;
    188188#endif
     
    230230}
    231231
    232 #if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
     232#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    233233IntRect enclosingIntRect(const CGRect&);
    234234#endif
  • trunk/Source/WebCore/platform/graphics/IntSize.h

    r83818 r84101  
    2727#define IntSize_h
    2828
    29 #if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
     29#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    3030typedef struct CGSize CGSize;
    3131#endif
     
    110110    }
    111111
    112 #if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
     112#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    113113    explicit IntSize(const CGSize&); // don't do this implicitly since it's lossy
    114114    operator CGSize() const;
  • trunk/Source/WebCore/platform/graphics/Path.h

    r84088 r84101  
    3232#include <wtf/Forward.h>
    3333
    34 #if PLATFORM(CG)
     34#if USE(CG)
    3535typedef struct CGPath PlatformPath;
    3636#elif PLATFORM(OPENVG)
  • trunk/Source/WebCore/platform/graphics/Pattern.h

    r84088 r84101  
    3636#include <wtf/RefPtr.h>
    3737
    38 #if PLATFORM(CG)
     38#if USE(CG)
    3939typedef struct CGPattern* CGPatternRef;
    4040typedef CGPatternRef PlatformPatternPtr;
  • trunk/Source/WebCore/platform/graphics/SimpleFontData.h

    r84088 r84101  
    116116    float spaceWidth() const { return m_spaceWidth; }
    117117
    118 #if PLATFORM(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROME)
     118#if USE(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) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROME)
     255#if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROME)
    256256    float m_syntheticBoldOffset;
    257257#endif
  • trunk/Source/WebCore/platform/graphics/cg/ColorCG.cpp

    r70143 r84101  
    2727#include "Color.h"
    2828
    29 #if PLATFORM(CG)
     29#if USE(CG)
    3030
    3131#include "GraphicsContextCG.h"
     
    147147}
    148148
    149 #endif // PLATFORM(CG)
     149#endif // USE(CG)
  • trunk/Source/WebCore/platform/graphics/cg/FloatPointCG.cpp

    r83818 r84101  
    2828#include "FloatPoint.h"
    2929
    30 #if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
     30#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    3131
    3232#include <ApplicationServices/ApplicationServices.h>
     
    4545}
    4646
    47 #endif // PLATFORM(CG)
     47#endif // USE(CG)
  • trunk/Source/WebCore/platform/graphics/cg/FloatRectCG.cpp

    r83818 r84101  
    2828#include "FloatRect.h"
    2929
    30 #if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
     30#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    3131
    3232#include <ApplicationServices/ApplicationServices.h>
     
    4545}
    4646
    47 #endif // PLATFORM(CG)
     47#endif // USE(CG)
  • trunk/Source/WebCore/platform/graphics/cg/FloatSizeCG.cpp

    r83818 r84101  
    2828#include "FloatSize.h"
    2929
    30 #if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
     30#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    3131
    3232#include <ApplicationServices/ApplicationServices.h>
     
    4545}
    4646
    47 #endif // PLATFORM(CG)
     47#endif // USE(CG)
  • trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp

    r83521 r84101  
    2727#include "BitmapImage.h"
    2828
    29 #if PLATFORM(CG)
     29#if USE(CG)
    3030
    3131#include "AffineTransform.h"
     
    360360}
    361361
    362 #endif // PLATFORM(CG)
     362#endif // USE(CG)
  • trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp

    r79277 r84101  
    2727#include "ImageSource.h"
    2828
    29 #if PLATFORM(CG)
     29#if USE(CG)
    3030#include "ImageSourceCG.h"
    3131
     
    357357}
    358358
    359 #endif // PLATFORM(CG)
     359#endif // USE(CG)
  • trunk/Source/WebCore/platform/graphics/cg/IntPointCG.cpp

    r83818 r84101  
    2727#include "IntPoint.h"
    2828
    29 #if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
     29#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    3030
    3131#include <ApplicationServices/ApplicationServices.h>
     
    4444}
    4545
    46 #endif // PLATFORM(CG)
     46#endif // USE(CG)
  • trunk/Source/WebCore/platform/graphics/cg/IntRectCG.cpp

    r83818 r84101  
    2727#include "IntRect.h"
    2828
    29 #if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
     29#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    3030
    3131#include <ApplicationServices/ApplicationServices.h>
     
    4949}
    5050
    51 #endif // PLATFORM(CG)
     51#endif // USE(CG)
  • trunk/Source/WebCore/platform/graphics/cg/IntSizeCG.cpp

    r83818 r84101  
    2727#include "IntSize.h"
    2828
    29 #if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
     29#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    3030
    3131#include <ApplicationServices/ApplicationServices.h>
     
    4444}
    4545
    46 #endif // PLATFORM(CG)
     46#endif // USE(CG)
  • trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp

    r56205 r84101  
    2828#include "PDFDocumentImage.h"
    2929
    30 #if PLATFORM(CG)
     30#if USE(CG)
    3131
    3232#include "GraphicsContext.h"
     
    189189}
    190190
    191 #endif // PLATFORM(CG)
     191#endif // USE(CG)
  • trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h

    r75971 r84101  
    3232#include "GraphicsTypes.h"
    3333
    34 #if PLATFORM(CG)
     34#if USE(CG)
    3535
    3636#include <ApplicationServices/ApplicationServices.h>
     
    7979}
    8080
    81 #endif // PLATFORM(CG)
     81#endif // USE(CG)
    8282
    8383#endif // PDFDocumentImage_h
  • trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp

    r80557 r84101  
    2828#include "Path.h"
    2929
    30 #if PLATFORM(CG)
     30#if USE(CG)
    3131
    3232#include "AffineTransform.h"
     
    310310}
    311311
    312 #endif // PLATFORM(CG)
     312#endif // USE(CG)
  • trunk/Source/WebCore/platform/graphics/cg/TransformationMatrixCG.cpp

    r73540 r84101  
    2828#include "TransformationMatrix.h"
    2929
    30 #if PLATFORM(CG)
     30#if USE(CG)
    3131
    3232#include <CoreGraphics/CGAffineTransform.h>
     
    6767}
    6868
    69 #endif // PLATFORM(CG)
     69#endif // USE(CG)
  • trunk/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.h

    r83915 r84101  
    3838#include "PlatformImage.h"
    3939
    40 #if PLATFORM(CG)
     40#if USE(CG)
    4141#include <wtf/RetainPtr.h>
    4242#endif
  • trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp

    r83915 r84101  
    5151#include "NativeImageSkia.h"
    5252#include "PlatformContextSkia.h"
    53 #elif PLATFORM(CG)
     53#elif USE(CG)
    5454#include <CoreGraphics/CGBitmapContext.h>
    5555#endif
  • trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h

    r83941 r84101  
    5353#include <wtf/Vector.h>
    5454
    55 #if PLATFORM(CG)
     55#if USE(CG)
    5656#include <CoreGraphics/CGContext.h>
    5757#include <wtf/RetainPtr.h>
     
    191191    OwnPtr<PlatformContextSkia> m_rootLayerSkiaContext;
    192192    OwnPtr<GraphicsContext> m_rootLayerGraphicsContext;
    193 #elif PLATFORM(CG)
     193#elif USE(CG)
    194194    Vector<uint8_t> m_rootLayerBackingStore;
    195195    RetainPtr<CGContextRef> m_rootLayerCGContext;
  • trunk/Source/WebCore/platform/graphics/chromium/PlatformCanvas.cpp

    r83941 r84101  
    3535#include "SkColorPriv.h"
    3636#include "skia/ext/platform_canvas.h"
    37 #elif PLATFORM(CG)
     37#elif USE(CG)
    3838#include <CoreGraphics/CGBitmapContext.h>
    3939#endif
     
    5454#if USE(SKIA)
    5555    m_skiaCanvas = skia::CreateBitmapCanvas(size.width(), size.height(), false);
    56 #elif PLATFORM(CG)
     56#elif USE(CG)
    5757    size_t bufferSize = size.width() * size.height() * 4;
    5858    m_pixelData = adoptArrayPtr(new uint8_t[bufferSize]);
     
    7474    } else
    7575        m_bitmap = 0;
    76 #elif PLATFORM(CG)
     76#elif USE(CG)
    7777    if (canvas->m_pixelData)
    7878        m_pixels = &canvas->m_pixelData[0];
     
    9696
    9797    m_context = adoptPtr(new GraphicsContext(reinterpret_cast<PlatformGraphicsContext*>(m_skiaContext.get())));
    98 #elif PLATFORM(CG)
     98#elif USE(CG)
    9999
    100100    m_colorSpace = CGColorSpaceCreateDeviceRGB();
  • trunk/Source/WebCore/platform/graphics/chromium/PlatformCanvas.h

    r83941 r84101  
    3232#include <wtf/OwnPtr.h>
    3333
    34 #if PLATFORM(CG)
     34#if USE(CG)
    3535#include <CoreGraphics/CGColorSpace.h>
    3636#include <CoreGraphics/CGContext.h>
     
    8989#if USE(SKIA)
    9090        OwnPtr<PlatformContextSkia> m_skiaContext;
    91 #elif PLATFORM(CG)
     91#elif USE(CG)
    9292        RetainPtr<CGColorSpaceRef> m_colorSpace;
    9393        RetainPtr<CGContextRef> m_contextCG;
     
    101101#if USE(SKIA)
    102102    OwnPtr<SkCanvas> m_skiaCanvas;
    103 #elif PLATFORM(CG)
     103#elif USE(CG)
    104104    OwnArrayPtr<uint8_t> m_pixelData;
    105105#endif
  • trunk/Source/WebCore/platform/graphics/chromium/PlatformImage.cpp

    r80081 r84101  
    3131#include "NativeImageSkia.h"
    3232#include "PlatformContextSkia.h"
    33 #elif PLATFORM(CG)
     33#elif USE(CG)
    3434#include <CoreGraphics/CGBitmapContext.h>
    3535#include <CoreGraphics/CGContext.h>
     
    5555    IntSize bitmapSize(skiaBitmap->width(), skiaBitmap->height());
    5656    ASSERT(skiaBitmap);
    57 #elif PLATFORM(CG)
     57#elif USE(CG)
    5858    // NativeImagePtr is a CGImageRef on Mac OS X.
    5959    int width = CGImageGetWidth(nativeImage);
     
    7474    ASSERT(skiaBitmap->config()== SkBitmap::kARGB_8888_Config);
    7575    skiaBitmap->copyPixelsTo(m_pixelData.get(), bufferSize);
    76 #elif PLATFORM(CG)
     76#elif USE(CG)
    7777    // FIXME: we should get rid of this temporary copy where possible.
    7878    int tempRowBytes = width * 4;
  • trunk/Source/WebCore/platform/graphics/opentype/OpenTypeUtilities.cpp

    r63709 r84101  
    7171};
    7272
    73 #if !PLATFORM(CG) || !defined(COREGRAPHICS_INCLUDES_CORESERVICES_HEADER)
     73#if !USE(CG) || !defined(COREGRAPHICS_INCLUDES_CORESERVICES_HEADER)
    7474// Fixed type is not defined on non-CG and Windows platforms. |version| in sfntHeader
    7575// and headTable and |fontRevision| in headTable are of Fixed, but they're
  • trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h

    r84088 r84101  
    3333#include <wtf/FastAllocBase.h>
    3434
    35 #if PLATFORM(CG)
     35#if USE(CG)
    3636#include <CoreGraphics/CGAffineTransform.h>
    3737#elif USE(CAIRO)
     
    158158    }
    159159
    160 #if PLATFORM(CG)
     160#if USE(CG)
    161161    operator CGAffineTransform() const;
    162162#elif USE(CAIRO)
  • trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h

    r84088 r84101  
    3535typedef struct CATransform3D CATransform3D;
    3636#endif
    37 #if PLATFORM(CG)
     37#if USE(CG)
    3838typedef struct CGAffineTransform CGAffineTransform;
    3939#elif USE(CAIRO)
     
    313313    operator CATransform3D() const;
    314314#endif
    315 #if PLATFORM(CG)
     315#if USE(CG)
    316316    TransformationMatrix(const CGAffineTransform&);
    317317    operator CGAffineTransform() const;
  • trunk/Source/WebCore/platform/graphics/win/DIBPixelData.h

    r82640 r84101  
    3030#include <windows.h>
    3131
    32 #if !PLATFORM(CG)
     32#if !USE(CG)
    3333// UInt8 is defined in CoreFoundation/CFBase.h
    3434typedef unsigned char UInt8;
  • trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp

    r84088 r84101  
    3737#include <wtf/StdLibExtras.h>
    3838#include <wtf/text/StringHash.h>
    39 #if PLATFORM(CG)
     39#if USE(CG)
    4040#include <ApplicationServices/ApplicationServices.h>
    4141#include <WebKitSystemInterface/WebKitSystemInterface.h>
     
    4949void FontCache::platformInit()
    5050{
    51 #if PLATFORM(CG)
     51#if USE(CG)
    5252    wkSetUpFontCache(1536 * 1024 * 4); // This size matches Mac.
    5353#endif
     
    472472    matchData.m_chosen.lfStrikeOut = false;
    473473    matchData.m_chosen.lfCharSet = DEFAULT_CHARSET;
    474 #if PLATFORM(CG) || USE(CAIRO)
     474#if USE(CG) || USE(CAIRO)
    475475    matchData.m_chosen.lfOutPrecision = OUT_TT_ONLY_PRECIS;
    476476#else
     
    582582    FontPlatformData* result = new FontPlatformData(hfont, fontDescription.computedPixelSize(), synthesizeBold, synthesizeItalic, useGDI);
    583583
    584 #if PLATFORM(CG)
     584#if USE(CG)
    585585    bool fontCreationFailed = !result->cgFont();
    586586#elif USE(CAIRO)
  • trunk/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp

    r84088 r84101  
    4242    , m_textOrientation(TextOrientationVerticalRight)
    4343    , m_widthVariant(RegularWidth)
    44 #if PLATFORM(CG)
     44#if USE(CG)
    4545    , m_cgFont(0)
    4646#elif USE(CAIRO)
  • trunk/Source/WebCore/platform/graphics/win/GraphicsContextWin.cpp

    r84088 r84101  
    2727#include "GraphicsContext.h"
    2828
    29 #if PLATFORM(CG)
     29#if USE(CG)
    3030#include "GraphicsContextPlatformPrivateCG.h"
    3131#elif USE(CAIRO)
  • trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.cpp

    r76852 r84101  
    3131#include <windows.h>
    3232
    33 #if PLATFORM(CG)
     33#if USE(CG)
    3434#include <CoreGraphics/CGColor.h>
    3535#endif
  • trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp

    r77775 r84101  
    4040#include <wtf/MathExtras.h>
    4141
    42 #if PLATFORM(CG)
     42#if USE(CG)
    4343#include <ApplicationServices/ApplicationServices.h>
    4444#include <WebKitSystemInterface/WebKitSystemInterface.h>
  • trunk/Source/WebCore/platform/image-decoders/ImageDecoder.cpp

    r79578 r84101  
    168168}
    169169
    170 #if !PLATFORM(CG)
     170#if !USE(CG)
    171171
    172172void ImageFrame::copyReferenceToBitmapData(const ImageFrame& other)
  • trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h

    r82067 r84101  
    143143
    144144    private:
    145 #if PLATFORM(CG)
     145#if USE(CG)
    146146        typedef RetainPtr<CFMutableDataRef> NativeBackingStore;
    147147#else
  • trunk/Source/WebCore/rendering/RenderObject.h

    r84088 r84101  
    3838#include <wtf/UnusedParam.h>
    3939
    40 #if PLATFORM(CG) || USE(CAIRO) || PLATFORM(QT)
     40#if USE(CG) || USE(CAIRO) || PLATFORM(QT)
    4141#define HAVE_PATH_BASED_BORDER_RADIUS_DRAWING 1
    4242#endif
  • trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp

    r77240 r84101  
    279279        context = filterData->savedContext;
    280280        filterData->savedContext = 0;
    281 #if !PLATFORM(CG)
     281#if !USE(CG)
    282282        if (filterData->sourceGraphicBuffer)
    283283            filterData->sourceGraphicBuffer->transformColorSpace(ColorSpaceDeviceRGB, ColorSpaceLinearRGB);
     
    297297        if (!lastEffect->hasResult()) {
    298298            lastEffect->apply();
    299 #if !PLATFORM(CG)
     299#if !USE(CG)
    300300            ImageBuffer* resultImage = lastEffect->asImageBuffer();
    301301            if (resultImage)
  • trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp

    r76146 r84101  
    3838    : RenderSVGResourceContainer(node)
    3939    , m_shouldCollectGradientAttributes(true)
    40 #if PLATFORM(CG)
     40#if USE(CG)
    4141    , m_savedContext(0)
    4242#endif
     
    7474}
    7575
    76 #if PLATFORM(CG)
     76#if USE(CG)
    7777static inline bool createMaskAndSwapContextForTextGradient(GraphicsContext*& context,
    7878                                                           GraphicsContext*& savedContext,
     
    179179        // resource, so don't apply it here. For non-CG platforms, we want the text bounding
    180180        // box applied to the gradient space transform now, so the gradient shader can use it.
    181 #if PLATFORM(CG)
     181#if USE(CG)
    182182        if (boundingBoxMode() && !objectBoundingBox.isEmpty() && !isPaintingText) {
    183183#else
     
    202202
    203203    if (isPaintingText) {
    204 #if PLATFORM(CG)
     204#if USE(CG)
    205205        if (!createMaskAndSwapContextForTextGradient(context, m_savedContext, m_imageBuffer, object)) {
    206206            context->restore();
     
    236236
    237237    if (resourceMode & ApplyToTextMode) {
    238 #if PLATFORM(CG)
     238#if USE(CG)
    239239        // CG requires special handling for gradient on text
    240240        if (m_savedContext && m_gradient.contains(object)) {
  • trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.h

    r75350 r84101  
    6666    HashMap<RenderObject*, GradientData*> m_gradient;
    6767
    68 #if PLATFORM(CG)
     68#if USE(CG)
    6969    GraphicsContext* m_savedContext;
    7070    OwnPtr<ImageBuffer> m_imageBuffer;
  • trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp

    r75350 r84101  
    155155    maskImageContext->restore();
    156156
    157 #if !PLATFORM(CG)
     157#if !USE(CG)
    158158    maskerData->maskImage->transformColorSpace(ColorSpaceDeviceRGB, ColorSpaceLinearRGB);
    159159#endif
  • trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp

    r78806 r84101  
    167167            context->setTextDrawingMode(TextModeFill);
    168168
    169 #if PLATFORM(CG)
     169#if USE(CG)
    170170            context->applyFillPattern();
    171171#endif
     
    173173            context->setTextDrawingMode(TextModeStroke);
    174174
    175 #if PLATFORM(CG)
     175#if USE(CG)
    176176            context->applyStrokePattern();
    177177#endif
  • trunk/Source/WebKit/chromium/ChangeLog

    r84079 r84101  
     12011-04-17  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Rename PLATFORM(CG) to USE(CG)
     6        https://bugs.webkit.org/show_bug.cgi?id=58729
     7
     8        * src/GraphicsContext3DChromium.cpp:
     9        (WebCore::GraphicsContext3DInternal::GraphicsContext3DInternal):
     10        (WebCore::GraphicsContext3DInternal::~GraphicsContext3DInternal):
     11        (WebCore::GraphicsContext3DInternal::paintRenderingResultsToCanvas):
     12        (WebCore::GraphicsContext3DInternal::reshape):
     13        * src/GraphicsContext3DInternal.h:
     14        * src/PlatformBridge.cpp:
     15        * src/WebViewImpl.cpp:
     16        (WebKit::WebViewImpl::doPixelReadbackToCanvas):
     17
    1182011-04-15  John Bates  <jbates@google.com>
    219
  • trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp

    r83935 r84101  
    5555#include <wtf/text/CString.h>
    5656
    57 #if PLATFORM(CG)
     57#if USE(CG)
    5858#include "GraphicsContext.h"
    5959#include "WebGLRenderingContext.h"
     
    8585    , m_layerComposited(false)
    8686#if USE(SKIA)
    87 #elif PLATFORM(CG)
     87#elif USE(CG)
    8888    , m_renderOutput(0)
    8989#else
     
    9595GraphicsContext3DInternal::~GraphicsContext3DInternal()
    9696{
    97 #if PLATFORM(CG)
     97#if USE(CG)
    9898    if (m_renderOutput)
    9999        delete[] m_renderOutput;
     
    211211    SkAutoLockPixels bitmapLock(*readbackBitmap);
    212212    pixels = static_cast<unsigned char*>(readbackBitmap->getPixels());
    213 #elif PLATFORM(CG)
     213#elif USE(CG)
    214214    if (m_renderOutput)
    215215        pixels = m_renderOutput;
     
    239239        canvas.drawBitmapRect(m_resizingBitmap, 0, dst);
    240240    }
    241 #elif PLATFORM(CG)
     241#elif USE(CG)
    242242    if (m_renderOutput && context->is3d()) {
    243243        WebGLRenderingContext* webGLContext = static_cast<WebGLRenderingContext*>(context);
     
    279279    m_impl->reshape(width, height);
    280280
    281 #if PLATFORM(CG)
     281#if USE(CG)
    282282    // Need to reallocate the client-side backing store.
    283283    // FIXME: make this more efficient.
     
    288288    int rowBytes = width * 4;
    289289    m_renderOutput = new unsigned char[height * rowBytes];
    290 #endif // PLATFORM(CG)
     290#endif // USE(CG)
    291291}
    292292
  • trunk/Source/WebKit/chromium/src/GraphicsContext3DInternal.h

    r83762 r84101  
    299299#endif
    300300
    301 #if PLATFORM(CG)
     301#if USE(CG)
    302302    unsigned char* m_renderOutput;
    303303#endif
  • trunk/Source/WebKit/chromium/src/PlatformBridge.cpp

    r83494 r84101  
    6262#include "WebWorkerClientImpl.h"
    6363
    64 #if PLATFORM(CG)
     64#if USE(CG)
    6565#include <CoreGraphics/CGContext.h>
    6666#endif
  • trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

    r83820 r84101  
    127127#include <wtf/RefPtr.h>
    128128
    129 #if PLATFORM(CG)
     129#if USE(CG)
    130130#include <CoreGraphics/CGBitmapContext.h>
    131131#include <CoreGraphics/CGContext.h>
     
    10401040    GraphicsContext gc(reinterpret_cast<PlatformGraphicsContext*>(&context));
    10411041    int bitmapHeight = canvas->getDevice()->accessBitmap(false).height();
    1042 #elif PLATFORM(CG)
     1042#elif USE(CG)
    10431043    GraphicsContext gc(canvas);
    10441044    int bitmapHeight = CGBitmapContextGetHeight(reinterpret_cast<CGContextRef>(canvas));
  • trunk/Source/WebKit/win/ChangeLog

    r84094 r84101  
     12011-04-17  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Rename PLATFORM(CG) to USE(CG)
     6        https://bugs.webkit.org/show_bug.cgi?id=58729
     7
     8        * WebFrame.cpp:
     9        (WebFrame::spoolPages):
     10        * WebFrame.h:
     11        * WebPreferences.cpp:
     12        (WebPreferences::setFontSmoothing):
     13        (WebPreferences::setFontSmoothingContrast):
     14        * WebView.cpp:
     15        (systemParameterChanged):
     16
    1172011-04-16  Sam Weinig  <sam@webkit.org>
    218
  • trunk/Source/WebKit/win/WebFrame.cpp

    r84088 r84101  
    105105#include <wtf/MathExtras.h>
    106106
    107 #if PLATFORM(CG)
     107#if USE(CG)
    108108#include <CoreGraphics/CoreGraphics.h>
    109109#elif USE(CAIRO)
     
    112112#endif
    113113
    114 #if PLATFORM(CG)
     114#if USE(CG)
    115115// CG SPI used for printing
    116116extern "C" {
     
    21142114}
    21152115
    2116 #if PLATFORM(CG)
     2116#if USE(CG)
    21172117void WebFrame::drawHeader(PlatformGraphicsContext* pctx, IWebUIDelegate* ui, const IntRect& pageRect, float headerHeight)
    21182118{
     
    23212321    /* [retval][out] */ void* ctx)
    23222322{
    2323 #if PLATFORM(CG)
     2323#if USE(CG)
    23242324    if (!printDC || !ctx) {
    23252325        ASSERT_NOT_REACHED();
     
    23702370
    23712371    UINT pageCount = (UINT) m_pageRects.size();
    2372 #if PLATFORM(CG)
     2372#if USE(CG)
    23732373    PlatformGraphicsContext* pctx = (PlatformGraphicsContext*)ctx;
    23742374#endif
  • trunk/Source/WebKit/win/WebFrame.h

    r84088 r84101  
    6060typedef struct OpaqueJSValue* JSObjectRef;
    6161
    62 #if PLATFORM(CG)
     62#if USE(CG)
    6363typedef struct CGContext PlatformGraphicsContext;
    6464#elif USE(CAIRO)
  • trunk/Source/WebKit/win/WebPreferences.cpp

    r84094 r84101  
    4747#include <wtf/text/WTFString.h>
    4848
    49 #if PLATFORM(CG)
     49#if USE(CG)
    5050#include <CoreGraphics/CoreGraphics.h>
    5151#include <WebKitSystemInterface/WebKitSystemInterface.h>
     
    11021102    if (smoothingType == FontSmoothingTypeWindows)
    11031103        smoothingType = FontSmoothingTypeMedium;
    1104 #if PLATFORM(CG)
     1104#if USE(CG)
    11051105    wkSetFontSmoothingLevel((int)smoothingType);
    11061106#endif
     
    11191119{
    11201120    setFloatValue(CFSTR(WebKitFontSmoothingContrastPreferenceKey), contrast);
    1121 #if PLATFORM(CG)
     1121#if USE(CG)
    11221122    wkSetFontSmoothingContrast(contrast);
    11231123#endif
  • trunk/Source/WebKit/win/WebView.cpp

    r83852 r84101  
    139139#endif
    140140
    141 #if PLATFORM(CG)
     141#if USE(CG)
    142142#include <CoreGraphics/CGContext.h>
    143143#endif
     
    31963196static void systemParameterChanged(WPARAM parameter)
    31973197{
    3198 #if PLATFORM(CG)
     3198#if USE(CG)
    31993199    if (parameter == SPI_SETFONTSMOOTHING || parameter == SPI_SETFONTSMOOTHINGTYPE || parameter == SPI_SETFONTSMOOTHINGCONTRAST || parameter == SPI_SETFONTSMOOTHINGORIENTATION)
    32003200        wkSystemFontSmoothingChanged();
  • trunk/Source/WebKit2/ChangeLog

    r84095 r84101  
     12011-04-17  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Rename PLATFORM(CG) to USE(CG)
     6        https://bugs.webkit.org/show_bug.cgi?id=58729
     7
     8        * Shared/ShareableBitmap.h:
     9        * Shared/WebCoreArgumentCoders.cpp:
     10        * Shared/WebCoreArgumentCoders.h:
     11        * Shared/WebGraphicsContext.cpp:
     12        (WebKit::WebGraphicsContext::WebGraphicsContext):
     13        * Shared/WebGraphicsContext.h:
     14        * Shared/win/PlatformCertificateInfo.cpp:
     15        (WebKit::PlatformCertificateInfo::PlatformCertificateInfo):
     16        * UIProcess/win/WebView.cpp:
     17        (WebKit::WebView::setFindIndicator):
     18        * WebProcess/WebPage/WebPage.cpp:
     19        (WebKit::WebPage::drawRectToPDF):
     20        (WebKit::WebPage::drawPagesToPDF):
     21        * WebProcess/WebPage/win/WebPageWin.cpp:
     22        (WebKit::WebPage::platformPreferencesDidChange):
     23        * config.h:
     24
    1252011-04-16  Anders Carlsson  <andersca@apple.com>
    226
  • trunk/Source/WebKit2/Shared/ShareableBitmap.h

    r82442 r84101  
    3434#include <wtf/RefPtr.h>
    3535
    36 #if PLATFORM(CG)
     36#if USE(CG)
    3737#include <wtf/RetainPtr.h>
    3838#endif
     
    9999    bool isBackedBySharedMemory() const { return m_sharedMemory; }
    100100
    101 #if PLATFORM(CG)
     101#if USE(CG)
    102102    // This creates a copied CGImageRef (most likely a copy-on-write) of the shareable bitmap.
    103103    RetainPtr<CGImageRef> makeCGImageCopy();
     
    114114    static size_t numBytesForSize(const WebCore::IntSize& size) { return size.width() * size.height() * 4; }
    115115
    116 #if PLATFORM(CG)
     116#if USE(CG)
    117117    static void releaseBitmapContextData(void* typelessBitmap, void* typelessData);
    118118    static void releaseDataProviderData(void* typelessBitmap, const void* typelessData, size_t);
  • trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp

    r82442 r84101  
    3434// For now, these are CG-only. Once other platforms have createImage functions,
    3535// we can compile these for non-CG builds.
    36 #if PLATFORM(CG)
     36#if USE(CG)
    3737
    3838void encodeImage(ArgumentEncoder* encoder, Image* image)
  • trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h

    r82717 r84101  
    195195    {
    196196        WebCore::Cursor::Type type = cursor.type();
    197 #if !PLATFORM(CG)
     197#if !USE(CG)
    198198        // FIXME: Currently we only have the createImage function implemented for CG.
    199199        // Once we implement it for other platforms we can remove this conditional,
     
    203203#endif
    204204        encoder->encode(static_cast<uint32_t>(type));
    205 #if PLATFORM(CG)
     205#if USE(CG)
    206206        if (type != WebCore::Cursor::Custom)
    207207            return;
     
    226226        }
    227227
    228 #if !PLATFORM(CG)
     228#if !USE(CG)
    229229        return false;
    230230#else
  • trunk/Source/WebKit2/Shared/WebGraphicsContext.cpp

    r82962 r84101  
    3636
    3737WebGraphicsContext::WebGraphicsContext(GraphicsContext* graphicsContext)
    38 #if PLATFORM(CG)
     38#if USE(CG)
    3939    : m_platformContext(graphicsContext->platformContext())
    4040#elif PLATFORM(GTK)
  • trunk/Source/WebKit2/Shared/WebGraphicsContext.h

    r78069 r84101  
    3131#include <wtf/PassRefPtr.h>
    3232
    33 #if PLATFORM(CG)
     33#if USE(CG)
    3434#include <wtf/RetainPtr.h>
    3535#elif PLATFORM(GTK)
     
    4848    }
    4949
    50 #if PLATFORM(CG)
     50#if USE(CG)
    5151    CGContextRef platformContext() { return m_platformContext.get(); }
    5252#elif PLATFORM(GTK)
     
    6060    virtual Type type() const { return APIType; }
    6161
    62 #if PLATFORM(CG)
     62#if USE(CG)
    6363    RetainPtr<CGContextRef> m_platformContext;
    6464#elif PLATFORM(GTK)
  • trunk/Source/WebKit2/Shared/win/PlatformCertificateInfo.cpp

    r82146 r84101  
    3131#include <WebCore/ResourceResponse.h>
    3232
    33 #if PLATFORM(CG)
     33#if USE(CG)
    3434#include <WebKitSystemInterface/WebKitSystemInterface.h>
    3535#endif
     
    4949        return;
    5050
    51 #if PLATFORM(CG)
     51#if USE(CG)
    5252    CFDictionaryRef certificateInfo = wkGetSSLCertificateInfo(cfResponse);
    5353    if (!certificateInfo)
  • trunk/Source/WebKit2/UIProcess/win/WebView.cpp

    r84064 r84101  
    4646#include <WebCore/Cursor.h>
    4747#include <WebCore/FloatRect.h>
    48 #if PLATFORM(CG)
     48#if USE(CG)
    4949#include <WebCore/GraphicsContextCG.h>
    5050#endif
     
    14071407            hbmp = CreateDIBSection(0, &bitmapInfo, DIB_RGB_COLORS, static_cast<void**>(&bits), 0, 0);
    14081408            HBITMAP hbmpOld = static_cast<HBITMAP>(SelectObject(hdc, hbmp));
    1409 #if PLATFORM(CG)
     1409#if USE(CG)
    14101410            RetainPtr<CGContextRef> context(AdoptCF, CGBitmapContextCreate(bits, width, height,
    14111411                8, width * sizeof(RGBQUAD), deviceRGBColorSpaceRef(), kCGBitmapByteOrder32Little | kCGImageAlphaPremultipliedFirst));
  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r84042 r84101  
    21032103        ASSERT(coreFrame->document()->printing());
    21042104
    2105 #if PLATFORM(CG)
     2105#if USE(CG)
    21062106        // FIXME: Use CGDataConsumerCreate with callbacks to avoid copying the data.
    21072107        RetainPtr<CGDataConsumerRef> pdfDataConsumer(AdoptCF, CGDataConsumerCreateWithCFData(pdfPageData.get()));
     
    21352135        ASSERT(coreFrame->document()->printing());
    21362136
    2137 #if PLATFORM(CG)
     2137#if USE(CG)
    21382138        // FIXME: Use CGDataConsumerCreate with callbacks to avoid copying the data.
    21392139        RetainPtr<CGDataConsumerRef> pdfDataConsumer(AdoptCF, CGDataConsumerCreateWithCFData(pdfPageData.get()));
  • trunk/Source/WebKit2/WebProcess/WebPage/win/WebPageWin.cpp

    r83460 r84101  
    4444#include <WebCore/ResourceHandle.h>
    4545#include <WebCore/Settings.h>
    46 #if PLATFORM(CG)
     46#if USE(CG)
    4747#include <WebKitSystemInterface/WebKitSystemInterface.h>
    4848#endif
     
    6868    FontSmoothingLevel fontSmoothingLevel = static_cast<FontSmoothingLevel>(store.getUInt32ValueForKey(WebPreferencesKey::fontSmoothingLevelKey()));
    6969
    70 #if PLATFORM(CG)
     70#if USE(CG)
    7171    FontSmoothingLevel adjustedLevel = fontSmoothingLevel;
    7272    if (adjustedLevel == FontSmoothingLevelWindows)
  • trunk/Source/WebKit2/config.h

    r82883 r84101  
    126126#include <windows.h>
    127127
    128 #if PLATFORM(CG)
     128#if USE(CG)
    129129#include <CoreGraphics/CoreGraphics.h>
    130130#endif
  • trunk/Tools/ChangeLog

    r84088 r84101  
     12011-04-17  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Rename PLATFORM(CG) to USE(CG)
     6        https://bugs.webkit.org/show_bug.cgi?id=58729
     7
     8        * DumpRenderTree/PixelDumpSupport.cpp:
     9        * DumpRenderTree/chromium/WebViewHost.cpp:
     10        (WebViewHost::paintRect):
     11        * DumpRenderTree/config.h:
     12        * DumpRenderTree/win/PixelDumpSupportWin.cpp:
     13        (createBitmapContextFromWebView):
     14        * TestWebKitAPI/PlatformWebView.h:
     15        * WebKitTestRunner/config.h:
     16        * WebKitTestRunner/win/TestInvocationWin.cpp:
     17
    1182011-04-16  Patrick Gansterer  <paroga@webkit.org>
    219
  • trunk/Tools/DumpRenderTree/PixelDumpSupport.cpp

    r84088 r84101  
    3838#include <wtf/Vector.h>
    3939
    40 #if PLATFORM(CG)
     40#if USE(CG)
    4141#include "PixelDumpSupportCG.h"
    4242#elif USE(CAIRO)
  • trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp

    r83946 r84101  
    14701470    ASSERT(canvas());
    14711471    m_isPainting = true;
    1472 #if PLATFORM(CG)
     1472#if USE(CG)
    14731473    webWidget()->paint(skia::BeginPlatformPaint(canvas()), rect);
    14741474    skia::EndPlatformPaint(canvas());
  • trunk/Tools/DumpRenderTree/config.h

    r84088 r84101  
    7878#define WTF_USE_CURL 1
    7979#else
    80 #define WTF_PLATFORM_CG 1
     80#define WTF_USE_CG 1
    8181#define WTF_USE_CFNETWORK 1
    8282#endif
  • trunk/Tools/DumpRenderTree/win/PixelDumpSupportWin.cpp

    r84088 r84101  
    2929#include "config.h"
    3030
    31 #if PLATFORM(CG)
     31#if USE(CG)
    3232#include "PixelDumpSupportCG.h"
    3333#elif USE(CAIRO)
     
    3737#include "DumpRenderTree.h"
    3838
    39 #if PLATFORM(CG)
     39#if USE(CG)
    4040// Note: Must be included *after* DumpRenderTree.h to avoid compile error.
    4141#include <CoreGraphics/CGBitmapContext.h>
     
    7171    ASSERT(info.bmBitsPixel == 32);
    7272
    73 #if PLATFORM(CG)
     73#if USE(CG)
    7474    RetainPtr<CGColorSpaceRef> colorSpace(AdoptCF, CGColorSpaceCreateDeviceRGB());
    7575    CGContextRef context = CGBitmapContextCreate(info.bmBits, info.bmWidth, info.bmHeight, 8,
  • trunk/Tools/TestWebKitAPI/PlatformWebView.h

    r83793 r84101  
    2929#include <wtf/Platform.h>
    3030
    31 #if PLATFORM(CG)
     31#if USE(CG)
    3232#include <CoreGraphics/CGGeometry.h>
    3333#endif
  • trunk/Tools/WebKitTestRunner/config.h

    r84088 r84101  
    6161#define WTF_USE_CURL 1
    6262#else
    63 #define WTF_PLATFORM_CG 1
     63#define WTF_USE_CG 1
    6464#define WTF_USE_CFNETWORK 1
    6565#endif
  • trunk/Tools/WebKitTestRunner/win/TestInvocationWin.cpp

    r81494 r84101  
    2929namespace WTR {
    3030
    31 #if !PLATFORM(CG)
     31#if !USE(CG)
    3232void TestInvocation::dumpPixelsAndCompareWithExpected(WKImageRef)
    3333{
Note: See TracChangeset for help on using the changeset viewer.