216957 2020-09-24 20:55:30 -0700 [LFC][IFC] Add helper functions to create LineBox::InlineBox objects for inline level boxes. 2020-09-24 21:50:17 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham simon.fraser webkit-bug-importer zalan oldest_to_newest 1691757 0 zalan 2020-09-24 20:55:30 -0700 and there's FIXME on the LineBox::InlineBox name 1691758 1 409653 zalan 2020-09-24 21:02:55 -0700 Created attachment 409653 Patch 1691759 2 409653 simon.fraser 2020-09-24 21:11:01 -0700 Comment on attachment 409653 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=409653&action=review > Source/WebCore/layout/inlineformatting/InlineLineBox.cpp:37 > + , m_logicalRect({ }, logicalLeft, logicalSize.width(), logicalSize.height()) Argument order is confusing because FloatRect(float x, float y, float width, float height) 1691761 3 zalan 2020-09-24 21:49:09 -0700 (In reply to Simon Fraser (smfr) from comment #2) > Comment on attachment 409653 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=409653&action=review > > > Source/WebCore/layout/inlineformatting/InlineLineBox.cpp:37 > > + , m_logicalRect({ }, logicalLeft, logicalSize.width(), logicalSize.height()) > > Argument order is confusing because FloatRect(float x, float y, float > width, float height) Yeah, in layout I started using top, left, width, height. I might change it later. 1691762 4 ews-feeder 2020-09-24 21:49:51 -0700 Committed r267557: <https://trac.webkit.org/changeset/267557> All reviewed patches have been landed. Closing bug and clearing flags on attachment 409653. 1691763 5 webkit-bug-importer 2020-09-24 21:50:17 -0700 <rdar://problem/69546533> 409653 2020-09-24 21:02:55 -0700 2020-09-24 21:49:51 -0700 Patch bug-216957-20200924210254.patch text/plain 10377 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NDk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTU5Y2NhNDg4YWIyY2M2 YTllZDkxYmI3ZWRlOGEyNjRmOTQxODI4Yy4uYzE1NDFmNGI5YjM4MDMwZTI0YzcwNzhmYThiZjgw ZWFmMjQzZWZiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA5LTI0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgaGVs cGVyIGZ1bmN0aW9ucyB0byBjcmVhdGUgTGluZUJveDo6SW5saW5lQm94IG9iamVjdHMgZm9yIGlu bGluZSBsZXZlbCBib3hlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxNjk1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRoZSBvdmVybG9hZGVkIExpbmVCb3g6OklubGluZUJveCBjb25zdHJ1Y3RvcnMg d2VyZSByZXByZXNlbnRpbmcgZGlmZmVyZW50IHR5cGVzIG9mIGlubGluZSBsZXZlbCBib3hlcy4K KyAgICAgICAgVGhlc2UgbmV3IGhlbHBlciBmdW5jdGlvbnMgbWFrZSBpdCBlYXNpZXIgdG8gZmln dXJlIG91dCBob3cgdG8gaW5pdGlhdGUgTGluZUJveDo6SW5saW5lQm94IG9iamVjdHMgZGVwZW5k aW5nIG9uIHRoZSB0eXBlIG9mCisgICAgICAgIHRoZSBpbmxpbmUgbGV2ZWwgYm94LgorICAgICAg ICBUaGlzIHBhdGNoIGFsc28gcmVtb3ZlcyBhbiBpbmNvcnJlY3QgQVNTRVJUIG9uIHRoZSBpbmxp bmUgYm94J3MgaGVpZ2h0LiBJdCBpcyBva2F5IHRvIGhhdmUgYSB6ZXJvIGhlaWdodCBpbmxpbmUg Ym94LiAgCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJv eEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUJveGVzKToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZUJveDo6SW5saW5lQm94OjpJbmxpbmVCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjptX2Jhc2VsaW5lKToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lQm94Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OklubGluZUJveDo6 Y3JlYXRlQm94Rm9yUm9vdElubGluZUJveCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Okxp bmVCb3g6OklubGluZUJveDo6Y3JlYXRlQm94Rm9yQXRvbWljSW5saW5lTGV2ZWxCb3gpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpJbmxpbmVCb3g6OmNyZWF0ZUJveEZvcklu bGluZUJveCk6CisKIDIwMjAtMDktMjMgIFRhZGV1IFphZ2FsbG8gIDx0emFnYWxsb0BhcHBsZS5j b20+CiAKICAgICAgICAgTWlzc2luZyBzY29wZSByZWxlYXNlIGluIEpTRE9NQnVpbHRpbkNvbnN0 cnVjdG9yQmFzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5 LmNwcAppbmRleCA5OTRiOWJiYzliOTEyOGU3MGJjZjFmYjFlMjEyZDg3NTc0MTExNmY5Li44M2E2 OTQ5Njg5YjNhNzc3Y2Y1YWM1ZDdlMDI4YTI1ZTEwNGQyMWZiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdl b21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtMTc5LDkgKzE3OSw5IEBAIHZv aWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUJveGVzKExpbmVCb3gmIGxpbmVCb3gs IGNvbnN0IExpbmU6OlJ1bkxpc3QmCiAgICAgICAgIGlmIChhdXRvIGxpbmVTcGFjaW5nID0gZm9u dE1ldHJpY3MubGluZVNwYWNpbmcoKSAtIGxvZ2ljYWxIZWlnaHQpCiAgICAgICAgICAgICBpbmxp bmVCb3guc2V0TGluZVNwYWNpbmcobGluZVNwYWNpbmcpOwogICAgIH07Ci0KKyAgICBhdXRvIGhv cml6b250YWxBbGlnbWVudE9mZnNldCA9IGxpbmVCb3guaG9yaXpvbnRhbEFsaWdubWVudE9mZnNl dCgpLnZhbHVlT3IoSW5saW5lTGF5b3V0VW5pdCB7IH0pOwogICAgIGF1dG8gY29uc3RydWN0Um9v dElubGluZUJveCA9IFsmXSB7Ci0gICAgICAgIGF1dG8gcm9vdElubGluZUJveCA9IG1ha2VVbmlx dWU8TGluZUJveDo6SW5saW5lQm94Pihyb290Qm94KCksIGxpbmVCb3guaG9yaXpvbnRhbEFsaWdu bWVudE9mZnNldCgpLnZhbHVlT3IoSW5saW5lTGF5b3V0VW5pdCB7IH0pLCBsaW5lQm94LmxvZ2lj YWxXaWR0aCgpKTsKKyAgICAgICAgYXV0byByb290SW5saW5lQm94ID0gTGluZUJveDo6SW5saW5l Qm94OjpjcmVhdGVCb3hGb3JSb290SW5saW5lQm94KHJvb3RCb3goKSwgaG9yaXpvbnRhbEFsaWdt ZW50T2Zmc2V0LCBsaW5lQm94LmxvZ2ljYWxXaWR0aCgpKTsKIAogICAgICAgICBhdXRvIGxpbmVI YXNJbWFnaW5hcnlTdHJ1dCA9ICFsYXlvdXRTdGF0ZSgpLmluUXVpcmtzTW9kZSgpOwogICAgICAg ICBhdXRvIGlzSW5pdGlhbGx5Q29uc2lkZXJlZE5vbkVtcHR5ID0gIWxpbmVCb3guaXNMaW5lVmlz dWFsbHlFbXB0eSgpICYmIGxpbmVIYXNJbWFnaW5hcnlTdHJ1dDsKQEAgLTIxNSw3ICsyMTUsNyBA QCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVCb3hlcyhMaW5lQm94JiBsaW5l Qm94LCBjb25zdCBMaW5lOjpSdW5MaXN0JgogICAgICAgICAgICAgfQogICAgICAgICAgICAgLy8g Q29uc3RydWN0IHRoZSBtaXNzaW5nIExpbmVCb3g6OklubGluZUJveGVzIHN0YXJ0aW5nIHdpdGgg dGhlIHRvcG1vc3QgYW5jZXN0b3IuCiAgICAgICAgICAgICBmb3IgKGF1dG8qIGFuY2VzdG9yIDog V1RGOjptYWtlUmV2ZXJzZWRSYW5nZShhbmNlc3RvcnNXaXRob3V0SW5saW5lQm94ZXMpKSB7Ci0g ICAgICAgICAgICAgICAgYXV0byBpbmxpbmVCb3ggPSBtYWtlVW5pcXVlPExpbmVCb3g6OklubGlu ZUJveD4oKmFuY2VzdG9yLCBsaW5lQm94Lmhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQoKS52YWx1 ZU9yKElubGluZUxheW91dFVuaXQgeyB9KSwgbGluZUJveC5sb2dpY2FsV2lkdGgoKSk7CisgICAg ICAgICAgICAgICAgYXV0byBpbmxpbmVCb3ggPSBMaW5lQm94OjpJbmxpbmVCb3g6OmNyZWF0ZUJv eEZvcklubGluZUJveCgqYW5jZXN0b3IsIGhvcml6b250YWxBbGlnbWVudE9mZnNldCwgbGluZUJv eC5sb2dpY2FsV2lkdGgoKSk7CiAgICAgICAgICAgICAgICAgaW5saW5lQm94LT5zZXRJc05vbkVt cHR5KCk7CiAgICAgICAgICAgICAgICAgYWRqdXN0VmVydGljYWxHZW9tZXRyeUZvck5vbkVtcHR5 SW5saW5lQm94KCppbmxpbmVCb3gpOwogICAgICAgICAgICAgICAgIGxpbmVCb3guYWRkSW5saW5l Qm94KFdURk1vdmUoaW5saW5lQm94KSk7CkBAIC0yMjYsNyArMjI2LDcgQEAgdm9pZCBMaW5lQm94 QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGlu ZTo6UnVuTGlzdCYKICAgICBmb3IgKGF1dG8mIHJ1biA6IHJ1bnMpIHsKICAgICAgICAgYXV0byYg aW5saW5lTGV2ZWxCb3ggPSBydW4ubGF5b3V0Qm94KCk7CiAgICAgICAgIGlmIChydW4uaXNCb3go KSkgewotICAgICAgICAgICAgYXV0byBsb2dpY2FsTGVmdCA9IGxpbmVCb3guaG9yaXpvbnRhbEFs aWdubWVudE9mZnNldCgpLnZhbHVlT3IoSW5saW5lTGF5b3V0VW5pdCB7IH0pICsgcnVuLmxvZ2lj YWxMZWZ0KCk7CisgICAgICAgICAgICBhdXRvIGxvZ2ljYWxMZWZ0ID0gaG9yaXpvbnRhbEFsaWdt ZW50T2Zmc2V0ICsgcnVuLmxvZ2ljYWxMZWZ0KCk7CiAgICAgICAgICAgICBhdXRvJiBpbmxpbmVM ZXZlbEJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChpbmxp bmVMZXZlbEJveCk7CiAgICAgICAgICAgICBhdXRvIGxvZ2ljYWxIZWlnaHQgPSBpbmxpbmVMZXZl bEJveEdlb21ldHJ5Lm1hcmdpbkJveEhlaWdodCgpOwogICAgICAgICAgICAgYXV0byBiYXNlbGlu ZSA9IGxvZ2ljYWxIZWlnaHQ7CkBAIC0yNDgsMTMgKzI0OCwxNSBAQCB2b2lkIExpbmVCb3hCdWls ZGVyOjpjb25zdHJ1Y3RJbmxpbmVCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5lOjpS dW5MaXN0JgogICAgICAgICAgICAgICAgIGF1dG8gaW5saW5lQmxvY2tCYXNlbGluZSA9IGxhc3RM aW5lLmxvZ2ljYWxUb3AoKSArIGxhc3RMaW5lLmJhc2VsaW5lKCk7CiAgICAgICAgICAgICAgICAg YmFzZWxpbmUgPSBpbmxpbmVMZXZlbEJveEdlb21ldHJ5Lm1hcmdpbkJlZm9yZSgpICsgaW5saW5l TGV2ZWxCb3hHZW9tZXRyeS5ib3JkZXJUb3AoKSArIGlubGluZUxldmVsQm94R2VvbWV0cnkucGFk ZGluZ1RvcCgpLnZhbHVlT3IoMCkgKyBpbmxpbmVCbG9ja0Jhc2VsaW5lOwogICAgICAgICAgICAg fQotICAgICAgICAgICAgYXV0byByZWN0ID0gSW5saW5lUmVjdCB7IHsgfSwgbG9naWNhbExlZnQs IHJ1bi5sb2dpY2FsV2lkdGgoKSwgbG9naWNhbEhlaWdodCB9OwotICAgICAgICAgICAgbGluZUJv eC5hZGRJbmxpbmVCb3gobWFrZVVuaXF1ZTxMaW5lQm94OjpJbmxpbmVCb3g+KGlubGluZUxldmVs Qm94LCByZWN0LCBiYXNlbGluZSkpOworICAgICAgICAgICAgYXV0byBpbmxpbmVCb3ggPSBMaW5l Qm94OjpJbmxpbmVCb3g6OmNyZWF0ZUJveEZvckF0b21pY0lubGluZUxldmVsQm94KGlubGluZUxl dmVsQm94LCBsb2dpY2FsTGVmdCwgeyBydW4ubG9naWNhbFdpZHRoKCksIGxvZ2ljYWxIZWlnaHQg fSwgYmFzZWxpbmUpOworICAgICAgICAgICAgaWYgKGxvZ2ljYWxIZWlnaHQpCisgICAgICAgICAg ICAgICAgaW5saW5lQm94LT5zZXRJc05vbkVtcHR5KCk7CisgICAgICAgICAgICBsaW5lQm94LmFk ZElubGluZUJveChXVEZNb3ZlKGlubGluZUJveCkpOwogICAgICAgICB9IGVsc2UgaWYgKHJ1bi5p c0NvbnRhaW5lclN0YXJ0KCkpIHsKLSAgICAgICAgICAgIGF1dG8gbG9naWNhbExlZnQgPSBsaW5l Qm94Lmhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQoKS52YWx1ZU9yKElubGluZUxheW91dFVuaXQg eyB9KSArIHJ1bi5sb2dpY2FsTGVmdCgpOworICAgICAgICAgICAgYXV0byBsb2dpY2FsTGVmdCA9 IGhvcml6b250YWxBbGlnbWVudE9mZnNldCArIHJ1bi5sb2dpY2FsTGVmdCgpOwogICAgICAgICAg ICAgYXV0byBpbml0aWFsTG9naWNhbFdpZHRoID0gbGluZUJveC5sb2dpY2FsV2lkdGgoKSAtIHJ1 bi5sb2dpY2FsTGVmdCgpOwogICAgICAgICAgICAgQVNTRVJUKGluaXRpYWxMb2dpY2FsV2lkdGgg Pj0gMCk7Ci0gICAgICAgICAgICBsaW5lQm94LmFkZElubGluZUJveChtYWtlVW5pcXVlPExpbmVC b3g6OklubGluZUJveD4oaW5saW5lTGV2ZWxCb3gsIGxvZ2ljYWxMZWZ0LCBpbml0aWFsTG9naWNh bFdpZHRoKSk7CisgICAgICAgICAgICBsaW5lQm94LmFkZElubGluZUJveChMaW5lQm94OjpJbmxp bmVCb3g6OmNyZWF0ZUJveEZvcklubGluZUJveChpbmxpbmVMZXZlbEJveCwgbG9naWNhbExlZnQs IGluaXRpYWxMb2dpY2FsV2lkdGgpKTsKICAgICAgICAgfSBlbHNlIGlmIChydW4uaXNDb250YWlu ZXJFbmQoKSkgewogICAgICAgICAgICAgLy8gQWRqdXN0IHRoZSBsb2dpY2FsIHdpZHRoIHdoZW4g dGhlIGlubGluZSBsZXZlbCBjb250YWluZXIgY2xvc2VzIG9uIHRoaXMgbGluZS4KICAgICAgICAg ICAgIGF1dG8mIGlubGluZUJveCA9IGxpbmVCb3guaW5saW5lQm94Rm9yTGF5b3V0Qm94KGlubGlu ZUxldmVsQm94KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAKaW5kZXggMjZiZjUxMGRjNzM1OGJlODBkNmMzZmIy ZmMyODJlZjQ2NzY1ZDQ1OC4uNDhmZjlmNzIxNTNmZTRhMmE2YmY1MjdkMGI5OGQwYWFhZjcxNDAy OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZUJveC5jcHAKQEAgLTMyLDEzICszMiwxMSBAQAogbmFtZXNwYWNlIFdlYkNv cmUgewogbmFtZXNwYWNlIExheW91dCB7CiAKLUxpbmVCb3g6OklubGluZUJveDo6SW5saW5lQm94 KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBjb25zdCBJbmxpbmVSZWN0JiByZWN0LCBJbmxpbmVMYXlv dXRVbml0IGJhc2VsaW5lKQorTGluZUJveDo6SW5saW5lQm94OjpJbmxpbmVCb3goY29uc3QgQm94 JiBsYXlvdXRCb3gsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91dFNp emUgbG9naWNhbFNpemUsIElubGluZUxheW91dFVuaXQgYmFzZWxpbmUpCiAgICAgOiBtX2xheW91 dEJveChtYWtlV2Vha1B0cihsYXlvdXRCb3gpKQotICAgICwgbV9sb2dpY2FsUmVjdChyZWN0KQor ICAgICwgbV9sb2dpY2FsUmVjdCh7IH0sIGxvZ2ljYWxMZWZ0LCBsb2dpY2FsU2l6ZS53aWR0aCgp LCBsb2dpY2FsU2l6ZS5oZWlnaHQoKSkKICAgICAsIG1fYmFzZWxpbmUoYmFzZWxpbmUpCi0gICAg LCBtX2lzRW1wdHkoZmFsc2UpCiB7Ci0gICAgQVNTRVJUKHJlY3QuaGVpZ2h0KCkpOwogfQogCiBM aW5lQm94OjpJbmxpbmVCb3g6OklubGluZUJveChjb25zdCBCb3gmIGxheW91dEJveCwgSW5saW5l TGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lQm94LmgKaW5kZXggOTY0Yzg2MzY3ZWIzNGRmY2M4ZWNiZTQxNDVmMzcwNmNiMTMxMGUzMi4u ZjkwMGM0MjllNzk2MjY4MDc0ZDNkZWE2ZjMwZGFlYzVjYmY5OWQ4YiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaApA QCAtNTcsMTIgKzU3LDE0IEBAIGNsYXNzIExpbmVCb3hCdWlsZGVyOwogY2xhc3MgTGluZUJveCB7 CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6CisgICAgLy8gRklYTUU6IFRo aXMgbmFtZSBpcyBpbiBjb25mbGljdCB3aXRoIHRoZSBhY3R1YWwgaW5saW5lIGJveCB0ZXJtOiBp bmxpbmUgbGV2ZWwgYm94IHdob3NlIGNvbnRlbnRzIHBhcnRpY2lwYXRlIGluIHRoaXMgSUZDLgor ICAgIC8vIFRoaXMgY2xhc3MgcmVwcmVzZW50cyBhIHJlY3RhbmdsZSBvbiB0aGUgbGluZSAoaW5p dGlhdGVkIGJ5IGFuIGlubGluZSBsZXZlbCBib3gpIHdpdGggc29tZSBhZGRpdGlvbmFsIGF0dHJp YnV0ZXMgbGlrZSBiYXNlbGluZSwgZGVzY2VudCBldGMuCiAgICAgc3RydWN0IElubGluZUJveCB7 CiAgICAgICAgIFdURl9NQUtFX0lTT19BTExPQ0FURURfSU5MSU5FKElubGluZUJveCk7CiAgICAg cHVibGljOgotICAgICAgICBJbmxpbmVCb3goY29uc3QgQm94JiwgY29uc3QgSW5saW5lUmVjdCYs IElubGluZUxheW91dFVuaXQgYmFzZWxpbmUpOwotICAgICAgICBJbmxpbmVCb3goY29uc3QgQm94 JiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2Fs V2lkdGgpOwotICAgICAgICBJbmxpbmVCb3goKSA9IGRlZmF1bHQ7CisgICAgICAgIHN0YXRpYyBz dGQ6OnVuaXF1ZV9wdHI8TGluZUJveDo6SW5saW5lQm94PiBjcmVhdGVCb3hGb3JSb290SW5saW5l Qm94KGNvbnN0IEJveCYsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91 dFVuaXQgbG9naWNhbFdpZHRoKTsKKyAgICAgICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxMaW5l Qm94OjpJbmxpbmVCb3g+IGNyZWF0ZUJveEZvckF0b21pY0lubGluZUxldmVsQm94KGNvbnN0IEJv eCYsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91dFNpemUsIElubGlu ZUxheW91dFVuaXQgYmFzZWxpbmUpOworICAgICAgICBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPExp bmVCb3g6OklubGluZUJveD4gY3JlYXRlQm94Rm9ySW5saW5lQm94KGNvbnN0IEJveCYsIElubGlu ZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKTsK IAogICAgICAgICBjb25zdCBJbmxpbmVSZWN0JiBsb2dpY2FsUmVjdCgpIGNvbnN0IHsgcmV0dXJu IG1fbG9naWNhbFJlY3Q7IH0KICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsVG9wKCkg Y29uc3QgeyByZXR1cm4gbV9sb2dpY2FsUmVjdC50b3AoKTsgfQpAQCAtODEsNiArODMsMTAgQEAg cHVibGljOgogICAgICAgICBjb25zdCBGb250TWV0cmljcyYgZm9udE1ldHJpY3MoKSBjb25zdCB7 IHJldHVybiBsYXlvdXRCb3goKS5zdHlsZSgpLmZvbnRNZXRyaWNzKCk7IH0KICAgICAgICAgY29u c3QgQm94JiBsYXlvdXRCb3goKSBjb25zdCB7IHJldHVybiAqbV9sYXlvdXRCb3g7IH0KIAorICAg ICAgICBJbmxpbmVCb3goY29uc3QgQm94JiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwg SW5saW5lTGF5b3V0U2l6ZSwgSW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZSk7CisgICAgICAgIElu bGluZUJveChjb25zdCBCb3gmLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVM YXlvdXRVbml0IGxvZ2ljYWxXaWR0aCk7CisgICAgICAgIElubGluZUJveCgpID0gZGVmYXVsdDsK KwogICAgIHByaXZhdGU6CiAgICAgICAgIGZyaWVuZCBjbGFzcyBMaW5lQm94QnVpbGRlcjsKIApA QCAtOTEsNiArOTcsNyBAQCBwdWJsaWM6CiAgICAgICAgIHZvaWQgc2V0RGVzY2VudChJbmxpbmVM YXlvdXRVbml0IGRlc2NlbnQpIHsgbV9kZXNjZW50ID0gZGVzY2VudDsgfQogICAgICAgICB2b2lk IHNldExpbmVTcGFjaW5nKElubGluZUxheW91dFVuaXQgbGluZVNwYWNpbmcpIHsgbV9saW5lU3Bh Y2luZyA9IGxpbmVTcGFjaW5nOyB9CiAKKyAgICBwcml2YXRlOgogICAgICAgICBXZWFrUHRyPGNv bnN0IEJveD4gbV9sYXlvdXRCb3g7CiAgICAgICAgIElubGluZVJlY3QgbV9sb2dpY2FsUmVjdDsK ICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBtX2Jhc2VsaW5lIHsgMCB9OwpAQCAtMTQyLDYgKzE0 OSwyMSBAQCBwcml2YXRlOgogICAgIEhhc2hNYXA8Y29uc3QgQm94KiwgSW5saW5lQm94Kj4gbV9p bmxpbmVCb3hSZWN0TWFwOwogfTsKIAoraW5saW5lIHN0ZDo6dW5pcXVlX3B0cjxMaW5lQm94OjpJ bmxpbmVCb3g+IExpbmVCb3g6OklubGluZUJveDo6Y3JlYXRlQm94Rm9yUm9vdElubGluZUJveChj b25zdCBCb3gmIGxheW91dEJveCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwgSW5saW5l TGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpCit7CisgICAgcmV0dXJuIG1ha2VVbmlxdWU8TGluZUJv eDo6SW5saW5lQm94PihsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0LCBsb2dpY2FsV2lkdGgpOworfQor CitpbmxpbmUgc3RkOjp1bmlxdWVfcHRyPExpbmVCb3g6OklubGluZUJveD4gTGluZUJveDo6SW5s aW5lQm94OjpjcmVhdGVCb3hGb3JBdG9taWNJbmxpbmVMZXZlbEJveChjb25zdCBCb3gmIGxheW91 dEJveCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0U2l6ZSBsb2dp Y2FsU2l6ZSwgSW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZSkKK3sKKyAgICByZXR1cm4gbWFrZVVu aXF1ZTxMaW5lQm94OjpJbmxpbmVCb3g+KGxheW91dEJveCwgbG9naWNhbExlZnQsIGxvZ2ljYWxT aXplLCBiYXNlbGluZSk7Cit9CisKK2lubGluZSBzdGQ6OnVuaXF1ZV9wdHI8TGluZUJveDo6SW5s aW5lQm94PiBMaW5lQm94OjpJbmxpbmVCb3g6OmNyZWF0ZUJveEZvcklubGluZUJveChjb25zdCBC b3gmIGxheW91dEJveCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0 VW5pdCBsb2dpY2FsV2lkdGgpCit7CisgICAgcmV0dXJuIG1ha2VVbmlxdWU8TGluZUJveDo6SW5s aW5lQm94PihsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0LCBsb2dpY2FsV2lkdGgpOworfQorCiB9CiB9 CiAK