235984 2022-02-01 16:15:01 -0800 Fixes for non-unified builds after r288868 2022-02-02 12:43:17 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 psaavedra psaavedra cdumez changseok darin esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan mmaxfield pdr webkit-bug-importer zalan oldest_to_newest 1836206 0 psaavedra 2022-02-01 16:15:01 -0800 SSIA Related-to: https://bugs.webkit.org/show_bug.cgi?id=235938 1836207 1 450583 psaavedra 2022-02-01 16:16:49 -0800 Created attachment 450583 patch 1836208 2 450583 cdumez 2022-02-01 16:18:43 -0800 Comment on attachment 450583 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? 1836212 3 450583 cdumez 2022-02-01 16:20:54 -0800 Comment on attachment 450583 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. 1836237 4 zalan 2022-02-01 16:48:39 -0800 (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. 1836253 5 450583 darin 2022-02-01 17:29:10 -0800 Comment on attachment 450583 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. 1836415 6 psaavedra 2022-02-02 05:44:27 -0800 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. 1836555 7 psaavedra 2022-02-02 11:43:06 -0800 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: ``` 1836556 8 450682 psaavedra 2022-02-02 11:43:35 -0800 Created attachment 450682 patch 1836557 9 450682 cdumez 2022-02-02 11:44:50 -0800 Comment on attachment 450682 patch This looks more reasonable, thank you. 1836588 10 ews-feeder 2022-02-02 12:42:12 -0800 Committed r288985 (246706@main): <https://commits.webkit.org/246706@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 450682. 1836589 11 webkit-bug-importer 2022-02-02 12:43:17 -0800 <rdar://problem/88396138> 450583 2022-02-01 16:16:49 -0800 2022-02-02 11:43:18 -0800 patch bug-235984-20220202011648.patch text/plain 2282 psaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4OTA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWIyNDg0NTliNjg3NWMy MWMzYmUyMTRiYzU1ZGU3MjhkMjkyNTY1Zi4uNDE4YTBlNDRhNmIyN2JjYjU1M2E2NGYzNGY0NTAx MWU3ODBiYzUwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIyLTAyLTAxICBQYWJs byBTYWF2ZWRyYSAgPHBzYWF2ZWRyYUBpZ2FsaWEuY29tPgorCisgICAgICAgIEZpeGVzIGZvciBu b24tdW5pZmllZCBidWlsZHMgYWZ0ZXIgcjI4ODg2OAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1OTg0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcDoK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcDoKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVySW5saW5lLmg6CisKIDIwMjItMDItMDEgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRz QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVmYWN0b3IgS2V5ZnJhbWVzUnVsZU1hcCB0byB1c2Ug QXRvbVN0cmluZyBmb3IgdGhlIGtleQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrRmxvdy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2tGbG93LmNwcAppbmRleCA3YzU2M2NmOWZjNmE5Yjc0OTY5NzdkODA1ZDU4NTBiM2U4ODFi YzNlLi5mNWQxNzE5MzZmNGQ1MzQ1NDc4NTQzMGY0N2U3ZTRlZDM2YzY0ZGMwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcApAQCAtMzUsNiArMzUsNyBA QAogI2luY2x1ZGUgIkhUTUxUZXh0QXJlYUVsZW1lbnQuaCIKICNpbmNsdWRlICJIaXRUZXN0TG9j YXRpb24uaCIKICNpbmNsdWRlICJJbmxpbmVJdGVyYXRvckJveC5oIgorI2luY2x1ZGUgIklubGlu ZUl0ZXJhdG9ySW5saW5lQm94LmgiCiAjaW5jbHVkZSAiSW5saW5lSXRlcmF0b3JMaW5lLmgiCiAj aW5jbHVkZSAiSW5saW5lSXRlcmF0b3JMb2dpY2FsT3JkZXJUcmF2ZXJzYWwuaCIKICNpbmNsdWRl ICJJbmxpbmVJdGVyYXRvclRleHRCb3guaCIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl cklubGluZS5jcHAKaW5kZXggMGEwOWY0OGJjZTY1MTVjMDg5NzZhNjg0M2RjMDIxMWZiZTcxYmEz OS4uNTdhYmQyMDJlNTRmYjIyNzNkN2Y3ZDVlNTQzYzMyNTUwYzUxYjE5MiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAKQEAgLTI5LDYgKzI5LDcgQEAKICNpbmNs dWRlICJHcmFwaGljc0NvbnRleHQuaCIKICNpbmNsdWRlICJIaXRUZXN0UmVzdWx0LmgiCiAjaW5j bHVkZSAiSW5saW5lSXRlcmF0b3JJbmxpbmVCb3guaCIKKyNpbmNsdWRlICJJbmxpbmVJdGVyYXRv ckxpbmUuaCIKICNpbmNsdWRlICJMYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuaCIKICNpbmNs dWRlICJMZWdhY3lJbmxpbmVFbGVtZW50Qm94LmgiCiAjaW5jbHVkZSAiTGVnYWN5SW5saW5lVGV4 dEJveC5oIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGlu ZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5oCmluZGV4IDBhMTcx YWY4YmJhZGNhYjBlMGJhNDE2ZDJhMDk4Nzk4YmVkMjc0MzUuLjFlY2JhNGJlNzRmNDI1NzAyZGRm MGE4ZmMxYTBhNTA3MmRhMGE3YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJJbmxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5s aW5lLmgKQEAgLTIzLDYgKzIzLDcgQEAKICNwcmFnbWEgb25jZQogCiAjaW5jbHVkZSAiTGVnYWN5 SW5saW5lRmxvd0JveC5oIgorI2luY2x1ZGUgIlJlbmRlckJsb2NrRmxvdy5oIgogI2luY2x1ZGUg IlJlbmRlckJveE1vZGVsT2JqZWN0LmgiCiAjaW5jbHVkZSAiUmVuZGVyTGluZUJveExpc3QuaCIK IAo= 450682 2022-02-02 11:43:35 -0800 2022-02-02 12:42:15 -0800 patch bug-235984-20220202204334.patch text/plain 2400 psaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4OTUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzVkYTA4MDZjZGJiOTEw ZTMzYmVmNWEzNDE1ODExMjMwNzkwZTcwMC4uMDFlYmM5NmQxYmQyZjRkNDA0MDg1Mzk0MzJkN2Qx MWNjYjVkYzYzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIyLTAyLTAyICBQYWJs byBTYWF2ZWRyYSAgPHBzYWF2ZWRyYUBpZ2FsaWEuY29tPgorCisgICAgICAgIEZpeGVzIGZvciBu b24tdW5pZmllZCBidWlsZHMgYWZ0ZXIgcjI4ODg2OAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1OTg0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0 b3JJbmxpbmVCb3guY3BwOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3Bw OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwOgorCiAyMDIyLTAyLTAyICBZ b3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBMaWJXZWJSVENDb2Rl Y3Mgc2hvdWxkIG5vdCBuZWVkIHRvIGNyZWF0ZSBJT1N1cmZhY2VzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JJbmxpbmVCb3guY3Bw IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9ySW5saW5l Qm94LmNwcAppbmRleCBhMzM4YjQxZWVkNDkwMGNhMzhiNmZmYjFiNTEwMmEyOWFlNWU4MDhkLi4y YWVjNWE2YWEwMzRhYTUyZWMwMjMwYjk5OGRmMDBhODE0MjRjMDc4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JJbmxpbmVCb3guY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvcklu bGluZUJveC5jcHAKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJJbmxpbmVJdGVyYXRvcklu bGluZUJveC5oIgogCiAjaW5jbHVkZSAiTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmgiCisj aW5jbHVkZSAiUmVuZGVyQmxvY2tGbG93LmgiCiAjaW5jbHVkZSAiUmVuZGVySW5saW5lLmgiCiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9ja0Zsb3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrRmxvdy5jcHAKaW5kZXggMGRjY2E0YjEwMWVjZmFhNTAwOTkwODFmMjg3YzYxMTRkNjc5ZTUw Mi4uYTdlOTVjODQ3YjE4YjJhZDdjOWE2YzhiNzJiNzVmMTE3MzQ3NGRmOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKQEAgLTM1LDYgKzM1LDcgQEAK ICNpbmNsdWRlICJIVE1MVGV4dEFyZWFFbGVtZW50LmgiCiAjaW5jbHVkZSAiSGl0VGVzdExvY2F0 aW9uLmgiCiAjaW5jbHVkZSAiSW5saW5lSXRlcmF0b3JCb3guaCIKKyNpbmNsdWRlICJJbmxpbmVJ dGVyYXRvcklubGluZUJveC5oIgogI2luY2x1ZGUgIklubGluZUl0ZXJhdG9yTGluZS5oIgogI2lu Y2x1ZGUgIklubGluZUl0ZXJhdG9yTG9naWNhbE9yZGVyVHJhdmVyc2FsLmgiCiAjaW5jbHVkZSAi SW5saW5lSXRlcmF0b3JUZXh0Qm94LmgiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVySW5saW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJ bmxpbmUuY3BwCmluZGV4IDRhZjIyNmU3Y2RhYjEwNGQyMzU5MTY0NDQxNjU4MzUxMjkzNjE0ZGUu LmUyYjRiMDlmNTdkZWIzYTQ1OThmM2JkMGNlNjczNGIwOTc1YjFjNTIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCkBAIC0yOSw2ICsyOSw3IEBACiAjaW5jbHVk ZSAiR3JhcGhpY3NDb250ZXh0LmgiCiAjaW5jbHVkZSAiSGl0VGVzdFJlc3VsdC5oIgogI2luY2x1 ZGUgIklubGluZUl0ZXJhdG9ySW5saW5lQm94LmgiCisjaW5jbHVkZSAiSW5saW5lSXRlcmF0b3JM aW5lLmgiCiAjaW5jbHVkZSAiTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmgiCiAjaW5jbHVk ZSAiTGVnYWN5SW5saW5lRWxlbWVudEJveC5oIgogI2luY2x1ZGUgIkxlZ2FjeUlubGluZVRleHRC b3guaCIK