201763 2019-09-13 08:53:12 -0700 [LFC] Rename FormattingContext::layout to layoutInFlowContent() 2019-09-13 09:40:48 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1570591 0 zalan 2019-09-13 08:53:12 -0700 it really only takes care of inflow content. 1570592 1 webkit-bug-importer 2019-09-13 08:53:55 -0700 <rdar://problem/55340435> 1570594 2 378732 zalan 2019-09-13 08:56:15 -0700 Created attachment 378732 Patch 1570615 3 378732 commit-queue 2019-09-13 09:40:47 -0700 Comment on attachment 378732 Patch Clearing flags on attachment: 378732 Committed r249837: <https://trac.webkit.org/changeset/249837> 1570616 4 commit-queue 2019-09-13 09:40:48 -0700 All reviewed patches have been landed. Closing bug. 378732 2019-09-13 08:56:15 -0700 2019-09-13 09:40:47 -0700 Patch bug-201763-20190913085610.patch text/plain 10272 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5ODM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzdlZmYwMzU5YTI1ZDlj NDhjMjA4OGE0MzdhMzc3Y2U0ODNhODRkNy4uMTJhZGZjMmI2MjE1YTgzMTBkNzcxNTRiODU2M2Mz MTQ1ZjNlMWVmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE5LTA5LTEzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gUmVuYW1lIEZvcm1h dHRpbmdDb250ZXh0OjpsYXlvdXQgdG8gbGF5b3V0SW5GbG93Q29udGVudCgpCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDE3NjMKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzU1MzQwNDM1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXQoKSBvbmx5IHRha2VzIGNh cmUgb2YgdGhlIGluZmxvdyBjb250ZW50LiBPdXQtb3V0LWZsb3cgYm94ZXMgYXJlIGxhaWQgb3V0 IHRocm91Z2ggRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dE91dE9mRmxvd0NvbnRlbnQuCisKKyAg ICAgICAgKiBsYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0T3V0T2ZGbG93Q29udGVudCk6CisgICAg ICAgICogbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0Lmg6CisgICAgICAgICogbGF5b3V0L0xheW91 dFN0YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGF5b3V0U3RhdGU6OmxheW91 dEZvcm1hdHRpbmdDb250ZXh0U3VidHJlZSk6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0 dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEZvcm1hdHRp bmdDb250ZXh0Um9vdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGlu Z0NvbnRleHQ6OmxheW91dCk6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0 dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0Lmg6CisgICAgICAgICogbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudCk6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRG b3JtYXR0aW5nQ29udGV4dFJvb3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVG b3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oOgorICAgICAgICAqIGxheW91 dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OlRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRl bnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0Ojps YXlvdXRUYWJsZUNlbGxCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1h dHRpbmdDb250ZXh0OjpsYXlvdXQpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC90YWJsZWZv cm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5oOgorCiAyMDE5LTA5LTEzICBaYWxhbiBC dWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ10gRm9ybWF0dGluZ0NvbnRl eHQ6OmRpc3BsYXlCb3hGb3JMYXlvdXRCb3ggc2hvdWxkIGJlIHNwbGl0IGludG8gMiBmdW5jdGlv bnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IGQ5 NTlmMzUxYTM3OGRkMzNmMTBhNzUxOGMwYjcxYTEzNzFiZGUwODguLjFmZGYxODBlNTcxYTU4NjAx MmFmYjRiNzAzNDI1MTYxNDZkYWQ3ZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1h dHRpbmdDb250ZXh0LmNwcApAQCAtMTQwLDggKzE0MCw3IEBAIHZvaWQgRm9ybWF0dGluZ0NvbnRl eHQ6OmxheW91dE91dE9mRmxvd0NvbnRlbnQoKQogICAgICAgICBjb21wdXRlT3V0T2ZGbG93SG9y aXpvbnRhbEdlb21ldHJ5KCpvdXRPZkZsb3dCb3gpOwogCiAgICAgICAgIGF1dG8gZm9ybWF0dGlu Z0NvbnRleHQgPSBsYXlvdXRTdGF0ZSgpLmNyZWF0ZUZvcm1hdHRpbmdDb250ZXh0KCpvdXRPZkZs b3dCb3gpOwotICAgICAgICBmb3JtYXR0aW5nQ29udGV4dC0+bGF5b3V0KCk7Ci0KKyAgICAgICAg Zm9ybWF0dGluZ0NvbnRleHQtPmxheW91dEluRmxvd0NvbnRlbnQoKTsKICAgICAgICAgY29tcHV0 ZU91dE9mRmxvd1ZlcnRpY2FsR2VvbWV0cnkoKm91dE9mRmxvd0JveCk7CiAgICAgICAgIGZvcm1h dHRpbmdDb250ZXh0LT5sYXlvdXRPdXRPZkZsb3dDb250ZW50KCk7CiAgICAgfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCBjZWFlMWEyZThmNDViNGQyMTI2 NGNmYzVkNGQ4M2VkNzBkM2UzZTg0Li5kOTdhOGI4NTI3NDNjZjZiMGY5ZjkwOTAyOGRjNjQ5NzQ1 MDliNzUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRl eHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaApAQCAt NDksNyArNDksNyBAQCBwdWJsaWM6CiAgICAgRm9ybWF0dGluZ0NvbnRleHQoY29uc3QgQm94JiBm b3JtYXR0aW5nQ29udGV4dFJvb3QsIEZvcm1hdHRpbmdTdGF0ZSYpOwogICAgIHZpcnR1YWwgfkZv cm1hdHRpbmdDb250ZXh0KCk7CiAKLSAgICB2aXJ0dWFsIHZvaWQgbGF5b3V0KCkgPSAwOworICAg IHZpcnR1YWwgdm9pZCBsYXlvdXRJbkZsb3dDb250ZW50KCkgPSAwOwogICAgIHZvaWQgbGF5b3V0 T3V0T2ZGbG93Q29udGVudCgpOwogCiAgICAgc3RydWN0IEludHJpbnNpY1dpZHRoQ29uc3RyYWlu dHMgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFN0YXRlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRTdGF0ZS5jcHAKaW5kZXggZjQ3ZGIxNWU4NTdm MzhlM2QxMDliODI2OTI4ZTgxYTU5NjFjOWFkNi4uYzdjMzVlYzQzMWQ5ZDM3M2VjZWM0MWVlNmQ4 NmYzNjg4ZmY3ZTBlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFN0 YXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0U3RhdGUuY3BwCkBAIC02 NCw3ICs2NCw3IEBAIHZvaWQgTGF5b3V0U3RhdGU6OmxheW91dEZvcm1hdHRpbmdDb250ZXh0U3Vi dHJlZShjb25zdCBCb3gmIGxheW91dFJvb3QpCiB7CiAgICAgUkVMRUFTRV9BU1NFUlQobGF5b3V0 Um9vdC5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCkpOwogICAgIGF1dG8gZm9ybWF0dGlu Z0NvbnRleHQgPSBjcmVhdGVGb3JtYXR0aW5nQ29udGV4dChsYXlvdXRSb290KTsKLSAgICBmb3Jt YXR0aW5nQ29udGV4dC0+bGF5b3V0KCk7CisgICAgZm9ybWF0dGluZ0NvbnRleHQtPmxheW91dElu Rmxvd0NvbnRlbnQoKTsKICAgICBmb3JtYXR0aW5nQ29udGV4dC0+bGF5b3V0T3V0T2ZGbG93Q29u dGVudCgpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3Jt YXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCBkZGUwNWFh YjFhODkzN2ViNTE4MGFkYWMxNWJkYjVkYWFlMDJkYzEyLi42ZDE0MTlhZjVjMjI4YzcwMGQ1MWEz MmI4Y2NmNmUxZTk1ZDg3OWEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxv Y2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAg LTQ5LDcgKzQ5LDcgQEAgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6QmxvY2tGb3JtYXR0aW5nQ29u dGV4dChjb25zdCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCwKIHsKIH0KIAotdm9pZCBCbG9j a0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXQoKQordm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0 OjpsYXlvdXRJbkZsb3dDb250ZW50KCkKIHsKICAgICAvLyA5LjQuMSBCbG9jayBmb3JtYXR0aW5n IGNvbnRleHRzCiAgICAgLy8gSW4gYSBibG9jayBmb3JtYXR0aW5nIGNvbnRleHQsIGJveGVzIGFy ZSBsYWlkIG91dCBvbmUgYWZ0ZXIgdGhlIG90aGVyLCB2ZXJ0aWNhbGx5LCBiZWdpbm5pbmcgYXQg dGhlIHRvcCBvZiBhIGNvbnRhaW5pbmcgYmxvY2suCkBAIC0xNjksOCArMTY5LDcgQEAgdm9pZCBC bG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRGb3JtYXR0aW5nQ29udGV4dFJvb3QoRmxvYXRp bmdDb250ZXh0JiBmbG9hdGkKICAgICBjb21wdXRlU3RhdGljSG9yaXpvbnRhbFBvc2l0aW9uKGxh eW91dEJveCk7CiAgICAgLy8gU3dpY2ggb3ZlciB0byB0aGUgbmV3IGZvcm1hdHRpbmcgY29udGV4 dCAodGhlIG9uZSB0aGF0IHRoZSByb290IGNyZWF0ZXMpLgogICAgIGF1dG8gZm9ybWF0dGluZ0Nv bnRleHQgPSBsYXlvdXRTdGF0ZSgpLmNyZWF0ZUZvcm1hdHRpbmdDb250ZXh0KGxheW91dEJveCk7 Ci0gICAgZm9ybWF0dGluZ0NvbnRleHQtPmxheW91dCgpOwotCisgICAgZm9ybWF0dGluZ0NvbnRl eHQtPmxheW91dEluRmxvd0NvbnRlbnQoKTsKICAgICAvLyBDb21lIGJhY2sgYW5kIGZpbmFsaXpl IHRoZSByb290J3MgZ2VvbWV0cnkuCiAgICAgTE9HX1dJVEhfU1RSRUFNKEZvcm1hdHRpbmdDb250 ZXh0TGF5b3V0LCBzdHJlYW0gPDwgIltDb21wdXRlXSAtPiBbSGVpZ2h0XVtNYXJnaW5dIC0+IGZv ciBsYXlvdXRCb3goIiA8PCAmbGF5b3V0Qm94IDw8ICIpIik7CiAgICAgY29tcHV0ZUhlaWdodEFu ZE1hcmdpbihsYXlvdXRCb3gpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Js b2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCBlZTc1 Nzk3MTBjNWYxMTAwODA3NDk3YzllZjRmNmUwYmE4OTlhNWIxLi5kZDZmNTQ5OGM4ZDJiZDg4Mjc4 OWZmNGZjMWNjYjlkZTdkYmVlZDczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv YmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaApAQCAt NDksNyArNDksNyBAQCBjbGFzcyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0IDogcHVibGljIEZvcm1h dHRpbmdDb250ZXh0IHsKIHB1YmxpYzoKICAgICBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0KGNvbnN0 IEJveCYgZm9ybWF0dGluZ0NvbnRleHRSb290LCBCbG9ja0Zvcm1hdHRpbmdTdGF0ZSYpOwogCi0g ICAgdm9pZCBsYXlvdXQoKSBvdmVycmlkZTsKKyAgICB2b2lkIGxheW91dEluRmxvd0NvbnRlbnQo KSBvdmVycmlkZTsKIAogcHJpdmF0ZToKICAgICB2b2lkIGxheW91dEZvcm1hdHRpbmdDb250ZXh0 Um9vdChGbG9hdGluZ0NvbnRleHQmLCBjb25zdCBCb3gmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRp bmdDb250ZXh0LmNwcAppbmRleCA5ODA1Njg5YWJiMzUwNTg0ZjQ5NDAxOTIzODVlODVmZDg0Yjgw YTA0Li5iYTVhZWMxMzAzYjFiZWZiMDYyZDUzMzc1ODgxZTdmNDFhM2E4NjhiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5n Q29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC02Miw3ICs2Miw3IEBAIHN0YXRpYyBpbmxp bmUgY29uc3QgQm94KiBuZXh0SW5QcmVPcmRlcihjb25zdCBCb3gmIGxheW91dEJveCwgY29uc3Qg Q29udGFpbmVyJiBzCiAgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKLXZvaWQgSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQ6OmxheW91dCgpCit2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsYXlv dXRJbkZsb3dDb250ZW50KCkKIHsKICAgICBpZiAoIWlzPENvbnRhaW5lcj4ocm9vdCgpKSkKICAg ICAgICAgcmV0dXJuOwpAQCAtMjQxLDcgKzI0MSw3IEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQ6OmxheW91dEZvcm1hdHRpbmdDb250ZXh0Um9vdChjb25zdCBCb3gmIHJvb3QsIFVzZWRI CiAgICAgZm9ybWF0dGluZ1N0YXRlKCkuZGlzcGxheUJveChyb290KS5zZXRUb3BMZWZ0KHsgMCwg MCB9KTsKICAgICAvLyBTd2ljaCBvdmVyIHRvIHRoZSBuZXcgZm9ybWF0dGluZyBjb250ZXh0ICh0 aGUgb25lIHRoYXQgdGhlIHJvb3QgY3JlYXRlcykuCiAgICAgYXV0byBmb3JtYXR0aW5nQ29udGV4 dCA9IGxheW91dFN0YXRlKCkuY3JlYXRlRm9ybWF0dGluZ0NvbnRleHQocm9vdCk7Ci0gICAgZm9y bWF0dGluZ0NvbnRleHQtPmxheW91dCgpOworICAgIGZvcm1hdHRpbmdDb250ZXh0LT5sYXlvdXRJ bkZsb3dDb250ZW50KCk7CiAgICAgLy8gQ29tZSBiYWNrIGFuZCBmaW5hbGl6ZSB0aGUgcm9vdCdz IGhlaWdodCBhbmQgbWFyZ2luLgogICAgIGNvbXB1dGVIZWlnaHRBbmRNYXJnaW4ocm9vdCk7CiAg ICAgLy8gTm93IHRoYXQgd2UgY29tcHV0ZWQgdGhlIHJvb3QncyBoZWlnaHQsIHdlIGNhbiBnbyBi YWNrIGFuZCBsYXlvdXQgdGhlIG91dC1vZi1mbG93IGNvbnRlbnQuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQuaAppbmRleCAwOTczNzVlMDFmNmQ0YWJlODIwYmM5MDY5MjMzZjNlYjg0Mzhj ZmU3Li45Nzc5OTM2OWI2ZmFmNjQwODVmZmU5Yjg2NzIxNzdmZjk5NmZkOGY0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5n Q29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUZvcm1hdHRpbmdDb250ZXh0LmgKQEAgLTQ2LDcgKzQ2LDcgQEAgY2xhc3MgSW5saW5lRm9y bWF0dGluZ0NvbnRleHQgOiBwdWJsaWMgRm9ybWF0dGluZ0NvbnRleHQgewogICAgIFdURl9NQUtF X0lTT19BTExPQ0FURUQoSW5saW5lRm9ybWF0dGluZ0NvbnRleHQpOwogcHVibGljOgogICAgIElu bGluZUZvcm1hdHRpbmdDb250ZXh0KGNvbnN0IEJveCYgZm9ybWF0dGluZ0NvbnRleHRSb290LCBJ bmxpbmVGb3JtYXR0aW5nU3RhdGUmKTsKLSAgICB2b2lkIGxheW91dCgpIG92ZXJyaWRlOworICAg IHZvaWQgbGF5b3V0SW5GbG93Q29udGVudCgpIG92ZXJyaWRlOwogCiBwcml2YXRlOgogICAgIElu dHJpbnNpY1dpZHRoQ29uc3RyYWludHMgY29tcHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRz KCkgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3Jt YXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA4OTk3NzVl MGU1NTMwNTU2MmNlMTNlOTE0Zjg5ODBiNGUyNWVlNDVkLi42YjE1ZDliMjZhNDE3MDllYzgzMjU3 MWI0Yzc4ZWM4NjNjMWE1NjIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFi bGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAg LTU3LDcgKzU3LDcgQEAgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6VGFibGVGb3JtYXR0aW5nQ29u dGV4dChjb25zdCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCwKIHsKIH0KIAotdm9pZCBUYWJs ZUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXQoKQordm9pZCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0 OjpsYXlvdXRJbkZsb3dDb250ZW50KCkKIHsKICAgICBhdXRvJiBncmlkID0gZm9ybWF0dGluZ1N0 YXRlKCkudGFibGVHcmlkKCk7CiAgICAgYXV0byYgY2VsbExpc3QgPSBncmlkLmNlbGxzKCk7CkBA IC05Niw5ICs5NiwxMCBAQCB2b2lkIFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dFRhYmxl Q2VsbEJveChjb25zdCBCb3gmIGNlbGxMYXlvdXRCb3gsIGNvbnN0CiAgICAgY2VsbERpc3BsYXlC b3guc2V0Q29udGVudEJveFdpZHRoKGNvbHVtbi5sb2dpY2FsV2lkdGgoKSAtIGNlbGxEaXNwbGF5 Qm94Lmhvcml6b250YWxNYXJnaW5Cb3JkZXJBbmRQYWRkaW5nKCkpOwogCiAgICAgQVNTRVJUKGNl bGxMYXlvdXRCb3guZXN0YWJsaXNoZXNCbG9ja0Zvcm1hdHRpbmdDb250ZXh0KCkpOwotICAgIGxh eW91dFN0YXRlKCkuY3JlYXRlRm9ybWF0dGluZ0NvbnRleHQoY2VsbExheW91dEJveCktPmxheW91 dCgpOworICAgIGxheW91dFN0YXRlKCkuY3JlYXRlRm9ybWF0dGluZ0NvbnRleHQoY2VsbExheW91 dEJveCktPmxheW91dEluRmxvd0NvbnRlbnQoKTsKICAgICBjZWxsRGlzcGxheUJveC5zZXRWZXJ0 aWNhbE1hcmdpbih7IHsgfSwgeyB9IH0pOwogICAgIGNlbGxEaXNwbGF5Qm94LnNldENvbnRlbnRC b3hIZWlnaHQoZ2VvbWV0cnkoKS50YWJsZUNlbGxIZWlnaHRBbmRNYXJnaW4oY2VsbExheW91dEJv eCkuaGVpZ2h0KTsKKyAgICAvLyBGSVhNRTogQ2hlY2sgd2hhdCB0byBkbyB3aXRoIG91dC1vZi1m bG93IGNvbnRlbnQuCiB9CiAKIHZvaWQgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6cG9zaXRpb25U YWJsZUNlbGxzKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1h dHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L3Rh YmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggODQ2YWUzYTcxZDkx M2NmNDQ1YWRjODQzYmQ3MTkwMzdhZGU3NWJiYy4uYjBjYTI1MmQ3M2MxMTViYzFjNTdjMzI5Njdk MmZjNTI2ZTU0YzE1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9y bWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmgKQEAgLTQwLDcgKzQw LDcgQEAgY2xhc3MgVGFibGVGb3JtYXR0aW5nQ29udGV4dCA6IHB1YmxpYyBGb3JtYXR0aW5nQ29u dGV4dCB7CiAgICAgV1RGX01BS0VfSVNPX0FMTE9DQVRFRChUYWJsZUZvcm1hdHRpbmdDb250ZXh0 KTsKIHB1YmxpYzoKICAgICBUYWJsZUZvcm1hdHRpbmdDb250ZXh0KGNvbnN0IEJveCYgZm9ybWF0 dGluZ0NvbnRleHRSb290LCBUYWJsZUZvcm1hdHRpbmdTdGF0ZSYpOwotICAgIHZvaWQgbGF5b3V0 KCkgb3ZlcnJpZGU7CisgICAgdm9pZCBsYXlvdXRJbkZsb3dDb250ZW50KCkgb3ZlcnJpZGU7CiAK IHByaXZhdGU6CiAgICAgY2xhc3MgR2VvbWV0cnkgOiBwdWJsaWMgRm9ybWF0dGluZ0NvbnRleHQ6 Okdlb21ldHJ5IHsK