183700 2018-03-16 10:07:54 -0700 [LayoutReloaded] Introduce Display.Box 2018-03-16 10:13:19 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan webkit-bug-importer oldest_to_newest 1407025 0 zalan 2018-03-16 10:07:54 -0700 Display.Box objects will end up in the display (box) tree. 1407028 1 335947 zalan 2018-03-16 10:10:52 -0700 Created attachment 335947 Patch 1407030 2 zalan 2018-03-16 10:12:29 -0700 Committed r229671: <https://trac.webkit.org/changeset/229671> 1407031 3 webkit-bug-importer 2018-03-16 10:13:19 -0700 <rdar://problem/38548838> 335947 2018-03-16 10:10:52 -0700 2018-03-16 10:10:52 -0700 Patch bug-183700-20180316101052.patch text/plain 15852 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5NjY0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTA5N2RhZmY1OGQ4NDlhMjBkOTcxZjFhMDY3ZDc1YjQw YjdmZDZjMy4uZDY1OWNjYWZmMWZkMTYwNjZkYjQzMDM2YjliNGRlNDcyODBkOTQ2OSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU3 IEBACisyMDE4LTAzLTE2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xheW91dFJlbG9hZGVkXSBJbnRyb2R1Y2UgRGlzcGxheS5Cb3gKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MzcwMAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERpc3BsYXkuQm94IG9iamVjdHMgd2ls bCBlbmQgdXAgaW4gdGhlIGRpc3BsYXkoYm94KSB0cmVlLiBDdXJyZW50bHkKKyAgICAgICAgdGhl eSBhcmUganVzdCBoYW5naW5nIG9mZiBvZiB0aGUgTGF5b3V0LkJveCBvYmplY3RzLgorCisgICAg ICAgICogTGF5b3V0UmVsb2FkZWQvRGlzcGxheVRyZWUvQm94LmpzOiBBZGRlZC4KKyAgICAgICAg KERpc3BsYXkuQm94KToKKyAgICAgICAgKERpc3BsYXkuQm94LnByb3RvdHlwZS5yZWN0KToKKyAg ICAgICAgKERpc3BsYXkuQm94LnByb3RvdHlwZS50b3ApOgorICAgICAgICAoRGlzcGxheS5Cb3gu cHJvdG90eXBlLmxlZnQpOgorICAgICAgICAoRGlzcGxheS5Cb3gucHJvdG90eXBlLmJvdHRvbSk6 CisgICAgICAgIChEaXNwbGF5LkJveC5wcm90b3R5cGUucmlnaHQpOgorICAgICAgICAoRGlzcGxh eS5Cb3gucHJvdG90eXBlLnRvcExlZnQpOgorICAgICAgICAoRGlzcGxheS5Cb3gucHJvdG90eXBl LmJvdHRvbVJpZ2h0KToKKyAgICAgICAgKERpc3BsYXkuQm94LnByb3RvdHlwZS5zZXRUb3BMZWZ0 KToKKyAgICAgICAgKERpc3BsYXkuQm94LnByb3RvdHlwZS5zZXRTaXplKToKKyAgICAgICAgKERp c3BsYXkuQm94LnByb3RvdHlwZS5zZXRXaWR0aCk6CisgICAgICAgIChEaXNwbGF5LkJveC5wcm90 b3R5cGUuc2V0SGVpZ2h0KToKKyAgICAgICAgKERpc3BsYXkuQm94LnByb3RvdHlwZS5ib3JkZXJC b3gpOgorICAgICAgICAoRGlzcGxheS5Cb3gucHJvdG90eXBlLnBhZGRpbmdCb3gpOgorICAgICAg ICAoRGlzcGxheS5Cb3gucHJvdG90eXBlLmNvbnRlbnRCb3gpOgorICAgICAgICAqIExheW91dFJl bG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Jsb2NrRm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdD b250ZXh0LmpzOgorICAgICAgICAoQmxvY2tGb3JtYXR0aW5nQ29udGV4dCk6CisgICAgICAgIChC bG9ja0Zvcm1hdHRpbmdDb250ZXh0LnByb3RvdHlwZS5sYXlvdXQpOgorICAgICAgICAoQmxvY2tG b3JtYXR0aW5nQ29udGV4dC5wcm90b3R5cGUuX3RvQWJzb2x1dGVQb3NpdGlvbik6CisgICAgICAg IChCbG9ja0Zvcm1hdHRpbmdDb250ZXh0LnByb3RvdHlwZS5fbmVlZHNMYXlvdXQpOgorICAgICAg ICAoQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5wcm90b3R5cGUuX2FkZFRvTGF5b3V0UXVldWUpOgor ICAgICAgICAoQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5wcm90b3R5cGUuX25leHRJbkxheW91dFF1 ZXVlKToKKyAgICAgICAgKEJsb2NrRm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBlLl9yZW1vdmVG cm9tTGF5b3V0UXVldWUpOgorICAgICAgICAoQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5wcm90b3R5 cGUuX2NyZWF0ZURpc3BsYXlCb3gpOgorICAgICAgICAoQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5w cm90b3R5cGUuX3RvRGlzcGxheUJveCk6CisgICAgICAgIChCbG9ja0Zvcm1hdHRpbmdDb250ZXh0 LnByb3RvdHlwZS5fdG9MYXlvdXRCb3gpOgorICAgICAgICAqIExheW91dFJlbG9hZGVkL0xheW91 dC5qczoKKyAgICAgICAgKGxheW91dCk6CisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvTGF5b3V0 UmVsb2FkZWQueGN3b3Jrc3BhY2UvY29udGVudHMueGN3b3Jrc3BhY2VkYXRhOgorICAgICAgICAq IExheW91dFJlbG9hZGVkL0xheW91dFRyZWUvQm94LmpzOgorICAgICAgICAoTGF5b3V0LkJveCk6 CisgICAgICAgIChMYXlvdXQuQm94LnByb3RvdHlwZS5zZXREaXNwbGF5Qm94KToKKyAgICAgICAg KExheW91dC5Cb3gucHJvdG90eXBlLmRpc3BsYXlCb3gpOgorICAgICAgICAoTGF5b3V0LkJveC5w cm90b3R5cGUucmVjdCk6CisgICAgICAgIChMYXlvdXQuQm94LnByb3RvdHlwZS5zZXRUb3BMZWZ0 KToKKyAgICAgICAgKExheW91dC5Cb3gucHJvdG90eXBlLnNldFNpemUpOgorICAgICAgICAoTGF5 b3V0LkJveC5wcm90b3R5cGUuc2V0V2lkdGgpOgorICAgICAgICAoTGF5b3V0LkJveC5wcm90b3R5 cGUuc2V0SGVpZ2h0KToKKyAgICAgICAgKExheW91dC5Cb3gucHJvdG90eXBlLmJvcmRlckJveCk6 CisgICAgICAgIChMYXlvdXQuQm94LnByb3RvdHlwZS5wYWRkaW5nQm94KToKKyAgICAgICAgKExh eW91dC5Cb3gucHJvdG90eXBlLmNvbnRlbnRCb3gpOgorICAgICAgICAqIExheW91dFJlbG9hZGVk L3Rlc3QvaW5kZXguaHRtbDoKKwogMjAxOC0wMy0xNiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFtMYXlvdXRSZWxvYWRlZF0gVXRpbHMuY29tcHV0ZWQqIGZ1bmN0 aW9ucyBzaG91bGQganVzdCB0YWtlIG5vZGUgaW5zdGVhZCBvZiBib3guCmRpZmYgLS1naXQgYS9U b29scy9MYXlvdXRSZWxvYWRlZC9EaXNwbGF5VHJlZS9Cb3guanMgYi9Ub29scy9MYXlvdXRSZWxv YWRlZC9EaXNwbGF5VHJlZS9Cb3guanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uODEzNmQ2MzcxYTMyY2E4NTcyOWY2 N2Q2YTg5YzBhYzk3ZjM0ZjU5MgotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL0xheW91dFJlbG9h ZGVkL0Rpc3BsYXlUcmVlL0JveC5qcwpAQCAtMCwwICsxLDk5IEBACisvKgorICogQ29weXJpZ2h0 IChDKSAyMDE4IEFwcGxlIEluYy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KKyAqCisgKiBSZWRpc3Ry aWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhv dXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xs b3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBz b3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisg KiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFi b3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQv b3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisg KiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gYGBBUyBJUycnIEFORCBB TlkKKyAqIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1Qg TElNSVRFRCBUTywgVEhFCisgKiBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZ IEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQu ICBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SCisgKiBDT05UUklCVVRPUlMgQkUgTElB QkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwKKyAqIEVY RU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElN SVRFRCBUTywKKyAqIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7 IExPU1MgT0YgVVNFLCBEQVRBLCBPUgorICogUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBU SU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWQorICogT0YgTElBQklMSVRZLCBX SEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVE SU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRI RSBVU0UKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKwordmFyIERpc3BsYXkgPSB7IH0KKworRGlzcGxh eS5Cb3ggPSBjbGFzcyBCb3ggeworICAgIGNvbnN0cnVjdG9yKG5vZGUpIHsKKyAgICAgICAgdGhp cy5tX25vZGUgPSBub2RlOworICAgICAgICB0aGlzLm1fcmVjdCA9IG5ldyBMYXlvdXRSZWN0KG5l dyBMYXlvdXRQb2ludCgwLCAwKSwgbmV3IExheW91dFNpemUoMCwgMCkpOworICAgIH0KKworICAg IHJlY3QoKSB7CisgICAgICAgIHJldHVybiB0aGlzLm1fcmVjdC5jbG9uZSgpOworICAgIH0KKyAg ICAKKyAgICB0b3AoKSB7CisgICAgICAgIHJldHVybiB0aGlzLnJlY3QoKS50b3AoKTsKKyAgICB9 CisgICAgCisgICAgbGVmdCgpIHsKKyAgICAgICAgcmV0dXJuIHRoaXMucmVjdCgpLmxlZnQoKTsK KyAgICB9CisgICAgCisgICAgYm90dG9tKCkgeworICAgICAgICByZXR1cm4gdGhpcy5yZWN0KCku Ym90dG9tKCk7CisgICAgfQorICAgIAorICAgIHJpZ2h0KCkgeworICAgICAgICByZXR1cm4gdGhp cy5yZWN0KCkucmlnaHQoKTsKKyAgICB9CisKKyAgICB0b3BMZWZ0KCkgeworICAgICAgICByZXR1 cm4gdGhpcy5yZWN0KCkudG9wTGVmdCgpOworICAgIH0KKworICAgIGJvdHRvbVJpZ2h0KCkgewor ICAgICAgICByZXR1cm4gdGhpcy5yZWN0KCkuYm90dG9tUmlnaHQoKTsKKyAgICB9CisKKyAgICBz ZXRUb3BMZWZ0KHRvcExlZnQpIHsKKyAgICAgICAgdGhpcy5tX3JlY3Quc2V0VG9wTGVmdCh0b3BM ZWZ0KTsKKyAgICB9CisKKyAgICBzZXRTaXplKHNpemUpIHsKKyAgICAgICAgdGhpcy5tX3JlY3Qu c2V0U2l6ZShzaXplKTsKKyAgICB9CisKKyAgICBzZXRXaWR0aCh3aWR0aCkgeworICAgICAgICB0 aGlzLm1fcmVjdC5zZXRXaWR0aCh3aWR0aCk7CisgICAgfQorCisgICAgc2V0SGVpZ2h0KGhlaWdo dCkgeworICAgICAgICB0aGlzLm1fcmVjdC5zZXRIZWlnaHQoaGVpZ2h0KTsKKyAgICB9CisKKyAg ICBib3JkZXJCb3goKSB7CisgICAgICAgIHJldHVybiBuZXcgTGF5b3V0UmVjdChuZXcgTGF5b3V0 UG9pbnQoMCwgMCksIHRoaXMucmVjdCgpLnNpemUoKSk7CisgICAgfQorCisgICAgcGFkZGluZ0Jv eCgpIHsKKyAgICAgICAgbGV0IHBhZGRpbmdCb3ggPSB0aGlzLmJvcmRlckJveCgpOworICAgICAg ICBsZXQgYm9yZGVyU2l6ZSA9IFV0aWxzLmNvbXB1dGVkQm9yZGVyVG9wTGVmdCh0aGlzLm1fbm9k ZSk7CisgICAgICAgIHBhZGRpbmdCb3gubW92ZUJ5KGJvcmRlclNpemUpOworICAgICAgICBwYWRk aW5nQm94LnNocmlua0J5KGJvcmRlclNpemUpOworICAgICAgICBwYWRkaW5nQm94LnNocmlua0J5 KFV0aWxzLmNvbXB1dGVkQm9yZGVyQm90dG9tUmlnaHQodGhpcy5tX25vZGUpKTsKKyAgICAgICAg cmV0dXJuIHBhZGRpbmdCb3g7CisgICAgfQorCisgICAgY29udGVudEJveCgpIHsKKyAgICAgICAg bGV0IGNvbnRlbnRCb3ggPSB0aGlzLnBhZGRpbmdCb3goKTsKKyAgICAgICAgbGV0IHBhZGRpbmdT aXplID0gVXRpbHMuY29tcHV0ZWRQYWRkaW5nVG9wTGVmdCh0aGlzLm1fbm9kZSk7CisgICAgICAg IGNvbnRlbnRCb3gubW92ZUJ5KHBhZGRpbmdTaXplKTsKKyAgICAgICAgY29udGVudEJveC5zaHJp bmtCeShwYWRkaW5nU2l6ZSk7CisgICAgICAgIGNvbnRlbnRCb3guc2hyaW5rQnkoVXRpbHMuY29t cHV0ZWRQYWRkaW5nQm90dG9tUmlnaHQodGhpcy5tX25vZGUpKTsKKyAgICAgICAgcmV0dXJuIGNv bnRlbnRCb3g7CisgICAgfQorfQpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9y bWF0dGluZ0NvbnRleHQvQmxvY2tGb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuanMg Yi9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9CbG9ja0Zvcm1hdHRpbmcv QmxvY2tGb3JtYXR0aW5nQ29udGV4dC5qcwppbmRleCA1Yjc2N2EwMmFmOGI5OWZhYzM5YmFkNTZl OTFiZWYxN2U2MGE4YjNkLi4wNGUwNTA4MjNlYzU3ZDgwMzgwZGRmNTE1OGM1NTBhOGIzNjYyODU5 IDEwMDY0NAotLS0gYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9CbG9j a0Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5qcworKysgYi9Ub29scy9MYXlvdXRS ZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9CbG9ja0Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5n Q29udGV4dC5qcwpAQCAtMjcsNiArMjcsOSBAQCBjbGFzcyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0 IGV4dGVuZHMgRm9ybWF0dGluZ0NvbnRleHQgewogICAgICAgICBzdXBlcihyb290KTsKICAgICAg ICAgLy8gTmV3IGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dCBhbHdheXMgZXN0YWJsaXNoZXMgYSBu ZXcgZmxvYXRpbmcgY29udGV4dC4KICAgICAgICAgdGhpcy5tX2Zsb2F0aW5nQ29udGV4dCA9IG5l dyBGbG9hdGluZ0NvbnRleHQodGhpcyk7CisgICAgICAgIHRoaXMubV9kaXNwbGF5VG9MYXlvdXQg PSBuZXcgTWFwKCk7CisgICAgICAgIHRoaXMubV9sYXlvdXRUb0Rpc3BsYXkgPSBuZXcgTWFwKCk7 CisgICAgICAgIHRoaXMubV9sYXlvdXRTdGFjayA9IG5ldyBBcnJheSgpOwogICAgIH0KIAogICAg IGxheW91dChsYXlvdXRDb250ZXh0KSB7CkBAIC0zNywxNyArNDAsMTYgQEAgY2xhc3MgQmxvY2tG b3JtYXR0aW5nQ29udGV4dCBleHRlbmRzIEZvcm1hdHRpbmdDb250ZXh0IHsKICAgICAgICAgaWYg KCF0aGlzLnJvb3RDb250YWluZXIoKS5maXJzdENoaWxkKCkpCiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIC8vIFRoaXMgaXMgYSBwb3N0LW9yZGVyIHRyZWUgdHJhdmVyc2FsIGxheW91dC4K LSAgICAgICAgbGV0IGxheW91dFN0YWNrID0gbmV3IEFycmF5KCk7CiAgICAgICAgIC8vIFRoZSBy b290IGNvbnRhaW5lciBsYXlvdXQgaXMgZG9uZSBpbiB0aGUgZm9ybWF0dGluZyBjb250ZXh0IGl0 IGxpdmVzIGluLCBub3QgdGhhdCBvbmUgaXQgY3JlYXRlcywgc28gbGV0J3Mgc3RhcnQgd2l0aCB0 aGUgZmlyc3QgY2hpbGQuCi0gICAgICAgIGxheW91dFN0YWNrLnB1c2godGhpcy5yb290Q29udGFp bmVyKCkuZmlyc3RDaGlsZCgpKTsKKyAgICAgICAgdGhpcy5fYWRkVG9MYXlvdXRRdWV1ZSh0aGlz LnJvb3RDb250YWluZXIoKS5maXJzdENoaWxkKCkpOwogICAgICAgICAvLyAxLiBHbyBhbGwgdGhl IHdheSBkb3duIHRvIHRoZSBsZWFmIG5vZGUKICAgICAgICAgLy8gMi4gQ29tcHV0ZSBzdGF0aWMg cG9zaXRpb24gYW5kIHdpZHRoIGFzIHdlIHRyYXZlcnMgZG93bgogICAgICAgICAvLyAzLiBBcyB3 ZSBjbGltYiBiYWNrIG9uIHRoZSB0cmVlLCBjb21wdXRlIGhlaWdodCBhbmQgZmluaWFsaXplIHBv c2l0aW9uCiAgICAgICAgIC8vIChBbnkgc3VidHJlZXMgd2l0aCBuZXcgZm9ybWF0dGluZyBjb250 ZXh0cyBuZWVkIHRvIGxheW91dCBzeW5jaHJvbm91c2x5KQotICAgICAgICB3aGlsZSAobGF5b3V0 U3RhY2subGVuZ3RoKSB7CisgICAgICAgIHdoaWxlICh0aGlzLl9uZWVkc0xheW91dCgpKSB7CiAg ICAgICAgICAgICAvLyBUcmF2ZXJzIGRvd24gb24gdGhlIGRlc2NlbmRhbnRzIHVudGlsIHdlIGZp bmQgYSBsZWFmIG5vZGUuCiAgICAgICAgICAgICB3aGlsZSAodHJ1ZSkgewotICAgICAgICAgICAg ICAgIGxldCBsYXlvdXRCb3ggPSBsYXlvdXRTdGFja1tsYXlvdXRTdGFjay5sZW5ndGggLSAxXTsK KyAgICAgICAgICAgICAgICBsZXQgbGF5b3V0Qm94ID0gdGhpcy5fbmV4dEluTGF5b3V0UXVldWUo KTsKICAgICAgICAgICAgICAgICB0aGlzLmNvbXB1dGVXaWR0aChsYXlvdXRCb3gpOwogICAgICAg ICAgICAgICAgIHRoaXMuX2NvbXB1dGVTdGF0aWNQb3NpdGlvbihsYXlvdXRCb3gpOwogICAgICAg ICAgICAgICAgIGlmIChsYXlvdXRCb3guZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpKSB7 CkBAIC01NiwxMyArNTgsMTMgQEAgY2xhc3MgQmxvY2tGb3JtYXR0aW5nQ29udGV4dCBleHRlbmRz IEZvcm1hdHRpbmdDb250ZXh0IHsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAg aWYgKCFsYXlvdXRCb3guaXNDb250YWluZXIoKSB8fCAhbGF5b3V0Qm94Lmhhc0NoaWxkKCkpCiAg ICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIGxheW91dFN0YWNrLnB1 c2gobGF5b3V0Qm94LmZpcnN0Q2hpbGQoKSk7CisgICAgICAgICAgICAgICAgdGhpcy5fYWRkVG9M YXlvdXRRdWV1ZShsYXlvdXRCb3guZmlyc3RDaGlsZCgpKTsKICAgICAgICAgICAgIH0KIAogICAg ICAgICAgICAgLy8gQ2xpbWIgYmFjayBvbiB0aGUgYW5jZXN0b3JzIGFuZCBjb21wdXRlIGhlaWdo dC9maW5hbCBwb3NpdGlvbi4KLSAgICAgICAgICAgIHdoaWxlIChsYXlvdXRTdGFjay5sZW5ndGgp IHsKKyAgICAgICAgICAgIHdoaWxlICh0aGlzLl9uZWVkc0xheW91dCgpKSB7CiAgICAgICAgICAg ICAgICAgLy8gQWxsIGluZmxvdyBkZXNjZW5kYW50cyAoaWYgdGhlcmUgYXJlIGFueSkgYXJlIGxh aWQgb3V0IGJ5IG5vdy4gTGV0J3MgY29tcHV0ZSB0aGUgYm94J3MgaGVpZ2h0LgotICAgICAgICAg ICAgICAgIGxldCBsYXlvdXRCb3ggPSBsYXlvdXRTdGFjay5wb3AoKTsKKyAgICAgICAgICAgICAg ICBsZXQgbGF5b3V0Qm94ID0gdGhpcy5fbmV4dEluTGF5b3V0UXVldWUoKTsKICAgICAgICAgICAg ICAgICB0aGlzLmNvbXB1dGVIZWlnaHQobGF5b3V0Qm94KTsKICAgICAgICAgICAgICAgICAvLyBB ZGp1c3QgcG9zaXRpb24gbm93IHRoYXQgd2UgaGF2ZSBhbGwgdGhlIHByZXZpb3VzIGZsb2F0cyBw bGFjZWQgaW4gdGhpcyBjb250ZXh0IC1pZiBuZWVkZWQuCiAgICAgICAgICAgICAgICAgdGhpcy5m bG9hdGluZ0NvbnRleHQoKS5jb21wdXRlUG9zaXRpb24obGF5b3V0Qm94KTsKQEAgLTcyLDggKzc0 LDEwIEBAIGNsYXNzIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQgZXh0ZW5kcyBGb3JtYXR0aW5nQ29u dGV4dCB7CiAgICAgICAgICAgICAgICAgICAgIC8vIFBsYWNlIHRoZSBvdXQgb2YgZmxvdyBjb250 ZW50LgogICAgICAgICAgICAgICAgICAgICB0aGlzLl9wbGFjZU91dE9mRmxvd0Rlc2NlbmRhbnRz KGxheW91dEJveCk7CiAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIC8vIFdlIGFy ZSBkb25lIHdpdGggbGF5aW5nIG91dCB0aGlzIGJveC4KKyAgICAgICAgICAgICAgICB0aGlzLl9y ZW1vdmVGcm9tTGF5b3V0UXVldWUobGF5b3V0Qm94KTsKICAgICAgICAgICAgICAgICBpZiAobGF5 b3V0Qm94Lm5leHRTaWJsaW5nKCkpIHsKLSAgICAgICAgICAgICAgICAgICAgbGF5b3V0U3RhY2su cHVzaChsYXlvdXRCb3gubmV4dFNpYmxpbmcoKSk7CisgICAgICAgICAgICAgICAgICAgIHRoaXMu X2FkZFRvTGF5b3V0UXVldWUobGF5b3V0Qm94Lm5leHRTaWJsaW5nKCkpOwogICAgICAgICAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CkBAIC0zNDAs NSArMzQ0LDQ2IEBAIGNsYXNzIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQgZXh0ZW5kcyBGb3JtYXR0 aW5nQ29udGV4dCB7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIG5ldyBMYXlvdXRSZWN0KHRv cExlZnQsIGxheW91dEJveC5yZWN0KCkuc2l6ZSgpKTsKICAgICB9Ci19CiAKKyAgICBfbmVlZHNM YXlvdXQoKSB7CisgICAgICAgIHJldHVybiB0aGlzLm1fbGF5b3V0U3RhY2subGVuZ3RoOworICAg IH0KKworICAgIF9hZGRUb0xheW91dFF1ZXVlKGxheW91dEJveCkgeworICAgICAgICAvLyBJbml0 aWFsaXplIHRoZSBjb3JyZXNwb25kaW5nIGRpc3BsYXkgYm94LgorICAgICAgICB0aGlzLl9jcmVh dGVEaXNwbGF5Qm94KGxheW91dEJveCk7CisgICAgICAgIHRoaXMubV9sYXlvdXRTdGFjay5wdXNo KGxheW91dEJveCk7CisgICAgfQorCisgICAgX25leHRJbkxheW91dFF1ZXVlKCkgeworICAgICAg ICBBU1NFUlQodGhpcy5tX2xheW91dFN0YWNrLmxlbmd0aCk7CisgICAgICAgIHJldHVybiB0aGlz Lm1fbGF5b3V0U3RhY2tbdGhpcy5tX2xheW91dFN0YWNrLmxlbmd0aCAtIDFdOworICAgIH0KKwor ICAgIF9yZW1vdmVGcm9tTGF5b3V0UXVldWUobGF5b3V0Qm94KSB7CisgICAgICAgIC8vIFdpdGgg dGhlIGN1cnJlbnQgbGF5b3V0IGxvZ2ljLCB0aGUgbGF5b3V0Qm94IHNob3VsZCBiZSBhdCB0aGUg dG9wICh0aGlzLm1fbGF5b3V0U3RhY2sucG9wKCkgc2hvdWxkIGRvKS4KKyAgICAgICAgQVNTRVJU KHRoaXMubV9sYXlvdXRTdGFjay5sZW5ndGgpOworICAgICAgICBBU1NFUlQodGhpcy5tX2xheW91 dFN0YWNrW3RoaXMubV9sYXlvdXRTdGFjay5sZW5ndGggLSAxXSA9PSBsYXlvdXRCb3gpOworICAg ICAgICB0aGlzLm1fbGF5b3V0U3RhY2suc3BsaWNlKHRoaXMubV9sYXlvdXRTdGFjay5pbmRleE9m KGxheW91dEJveCksIDEpOworICAgIH0KKworICAgIF9jcmVhdGVEaXNwbGF5Qm94KGxheW91dEJv eCkgeworICAgICAgICBsZXQgZGlzcGxheUJveCA9IG5ldyBEaXNwbGF5LkJveChsYXlvdXRCb3gu bm9kZSgpKTsKKyAgICAgICAgdGhpcy5tX2Rpc3BsYXlUb0xheW91dC5zZXQoZGlzcGxheUJveCwg bGF5b3V0Qm94KTsKKyAgICAgICAgdGhpcy5tX2xheW91dFRvRGlzcGxheS5zZXQobGF5b3V0Qm94 LCBkaXNwbGF5Qm94KTsKKyAgICAgICAgLy8gVGhpcyBpcyB0ZW1wb3JhcnkuCisgICAgICAgIGxh eW91dEJveC5zZXREaXNwbGF5Qm94KGRpc3BsYXlCb3gpOworICAgIH0KKworICAgIF90b0Rpc3Bs YXlCb3gobGF5b3V0Qm94KSB7CisgICAgICAgIEFTU0VSVChsYXlvdXRCb3gpOworICAgICAgICBB U1NFUlQodGhpcy5tX2xheW91dFRvRGlzcGxheS5oYXMobGF5b3V0Qm94KSk7CisgICAgICAgIHJl dHVybiB0aGlzLm1fbGF5b3V0VG9EaXNwbGF5LmdldChsYXlvdXQpOworICAgIH0KKworICAgIF90 b0xheW91dEJveChkaXNwbGF5Qm94KSB7CisgICAgICAgIEFTU0VSVChkaXNwbGF5Qm94KTsKKyAg ICAgICAgQVNTRVJUKHRoaXMubV9kaXNwbGF5VG9MYXlvdXQuaGFzKGRpc3BsYXlCb3gpKTsKKyAg ICAgICAgcmV0dXJuIHRoaXMubV9kaXNwbGF5VG9MYXlvdXQuZ2V0KGxheW91dCk7CisgICAgfQor fQpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvTGF5b3V0LmpzIGIvVG9vbHMvTGF5 b3V0UmVsb2FkZWQvTGF5b3V0LmpzCmluZGV4IDViOTg0YTRkZGI5YmM1MTViMGUyNzQxOTZiYjVk YmViMThhMjMzMWYuLjBiZWM2OTdmZTc4ZDhhNjMzMmQzZWQ3ZjIxMjRhNWU4ZDM3MDQ5N2UgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91dC5qcworKysgYi9Ub29scy9MYXlv dXRSZWxvYWRlZC9MYXlvdXQuanMKQEAgLTI2LDYgKzI2LDcgQEAKIGZ1bmN0aW9uIGxheW91dCh3 aW5kb3csIHZpZXdwb3J0U2l6ZSkgewogICAgIGxldCB0cmVlQnVpbGRlciA9IG5ldyBUcmVlQnVp bGRlcigpOwogICAgIGxldCBpbml0aWFsQ29udGFpbmluZ0Jsb2NrID0gdHJlZUJ1aWxkZXIuY3Jl YXRlVHJlZSh3aW5kb3cuZG9jdW1lbnQsIHdpbmRvdy5yZW5kZXJUcmVlU3RydWN0dXJlKTsKKyAg ICBpbml0aWFsQ29udGFpbmluZ0Jsb2NrLnNldERpc3BsYXlCb3gobmV3IERpc3BsYXkuQm94KCkp OwogICAgIGluaXRpYWxDb250YWluaW5nQmxvY2suc2V0U2l6ZSh2aWV3cG9ydFNpemUpOwogCiAg ICAgbGV0IGxheW91dENvbnRleHQgPSBuZXcgTGF5b3V0Q29udGV4dChpbml0aWFsQ29udGFpbmlu Z0Jsb2NrKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91dFJlbG9hZGVk Lnhjd29ya3NwYWNlL2NvbnRlbnRzLnhjd29ya3NwYWNlZGF0YSBiL1Rvb2xzL0xheW91dFJlbG9h ZGVkL0xheW91dFJlbG9hZGVkLnhjd29ya3NwYWNlL2NvbnRlbnRzLnhjd29ya3NwYWNlZGF0YQpp bmRleCAxNWI3NjllZWMwOTk0NDk3MGFiYjljMDc3NzA5ZWU4OWUzMTVjOWNkLi42NzgzZmJiODI4 ZTllY2U4ZjgyZGI2Y2JlZmNlZWUxNTMyYTZlMDZiIDEwMDY0NAotLS0gYS9Ub29scy9MYXlvdXRS ZWxvYWRlZC9MYXlvdXRSZWxvYWRlZC54Y3dvcmtzcGFjZS9jb250ZW50cy54Y3dvcmtzcGFjZWRh dGEKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvTGF5b3V0UmVsb2FkZWQueGN3b3Jrc3BhY2Uv Y29udGVudHMueGN3b3Jrc3BhY2VkYXRhCkBAIC0xLDYgKzEsOSBAQAogPD94bWwgdmVyc2lvbj0i MS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KIDxXb3Jrc3BhY2UKICAgIHZlcnNpb24gPSAiMS4wIj4K KyAgIDxGaWxlUmVmCisgICAgICBsb2NhdGlvbiA9ICJncm91cDpEaXNwbGF5VHJlZSI+CisgICA8 L0ZpbGVSZWY+CiAgICA8RmlsZVJlZgogICAgICAgbG9jYXRpb24gPSAiZ3JvdXA6dGVzdCI+CiAg ICA8L0ZpbGVSZWY+CmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9MYXlvdXRUcmVl L0JveC5qcyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91dFRyZWUvQm94LmpzCmluZGV4IDVm MjgyYmJiODBkOTBlMTc2MzY2ZjRjMzE5NGNiM2I5ZTJkM2M1M2IuLjIxNjFmZjk4YmJmNWViODlk ODFhYTQwYmIyMzFlMTRmYTMyNzY5YWEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9hZGVk L0xheW91dFRyZWUvQm94LmpzCisrKyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91dFRyZWUv Qm94LmpzCkBAIC0zNCw4ICszNCw4IEBAIExheW91dC5Cb3ggPSBjbGFzcyBCb3ggewogICAgICAg ICB0aGlzLm1fbmV4dFNpYmxpbmcgPSBudWxsOwogICAgICAgICB0aGlzLm1fcHJldmlvdXNTaWJs aW5nID0gbnVsbDsKICAgICAgICAgdGhpcy5tX2lzQW5vbnltb3VzID0gZmFsc2U7Ci0gICAgICAg IHRoaXMubV9yZWN0ID0gbmV3IExheW91dFJlY3QobmV3IExheW91dFBvaW50KDAsIDApLCBuZXcg TGF5b3V0U2l6ZSgwLCAwKSk7CiAgICAgICAgIHRoaXMubV9lc3RhYmxpc2hlZEZvcm1hdHRpbmdD b250ZXh0ID0gbnVsbDsKKyAgICAgICAgdGhpcy5tX2Rpc3BsYXlCb3ggPSBudWxsOwogICAgIH0K IAogICAgIGlkKCkgewpAQCAtOTgsOCArOTgsMTggQEAgTGF5b3V0LkJveCA9IGNsYXNzIEJveCB7 CiAgICAgICAgIHRoaXMubV9wcmV2aW91c1NpYmxpbmcgPSBwcmV2aW91c1NpYmxpbmc7CiAgICAg fQogCisgICAgc2V0RGlzcGxheUJveChkaXNwbGF5Qm94KSB7CisgICAgICAgIEFTU0VSVCghdGhp cy5tX2Rpc3BsYXlCb3gpOworICAgICAgICB0aGlzLm1fZGlzcGxheUJveCA9IGRpc3BsYXlCb3g7 CisgICAgfQorCisgICAgZGlzcGxheUJveCgpIHsKKyAgICAgICAgQVNTRVJUKHRoaXMubV9kaXNw bGF5Qm94KTsKKyAgICAgICAgcmV0dXJuIHRoaXMubV9kaXNwbGF5Qm94OworICAgIH0KKwogICAg IHJlY3QoKSB7Ci0gICAgICAgIHJldHVybiB0aGlzLm1fcmVjdC5jbG9uZSgpOworICAgICAgICBy ZXR1cm4gdGhpcy5kaXNwbGF5Qm94KCkucmVjdCgpOwogICAgIH0KIAogICAgIHRvcExlZnQoKSB7 CkBAIC0xMTEsMTkgKzEyMSwxOSBAQCBMYXlvdXQuQm94ID0gY2xhc3MgQm94IHsKICAgICB9CiAK ICAgICBzZXRUb3BMZWZ0KHRvcExlZnQpIHsKLSAgICAgICAgdGhpcy5tX3JlY3Quc2V0VG9wTGVm dCh0b3BMZWZ0KTsKKyAgICAgICAgdGhpcy5kaXNwbGF5Qm94KCkuc2V0VG9wTGVmdCh0b3BMZWZ0 KTsKICAgICB9CiAKICAgICBzZXRTaXplKHNpemUpIHsKLSAgICAgICAgdGhpcy5tX3JlY3Quc2V0 U2l6ZShzaXplKTsKKyAgICAgICAgdGhpcy5kaXNwbGF5Qm94KCkuc2V0U2l6ZShzaXplKTsKICAg ICB9CiAKICAgICBzZXRXaWR0aCh3aWR0aCkgewotICAgICAgICB0aGlzLm1fcmVjdC5zZXRXaWR0 aCh3aWR0aCk7CisgICAgICAgIHRoaXMuZGlzcGxheUJveCgpLnNldFdpZHRoKHdpZHRoKTsKICAg ICB9CiAKICAgICBzZXRIZWlnaHQoaGVpZ2h0KSB7Ci0gICAgICAgIHRoaXMubV9yZWN0LnNldEhl aWdodChoZWlnaHQpOworICAgICAgICB0aGlzLmRpc3BsYXlCb3goKS5zZXRIZWlnaHQoaGVpZ2h0 KTsKICAgICB9CiAKICAgICBpc0NvbnRhaW5lcigpIHsKQEAgLTIzNCwyNCArMjQ0LDE0IEBAIExh eW91dC5Cb3ggPSBjbGFzcyBCb3ggewogICAgIH0KIAogICAgIGJvcmRlckJveCgpIHsKLSAgICAg ICAgcmV0dXJuIG5ldyBMYXlvdXRSZWN0KG5ldyBMYXlvdXRQb2ludCgwLCAwKSwgdGhpcy5yZWN0 KCkuc2l6ZSgpKTsKKyAgICAgICAgcmV0dXJuIHRoaXMuZGlzcGxheUJveCgpLmJvcmRlckJveCgp OwogICAgIH0KIAogICAgIHBhZGRpbmdCb3goKSB7Ci0gICAgICAgIGxldCBwYWRkaW5nQm94ID0g dGhpcy5ib3JkZXJCb3goKTsKLSAgICAgICAgbGV0IGJvcmRlclNpemUgPSBVdGlscy5jb21wdXRl ZEJvcmRlclRvcExlZnQodGhpcy5ub2RlKCkpOwotICAgICAgICBwYWRkaW5nQm94Lm1vdmVCeShi b3JkZXJTaXplKTsKLSAgICAgICAgcGFkZGluZ0JveC5zaHJpbmtCeShib3JkZXJTaXplKTsKLSAg ICAgICAgcGFkZGluZ0JveC5zaHJpbmtCeShVdGlscy5jb21wdXRlZEJvcmRlckJvdHRvbVJpZ2h0 KHRoaXMubm9kZSgpKSk7Ci0gICAgICAgIHJldHVybiBwYWRkaW5nQm94OworICAgICAgICByZXR1 cm4gdGhpcy5kaXNwbGF5Qm94KCkucGFkZGluZ0JveCgpOwogICAgIH0KIAogICAgIGNvbnRlbnRC b3goKSB7Ci0gICAgICAgIGxldCBjb250ZW50Qm94ID0gdGhpcy5wYWRkaW5nQm94KCk7Ci0gICAg ICAgIGxldCBwYWRkaW5nU2l6ZSA9IFV0aWxzLmNvbXB1dGVkUGFkZGluZ1RvcExlZnQodGhpcy5u b2RlKCkpOwotICAgICAgICBjb250ZW50Qm94Lm1vdmVCeShwYWRkaW5nU2l6ZSk7Ci0gICAgICAg IGNvbnRlbnRCb3guc2hyaW5rQnkocGFkZGluZ1NpemUpOwotICAgICAgICBjb250ZW50Qm94LnNo cmlua0J5KFV0aWxzLmNvbXB1dGVkUGFkZGluZ0JvdHRvbVJpZ2h0KHRoaXMubm9kZSgpKSk7Ci0g ICAgICAgIHJldHVybiBjb250ZW50Qm94OworICAgICAgICByZXR1cm4gdGhpcy5kaXNwbGF5Qm94 KCkuY29udGVudEJveCgpOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9h ZGVkL3Rlc3QvaW5kZXguaHRtbCBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL3Rlc3QvaW5kZXguaHRt bAppbmRleCBiNTJmOTI3OTY2NWYxZmEzYjE1ZTg4NDM5NGEyNzVmYzFiMjNmYTcwLi5mZWY5MTcz YzYzY2FiNDhkMDUyZDM3MTFmNzQ1NGZlYmE2YWRhYWZmIDEwMDY0NAotLS0gYS9Ub29scy9MYXlv dXRSZWxvYWRlZC90ZXN0L2luZGV4Lmh0bWwKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvdGVz dC9pbmRleC5odG1sCkBAIC04MSw2ICs4MSw3IEBAIGFkZEpTKCIuLi9MYXlvdXRUcmVlL0Jsb2Nr Q29udGFpbmVyLmpzIik7CiBhZGRKUygiLi4vTGF5b3V0VHJlZS9Jbml0aWFsQmxvY2tDb250YWlu ZXIuanMiKTsKIGFkZEpTKCIuLi9MYXlvdXRUcmVlL0lubGluZUJveC5qcyIpOwogYWRkSlMoIi4u L0xheW91dFRyZWUvVGV4dC5qcyIpOworYWRkSlMoIi4uL0Rpc3BsYXlUcmVlL0JveC5qcyIpOwog YWRkSlMoIi4uL0Zvcm1hdHRpbmdDb250ZXh0L0Zvcm1hdHRpbmdDb250ZXh0LmpzIik7CiBhZGRK UygiLi4vRm9ybWF0dGluZ0NvbnRleHQvRmxvYXRpbmdDb250ZXh0LmpzIik7CiBhZGRKUygiLi4v Rm9ybWF0dGluZ0NvbnRleHQvQmxvY2tGb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQu anMiKTsK