Summary: | [WinCairo] Fix build errors which come from including headers and not suitable implementation for windows | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Yousuke Kimoto <Yousuke.Kimoto> | ||||||||||
Component: | WebKit2 | Assignee: | Yousuke Kimoto <Yousuke.Kimoto> | ||||||||||
Status: | RESOLVED FIXED | ||||||||||||
Severity: | Normal | CC: | cdumez, cgarcia, commit-queue, don.olmstead, ews-watchlist, mcatanzaro, ross.kirsling, ryanhaddad, webkit-bug-importer, wilander | ||||||||||
Priority: | P2 | Keywords: | InRadar | ||||||||||
Version: | WebKit Nightly Build | ||||||||||||
Hardware: | Unspecified | ||||||||||||
OS: | Unspecified | ||||||||||||
See Also: |
https://bugs.webkit.org/show_bug.cgi?id=182797 https://bugs.webkit.org/show_bug.cgi?id=182810 |
||||||||||||
Bug Depends on: | 182681 | ||||||||||||
Bug Blocks: | 174003 | ||||||||||||
Attachments: |
|
Description
Yousuke Kimoto
2018-02-11 20:25:22 PST
Created attachment 333576 [details]
bz182679-1.patch
A patch for bug 182681 is required before landing this patch. Created attachment 333682 [details]
bz182679-2.patch
Created attachment 333716 [details]
Patch
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.
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. Created attachment 333744 [details]
Patch
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.
Comment on attachment 333744 [details] Patch Clearing flags on attachment: 333744 Committed r228455: <https://trac.webkit.org/changeset/228455> All reviewed patches have been landed. Closing bug. 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. 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. (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 (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. 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. 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 |