227405 2021-06-25 14:21:12 -0700 [LFC][TFC] Remove redundant struct ResolvedItem 2021-06-25 19:27:16 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham sam simon.fraser webkit-bug-importer zalan oldest_to_newest 1772760 0 zalan 2021-06-25 14:21:12 -0700 ssia 1772761 1 432291 zalan 2021-06-25 14:22:19 -0700 Created attachment 432291 Patch 1772851 2 ews-feeder 2021-06-25 19:26:47 -0700 Committed r279306 (239182@main): <https://commits.webkit.org/239182@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 432291. 1772852 3 webkit-bug-importer 2021-06-25 19:27:16 -0700 <rdar://problem/79806145> 432291 2021-06-25 14:22:19 -0700 2021-06-25 19:26:48 -0700 Patch bug-227405-20210625142218.patch text/plain 6263 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5Mjg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjBkNDE0M2IyZDQxYTQ1 NGI5Njg2ZGYwOWI3YzYyNmZjODJkODc2Zi4uMDIzMzcwMjNhZjNjODQyMDlkYWQyZjdlMTBjZjZh ZTQyZWNhODgyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTA2LTI1ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtURkNdIFJlbW92ZSBy ZWR1bmRhbnQgc3RydWN0IFJlc29sdmVkSXRlbQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3NDA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1Rh YmxlTGF5b3V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6ZGlzdHJpYnV0ZUF2YWls YWJsZVNwYWNlKToKKwogMjAyMS0wNi0yNSAgUnlhbiBIYWRkYWQgIDxyeWFuaGFkZGFkQGFwcGxl LmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI3OTIwOC4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVM YXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJs ZS9UYWJsZUxheW91dC5jcHAKaW5kZXggNGYzMTEwMGE2NWY1MGI4MmVlNmRlYzZjYTVkZDI0N2Q0 N2YyNjkwNC4uYTM3NmY1NTcxZTgyNzBiZWQ3ZDZmYjI2YjlkYTkwMmY5ODE0NTdmYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJs ZUxheW91dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy90YWJsZS9UYWJsZUxheW91dC5jcHAKQEAgLTExMywxNCArMTEzLDEwIEBAIGlubGluZSBzdGF0 aWMgR3JpZFNwYWNlJiBvcGVyYXRvci8oR3JpZFNwYWNlJiBhLCB1bnNpZ25lZCB2YWx1ZSkKIHRl bXBsYXRlIDx0eXBlbmFtZSBTcGFuVHlwZT4KIHN0YXRpYyBWZWN0b3I8TGF5b3V0VW5pdD4gZGlz dHJpYnV0ZUF2YWlsYWJsZVNwYWNlKGNvbnN0IFRhYmxlR3JpZCYgZ3JpZCwgTGF5b3V0VW5pdCBh dmFpbGFibGVTcGFjZSwgY29uc3QgV1RGOjpGdW5jdGlvbjxHcmlkU3BhY2UoY29uc3QgVGFibGVH cmlkOjpTbG90Jiwgc2l6ZV90KT4mIHNsb3RTcGFjZSkKIHsKLSAgICBzdHJ1Y3QgUmVzb2x2ZWRJ dGVtIHsKLSAgICAgICAgR3JpZFNwYWNlIHNsb3RTcGFjZTsKLSAgICB9OwotCiAgICAgYXV0byYg Y29sdW1ucyA9IGdyaWQuY29sdW1ucygpOwogICAgIGF1dG8mIHJvd3MgPSBncmlkLnJvd3MoKTsK ICAgICAvLyAxLiBDb2xsZWN0IHRoZSBub24tc3Bhbm5pbmcgc3BhY2VzIGZpcnN0LiBUaGV5IGFy ZSB1c2VkIGZvciB0aGUgZmluYWwgZGlzdHJpYnV0aW9uIGFzIHdlbGwgYXMgZm9yIGRpc3RyaWJ1 dGluZyB0aGUgc3Bhbm5pbmcgc3BhY2UuCi0gICAgVmVjdG9yPHN0ZDo6b3B0aW9uYWw8UmVzb2x2 ZWRJdGVtPj4gcmVzb2x2ZWRJdGVtcyhTcGFuVHlwZTo6c2l6ZShncmlkKSk7CisgICAgVmVjdG9y PHN0ZDo6b3B0aW9uYWw8R3JpZFNwYWNlPj4gcmVzb2x2ZWRJdGVtcyhTcGFuVHlwZTo6c2l6ZShn cmlkKSk7CiAgICAgZm9yIChzaXplX3QgY29sdW1uSW5kZXggPSAwOyBjb2x1bW5JbmRleCA8IGNv bHVtbnMuc2l6ZSgpOyArK2NvbHVtbkluZGV4KSB7CiAgICAgICAgIGZvciAoc2l6ZV90IHJvd0lu ZGV4ID0gMDsgcm93SW5kZXggPCByb3dzLnNpemUoKTsgKytyb3dJbmRleCkgewogICAgICAgICAg ICAgYXV0byYgc2xvdCA9ICpncmlkLnNsb3QoeyBjb2x1bW5JbmRleCwgcm93SW5kZXggfSk7CkBA IC0xMjgsOCArMTI0LDggQEAgc3RhdGljIFZlY3RvcjxMYXlvdXRVbml0PiBkaXN0cmlidXRlQXZh aWxhYmxlU3BhY2UoY29uc3QgVGFibGVHcmlkJiBncmlkLCBMYXlvdXQKICAgICAgICAgICAgICAg ICBjb250aW51ZTsKICAgICAgICAgICAgIGF1dG8gaW5kZXggPSBTcGFuVHlwZTo6aW5kZXgoY29s dW1uSW5kZXgsIHJvd0luZGV4KTsKICAgICAgICAgICAgIGlmICghcmVzb2x2ZWRJdGVtc1tpbmRl eF0pCi0gICAgICAgICAgICAgICAgcmVzb2x2ZWRJdGVtc1tpbmRleF0gPSBSZXNvbHZlZEl0ZW0g eyB9OwotICAgICAgICAgICAgcmVzb2x2ZWRJdGVtc1tpbmRleF0tPnNsb3RTcGFjZSA9IG1heChy ZXNvbHZlZEl0ZW1zW2luZGV4XS0+c2xvdFNwYWNlLCBzbG90U3BhY2Uoc2xvdCwgaW5kZXgpKTsK KyAgICAgICAgICAgICAgICByZXNvbHZlZEl0ZW1zW2luZGV4XSA9IEdyaWRTcGFjZSB7IH07Cisg ICAgICAgICAgICByZXNvbHZlZEl0ZW1zW2luZGV4XSA9IG1heCgqcmVzb2x2ZWRJdGVtc1tpbmRl eF0sIHNsb3RTcGFjZShzbG90LCBpbmRleCkpOwogICAgICAgICB9CiAgICAgfQogCkBAIC0xNzQs MTQgKzE3MCwxNCBAQCBzdGF0aWMgVmVjdG9yPExheW91dFVuaXQ+IGRpc3RyaWJ1dGVBdmFpbGFi bGVTcGFjZShjb25zdCBUYWJsZUdyaWQmIGdyaWQsIExheW91dAogICAgICAgICAgICAgICAgICAg ICBjb250aW51ZTsKICAgICAgICAgICAgICAgICBBU1NFUlQodW5yZXNvbHZlZENvbHVtbkNvdW50 KTsKICAgICAgICAgICAgICAgICAtLXVucmVzb2x2ZWRDb2x1bW5Db3VudDsKLSAgICAgICAgICAg ICAgICB1bnJlc29sdmVkU3Bhbm5pbmdTcGFjZSAtPSByZXNvbHZlZEl0ZW1zW3NwYW5JbmRleF0t PnNsb3RTcGFjZTsKKyAgICAgICAgICAgICAgICB1bnJlc29sdmVkU3Bhbm5pbmdTcGFjZSAtPSAq cmVzb2x2ZWRJdGVtc1tzcGFuSW5kZXhdOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgQVNT RVJUKHVucmVzb2x2ZWRDb2x1bW5Db3VudCk7CiAgICAgICAgICAgICBhdXRvIGVxdWFsU3BhY2VG b3JTcGFubmVkQ29sdW1ucyA9IHVucmVzb2x2ZWRTcGFubmluZ1NwYWNlIC8gdW5yZXNvbHZlZENv bHVtbkNvdW50OwogICAgICAgICAgICAgZm9yIChhdXRvIHNwYW5JbmRleCA9IFNwYW5UeXBlOjpz dGFydFNwYW4oY2VsbCk7IHNwYW5JbmRleCA8IFNwYW5UeXBlOjplbmRTcGFuKGNlbGwpOyArK3Nw YW5JbmRleCkgewogICAgICAgICAgICAgICAgIGlmIChyZXNvbHZlZEl0ZW1zW3NwYW5JbmRleF0p CiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgICAgIHJlc29sdmVk SXRlbXNbc3BhbkluZGV4XSA9IFJlc29sdmVkSXRlbSB7IGVxdWFsU3BhY2VGb3JTcGFubmVkQ29s dW1ucyB9OworICAgICAgICAgICAgICAgIHJlc29sdmVkSXRlbXNbc3BhbkluZGV4XSA9IGVxdWFs U3BhY2VGb3JTcGFubmVkQ29sdW1uczsKICAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNlIHsK ICAgICAgICAgICAgIC8vIDEuIENvbGxlY3QgdGhlIG5vbi1zcGFuaW5nIHJlc29sdmVkIHNwYWNl cy4KQEAgLTE5MCw3ICsxODYsNyBAQCBzdGF0aWMgVmVjdG9yPExheW91dFVuaXQ+IGRpc3RyaWJ1 dGVBdmFpbGFibGVTcGFjZShjb25zdCBUYWJsZUdyaWQmIGdyaWQsIExheW91dAogICAgICAgICAg ICAgLy8gTmV3IHJlc29sdmVkIHdpZHRoczogWyAzIF0gWyA2IF0uCiAgICAgICAgICAgICBhdXRv IHJlc29sdmVkU3Bhbm5pbmdTcGFjZSA9IEdyaWRTcGFjZSB7IH07CiAgICAgICAgICAgICBmb3Ig KGF1dG8gc3BhbkluZGV4ID0gU3BhblR5cGU6OnN0YXJ0U3BhbihjZWxsKTsgc3BhbkluZGV4IDwg U3BhblR5cGU6OmVuZFNwYW4oY2VsbCk7ICsrc3BhbkluZGV4KQotICAgICAgICAgICAgICAgIHJl c29sdmVkU3Bhbm5pbmdTcGFjZSArPSByZXNvbHZlZEl0ZW1zW3NwYW5JbmRleF0tPnNsb3RTcGFj ZTsKKyAgICAgICAgICAgICAgICByZXNvbHZlZFNwYW5uaW5nU3BhY2UgKz0gKnJlc29sdmVkSXRl bXNbc3BhbkluZGV4XTsKICAgICAgICAgICAgIGlmIChyZXNvbHZlZFNwYW5uaW5nU3BhY2UucHJl ZmVycmVkU3BhY2UgPj0gdW5yZXNvbHZlZFNwYW5uaW5nU3BhY2UucHJlZmVycmVkU3BhY2UpIHsK ICAgICAgICAgICAgICAgICAvLyBUaGUgc3Bhbm5pbmcgY2VsbCBmaXRzIHRoZSBzcGFubmVkIGNv bHVtbnMvcm93cyBqdXN0IGZpbmUuIE5vdGhpbmcgdG8gZGlzdHJpYnV0ZS4KICAgICAgICAgICAg ICAgICBjb250aW51ZTsKQEAgLTIwMCw3ICsxOTYsNyBAQCBzdGF0aWMgVmVjdG9yPExheW91dFVu aXQ+IGRpc3RyaWJ1dGVBdmFpbGFibGVTcGFjZShjb25zdCBUYWJsZUdyaWQmIGdyaWQsIExheW91 dAogICAgICAgICAgICAgaWYgKCFzcGFjZVRvRGlzdHJpYnV0ZS5pc0VtcHR5KCkpIHsKICAgICAg ICAgICAgICAgICBhdXRvIGNvbHVtbnNGbGV4QmFzZSA9IHNwYWNlVG9EaXN0cmlidXRlLmZsZXhC YXNlIC8gcmVzb2x2ZWRTcGFubmluZ1NwYWNlLmZsZXhCYXNlOwogICAgICAgICAgICAgICAgIGZv ciAoYXV0byBzcGFuSW5kZXggPSBTcGFuVHlwZTo6c3RhcnRTcGFuKGNlbGwpOyBzcGFuSW5kZXgg PCBTcGFuVHlwZTo6ZW5kU3BhbihjZWxsKTsgKytzcGFuSW5kZXgpCi0gICAgICAgICAgICAgICAg ICAgIHJlc29sdmVkSXRlbXNbc3BhbkluZGV4XS0+c2xvdFNwYWNlICs9IEdyaWRTcGFjZSB7IHJl c29sdmVkSXRlbXNbc3BhbkluZGV4XS0+c2xvdFNwYWNlLnByZWZlcnJlZFNwYWNlICogY29sdW1u c0ZsZXhCYXNlLCByZXNvbHZlZEl0ZW1zW3NwYW5JbmRleF0tPnNsb3RTcGFjZS5mbGV4QmFzZSAq IGNvbHVtbnNGbGV4QmFzZX07CisgICAgICAgICAgICAgICAgICAgICpyZXNvbHZlZEl0ZW1zW3Nw YW5JbmRleF0gKz0gR3JpZFNwYWNlIHsgcmVzb2x2ZWRJdGVtc1tzcGFuSW5kZXhdLT5wcmVmZXJy ZWRTcGFjZSAqIGNvbHVtbnNGbGV4QmFzZSwgcmVzb2x2ZWRJdGVtc1tzcGFuSW5kZXhdLT5mbGV4 QmFzZSAqIGNvbHVtbnNGbGV4QmFzZX07CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9 CkBAIC0yMTMsNyArMjA5LDcgQEAgc3RhdGljIFZlY3RvcjxMYXlvdXRVbml0PiBkaXN0cmlidXRl QXZhaWxhYmxlU3BhY2UoY29uc3QgVGFibGVHcmlkJiBncmlkLCBMYXlvdXQKICAgICAvLyBGaXhl ZCBzaXplIGNlbGxzIGRvbid0IHBhcnRpY2lwYXRlIGluIGF2YWlsYWJsZSBzcGFjZSBkaXN0cmli dXRpb24uCiAgICAgYXV0byBhZGp1c3RhYmxlZFNwYWNlID0gR3JpZFNwYWNlIHsgfTsKICAgICBm b3IgKGF1dG8mIHJlc29sdmVkSXRlbSA6IHJlc29sdmVkSXRlbXMpCi0gICAgICAgIGFkanVzdGFi bGVkU3BhY2UgKz0gcmVzb2x2ZWRJdGVtLT5zbG90U3BhY2U7CisgICAgICAgIGFkanVzdGFibGVk U3BhY2UgKz0gKnJlc29sdmVkSXRlbTsKIAogICAgIFZlY3RvcjxMYXlvdXRVbml0PiBkaXN0cmli dXRlZFNwYWNlcyhyZXNvbHZlZEl0ZW1zLnNpemUoKSk7CiAgICAgZmxvYXQgc3BhY2VUb0Rpc3Ry aWJ1dGUgPSBhdmFpbGFibGVTcGFjZTsKQEAgLTIyNCw4ICsyMjAsOCBAQCBzdGF0aWMgVmVjdG9y PExheW91dFVuaXQ+IGRpc3RyaWJ1dGVBdmFpbGFibGVTcGFjZShjb25zdCBUYWJsZUdyaWQmIGdy aWQsIExheW91dAogICAgIC8vIHdlIG1heSBhc3NpZ24gbGVzcyBzcGFjZSB0byBjb2x1bW5zLgog ICAgIGF1dG8gY29sdW1uc0ZsZXhCYXNlID0gYWRqdXN0YWJsZWRTcGFjZS5mbGV4QmFzZSA/IHNw YWNlVG9EaXN0cmlidXRlIC8gYWRqdXN0YWJsZWRTcGFjZS5mbGV4QmFzZSA6IDAuZjsKICAgICBm b3IgKHNpemVfdCBpbmRleCA9IDA7IGluZGV4IDwgcmVzb2x2ZWRJdGVtcy5zaXplKCk7ICsraW5k ZXgpIHsKLSAgICAgICAgYXV0byBjb2x1bW5FeHRyYVNwYWNlID0gY29sdW1uc0ZsZXhCYXNlICog cmVzb2x2ZWRJdGVtc1tpbmRleF0tPnNsb3RTcGFjZS5mbGV4QmFzZTsKLSAgICAgICAgZGlzdHJp YnV0ZWRTcGFjZXNbaW5kZXhdID0gTGF5b3V0VW5pdCB7IHJlc29sdmVkSXRlbXNbaW5kZXhdLT5z bG90U3BhY2UucHJlZmVycmVkU3BhY2UgKyBjb2x1bW5FeHRyYVNwYWNlIH07CisgICAgICAgIGF1 dG8gY29sdW1uRXh0cmFTcGFjZSA9IGNvbHVtbnNGbGV4QmFzZSAqIHJlc29sdmVkSXRlbXNbaW5k ZXhdLT5mbGV4QmFzZTsKKyAgICAgICAgZGlzdHJpYnV0ZWRTcGFjZXNbaW5kZXhdID0gTGF5b3V0 VW5pdCB7IHJlc29sdmVkSXRlbXNbaW5kZXhdLT5wcmVmZXJyZWRTcGFjZSArIGNvbHVtbkV4dHJh U3BhY2UgfTsKICAgICB9CiAgICAgcmV0dXJuIGRpc3RyaWJ1dGVkU3BhY2VzOwogfQo=