Bug 182679 – [WinCairo] Fix build errors which come from including headers and not suitable implementation for windows

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit2

[Yousuke Kimoto]

For WinCairo WebKit build, some build errors which come from including headers must be fixed.
Those headers are not supported by the Windows SDK.

[Yousuke Kimoto]

Created attachment 333576 [details]
bz182679-1.patch

[Yousuke Kimoto]

A patch for bug 182681 is required before landing this patch.

[Yousuke Kimoto]

Created attachment 333682 [details]
bz182679-2.patch

[Ross Kirsling]

Created attachment 333716 [details]
Patch

[Ross Kirsling]

Comment on attachment 333716 [details]
Patch

Fixed the #include guard in WKBase.h.

Seems like something other than the C preprocessor is running over this file, so even `#if 0` doesn't remove anything. #elifs did the trick though.

[Michael Catanzaro]

Comment on attachment 333716 [details]
Patch

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

> Source/WebKit/NetworkProcess/cache/NetworkCacheBlobStorage.cpp:37
> +#if !OS(WINDOWS)
>  #include <sys/mman.h>
>  #include <sys/stat.h>
>  #include <unistd.h>
> +#endif

Style: please move these down beneath the other #includes, and leave one blank like before #if !OS(WINDOWS). You got it right *almost* everywhere else.

> Source/WebKit/WebProcess/WebProcess.cpp:122
> +#if !OS(WINDOWS)
>  #include <unistd.h>
> +#endif

Here too.

[Ross Kirsling]

Created attachment 333744 [details]
Patch

[Michael Catanzaro]

Comment on attachment 333744 [details]
Patch

OK. Since there are no changes to the cross-platform code, I don't think this needs an owner. Consider adding FIXMEs for the stuff you've disabled in NetworkCache.

[WebKit Commit Bot]

Comment on attachment 333744 [details]
Patch

Clearing flags on attachment: 333744

Committed r228455: <https://trac.webkit.org/changeset/228455>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/37525619>

[John Wilander]

This causes an iOS build failure for me when building with -Wunused-lambda-capture:

Sources/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp:911:79: error: lambda capture 'maximumParallelReadCount' is not required to be captured for this use [-Werror,-Wunused-lambda-capture]
            traverseOperation.activeCondition.wait(lock, [&traverseOperation, maximumParallelReadCount] {
                                                                              ^
1 error generated.

I will get a patch up removing this capture.

[John Wilander]

Build fix patch: https://bugs.webkit.org/show_bug.cgi?id=182797

BTW, this should not have been landed as an unreviewed WinCairo fix when it changed platform independent code.

[Ryan Haddad]

(In reply to John Wilander from comment #13)
> BTW, this should not have been landed as an unreviewed WinCairo fix when it
> changed platform independent code.

The change was reviewed by Michael. It is reflected in the changelog and commit message for https://trac.webkit.org/changeset/228455/webkit

[John Wilander]

(In reply to Ryan Haddad from comment #14)
> (In reply to John Wilander from comment #13)
> > BTW, this should not have been landed as an unreviewed WinCairo fix when it
> > changed platform independent code.
> 
> The change was reviewed by Michael. It is reflected in the changelog and
> commit message for https://trac.webkit.org/changeset/228455/webkit

Got it. I was looking at the patch.

[Michael Catanzaro]

Eh, actually I should not have approved it because I'm not an owner. I just missed that that line was changed outside the #if. Sorry.

[Ross Kirsling]

An even more trivial follow-up fix (which I probably should've noticed while helping get this patch landed):
https://bugs.webkit.org/show_bug.cgi?id=182810