Changeset 206830 in webkit


Ignore:
Timestamp:
Oct 5, 2016 2:16:27 PM (8 years ago)
Author:
Brent Fulgham
Message:

[Win][Direct2D] Disable some CoreGraphics and CoreAnimation-based logic when building for D2D
​https://bugs.webkit.org/show_bug.cgi?id=162977

Reviewed by Alex Christensen.

Currently the Direct2D implementation does not support some of the accelerated compositing
features that require CoreAnimation. During this bring-up, we want to disable these routines
so that we can build and run in (mostly) unaccelerated drawing.

This patch mostly consists of adding "#if USE(CG)" and "#if USE(CA)" to files that are
specific to those implementations.

This change should have no impact on non-Direct2D ports.

No change in behavior for active ports.

  • config.h: Turn of CG when building in Direct2D.
  • css/CSSFontFaceSource.cpp:
  • loader/cache/CachedFont.cpp:
  • loader/cache/CachedSVGFont.cpp:
  • page/CaptionUserPreferencesMediaAF.cpp:
  • page/win/FrameCGWin.cpp:
  • page/win/FrameDirect2D.cpp: Added.
  • platform/graphics/Font.cpp:
  • platform/graphics/FontCache.cpp:
  • platform/graphics/FontPlatformData.cpp:
  • platform/graphics/GraphicsContext.h:
  • platform/graphics/Image.cpp:
  • platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp:
  • platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
  • platform/graphics/ca/GraphicsLayerCA.cpp:
  • platform/graphics/ca/PlatformCALayer.cpp:
  • platform/graphics/ca/TileController.cpp:
  • platform/graphics/ca/TileGrid.cpp:
  • platform/graphics/ca/TileGrid.h:
  • platform/graphics/ca/win/CACFLayerTreeHost.cpp:
  • platform/graphics/ca/win/LayerChangesFlusher.cpp:
  • platform/graphics/ca/win/PlatformCAAnimationWin.cpp:
  • platform/graphics/ca/win/PlatformCAAnimationWin.h:
  • platform/graphics/ca/win/PlatformCAFiltersWin.cpp:
  • platform/graphics/ca/win/PlatformCALayerWin.cpp:
  • platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:
  • platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp:
  • platform/graphics/ca/win/WebTiledBackingLayerWin.cpp:
  • platform/graphics/cg/GradientCG.cpp:
  • platform/graphics/cg/GraphicsContextCG.cpp:
  • platform/graphics/cg/ImageBufferCG.cpp:
  • platform/graphics/cg/ImageBufferDataCG.cpp:
  • platform/graphics/cg/PDFDocumentImage.cpp:
  • platform/graphics/cg/PatternCG.cpp:
  • platform/graphics/cg/SubimageCacheWithTimer.cpp:
  • platform/graphics/win/FontCGWin.cpp:
  • platform/graphics/win/FontPlatformDataCGWin.cpp:
  • platform/graphics/win/GlyphPageTreeNodeCGWin.cpp:
  • platform/graphics/win/GlyphPageTreeNodeDirect2D.cpp:
  • platform/graphics/win/GradientDirect2D.cpp:
  • platform/graphics/win/PathDirect2D.cpp: Fix a few build problems I didn't notice

while building without Direct2D active.

  • platform/graphics/win/SimpleFontDataCGWin.cpp:
  • platform/graphics/win/SimpleFontDataWin.cpp:
  • platform/win/DragImageCGWin.cpp:
  • platform/win/DragImageDirect2D.cpp: Added.
  • rendering/RenderMediaControls.cpp:
