Bug 116138 – Introduce USE(WINGDI) for the Windows port

• Component: Platform
• Status: RESOLVED FIXED

[Patrick R. Gansterer]

Introduce USE(WINGDI) for the Windows port

[Patrick R. Gansterer]

Created attachment 201793 [details]
Patch

[Patrick R. Gansterer]

Created attachment 201795 [details]
Patch

[WebKit Commit Bot]

Attachment 201795 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'ChangeLog', u'Source/WTF/ChangeLog', u'Source/WTF/wtf/Platform.h', u'Source/WebCore/ChangeLog', u'Source/WebCore/config.h', u'Source/WebCore/platform/graphics/BitmapImage.h', u'Source/WebCore/platform/graphics/FontPlatformData.h', u'Source/WebCore/platform/graphics/GlyphBuffer.h', u'Source/WebCore/platform/graphics/Gradient.h', u'Source/WebCore/platform/graphics/GraphicsContext.cpp', u'Source/WebCore/platform/graphics/GraphicsContext.h', u'Source/WebCore/platform/graphics/ImageBufferData.h', u'Source/WebCore/platform/graphics/NativeImagePtr.h', u'Source/WebCore/platform/graphics/Path.h', u'Source/WebCore/platform/graphics/Pattern.h', u'Source/WebCore/plugins/win/PluginViewWin.cpp', u'Source/cmake/OptionsWinCE.cmake']" exit_code: 1
Source/WebCore/config.h:36:  Do not add platform specific code in WebCore outside of platform.  [build/webcore_platform_layering_violation] [5]
Total errors found: 1 in 17 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Benjamin Poulain]

Comment on attachment 201795 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=201795&action=review

> ChangeLog:9
> +        compile the GDI based Windwos port on WinNT too.

Typo: Windwos

[Patrick R. Gansterer]

Created attachment 201796 [details]
Patch

[WebKit Commit Bot]

Attachment 201796 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'ChangeLog', u'Source/WTF/ChangeLog', u'Source/WTF/wtf/Platform.h', u'Source/WebCore/ChangeLog', u'Source/WebCore/config.h', u'Source/WebCore/platform/graphics/BitmapImage.h', u'Source/WebCore/platform/graphics/FontPlatformData.h', u'Source/WebCore/platform/graphics/GlyphBuffer.h', u'Source/WebCore/platform/graphics/Gradient.h', u'Source/WebCore/platform/graphics/GraphicsContext.cpp', u'Source/WebCore/platform/graphics/GraphicsContext.h', u'Source/WebCore/platform/graphics/ImageBufferData.h', u'Source/WebCore/platform/graphics/NativeImagePtr.h', u'Source/WebCore/platform/graphics/Path.h', u'Source/WebCore/platform/graphics/Pattern.h', u'Source/WebCore/plugins/win/PluginViewWin.cpp', u'Source/cmake/OptionsWinCE.cmake']" exit_code: 1
Source/WebCore/config.h:36:  Do not add platform specific code in WebCore outside of platform.  [build/webcore_platform_layering_violation] [5]
Total errors found: 1 in 17 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Brent Fulgham]

Comment on attachment 201796 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=201796&action=review

>> Source/WebCore/config.h:36
>> +#if PLATFORM(WIN) && !USE(WINGDI)
> 
> Do not add platform specific code in WebCore outside of platform.  [build/webcore_platform_layering_violation] [5]

Changing this to OS(WIN) might satisfy the style bot.

[Patrick R. Gansterer]

Comment on attachment 201796 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=201796&action=review

>>> Source/WebCore/config.h:36
>>> +#if PLATFORM(WIN) && !USE(WINGDI)
>> 
>> Do not add platform specific code in WebCore outside of platform.  [build/webcore_platform_layering_violation] [5]
> 
> Changing this to OS(WIN) might satisfy the style bot.

that would be wrong and out of scope of thid change

[Patrick R. Gansterer]

ping?

[Brent Fulgham]

Comment on attachment 201796 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=201796&action=review

This looks fine to me.  One nuance is that the WinCairo port does use GDI for some drawing routines.  I would not want us to accidentally start guarding those routines (none of which are touched in this patch) with USE(WINGDI) because that would break the WinCairo build.

>>>> Source/WebCore/config.h:36
>>>> +#if PLATFORM(WIN) && !USE(WINGDI)
>>> 
>>> Do not add platform specific code in WebCore outside of platform.  [build/webcore_platform_layering_violation] [5]
>> 
>> Changing this to OS(WIN) might satisfy the style bot.
> 
> that would be wrong and out of scope of thid change

Oh -- right.  And I see that it's actually complaining about the existing PLATFORM(WIN) guard, not the USE(WINGDI).

[WebKit Commit Bot]

Comment on attachment 201796 [details]
Patch

Clearing flags on attachment: 201796

Committed r151610: <http://trac.webkit.org/changeset/151610>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.