231277 2021-10-05 21:51:40 -0700 [PlayStation] Fix build break after r283441 2021-10-25 19:05:17 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 basuke basuke achristensen basuke darin fujii webkit-bug-importer oldest_to_newest 1800941 0 basuke 2021-10-05 21:51:40 -0700 In file included from WebCore/DerivedSources/unified-sources/UnifiedSource-42f7b70e-2.cpp:6: In file included from C:/PSDev/webkit/Source/WebCore\xml/XPathFunctions.cpp:31: In file included from C:/PSDev/webkit/Source/WebCore/dom\Element.h:32: In file included from C:/PSDev/webkit/Source/WebCore/rendering/style\RenderStyle.h:62: In file included from C:/PSDev/webkit/Source/WebCore/rendering/style/StyleRareNonInheritedData.h:28: In file included from C:/PSDev/webkit/Source/WebCore/rendering\ClipPathOperation.h:33: C:/PSDev/webkit/Source/WebCore/platform/graphics\Path.h:140:58: error: expected ')' bool strokeContains(const FloatPoint&, const Function<void(GraphicsContext&)>& strokeStyleApplier) const; ^ C:/PSDev/webkit/Source/WebCore/platform/graphics\Path.h:140:24: note: to match this '(' bool strokeContains(const FloatPoint&, const Function<void(GraphicsContext&)>& strokeStyleApplier) const; ^ C:/PSDev/webkit/Source/WebCore/platform/graphics\Path.h:146:48: error: expected ')' FloatRect strokeBoundingRect(const Function<void(GraphicsContext&)>& strokeStyleApplier = { }) const; ^ C:/PSDev/webkit/Source/WebCore/platform/graphics\Path.h:146:33: note: to match this '(' FloatRect strokeBoundingRect(const Function<void(GraphicsContext&)>& strokeStyleApplier = { }) const; ^ 2 errors generated. 1800942 1 440329 basuke 2021-10-05 21:58:23 -0700 Created attachment 440329 PATCH 1800962 2 ews-feeder 2021-10-05 23:14:43 -0700 Committed r283602 (242554@main): <https://commits.webkit.org/242554@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440329. 1800963 3 webkit-bug-importer 2021-10-05 23:15:20 -0700 <rdar://problem/83920199> 1800967 4 440329 fujii 2021-10-05 23:33:07 -0700 Comment on attachment 440329 PATCH View in context: https://bugs.webkit.org/attachment.cgi?id=440329&action=review > Source/WebCore/platform/graphics/Path.h:140 > + bool strokeContains(const FloatPoint&, const WTF::Function<void(GraphicsContext&)>& strokeStyleApplier) const; This is not a right fix. Path.h includes <wtf/Forward.h>, it has "using WTF::Function;" You should remove all "using namespace XPath;". 1800974 5 basuke 2021-10-06 00:04:50 -0700 (In reply to Fujii Hironori from comment #4) > Comment on attachment 440329 [details] > PATCH > > View in context: > https://bugs.webkit.org/attachment.cgi?id=440329&action=review > > > Source/WebCore/platform/graphics/Path.h:140 > > + bool strokeContains(const FloatPoint&, const WTF::Function<void(GraphicsContext&)>& strokeStyleApplier) const; > > This is not a right fix. > Path.h includes <wtf/Forward.h>, it has "using WTF::Function;" > You should remove all "using namespace XPath;". We tried for days to fix that, but I gave up to fix like that. Actually in line 109, WTF prefix is already used so why not this isn't accepted? Source\WebCore\platform\graphics\Path.h:109 > using PathApplierFunction = WTF::Function<void(const PathElement&)>; But of course this is a build fix. Feel free to change like that but please don't revert this commit with such a reason. PlayStation port has been broken for days. We need to make it green. 1801088 6 440329 darin 2021-10-06 08:28:10 -0700 Comment on attachment 440329 PATCH View in context: https://bugs.webkit.org/attachment.cgi?id=440329&action=review >>> Source/WebCore/platform/graphics/Path.h:140 >>> + bool strokeContains(const FloatPoint&, const WTF::Function<void(GraphicsContext&)>& strokeStyleApplier) const; >> >> This is not a right fix. >> Path.h includes <wtf/Forward.h>, it has "using WTF::Function;" >> You should remove all "using namespace XPath;". > > We tried for days to fix that, but I gave up to fix like that. Actually in line 109, WTF prefix is already used so why not this isn't accepted? > > Source\WebCore\platform\graphics\Path.h:109 I agree with the comment. Removing "using namespace XPath" is the correct direction. Adding WTF prefixes is not our intended solution, the one in line 109 should be removed. 1801184 7 basuke 2021-10-06 10:52:58 -0700 > I agree with the comment. Removing "using namespace XPath" is the correct > direction. Adding WTF prefixes is not our intended solution, the one in line > 109 should be removed. I believe Alex is already working on it. https://bugs.webkit.org/show_bug.cgi?id=231186 1801199 8 darin 2021-10-06 11:09:10 -0700 (In reply to Basuke Suzuki from comment #7) > I believe Alex is already working on it. > https://bugs.webkit.org/show_bug.cgi?id=231186 I went a bit further in bug 231302. Just curious: Could we now undo this WTF::Function change without re-breaking the PlayStation build? 1801244 9 achristensen 2021-10-06 12:11:51 -0700 And https://bugs.webkit.org/show_bug.cgi?id=231318 1808723 10 fujii 2021-10-25 19:05:17 -0700 (In reply to EWS from comment #2) > Committed r283602 (242554@main): <https://commits.webkit.org/242554@main> We no longer need this change. I'm going to revert it in Bug 232226. 440329 2021-10-05 21:58:23 -0700 2021-10-05 23:14:44 -0700 PATCH patch.diff text/plain 1803 basuke ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3MjA2Y2JkMzBkOWEuLjU1Njg0ZjUyZjQ5MyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE1IEBACisyMDIxLTEwLTA1ICBCYXN1a2UgU3V6dWtpICA8YmFzdWtlLnN1enVraUBz b255LmNvbT4KKworICAgICAgICBbUGxheVN0YXRpb25dIEZpeCBidWlsZCBicmVhayBhZnRlciBy MjgzNDQxCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MzEyNzcKKworICAgICAgICBVbnJldmlld2VkLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNh dXNlIHRoZXJlIGlzIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL1BhdGguaDoKKyAgICAgICAgKFdlYkNvcmU6OlBhdGg6OnN0cm9rZUJvdW5kaW5nUmVj dCk6CisKIDIwMjEtMTAtMDUgIEpvaG4gV2lsYW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CiAK ICAgICAgICAgUENNOiBBbGxvdyBtZWFzdXJlbWVudCBvZiBsaW5rcyBpbiBuZXN0ZWQsIGNyb3Nz LXNpdGUgaWZyYW1lcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvUGF0aC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGF0aC5oCmluZGV4 IDcyMWFmYmZmZjczMS4uODliMWQ2ZTEwNWM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9QYXRoLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvUGF0aC5oCkBAIC0xMzcsMTMgKzEzNywxMyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFBh dGggcG9seWdvblBhdGhGcm9tUG9pbnRzKGNvbnN0IFZlY3RvcjxGbG9hdFBvaW50PiYpOwogCiAg ICAgYm9vbCBjb250YWlucyhjb25zdCBGbG9hdFBvaW50JiwgV2luZFJ1bGUgPSBXaW5kUnVsZTo6 Tm9uWmVybykgY29uc3Q7Ci0gICAgYm9vbCBzdHJva2VDb250YWlucyhjb25zdCBGbG9hdFBvaW50 JiwgY29uc3QgRnVuY3Rpb248dm9pZChHcmFwaGljc0NvbnRleHQmKT4mIHN0cm9rZVN0eWxlQXBw bGllcikgY29uc3Q7CisgICAgYm9vbCBzdHJva2VDb250YWlucyhjb25zdCBGbG9hdFBvaW50Jiwg Y29uc3QgV1RGOjpGdW5jdGlvbjx2b2lkKEdyYXBoaWNzQ29udGV4dCYpPiYgc3Ryb2tlU3R5bGVB cHBsaWVyKSBjb25zdDsKIAogICAgIC8vIGZhc3RCb3VuZGluZ1JlY3QoKSBzaG91bGQgZXF1YWwg b3IgY29udGFpbiBib3VuZGluZ1JlY3QoKTsgYm91bmRpbmdSZWN0KCkKICAgICAvLyBzaG91bGQg cGVyZmVjdGx5IGJvdW5kIHRoZSBwb2ludHMgd2l0aGluIHRoZSBwYXRoLgogICAgIEZsb2F0UmVj dCBib3VuZGluZ1JlY3QoKSBjb25zdDsKICAgICBXRUJDT1JFX0VYUE9SVCBGbG9hdFJlY3QgZmFz dEJvdW5kaW5nUmVjdCgpIGNvbnN0OwotICAgIEZsb2F0UmVjdCBzdHJva2VCb3VuZGluZ1JlY3Qo Y29uc3QgRnVuY3Rpb248dm9pZChHcmFwaGljc0NvbnRleHQmKT4mIHN0cm9rZVN0eWxlQXBwbGll ciA9IHsgfSkgY29uc3Q7CisgICAgRmxvYXRSZWN0IHN0cm9rZUJvdW5kaW5nUmVjdChjb25zdCBX VEY6OkZ1bmN0aW9uPHZvaWQoR3JhcGhpY3NDb250ZXh0Jik+JiBzdHJva2VTdHlsZUFwcGxpZXIg PSB7IH0pIGNvbnN0OwogCiAgICAgV0VCQ09SRV9FWFBPUlQgc2l6ZV90IGVsZW1lbnRDb3VudCgp IGNvbnN0OwogICAgIGZsb2F0IGxlbmd0aCgpIGNvbnN0Ow0K