141346 2015-02-06 16:34:50 -0800 Convert the compositing overlap map to use LayoutRects 2015-02-09 10:22:36 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue ddkilzer esprehn+autocc glenn kling kondapallykalyan simon.fraser zalan oldest_to_newest 1067454 0 simon.fraser 2015-02-06 16:34:50 -0800 Convert the compositing overlap map to use LayoutRects 1067456 1 246188 simon.fraser 2015-02-06 16:37:16 -0800 Created attachment 246188 Patch 1067457 2 simon.fraser 2015-02-06 16:37:36 -0800 rdar://problem/18206365 1067472 3 simon.fraser 2015-02-06 17:11:30 -0800 https://trac.webkit.org/r179771 1067852 4 ddkilzer 2015-02-09 10:22:36 -0800 (In reply to comment #3) > https://trac.webkit.org/r179771 Platform-specific results for ios-simulator added: <http://trac.webkit.org/changeset/179832> 246188 2015-02-06 16:37:16 -0800 2015-02-06 16:42:54 -0800 Patch bug-141346-20150206163715.patch text/plain 12456 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTc5NzA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzQ5NGExYTQwMTJiNmYz ZDViYzQ3OTY0NDJhZTkxZTJhODIxZjNjNi4uNWZkYTE5OWVhNWZhNDYwODdiZGRhNjM2OWJmNWRj NmIzNWE3MDgyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE1LTAyLTA2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENvbnZlcnQgdGhl IGNvbXBvc2l0aW5nIG92ZXJsYXAgbWFwIHRvIHVzZSBMYXlvdXRSZWN0cworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxMzQ2CisgICAgICAgIHJkYXI6 Ly9wcm9ibGVtLzE4MjA2MzY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisgICAgICAgIAorICAgICAgICBJZiB0d28gY29tcG9zaXRpbmcgbGF5ZXJzIHdlcmUgYWRqb2lu aW5nIGJ1dCBub3Qgb3ZlcmxhcHBpbmcsIGJ1dCBoYXBwZW5lZCB0bworICAgICAgICBoYXZlIG5v bi1pbnRlZ3JhbCBvZmZzZXRzLCB0aGVuIHVzaW5nIGVuY2xvc2luZyBJbnRSZWN0cyBpbiB0aGUg b3ZlcmxhcCBtYXAKKyAgICAgICAgd291bGQgY2F1c2UgdXMgdG8gdGhpbmsgdGhleSBhcmUgb3Zl cmxhcHBpbmcsIGFuZCBjcmVhdGUgdW5uZWNlc3NhcnkgYmFja2luZyBzdG9yZS4KKyAgICAgICAg CisgICAgICAgIEZpeCBieSBjb252ZXJ0aW5nIHRoZSBvdmVybGFwIG1hcCB0byB1c2UgTGF5b3V0 UmVjdHMuCisKKyAgICAgICAgVGVzdDogY29tcG9zaXRpbmcvbGF5ZXItY3JlYXRpb24vc3VicGl4 ZWwtYWRqYWNlbnQtbGF5ZXJzLW92ZXJsYXAuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpPdmVybGFwTWFwQ29u dGFpbmVyOjphZGQpOgorICAgICAgICAoV2ViQ29yZTo6T3ZlcmxhcE1hcENvbnRhaW5lcjo6b3Zl cmxhcHNMYXllcnMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpP dmVybGFwTWFwOjphZGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9y OjpPdmVybGFwTWFwOjpvdmVybGFwc0xheWVycyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllckNvbXBvc2l0b3I6Ok92ZXJsYXBNYXA6OlJlY3RMaXN0OjphcHBlbmQpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpPdmVybGFwTWFwOjpSZWN0TGlzdDo6aW50 ZXJzZWN0cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmxvZ0xh eWVySW5mbyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmFkZFRv T3ZlcmxhcE1hcCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmFk ZFRvT3ZlcmxhcE1hcFJlY3Vyc2l2ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNv bXBvc2l0b3I6OmNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50cyk6CisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oOgorCiAyMDE1LTAyLTA1ICBNYWNpZWogU3Rh Y2hvd2lhayAgPG1qc0BhcHBsZS5jb20+CiAKICAgICAgICAgQ3Jhc2ggZHVlIHRvIGZhaWxpbmcg dG8gZGlydHkgYSByZW1vdmVkIHRleHQgbm9kZSdzIGxpbmUgYm94CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCmluZGV4IDI3NTVjZjYy MzBlNTFiMDE4OTYyMTdjMGIwZDljZTdkMmQ1MjAzMWUuLjY3MmViMjZjYWY4MGM5NzEwMmJhZGFh OTE0MDA0ZjU0ZmViYjhiMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC02OCw4ICs2OCw2IEBACiAKICNpZiBQTEFURk9S TShJT1MpCiAjaW5jbHVkZSAiTGVnYWN5VGlsZUNhY2hlLmgiCi0jaW5jbHVkZSAiTWFpbkZyYW1l LmgiCi0jaW5jbHVkZSAiUmVnaW9uLmgiCiAjaW5jbHVkZSAiUmVuZGVyU2Nyb2xsYmFyLmgiCiAj ZW5kaWYKIApAQCAtMTA0LDEzICsxMDIsMTMgQEAgdXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1lczsK IAogY2xhc3MgT3ZlcmxhcE1hcENvbnRhaW5lciB7CiBwdWJsaWM6Ci0gICAgdm9pZCBhZGQoY29u c3QgSW50UmVjdCYgYm91bmRzKQorICAgIHZvaWQgYWRkKGNvbnN0IExheW91dFJlY3QmIGJvdW5k cykKICAgICB7CiAgICAgICAgIG1fbGF5ZXJSZWN0cy5hcHBlbmQoYm91bmRzKTsKICAgICAgICAg bV9ib3VuZGluZ0JveC51bml0ZShib3VuZHMpOwogICAgIH0KIAotICAgIGJvb2wgb3ZlcmxhcHNM YXllcnMoY29uc3QgSW50UmVjdCYgYm91bmRzKSBjb25zdAorICAgIGJvb2wgb3ZlcmxhcHNMYXll cnMoY29uc3QgTGF5b3V0UmVjdCYgYm91bmRzKSBjb25zdAogICAgIHsKICAgICAgICAgLy8gQ2hl Y2tpbmcgd2l0aCB0aGUgYm91bmRpbmcgYm94IHdpbGwgcXVpY2tseSByZWplY3QgY2FzZXMgd2hl bgogICAgICAgICAvLyBsYXllcnMgYXJlIGNyZWF0ZWQgZm9yIGxpc3RzIG9mIGl0ZW1zIGdvaW5n IGluIG9uZSBkaXJlY3Rpb24gYW5kCkBAIC0xMzAsOCArMTI4LDggQEAgcHVibGljOgogICAgICAg ICBtX2JvdW5kaW5nQm94LnVuaXRlKG90aGVyQ29udGFpbmVyLm1fYm91bmRpbmdCb3gpOwogICAg IH0KIHByaXZhdGU6Ci0gICAgVmVjdG9yPEludFJlY3Q+IG1fbGF5ZXJSZWN0czsKLSAgICBJbnRS ZWN0IG1fYm91bmRpbmdCb3g7CisgICAgVmVjdG9yPExheW91dFJlY3Q+IG1fbGF5ZXJSZWN0czsK KyAgICBMYXlvdXRSZWN0IG1fYm91bmRpbmdCb3g7CiB9OwogCiBjbGFzcyBSZW5kZXJMYXllckNv bXBvc2l0b3I6Ok92ZXJsYXBNYXAgewpAQCAtMTQ2LDcgKzE0NCw3IEBAIHB1YmxpYzoKICAgICAg ICAgcHVzaENvbXBvc2l0aW5nQ29udGFpbmVyKCk7CiAgICAgfQogCi0gICAgdm9pZCBhZGQoY29u c3QgUmVuZGVyTGF5ZXIqIGxheWVyLCBjb25zdCBJbnRSZWN0JiBib3VuZHMpCisgICAgdm9pZCBh ZGQoY29uc3QgUmVuZGVyTGF5ZXIqIGxheWVyLCBjb25zdCBMYXlvdXRSZWN0JiBib3VuZHMpCiAg ICAgewogICAgICAgICAvLyBMYXllcnMgZG8gbm90IGNvbnRyaWJ1dGUgdG8gb3ZlcmxhcCBpbW1l ZGlhdGVseS0taW5zdGVhZCwgdGhleSB3aWxsCiAgICAgICAgIC8vIGNvbnRyaWJ1dGUgdG8gb3Zl cmxhcCBhcyBzb29uIGFzIHRoZWlyIGNvbXBvc2l0ZWQgYW5jZXN0b3IgaGFzIGJlZW4KQEAgLTE2 MSw3ICsxNTksNyBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBtX2xheWVycy5jb250YWlucyhs YXllcik7CiAgICAgfQogCi0gICAgYm9vbCBvdmVybGFwc0xheWVycyhjb25zdCBJbnRSZWN0JiBi b3VuZHMpIGNvbnN0CisgICAgYm9vbCBvdmVybGFwc0xheWVycyhjb25zdCBMYXlvdXRSZWN0JiBi b3VuZHMpIGNvbnN0CiAgICAgewogICAgICAgICByZXR1cm4gbV9vdmVybGFwU3RhY2subGFzdCgp Lm92ZXJsYXBzTGF5ZXJzKGJvdW5kcyk7CiAgICAgfQpAQCAtMTg2LDEwICsxODQsMTAgQEAgcHVi bGljOgogCiBwcml2YXRlOgogICAgIHN0cnVjdCBSZWN0TGlzdCB7Ci0gICAgICAgIFZlY3RvcjxJ bnRSZWN0PiByZWN0czsKLSAgICAgICAgSW50UmVjdCBib3VuZGluZ1JlY3Q7CisgICAgICAgIFZl Y3RvcjxMYXlvdXRSZWN0PiByZWN0czsKKyAgICAgICAgTGF5b3V0UmVjdCBib3VuZGluZ1JlY3Q7 CiAgICAgICAgIAotICAgICAgICB2b2lkIGFwcGVuZChjb25zdCBJbnRSZWN0JiByZWN0KQorICAg ICAgICB2b2lkIGFwcGVuZChjb25zdCBMYXlvdXRSZWN0JiByZWN0KQogICAgICAgICB7CiAgICAg ICAgICAgICByZWN0cy5hcHBlbmQocmVjdCk7CiAgICAgICAgICAgICBib3VuZGluZ1JlY3QudW5p dGUocmVjdCk7CkBAIC0yMDEsNyArMTk5LDcgQEAgcHJpdmF0ZToKICAgICAgICAgICAgIGJvdW5k aW5nUmVjdC51bml0ZShyZWN0TGlzdC5ib3VuZGluZ1JlY3QpOwogICAgICAgICB9CiAgICAgICAg IAotICAgICAgICBib29sIGludGVyc2VjdHMoY29uc3QgSW50UmVjdCYgcmVjdCkgY29uc3QKKyAg ICAgICAgYm9vbCBpbnRlcnNlY3RzKGNvbnN0IExheW91dFJlY3QmIHJlY3QpIGNvbnN0CiAgICAg ICAgIHsKICAgICAgICAgICAgIGlmICghcmVjdHMuc2l6ZSgpIHx8ICFib3VuZGluZ1JlY3QuaW50 ZXJzZWN0cyhyZWN0KSkKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC04MjcsOSAr ODI1LDEyIEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpsb2dMYXllckluZm8oY29uc3Qg UmVuZGVyTGF5ZXImIGxheWVyLCBpbnQgZGVwdGgpCiAgICAgICAgIG1fc2Vjb25kYXJ5QmFja2lu Z1N0b3JlQnl0ZXMgKz0gYmFja2luZy0+YmFja2luZ1N0b3JlTWVtb3J5RXN0aW1hdGUoKTsKICAg ICB9CiAKKyAgICBMYXlvdXRSZWN0IGFic29sdXRlQm91bmRzID0gYmFja2luZy0+Y29tcG9zaXRl ZEJvdW5kcygpOworICAgIGFic29sdXRlQm91bmRzLm1vdmUobGF5ZXIub2Zmc2V0RnJvbUFuY2Vz dG9yKG1fcmVuZGVyVmlldy5sYXllcigpKSk7CisgICAgCiAgICAgU3RyaW5nQnVpbGRlciBsb2dT dHJpbmc7Ci0gICAgbG9nU3RyaW5nLmFwcGVuZChTdHJpbmc6OmZvcm1hdCgiJSpwICVkeCVkICUu MmZLQiIsIDEyICsgZGVwdGggKiAyLCAmbGF5ZXIsCi0gICAgICAgIGJhY2tpbmctPmNvbXBvc2l0 ZWRCb3VuZHMoKS53aWR0aCgpLnJvdW5kKCksIGJhY2tpbmctPmNvbXBvc2l0ZWRCb3VuZHMoKS5o ZWlnaHQoKS5yb3VuZCgpLAorICAgIGxvZ1N0cmluZy5hcHBlbmQoU3RyaW5nOjpmb3JtYXQoIiUq cCAoJS42ZiwlLjZmLSUuNmYsJS42ZikgJS4yZktCIiwgMTIgKyBkZXB0aCAqIDIsICZsYXllciwK KyAgICAgICAgYWJzb2x1dGVCb3VuZHMueCgpLnRvRmxvYXQoKSwgYWJzb2x1dGVCb3VuZHMueSgp LnRvRmxvYXQoKSwgYWJzb2x1dGVCb3VuZHMubWF4WCgpLnRvRmxvYXQoKSwgYWJzb2x1dGVCb3Vu ZHMubWF4WSgpLnRvRmxvYXQoKSwKICAgICAgICAgYmFja2luZy0+YmFja2luZ1N0b3JlTWVtb3J5 RXN0aW1hdGUoKSAvIDEwMjQpKTsKICAgICAKICAgICBsb2dTdHJpbmcuYXBwZW5kKCIgKCIpOwpA QCAtMTEwNSw3ICsxMTA2LDcgQEAgUmVuZGVyTGF5ZXIqIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6 ZW5jbG9zaW5nTm9uU3RhY2tpbmdDbGlwcGluZ0xheWVyKGNvbnN0IFJlbmQKICAgICByZXR1cm4g bnVsbHB0cjsKIH0KIAotdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmFkZFRvT3ZlcmxhcE1h cChPdmVybGFwTWFwJiBvdmVybGFwTWFwLCBSZW5kZXJMYXllciYgbGF5ZXIsIEludFJlY3QmIGxh eWVyQm91bmRzLCBib29sJiBib3VuZHNDb21wdXRlZCkKK3ZvaWQgUmVuZGVyTGF5ZXJDb21wb3Np dG9yOjphZGRUb092ZXJsYXBNYXAoT3ZlcmxhcE1hcCYgb3ZlcmxhcE1hcCwgUmVuZGVyTGF5ZXIm IGxheWVyLCBMYXlvdXRSZWN0JiBsYXllckJvdW5kcywgYm9vbCYgYm91bmRzQ29tcHV0ZWQpCiB7 CiAgICAgaWYgKGxheWVyLmlzUm9vdExheWVyKCkpCiAgICAgICAgIHJldHVybjsKQEAgLTExMTMs MTQgKzExMTQsMTQgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmFkZFRvT3ZlcmxhcE1h cChPdmVybGFwTWFwJiBvdmVybGFwTWFwLCBSZW5kZXJMYXllciYKICAgICBpZiAoIWJvdW5kc0Nv bXB1dGVkKSB7CiAgICAgICAgIC8vIEZJWE1FOiBJZiB0aGlzIGxheWVyJ3Mgb3ZlcmxhcCBib3Vu ZHMgaW5jbHVkZSBpdHMgY2hpbGRyZW4sIHdlIGRvbid0IG5lZWQgdG8gYWRkIGl0cwogICAgICAg ICAvLyBjaGlsZHJlbidzIGJvdW5kcyB0byB0aGUgb3ZlcmxhcCBtYXAuCi0gICAgICAgIGxheWVy Qm91bmRzID0gZW5jbG9zaW5nSW50UmVjdChvdmVybGFwTWFwLmdlb21ldHJ5TWFwKCkuYWJzb2x1 dGVSZWN0KGxheWVyLm92ZXJsYXBCb3VuZHMoKSkpOworICAgICAgICBsYXllckJvdW5kcyA9IGVu Y2xvc2luZ0xheW91dFJlY3Qob3ZlcmxhcE1hcC5nZW9tZXRyeU1hcCgpLmFic29sdXRlUmVjdChs YXllci5vdmVybGFwQm91bmRzKCkpKTsKICAgICAgICAgLy8gRW1wdHkgcmVjdHMgbmV2ZXIgaW50 ZXJzZWN0LCBidXQgd2UgbmVlZCB0aGVtIHRvIGZvciB0aGUgcHVycG9zZXMgb2Ygb3ZlcmxhcCB0 ZXN0aW5nLgogICAgICAgICBpZiAobGF5ZXJCb3VuZHMuaXNFbXB0eSgpKQotICAgICAgICAgICAg bGF5ZXJCb3VuZHMuc2V0U2l6ZShJbnRTaXplKDEsIDEpKTsKKyAgICAgICAgICAgIGxheWVyQm91 bmRzLnNldFNpemUoTGF5b3V0U2l6ZSgxLCAxKSk7CiAgICAgICAgIGJvdW5kc0NvbXB1dGVkID0g dHJ1ZTsKICAgICB9CiAKLSAgICBJbnRSZWN0IGNsaXBSZWN0ID0gc25hcHBlZEludFJlY3QobGF5 ZXIuYmFja2dyb3VuZENsaXBSZWN0KFJlbmRlckxheWVyOjpDbGlwUmVjdHNDb250ZXh0KCZyb290 UmVuZGVyTGF5ZXIoKSwgQWJzb2x1dGVDbGlwUmVjdHMpKS5yZWN0KCkpOyAvLyBGSVhNRTogSW5j b3JyZWN0IGZvciBDU1MgcmVnaW9ucy4KKyAgICBMYXlvdXRSZWN0IGNsaXBSZWN0ID0gbGF5ZXIu YmFja2dyb3VuZENsaXBSZWN0KFJlbmRlckxheWVyOjpDbGlwUmVjdHNDb250ZXh0KCZyb290UmVu ZGVyTGF5ZXIoKSwgQWJzb2x1dGVDbGlwUmVjdHMpKS5yZWN0KCk7IC8vIEZJWE1FOiBJbmNvcnJl Y3QgZm9yIENTUyByZWdpb25zLgogCiAgICAgLy8gT24gaU9TLCBwYWdlU2NhbGVGYWN0b3IoKSBp cyBub3QgYXBwbGllZCBieSBSZW5kZXJWaWV3LCBzbyB3ZSBzaG91bGQgbm90IHNjYWxlIGhlcmUu CiAgICAgLy8gRklYTUU6IFNldCBTZXR0aW5nczo6ZGVsZWdhdGVzUGFnZVNjYWxpbmcgdG8gdHJ1 ZSBmb3IgaU9TLgpAQCAtMTE0Miw3ICsxMTQzLDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0 b3I6OmFkZFRvT3ZlcmxhcE1hcFJlY3Vyc2l2ZShPdmVybGFwTWFwJiBvdmVybGFwTWFwLCBSZW4K ICAgICBpZiAoYW5jZXN0b3JMYXllcikKICAgICAgICAgb3ZlcmxhcE1hcC5nZW9tZXRyeU1hcCgp LnB1c2hNYXBwaW5nc1RvQW5jZXN0b3IoJmxheWVyLCBhbmNlc3RvckxheWVyKTsKICAgICAKLSAg ICBJbnRSZWN0IGJvdW5kczsKKyAgICBMYXlvdXRSZWN0IGJvdW5kczsKICAgICBib29sIGhhdmVD b21wdXRlZEJvdW5kcyA9IGZhbHNlOwogICAgIGFkZFRvT3ZlcmxhcE1hcChvdmVybGFwTWFwLCBs YXllciwgYm91bmRzLCBoYXZlQ29tcHV0ZWRCb3VuZHMpOwogCkBAIC0xMjI3LDE2ICsxMjI4LDE2 IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJl bWVudHMoUmVuZGVyTGF5ZXIqIGFuY2VzdG9yCiAKICAgICBSZW5kZXJMYXllcjo6SW5kaXJlY3RD b21wb3NpdGluZ1JlYXNvbiBjb21wb3NpdGluZ1JlYXNvbiA9IGNvbXBvc2l0aW5nU3RhdGUubV9z dWJ0cmVlSXNDb21wb3NpdGluZyA/IFJlbmRlckxheWVyOjpJbmRpcmVjdENvbXBvc2l0aW5nUmVh c29uOjpTdGFja2luZyA6IFJlbmRlckxheWVyOjpJbmRpcmVjdENvbXBvc2l0aW5nUmVhc29uOjpO b25lOwogICAgIGJvb2wgaGF2ZUNvbXB1dGVkQm91bmRzID0gZmFsc2U7Ci0gICAgSW50UmVjdCBh YnNCb3VuZHM7CisgICAgTGF5b3V0UmVjdCBhYnNCb3VuZHM7CiAKICAgICAvLyBJZiB3ZSBrbm93 IGZvciBzdXJlIHRoZSBsYXllciBpcyBnb2luZyB0byBiZSBjb21wb3NpdGVkLCBkb24ndCBib3Ro ZXIgbG9va2luZyBpdCB1cCBpbiB0aGUgb3ZlcmxhcCBtYXAKICAgICBpZiAoIXdpbGxCZUNvbXBv c2l0ZWQgJiYgIW92ZXJsYXBNYXAuaXNFbXB0eSgpICYmIGNvbXBvc2l0aW5nU3RhdGUubV90ZXN0 aW5nT3ZlcmxhcCkgewogICAgICAgICAvLyBJZiB3ZSdyZSB0ZXN0aW5nIGZvciBvdmVybGFwLCB3 ZSBvbmx5IG5lZWQgdG8gY29tcG9zaXRlIGlmIHdlIG92ZXJsYXAgc29tZXRoaW5nIHRoYXQgaXMg YWxyZWFkeSBjb21wb3NpdGVkLgotICAgICAgICBhYnNCb3VuZHMgPSBlbmNsb3NpbmdJbnRSZWN0 KG92ZXJsYXBNYXAuZ2VvbWV0cnlNYXAoKS5hYnNvbHV0ZVJlY3QobGF5ZXIub3ZlcmxhcEJvdW5k cygpKSk7CisgICAgICAgIGFic0JvdW5kcyA9IGVuY2xvc2luZ0xheW91dFJlY3Qob3ZlcmxhcE1h cC5nZW9tZXRyeU1hcCgpLmFic29sdXRlUmVjdChsYXllci5vdmVybGFwQm91bmRzKCkpKTsKIAog ICAgICAgICAvLyBFbXB0eSByZWN0cyBuZXZlciBpbnRlcnNlY3QsIGJ1dCB3ZSBuZWVkIHRoZW0g dG8gZm9yIHRoZSBwdXJwb3NlcyBvZiBvdmVybGFwIHRlc3RpbmcuCiAgICAgICAgIGlmIChhYnNC b3VuZHMuaXNFbXB0eSgpKQotICAgICAgICAgICAgYWJzQm91bmRzLnNldFNpemUoSW50U2l6ZSgx LCAxKSk7CisgICAgICAgICAgICBhYnNCb3VuZHMuc2V0U2l6ZShMYXlvdXRTaXplKDEsIDEpKTsK ICAgICAgICAgaGF2ZUNvbXB1dGVkQm91bmRzID0gdHJ1ZTsKICAgICAgICAgY29tcG9zaXRpbmdS ZWFzb24gPSBvdmVybGFwTWFwLm92ZXJsYXBzTGF5ZXJzKGFic0JvdW5kcykgPyBSZW5kZXJMYXll cjo6SW5kaXJlY3RDb21wb3NpdGluZ1JlYXNvbjo6T3ZlcmxhcCA6IFJlbmRlckxheWVyOjpJbmRp cmVjdENvbXBvc2l0aW5nUmVhc29uOjpOb25lOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaAppbmRleCA5ZTY4OTQxNTA2MTdiYTU0 NWM0ZmM4YzU5MTBiZTFjZjgxMmJjMWM5Li45N2M3YzlkMGE5YzM1ZjBlMGQzZTJiZGIzMTU1ZThi MzYwNDdmNzY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJDb21wb3NpdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy Q29tcG9zaXRvci5oCkBAIC0zMzMsNyArMzMzLDcgQEAgcHJpdmF0ZToKICAgICAvLyBSZXBhaW50 IHRoaXMgYW5kIGl0cyBjaGlsZCBsYXllcnMuCiAgICAgdm9pZCByZWN1cnNpdmVSZXBhaW50TGF5 ZXIoUmVuZGVyTGF5ZXImKTsKIAotICAgIHZvaWQgYWRkVG9PdmVybGFwTWFwKE92ZXJsYXBNYXAm LCBSZW5kZXJMYXllciYsIEludFJlY3QmIGxheWVyQm91bmRzLCBib29sJiBib3VuZHNDb21wdXRl ZCk7CisgICAgdm9pZCBhZGRUb092ZXJsYXBNYXAoT3ZlcmxhcE1hcCYsIFJlbmRlckxheWVyJiwg TGF5b3V0UmVjdCYgbGF5ZXJCb3VuZHMsIGJvb2wmIGJvdW5kc0NvbXB1dGVkKTsKICAgICB2b2lk IGFkZFRvT3ZlcmxhcE1hcFJlY3Vyc2l2ZShPdmVybGFwTWFwJiwgUmVuZGVyTGF5ZXImLCBSZW5k ZXJMYXllciogYW5jZXN0b3JMYXllciA9IG51bGxwdHIpOwogCiAgICAgdm9pZCB1cGRhdGVDb21w b3NpdGluZ0xheWVyc1RpbWVyRmlyZWQoKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA4YzdjODkzZjYzYWRkODgzZjM4OTlj Mzk0ZGM0MTA0YmUwYWRmNGMwLi5lNWY5YjU5NmU3NTVlNGQ1YmU3NTk2ZjhjM2UyZjE5NGE4ZWI1 MjE3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTUtMDItMDYgIFNpbW9uIEZyYXNlciAgPHNp bW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgQ29udmVydCB0aGUgY29tcG9zaXRpbmcg b3ZlcmxhcCBtYXAgdG8gdXNlIExheW91dFJlY3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDEzNDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFRlc3Qgd2l0aCBhZGphY2VudCBsYXllcnMg b24gbm9uLXBpeGVsIGJvdW5kYXJpZXMuCisKKyAgICAgICAgKiBjb21wb3NpdGluZy9sYXllci1j cmVhdGlvbi9zdWJwaXhlbC1hZGphY2VudC1sYXllcnMtb3ZlcmxhcC1leHBlY3RlZC50eHQ6IEFk ZGVkLgorICAgICAgICAqIGNvbXBvc2l0aW5nL2xheWVyLWNyZWF0aW9uL3N1YnBpeGVsLWFkamFj ZW50LWxheWVycy1vdmVybGFwLmh0bWw6IEFkZGVkLgorCiAyMDE1LTAyLTA1ICBNYWNpZWogU3Rh Y2hvd2lhayAgPG1qc0BhcHBsZS5jb20+CiAKICAgICAgICAgQ3Jhc2ggZHVlIHRvIGZhaWxpbmcg dG8gZGlydHkgYSByZW1vdmVkIHRleHQgbm9kZSdzIGxpbmUgYm94CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9jb21wb3NpdGluZy9sYXllci1jcmVhdGlvbi9zdWJwaXhlbC1hZGphY2VudC1sYXll cnMtb3ZlcmxhcC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9sYXllci1j cmVhdGlvbi9zdWJwaXhlbC1hZGphY2VudC1sYXllcnMtb3ZlcmxhcC1leHBlY3RlZC50eHQKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uYjFmMDcwNzA3MjU3NTUyZDc1Yjc4YmRiYmJiMTk4ZGQ0YTMyZDJhZAotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2xheWVyLWNyZWF0aW9uL3N1YnBp eGVsLWFkamFjZW50LWxheWVycy1vdmVybGFwLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDIwIEBA CitIZXJlIGlzIHNvbWUgdGV4dAorCisoR3JhcGhpY3NMYXllcgorICAoYW5jaG9yIDAuMDAgMC4w MCkKKyAgKGJvdW5kcyA4MDAuMDAgNjAwLjAwKQorICAoY2hpbGRyZW4gMQorICAgIChHcmFwaGlj c0xheWVyCisgICAgICAoYm91bmRzIDgwMC4wMCA2MDAuMDApCisgICAgICAoY29udGVudHNPcGFx dWUgMSkKKyAgICAgIChjaGlsZHJlbiAxCisgICAgICAgIChHcmFwaGljc0xheWVyCisgICAgICAg ICAgKHBvc2l0aW9uIDAuMDAgNDQuMDApCisgICAgICAgICAgKGFuY2hvciAwLjUwIDAuNTApCisg ICAgICAgICAgKGJvdW5kcyAyMDAuMDAgMjAxLjAwKQorICAgICAgICApCisgICAgICApCisgICAg KQorICApCispCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2xheWVyLWNy ZWF0aW9uL3N1YnBpeGVsLWFkamFjZW50LWxheWVycy1vdmVybGFwLmh0bWwgYi9MYXlvdXRUZXN0 cy9jb21wb3NpdGluZy9sYXllci1jcmVhdGlvbi9zdWJwaXhlbC1hZGphY2VudC1sYXllcnMtb3Zl cmxhcC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjA4N2JiMjhlMmI0MGYwNWQxMmI1MzM5NDRhM2E3MDE5ODk3 NmJjMzgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9sYXllci1j cmVhdGlvbi9zdWJwaXhlbC1hZGphY2VudC1sYXllcnMtb3ZlcmxhcC5odG1sCkBAIC0wLDAgKzEs NDMgQEAKKzwhRE9DVFlQRSBodG1sPgorCis8aHRtbD4KKzxoZWFkPgorICAgIDxzdHlsZT4KKyAg ICAgICAgYm9keSB7CisgICAgICAgICAgICBtYXJnaW46IDA7CisgICAgICAgIH0KKyAgICAgICAg LmJveCB7CisgICAgICAgICAgICBoZWlnaHQ6IDIwMHB4OworICAgICAgICAgICAgd2lkdGg6IDIw MHB4OworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogc2lsdmVyOworICAgICAgICAgICAg cG9zaXRpb246IHJlbGF0aXZlOworICAgICAgICB9CisgICAgICAgIC5jb21wb3NpdGVkIHsKKyAg ICAgICAgICAgIC13ZWJraXQtdHJhbnNmb3JtOiB0cmFuc2xhdGVaKDApOworICAgICAgICB9Cisg ICAgICAgIAorICAgICAgICBwIHsKKyAgICAgICAgICAgIGhlaWdodDogMTIuMzQ1cHg7IC8qIFN1 YnBpeGVsIGhlaWdodCAqLworICAgICAgICB9CisgICAgPC9zdHlsZT4KKyAgICA8c2NyaXB0Pgor ICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgICAgICAgICB0ZXN0UnVubmVyLmR1 bXBBc1RleHQoKTsKKworICAgICAgICBmdW5jdGlvbiBydW5UZXN0KCkKKyAgICAgICAgeworICAg ICAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICAgICAgICBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgnbGF5ZXJzJykuaW5uZXJUZXh0ID0gd2luZG93LmludGVybmFscy5sYXll clRyZWVBc1RleHQoZG9jdW1lbnQpOworICAgICAgICB9CisgICAgICAgIHdpbmRvdy5hZGRFdmVu dExpc3RlbmVyKCdsb2FkJywgcnVuVGVzdCwgZmFsc2UpOworICAgIDwvc2NyaXB0PgorPC9oZWFk PgorPGJvZHk+Cis8cD5IZXJlIGlzIHNvbWUgdGV4dDwvcD4KKzxkaXYgY2xhc3M9ImNvbXBvc2l0 ZWQgYm94Ij4KKzwvZGl2PgorPGRpdiBjbGFzcz0iYm94Ij4KKzwvZGl2PgorPHByZSBpZD0ibGF5 ZXJzIj48L3ByZT4KKzwvYm9keT4KKzwvaHRtbD4K