Bug 231277 – [PlayStation] Fix build break after r283441

• Status: RESOLVED
• Resolution: FIXED
• Component: Platform

[Basuke Suzuki]

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.

[Basuke Suzuki]

Created attachment 440329 [details]
PATCH

[EWS]

Committed r283602 (242554@main): <https://commits.webkit.org/242554@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 440329 [details].

[Radar WebKit Bug Importer]

<rdar://problem/83920199>

[Fujii Hironori]

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;".

[Basuke Suzuki]

(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.

[Darin Adler]

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

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.

[Basuke Suzuki]

> 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

[Darin Adler]

(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?

[Alex Christensen]

And https://bugs.webkit.org/show_bug.cgi?id=231318

[Fujii Hironori]

(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.