[webkit-reviews] review granted: [Bug 46007] Make 2D accelerated canvas rendering build on Mac : [Attachment 68628] Patch to fix merge conflict

[bugzilla-daemon at webkit.org]

Simon Fraser (smfr) <simon.fraser at apple.com> has granted Chris Marrin
<cmarrin at apple.com>'s request for review:
Bug 46007: Make 2D accelerated canvas rendering build on Mac
https://bugs.webkit.org/show_bug.cgi?id=46007

Attachment 68628: Patch to fix merge conflict
https://bugs.webkit.org/attachment.cgi?id=68628&action=review

------- Additional Comments from Simon Fraser (smfr) <simon.fraser at apple.com>
View in context: https://bugs.webkit.org/attachment.cgi?id=68628&action=review

> WebCore/Configurations/FeatureDefines.xcconfig:40
> +ENABLE_ACCELERATED_2D_CANVAS =
$(ENABLE_ACCELERATED_2D_CANVAS_$(REAL_PLATFORM_NAME));
> +ENABLE_ACCELERATED_2D_CANVAS_macosx =
$(ENABLE_ACCELERATED_2D_CANVAS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
> +ENABLE_ACCELERATED_2D_CANVAS_macosx_1060 = ;
> +ENABLE_ACCELERATED_2D_CANVAS_macosx_1070 = ;
> +

You need to add this to the FeatureDefines.xcconfig files for JSCore and WebKit
too.

> WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp:221
> +    static HashSet<SharedGraphicsContext3D*>* allContextsSet = new
HashSet<SharedGraphicsContext3D*>;
> +    return allContextsSet;

This should use DEFINE_STATIC_LOCAL

> WebCore/platform/graphics/gpu/mac/DrawingBufferMac.mm:46
> +class DrawingBufferInternal {
> +public:
> +    DrawingBufferInternal() { }
> +    ~DrawingBufferInternal() { }
> +    
> +    RetainPtr<PlatformLayer> m_platformLayer;
> +};

Normally we avoid this kind of thing by just putting #ifdefs in the header
file, which is much simpler (as long as there aren't too many of them).