Bug 235984 – Fixes for non-unified builds after r288868

• Status: RESOLVED
• Resolution: FIXED
• Component: WebCore Misc.

[Pablo Saavedra]

SSIA

Related-to: https://bugs.webkit.org/show_bug.cgi?id=235938

[Pablo Saavedra]

Created attachment 450583 [details]
patch

[Chris Dumez]

Comment on attachment 450583 [details]
patch

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

> Source/WebCore/rendering/RenderInline.h:26
> +#include "RenderBlockFlow.h"

What is this for? I don't see it being obviously used in this header?

[Chris Dumez]

Comment on attachment 450583 [details]
patch

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

>> Source/WebCore/rendering/RenderInline.h:26
>> +#include "RenderBlockFlow.h"
> 
> What is this for? I don't see it being obviously used in this header?

r288868 didn't actually touch this header.

[zalan]

(In reply to Chris Dumez from comment #2)
> Comment on attachment 450583 [details]
> patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=450583&action=review
> 
> > Source/WebCore/rendering/RenderInline.h:26
> > +#include "RenderBlockFlow.h"
> 
> What is this for? I don't see it being obviously used in this header?
RenderInline should have no business of referencing RenderBlockFlow in the header.

[Darin Adler]

Comment on attachment 450583 [details]
patch

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

>>>> Source/WebCore/rendering/RenderInline.h:26
>>>> +#include "RenderBlockFlow.h"
>>> 
>>> What is this for? I don't see it being obviously used in this header?
>> 
>> r288868 didn't actually touch this header.
> 
> RenderInline should have no business of referencing RenderBlockFlow in the header.

We need to see the error you are fixing with this include, so we can suggest a better solution.

[Pablo Saavedra]

Yeah, sorry for the noise, I think I've anticipated to much the r? flag. Let me work a bit in the problem. I will upload the error traces ASAP.

[Pablo Saavedra]

Related errors:

```
/home/bot/webkit/Source/WebCore/layout/integration/InlineIteratorInlineBox.cpp: In function �~@~XWebCore::InlineIterator::InlineBoxIterator WebCore::InlineIterator::firstRootInlineBoxFor(const WebCore::RenderBlockFlow&)�~@~Y:
/home/bot/webkit/Source/WebCore/layout/integration/InlineIteratorInlineBox.cpp:125:30: error: invalid use of incomplete type �~@~Xconst class WebCore::RenderBlockFlow�~@~Y
  125 |     return { BoxLegacyPath { block.firstRootBox() } };
      |                              ^~~~~
In file included from /home/bot/webkit/Source/WebCore/rendering/RenderElement.h:27,
                 from /home/bot/webkit/Source/WebCore/rendering/RenderLayerModelObject.h:25,
                 from /home/bot/webkit/Source/WebCore/rendering/RenderBoxModelObject.h:29,
                 from /home/bot/webkit/Source/WebCore/rendering/LegacyInlineBox.h:24,
                 from /home/bot/webkit/Source/WebCore/rendering/LegacyInlineTextBox.h:25,
                 from /home/bot/webkit/Source/WebCore/layout/integration/InlineIteratorBoxLegacyPath.h:28,
                 from /home/bot/webkit/Source/WebCore/layout/integration/InlineIteratorBox.h:28,
                 from /home/bot/webkit/Source/WebCore/layout/integration/InlineIteratorInlineBox.h:28,
                 from /home/bot/webkit/Source/WebCore/layout/integration/InlineIteratorInlineBox.cpp:27:
/home/bot/webkit/Source/WebCore/rendering/RenderObject.h:65:7: note: forward declaration of �~@~Xclass WebCore::RenderBlockFlow�~@~Y
   65 | class RenderBlockFlow;
      |       ^~~~~~~~~~~~~~~
```


```
/home/bot/webkit/Source/WebCore/rendering/RenderBlockFlow.cpp: In member function �~@~Xvirtual void WebCore::RenderBlockFlow::addFocusRingRectsForInlineChildren(WTF::Vector<WebCore::LayoutRect>&, const WebCore::LayoutPoint&, const WebCore::RenderLayerModelObject*)�~@~Y:
/home/bot/webkit/Source/WebCore/rendering/RenderBlockFlow.cpp:3460:37: error: �~@~XfirstRootInlineBoxFor�~@~Y is not a member of �~@~XWebCore::InlineIterator�~@~Y
 3460 |     for (auto box = InlineIterator::firstRootInlineBoxFor(*this); box; box.traverseNextInlineBox()) {
      |                                     ^~~~~~~~~~~~~~~~~~~~~
/home/bot/webkit/Source/WebCore/rendering/RenderBlockFlow.cpp:3465:153: error: no matching function for call to �~@~XWebCore::LayoutRect::LayoutRect(<brace-enclosed initializer list>)�~@~Y
 3465 |         LayoutRect rect { LayoutUnit(additionalOffset.x() + box->rect().x()), additionalOffset.y() + top, LayoutUnit(box->rect().width()), bottom - top };
      |                                                                                                                                                         ^
In file included from /home/bot/webkit/Source/WebCore/rendering/RenderBoxModelObject.h:27,
                 from /home/bot/webkit/Source/WebCore/rendering/LegacyInlineBox.h:24,
                 from /home/bot/webkit/Source/WebCore/rendering/LegacyInlineFlowBox.h:23,
                 from /home/bot/webkit/Source/WebCore/rendering/LegacyRootInlineBox.h:24,
                 from /home/bot/webkit/Source/WebCore/rendering/FloatingObjects.h:26,
                 from /home/bot/webkit/Source/WebCore/rendering/RenderBlockFlow.h:25,
                 from /home/bot/webkit/Source/WebCore/rendering/RenderBlockFlow.cpp:25:
/home/bot/webkit/Source/WebCore/platform/graphics/LayoutRect.h:51:5: note: candidate: �~@~Xtemplate<class T1, class T2, class U1, class U2> WebCore::LayoutRect::LayoutRect(T1, T2, U1, U2)�~@~Y
   51 |     LayoutRect(T1 x, T2 y, U1 width, U2 height)
      |     ^~~~~~~~~~
```


```
/home/bot/webkit/Source/WebCore/rendering/RenderInline.cpp: In member function �~@~Xvoid WebCore::RenderInline::paintOutline(WebCore::PaintInfo&, const WebCore::LayoutPoint&)�~@~Y:
/home/bot/webkit/Source/WebCore/rendering/RenderInline.cpp:963:30: error: invalid use of incomplete type �~@~Xclass WebCore::InlineIterator::LineIterator�~@~Y
  963 |         auto line = box->line();
      |                     ~~~~~~~~~^~
In file included from /home/bot/webkit/Source/WebCore/layout/integration/InlineIteratorInlineBox.h:28,
                 from /home/bot/webkit/Source/WebCore/rendering/RenderInline.cpp:31:
/home/bot/webkit/Source/WebCore/layout/integration/InlineIteratorBox.h:41:7: note: forward declaration of �~@~Xclass WebCore::InlineIterator::LineIterator�~@~Y
   41 | class LineIterator;
      |       ^~~~~~~~~~~~
In file included from /home/bot/webkit/WebKitBuild/Release-alternative/bmalloc/Headers/bmalloc/IsoHeapInlines.h:38,
                 from /home/bot/webkit/WebKitBuild/Release-alternative/WTF/Headers/wtf/IsoMallocInlines.h:40,
                 from /home/bot/webkit/Source/WebCore/rendering/RenderInline.cpp:53:
```

[Pablo Saavedra]

Created attachment 450682 [details]
patch

[Chris Dumez]

Comment on attachment 450682 [details]
patch

This looks more reasonable, thank you.

[EWS]

Committed r288985 (246706@main): <https://commits.webkit.org/246706@main>

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

[Radar WebKit Bug Importer]

<rdar://problem/88396138>