Location:
trunk/Source/WebCore
Files:
2 added
45 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r206828 r206830  
     12016-10-05  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win][Direct2D] Disable some CoreGraphics and CoreAnimation-based logic when building for D2D
     4        https://bugs.webkit.org/show_bug.cgi?id=162977
     5
     6        Reviewed by Alex Christensen.
     7
     8        Currently the Direct2D implementation does not support some of the accelerated compositing
     9        features that require CoreAnimation. During this bring-up, we want to disable these routines
     10        so that we can build and run in (mostly) unaccelerated drawing.
     11
     12        This patch mostly consists of adding "#if USE(CG)" and "#if USE(CA)" to files that are
     13        specific to those implementations.
     14
     15        This change should have no impact on non-Direct2D ports.
     16
     17        No change in behavior for active ports.
     18
     19        * config.h: Turn of CG when building in Direct2D.
     20        * css/CSSFontFaceSource.cpp:
     21        * loader/cache/CachedFont.cpp:
     22        * loader/cache/CachedSVGFont.cpp:
     23        * page/CaptionUserPreferencesMediaAF.cpp:
     24        * page/win/FrameCGWin.cpp:
     25        * page/win/FrameDirect2D.cpp: Added.
     26        * platform/graphics/Font.cpp:
     27        * platform/graphics/FontCache.cpp:
     28        * platform/graphics/FontPlatformData.cpp:
     29        * platform/graphics/GraphicsContext.h:
     30        * platform/graphics/Image.cpp:
     31        * platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp:
     32        * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
     33        * platform/graphics/ca/GraphicsLayerCA.cpp:
     34        * platform/graphics/ca/PlatformCALayer.cpp:
     35        * platform/graphics/ca/TileController.cpp:
     36        * platform/graphics/ca/TileGrid.cpp:
     37        * platform/graphics/ca/TileGrid.h:
     38        * platform/graphics/ca/win/CACFLayerTreeHost.cpp:
     39        * platform/graphics/ca/win/LayerChangesFlusher.cpp:
     40        * platform/graphics/ca/win/PlatformCAAnimationWin.cpp:
     41        * platform/graphics/ca/win/PlatformCAAnimationWin.h:
     42        * platform/graphics/ca/win/PlatformCAFiltersWin.cpp:
     43        * platform/graphics/ca/win/PlatformCALayerWin.cpp:
     44        * platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:
     45        * platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp:
     46        * platform/graphics/ca/win/WebTiledBackingLayerWin.cpp:
     47        * platform/graphics/cg/GradientCG.cpp:
     48        * platform/graphics/cg/GraphicsContextCG.cpp:
     49        * platform/graphics/cg/ImageBufferCG.cpp:
     50        * platform/graphics/cg/ImageBufferDataCG.cpp:
     51        * platform/graphics/cg/PDFDocumentImage.cpp:
     52        * platform/graphics/cg/PatternCG.cpp:
     53        * platform/graphics/cg/SubimageCacheWithTimer.cpp:
     54        * platform/graphics/win/FontCGWin.cpp:
     55        * platform/graphics/win/FontPlatformDataCGWin.cpp:
     56        * platform/graphics/win/GlyphPageTreeNodeCGWin.cpp:
     57        * platform/graphics/win/GlyphPageTreeNodeDirect2D.cpp:
     58        * platform/graphics/win/GradientDirect2D.cpp:
     59        * platform/graphics/win/PathDirect2D.cpp: Fix a few build problems I didn't notice
     60        while building without Direct2D active.
     61        * platform/graphics/win/SimpleFontDataCGWin.cpp:
     62        * platform/graphics/win/SimpleFontDataWin.cpp:
     63        * platform/win/DragImageCGWin.cpp:
     64        * platform/win/DragImageDirect2D.cpp: Added.
     65        * rendering/RenderMediaControls.cpp:
     66
    1672016-10-05  Chris Dumez  <cdumez@apple.com>
    268

  • trunk/Source/WebCore/config.h

    r198850 r206830  
    9595#define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
    9696#endif
     97#elif USE(DIRECT2D)
     98#undef USE_CG
    9799#elif !USE(WINGDI)
    98100#define USE_CG 1

  • trunk/Source/WebCore/css/CSSFontFaceSource.cpp

    r201676 r206830  
    4848#endif
    4949
     50#if USE(DIRECT2D)
     51#include <dwrite.h>
     52#endif
     53
    5054namespace WebCore {
    5155

  • trunk/Source/WebCore/loader/cache/CachedFont.cpp

    r206016 r206830  
    4040#include "WOFFFileFormat.h"
    4141#include <wtf/Vector.h>
     42
     43#if USE(DIRECT2D)
     44#include <dwrite.h>
     45#endif
    4246
    4347namespace WebCore {

  • trunk/Source/WebCore/loader/cache/CachedSVGFont.cpp

    r206016 r206830  
    4040#include "TypedElementDescendantIterator.h"
    4141#include "SVGToOTFFontConversion.h"
     42
     43#if USE(DIRECT2D)
     44#include <dwrite.h>
     45#endif
    4246
    4347namespace WebCore {

  • trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp

    r206145 r206830  
    2727
    2828#if ENABLE(VIDEO_TRACK)
     29
     30#if !USE(DIRECT2D)
    2931
    3032#include "CaptionUserPreferencesMediaAF.h"
    … …  
    966968}
    967969
     970#endif
     971
    968972#endif // ENABLE(VIDEO_TRACK)

  • trunk/Source/WebCore/page/win/FrameCGWin.cpp

    r194439 r206830  
    2626#include "config.h"
    2727#include "FrameWin.h"
     28
     29#if USE(CG)
    2830
    2931#include "BitmapInfo.h"
    … …  
    8486
    8587} // namespace WebCore
     88
     89#endif

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

    r205826 r206830  
    4343#if ENABLE(OPENTYPE_VERTICAL)
    4444#include "OpenTypeVerticalData.h"
     45#endif
     46
     47#if USE(DIRECT2D)
     48#include <dwrite.h>
    4549#endif
    4650

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

    r204466 r206830  
    4646#endif
    4747
     48#if USE(DIRECT2D)
     49#include <dwrite.h>
     50#endif
     51
    4852#if PLATFORM(IOS)
    4953#include <wtf/Noncopyable.h>

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

    r205883 r206830  
    3030#include "SharedBuffer.h"
    3131#include <CoreGraphics/CGFont.h>
     32#endif
     33
     34#if USE(DIRECT2D)
     35#include <dwrite.h>
    3236#endif
    3337

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

    r206780 r206830  
    580580#if USE(DIRECT2D)
    581581    void platformInit(HDC, ID2D1RenderTarget**, RECT, bool hasAlpha = false);
    582     void platformInit(ID2D1RenderTarget*);
    583582    void drawWithoutShadow(const FloatRect& boundingRect, const std::function<void(ID2D1RenderTarget*)>&);
    584583    void drawWithShadow(const FloatRect& boundingRect, const std::function<void(ID2D1RenderTarget*)>&);

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

    r206631 r206830  
    9393void Image::drawTiled(GraphicsContext& ctxt, const FloatRect& destRect, const FloatPoint& srcPoint, const FloatSize& scaledTileSize, const FloatSize& spacing, CompositeOperator op, BlendMode blendMode)
    9494{
     95#if USE(DIRECT2D)
     96    notImplemented();
     97#else
    9598    Color color = singlePixelSolidColor();
    9699    if (color.isValid()) {
    … …  
    200203    startAnimation();
    201204#endif
     205#endif
    202206}
    203207

  • trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp

    r206811 r206830  
    5555{
    5656    UNUSED_PARAM(mimeType);
    57 
     57#if USE(DIRECT2D)
     58    UNUSED_PARAM(initData);
     59    UNUSED_PARAM(destinationURL);
     60    UNUSED_PARAM(errorCode);
     61    UNUSED_PARAM(systemCode);
     62    notImplemented();
     63    return nullptr;
     64#else
    5865    String keyURI;
    5966    String keyID;
    … …  
    102109    RefPtr<ArrayBuffer> keyRequestBuffer = ArrayBuffer::create(CFDataGetBytePtr(keyRequest.get()), CFDataGetLength(keyRequest.get()));
    103110    return Uint8Array::create(keyRequestBuffer, 0, keyRequestBuffer->byteLength());
     111#endif
    104112}
    105113

  • trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp

    r206811 r206830  
    864864        context.setImageInterpolationQuality(InterpolationLow);
    865865        FloatRect paintRect(FloatPoint(), rect.size());
     866#if USE(DIRECT2D)
     867        notImplemented();
     868#else
    866869        CGContextDrawImage(context.platformContext(), CGRectMake(0, 0, paintRect.width(), paintRect.height()), image.get());
     870#endif
    867871        context.restore();
    868872        image = 0;

  • trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

    r206196 r206830  
    2727
    2828#include "GraphicsLayerCA.h"
     29
     30#if USE(CA)
    2931
    3032#include "Animation.h"
    … …  
    39943996
    39953997} // namespace WebCore
     3998
     3999#endif

  • trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp

    r204658 r206830  
    2727#include "PlatformCALayer.h"
    2828
     29#if USE(CA)
     30
    2931#include <CoreFoundation/CoreFoundation.h>
    3032#include <CoreText/CoreText.h>
    … …  
    3840#include "CoreTextSPIWin.h"
    3941#endif
    40 
    41 #if USE(CA)
    4242
    4343namespace WebCore {

  • trunk/Source/WebCore/platform/graphics/ca/TileController.cpp

    r200465 r206830  
    2727#include "TileController.h"
    2828
     29#if USE(CG)
     30
    2931#include "IntRect.h"
    3032#include "Logging.h"
    … …  
    736738
    737739} // namespace WebCore
     740
     741#endif

  • trunk/Source/WebCore/platform/graphics/ca/TileGrid.cpp

    r203261 r206830  
    2525
    2626#include "config.h"
     27
     28#if USE(CG)
     29
    2730#include "TileGrid.h"
    2831
    … …  
    763766
    764767} // namespace WebCore
     768
     769#endif

  • trunk/Source/WebCore/platform/graphics/ca/TileGrid.h

    r203261 r206830  
    5252    ~TileGrid();
    5353
     54#if USE(CA)
    5455    PlatformCALayer& containerLayer() { return m_containerLayer; }
     56#endif
    5557
    5658    void setIsZoomedOutTileGrid(bool);
    … …  
    8486    unsigned blankPixelCount() const;
    8587
     88#if USE(CG)
    8689    void drawTileMapContents(CGContextRef, CGRect layerBounds) const;
     90#endif
    8791
    8892#if PLATFORM(IOS)
    … …  
    151155
    152156    TileController& m_controller;
     157#if USE(CA)
    153158    Ref<PlatformCALayer> m_containerLayer;
     159#endif
    154160
    155161    typedef HashMap<TileIndex, TileInfo> TileMap;

  • trunk/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp

    r206234 r206830  
    2727#include "CACFLayerTreeHost.h"
    2828
     29#if USE(CA)
     30
    2931#include "CACFLayerTreeHostClient.h"
    3032#include "DebugPageOverlays.h"
    … …  
    375377
    376378}
     379
     380#endif

  • trunk/Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.cpp

    r189883 r206830  
    2626#include "config.h"
    2727#include "LayerChangesFlusher.h"
     28
     29#if USE(CA)
    2830
    2931#include "AbstractCACFLayerTreeHost.h"
    … …  
    130132
    131133} // namespace WebCore
     134
     135#endif

  • trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp

    r174715 r206830  
    2626#include "config.h"
    2727
    28 #if PLATFORM(WIN)
     28#if PLATFORM(WIN) && USE(CA)
    2929#include "PlatformCAAnimationWin.h"
    3030

  • trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.h

    r197563 r206830  
    2727#define PlatformCAAnimationWin_h
    2828
    29 #if PLATFORM(WIN)
     29#if PLATFORM(WIN) && USE(CA)
    3030
    3131#include "PlatformCAAnimation.h"

  • trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAFiltersWin.cpp

    r173268 r206830  
    2727#include "PlatformCAFilters.h"
    2828
     29#if USE(CA)
     30
    2931using namespace WebCore;
    3032
    … …  
    4547    return "";
    4648}
     49
     50#endif

  • trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp

    r201915 r206830  
    2828#include "PlatformCALayerWin.h"
    2929
     30#if USE(CA)
     31
    3032#include "AbstractCACFLayerTreeHost.h"
    3133#include "FontCascade.h"
    … …  
    954956    cg.drawText(font, TextRun(text), IntPoint(x, y));
    955957}
     958
     959#endif

  • trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp

    r192140 r206830  
    2828#include "PlatformCALayerWinInternal.h"
    2929
     30#if USE(CA)
     31
    3032#include "FontCascade.h"
    3133#include "GraphicsContext.h"
    … …  
    324326    CACFLayerSetBorderColor(owner()->platformLayer(), color.get());
    325327}
     328
     329#endif

  • trunk/Source/WebCore/platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp

    r194235 r206830  
    2727#include "WKCACFViewLayerTreeHost.h"
    2828
     29#if USE(CA)
     30
    2931#include "GDIUtilities.h"
    3032#include "PlatformCALayer.h"
    … …  
    198200
    199201} // namespace WebCore
     202
     203#endif

  • trunk/Source/WebCore/platform/graphics/ca/win/WebTiledBackingLayerWin.cpp

    r190616 r206830  
    2626#include "config.h"
    2727#include "WebTiledBackingLayerWin.h"
     28
     29#if USE(CA)
    2830
    2931#include "GraphicsContext.h"
    … …  
    181183    m_tileController = nullptr;
    182184}
     185
     186#endif

  • trunk/Source/WebCore/platform/graphics/cg/GradientCG.cpp

    r192712 r206830  
    2727#include "config.h"
    2828#include "Gradient.h"
     29
     30#if USE(CG)
    2931
    3032#include "GraphicsContextCG.h"
    … …  
    106108
    107109} //namespace
     110
     111#endif

  • trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp

    r206631 r206830  
    2727#include "config.h"
    2828#include "GraphicsContextCG.h"
     29
     30#if USE(CG)
    2931
    3032#include "AffineTransform.h"
    … …  
    10491051    }
    10501052
    1051 
    10521053    return enclosingIntRect(CGContextGetClipBoundingBox(platformContext()));
    10531054}
    … …  
    19061907
    19071908}
     1909
     1910#endif

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

    r206706 r206830  
    2929#include "ImageBuffer.h"
    3030
     31#if USE(CG)
     32
    3133#include "BitmapImage.h"
    3234#include "GraphicsContext.h"
    … …  
    592594
    593595} // namespace WebCore
     596
     597#endif

  • trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp

    r202887 r206830  
    2727#include "ImageBufferData.h"
    2828
     29#if USE(CG)
     30
    2931#include "GraphicsContext.h"
    3032#include "IntRect.h"
    … …  
    545547
    546548} // namespace WebCore
     549
     550#endif

  • trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp

    r206635 r206830  
    3939#include "IntRect.h"
    4040#include "Length.h"
     41#include "NotImplemented.h"
    4142#include "SharedBuffer.h"
    4243#include "TextStream.h"
    … …  
    345346    context.translate(-m_cropBox.x(), -m_cropBox.y());
    346347
     348#if USE(DIRECT2D)
     349    notImplemented();
     350#else
    347351    // CGPDF pages are indexed from 1.
    348352    CGContextDrawPDFPage(context.platformContext(), CGPDFDocumentGetPage(m_document.get(), 1));
     353#endif
    349354}
    350355

  • trunk/Source/WebCore/platform/graphics/cg/PatternCG.cpp

    r205682 r206830  
    2727#include "config.h"
    2828#include "Pattern.h"
     29
     30#if USE(CG)
    2931
    3032#include "AffineTransform.h"
    … …  
    9193
    9294}
     95
     96#endif

  • trunk/Source/WebCore/platform/graphics/cg/SubimageCacheWithTimer.cpp

    r176459 r206830  
    2626#include "config.h"
    2727#include "SubimageCacheWithTimer.h"
     28
     29#if USE(CG)
    2830
    2931#include <wtf/Vector.h>
    … …  
    115117
    116118#endif
     119
     120#endif

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

    r206597 r206830  
    2727#include "FontCascade.h"
    2828
     29#if USE(CG)
     30
    2931#include "AffineTransform.h"
    3032#include "FloatConversion.h"
    … …  
    219221
    220222}
     223
     224#endif

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

    r206597 r206830  
    2424#include "config.h"
    2525#include "FontPlatformData.h"
     26
     27#if USE(CG)
    2628
    2729#include "SharedGDIObject.h"
    … …  
    136138
    137139}
     140
     141#endif

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

    r192895 r206830  
    3030#include "GlyphPage.h"
    3131
     32#if USE(CG)
     33
    3234#include "Font.h"
    3335#include <WebKitSystemInterface/WebKitSystemInterface.h>
    … …  
    5961
    6062}
     63
     64#endif

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

    r206597 r206830  
    3030
    3131#include "Font.h"
    32 #include "TextAnalysisHelper.h"
     32#include "TextAnalyzerHelper.h"
    3333#include <dwrite.h>
    3434

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

    r206815 r206830  
    9999        ASSERT(m_p0 == m_p1);
    100100
    101         D2D1_MATRIX_3X2_F ctm;
     101        D2D1_MATRIX_3X2_F ctm = { };
    102102        d2dContext->GetTransform(&ctm);
    103103

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

    r206815 r206830  
    337337}
    338338
    339 static equalRadiusWidths(const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius)
     339static bool equalRadiusWidths(const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius)
    340340{
    341341    return topLeftRadius.width() == topRightRadius.width()
    … …  
    344344}
    345345
    346 static equalRadiusHeights(const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius)
     346static bool equalRadiusHeights(const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius)
    347347{
    348348    return topLeftRadius.height() == bottomLeftRadius.height()
    … …  
    415415    drawArcSection(m_activePath.get(), center, radius, startAngle, firstArcEnd, clockwise);
    416416
    417     if (areEssentiallyEqual(firstArcEnd, endAngle))
     417    if (WTF::areEssentiallyEqual(firstArcEnd, endAngle))
    418418        return;
    419419

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

    r204858 r206830  
    2929#include "config.h"
    3030#include "Font.h"
     31
     32#if USE(CG)
    3133
    3234#include "CoreTextSPIWin.h"
    … …  
    153155
    154156}
     157
     158#endif

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

    r200094 r206830  
    3838#include <wtf/win/GDIObject.h>
    3939
     40#if USE(DIRECT2D)
     41#include <dwrite.h>
     42#endif
     43
    4044namespace WebCore {
    4145

  • trunk/Source/WebCore/platform/win/DragImageCGWin.cpp

    r205682 r206830  
    2626#include "config.h"
    2727#include "DragImage.h"
     28
     29#if USE(CG)
    2830
    2931#include "BitmapInfo.h"
    … …  
    147149   
    148150}
     151
     152#endif

  • trunk/Source/WebCore/rendering/RenderMediaControls.cpp

    r189144 r206830  
    3333#include "HTMLMediaElement.h"
    3434#include "HTMLNames.h"
     35#include "NotImplemented.h"
    3536#include "PaintInfo.h"
    3637#include "RenderTheme.h"
    … …  
    129130bool RenderMediaControls::paintMediaControlsPart(MediaControlElementType part, const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
    130131{
     132#if USE(DIRECT2D)
     133    UNUSED_PARAM(part);
     134    UNUSED_PARAM(o);
     135    UNUSED_PARAM(paintInfo);
     136    UNUSED_PARAM(r);
     137    notImplemented();
     138#else
    131139    GraphicsContextStateSaver stateSaver(paintInfo.context());
    132140
    … …  
    215223        break;
    216224    }
    217 
     225#endif
    218226    return false;
    219227}
Note: See TracChangeset for help on using the changeset viewer.