88021 2012-05-31 16:10:47 -0700 RenderLayerCompositor cleanup: make RenderGeometryMap part of the OverlapMap 2012-05-31 16:25:38 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser enne eric jchaffraix simon.fraser webkit.review.bot oldest_to_newest 638790 0 simon.fraser 2012-05-31 16:10:47 -0700 RenderLayerCompositor cleanup: make RenderGeometryMap part of the OverlapMap 638793 1 145172 simon.fraser 2012-05-31 16:14:38 -0700 Created attachment 145172 Patch 638795 2 145172 jamesr 2012-05-31 16:20:13 -0700 Comment on attachment 145172 Patch R=me 638796 3 simon.fraser 2012-05-31 16:25:38 -0700 http://trac.webkit.org/changeset/119172 145172 2012-05-31 16:14:38 -0700 2012-05-31 16:20:13 -0700 Patch bug-88021-20120531161439.patch text/plain 14079 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5MTUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTNjNWQzYzUxNjAwMjQz Y2Q4MGZiOTFkNmFkN2NjYWMwMGVkMmZiNC4uNzJjMWI0NjUwMDA2MzllMGNlMzBhOWRlMDdlOTUz Yzk3MDFmNjU1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDEyLTA1LTMxICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIFJlbmRlckxheWVy Q29tcG9zaXRvciBjbGVhbnVwOiBtYWtlIFJlbmRlckdlb21ldHJ5TWFwIHBhcnQgb2YgdGhlIE92 ZXJsYXBNYXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTg4MDIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAor ICAgICAgICBXZSBvbmx5IGV2ZXIgdXNlIHRoZSBSZW5kZXJHZW9tZXRyeU1hcCB3aGVuIHdlIGhh dmUgYW4gT3ZlcmxhcE1hcCwgc28gbWFrZQorICAgICAgICBpdCBhIG1lbWJlciBvZiB0aGUgT3Zl cmxhcE1hcC4KKworICAgICAgICBObyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFJlbmRlckxheWVyQ29t cG9zaXRvcjo6T3ZlcmxhcE1hcCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBv c2l0b3I6Ok92ZXJsYXBNYXA6Omdlb21ldHJ5TWFwKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlQ29tcG9zaXRpbmdMYXllcnMpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjphZGRUb092ZXJsYXBNYXApOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjphZGRUb092ZXJsYXBNYXBSZWN1cnNpdmUp OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjb21wdXRlQ29tcG9z aXRpbmdSZXF1aXJlbWVudHMpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBv c2l0b3IuaDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoUmVuZGVyTGF5ZXJDb21wb3Np dG9yKToKKworMjAxMi0wNS0zMSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNv bT4KKwogICAgICAgICBSZW1vdmUgc29tZSBkdXBsaWNhdGUgY29kZSBpbiBSZW5kZXJMYXllckNv bXBvc2l0b3IKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTg4MDA5CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckNvbXBvc2l0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29t cG9zaXRvci5jcHAKaW5kZXggOTEwN2U5NjY5YTVlMDI2NGM5ZWE1Mjc1MDQzM2U5N2I0N2MxY2Mx ZC4uYzIwZGI4NGU4NzZiYTkzOWFkNjM0NGViN2EzNGZjN2M3YjY2OGVlYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKQEAgLTEy NCwxMCArMTI0LDEzIEBAIHB1YmxpYzoKICAgICAgICAgbV9vdmVybGFwU3RhY2tbbV9vdmVybGFw U3RhY2suc2l6ZSgpIC0gMl0udW5pdGUobV9vdmVybGFwU3RhY2subGFzdCgpKTsKICAgICAgICAg bV9vdmVybGFwU3RhY2sucmVtb3ZlTGFzdCgpOwogICAgIH0KKyAgICAKKyAgICBSZW5kZXJHZW9t ZXRyeU1hcCYgZ2VvbWV0cnlNYXAoKSB7IHJldHVybiBtX2dlb21ldHJ5TWFwOyB9CiAKIHByaXZh dGU6CiAgICAgVmVjdG9yPFJlZ2lvbj4gbV9vdmVybGFwU3RhY2s7CiAgICAgSGFzaFNldDxjb25z dCBSZW5kZXJMYXllcio+IG1fbGF5ZXJzOworICAgIFJlbmRlckdlb21ldHJ5TWFwIG1fZ2VvbWV0 cnlNYXA7CiB9OwogCiBzdHJ1Y3QgQ29tcG9zaXRpbmdTdGF0ZSB7CkBAIC00MDAsMTAgKzQwMyw5 IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVDb21wb3NpdGluZ0xheWVycyhD b21wb3NpdGluZ1VwZGF0ZVR5cGUgdXBkYXRlCiAgICAgICAgIGJvb2wgbGF5ZXJzQ2hhbmdlZCA9 IGZhbHNlOwogICAgICAgICBpZiAobV9jb21wb3NpdGluZ0NvbnN1bHRzT3ZlcmxhcCkgewogICAg ICAgICAgICAgT3ZlcmxhcE1hcCBvdmVybGFwVGVzdFJlcXVlc3RNYXA7Ci0gICAgICAgICAgICBS ZW5kZXJHZW9tZXRyeU1hcCBnZW9tZXRyeU1hcDsKLSAgICAgICAgICAgIGNvbXB1dGVDb21wb3Np dGluZ1JlcXVpcmVtZW50cygwLCB1cGRhdGVSb290LCAmZ2VvbWV0cnlNYXAsICZvdmVybGFwVGVz dFJlcXVlc3RNYXAsIGNvbXBTdGF0ZSwgbGF5ZXJzQ2hhbmdlZCk7CisgICAgICAgICAgICBjb21w dXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoMCwgdXBkYXRlUm9vdCwgJm92ZXJsYXBUZXN0UmVx dWVzdE1hcCwgY29tcFN0YXRlLCBsYXllcnNDaGFuZ2VkKTsKICAgICAgICAgfSBlbHNlCi0gICAg ICAgICAgICBjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoMCwgdXBkYXRlUm9vdCwgMCwg MCwgY29tcFN0YXRlLCBsYXllcnNDaGFuZ2VkKTsKKyAgICAgICAgICAgIGNvbXB1dGVDb21wb3Np dGluZ1JlcXVpcmVtZW50cygwLCB1cGRhdGVSb290LCAwLCBjb21wU3RhdGUsIGxheWVyc0NoYW5n ZWQpOwogICAgICAgICAKICAgICAgICAgbmVlZEhpZXJhcmNoeVVwZGF0ZSB8PSBsYXllcnNDaGFu Z2VkOwogICAgIH0KQEAgLTYzNywxMyArNjM5LDEzIEBAIFJlbmRlckxheWVyKiBSZW5kZXJMYXll ckNvbXBvc2l0b3I6OmVuY2xvc2luZ05vblN0YWNraW5nQ2xpcHBpbmdMYXllcihjb25zdCBSZW5k CiAgICAgcmV0dXJuIDA7CiB9CiAKLXZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjphZGRUb092 ZXJsYXBNYXAoUmVuZGVyR2VvbWV0cnlNYXAmIGdlb21ldHJ5TWFwLCBPdmVybGFwTWFwJiBvdmVy bGFwTWFwLCBSZW5kZXJMYXllciogbGF5ZXIsIEludFJlY3QmIGxheWVyQm91bmRzLCBib29sJiBi b3VuZHNDb21wdXRlZCkKK3ZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjphZGRUb092ZXJsYXBN YXAoT3ZlcmxhcE1hcCYgb3ZlcmxhcE1hcCwgUmVuZGVyTGF5ZXIqIGxheWVyLCBJbnRSZWN0JiBs YXllckJvdW5kcywgYm9vbCYgYm91bmRzQ29tcHV0ZWQpCiB7CiAgICAgaWYgKGxheWVyLT5pc1Jv b3RMYXllcigpKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoIWJvdW5kc0NvbXB1dGVkKSB7 Ci0gICAgICAgIGxheWVyQm91bmRzID0gZW5jbG9zaW5nSW50UmVjdChnZW9tZXRyeU1hcC5hYnNv bHV0ZVJlY3QobGF5ZXItPmxvY2FsQm91bmRpbmdCb3goKSkpOworICAgICAgICBsYXllckJvdW5k cyA9IGVuY2xvc2luZ0ludFJlY3Qob3ZlcmxhcE1hcC5nZW9tZXRyeU1hcCgpLmFic29sdXRlUmVj dChsYXllci0+bG9jYWxCb3VuZGluZ0JveCgpKSk7CiAgICAgICAgIC8vIEVtcHR5IHJlY3RzIG5l dmVyIGludGVyc2VjdCwgYnV0IHdlIG5lZWQgdGhlbSB0byBmb3IgdGhlIHB1cnBvc2VzIG9mIG92 ZXJsYXAgdGVzdGluZy4KICAgICAgICAgaWYgKGxheWVyQm91bmRzLmlzRW1wdHkoKSkKICAgICAg ICAgICAgIGxheWVyQm91bmRzLnNldFNpemUoSW50U2l6ZSgxLCAxKSk7CkBAIC02NTYsMTggKzY1 OCwxOCBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6YWRkVG9PdmVybGFwTWFwKFJlbmRl ckdlb21ldHJ5TWFwJiBnZW9tZXRyeU1hcCwgT3ZlcgogICAgIG92ZXJsYXBNYXAuYWRkKGxheWVy LCBjbGlwUmVjdCk7CiB9CiAKLXZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjphZGRUb092ZXJs YXBNYXBSZWN1cnNpdmUoUmVuZGVyR2VvbWV0cnlNYXAmIGdlb21ldHJ5TWFwLCBPdmVybGFwTWFw JiBvdmVybGFwTWFwLCBSZW5kZXJMYXllciogbGF5ZXIsIFJlbmRlckxheWVyKiBhbmNlc3Rvckxh eWVyKQordm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmFkZFRvT3ZlcmxhcE1hcFJlY3Vyc2l2 ZShPdmVybGFwTWFwJiBvdmVybGFwTWFwLCBSZW5kZXJMYXllciogbGF5ZXIsIFJlbmRlckxheWVy KiBhbmNlc3RvckxheWVyKQogewogICAgIGlmICghY2FuQmVDb21wb3NpdGVkKGxheWVyKSB8fCBv dmVybGFwTWFwLmNvbnRhaW5zKGxheWVyKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gQSBu dWxsIGFuY2VzdG9yTGF5ZXIgaXMgYW4gaW5kaWNhdGlvbiB0aGF0ICdsYXllcicgaGFzIGFscmVh ZHkgYmVlbiBwdXNoZWQuCiAgICAgaWYgKGFuY2VzdG9yTGF5ZXIpCi0gICAgICAgIGdlb21ldHJ5 TWFwLnB1c2hNYXBwaW5nc1RvQW5jZXN0b3IobGF5ZXItPnJlbmRlcmVyKCksIGFuY2VzdG9yTGF5 ZXItPnJlbmRlcmVyKCkpOworICAgICAgICBvdmVybGFwTWFwLmdlb21ldHJ5TWFwKCkucHVzaE1h cHBpbmdzVG9BbmNlc3RvcihsYXllci0+cmVuZGVyZXIoKSwgYW5jZXN0b3JMYXllci0+cmVuZGVy ZXIoKSk7CiAgICAgCiAgICAgSW50UmVjdCBib3VuZHM7CiAgICAgYm9vbCBoYXZlQ29tcHV0ZWRC b3VuZHMgPSBmYWxzZTsKLSAgICBhZGRUb092ZXJsYXBNYXAoZ2VvbWV0cnlNYXAsIG92ZXJsYXBN YXAsIGxheWVyLCBib3VuZHMsIGhhdmVDb21wdXRlZEJvdW5kcyk7CisgICAgYWRkVG9PdmVybGFw TWFwKG92ZXJsYXBNYXAsIGxheWVyLCBib3VuZHMsIGhhdmVDb21wdXRlZEJvdW5kcyk7CiAKICNp ZiAhQVNTRVJUX0RJU0FCTEVECiAgICAgTGF5ZXJMaXN0TXV0YXRpb25EZXRlY3RvciBtdXRhdGlv bkNoZWNrZXIobGF5ZXIpOwpAQCAtNjc4LDcgKzY4MCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21w b3NpdG9yOjphZGRUb092ZXJsYXBNYXBSZWN1cnNpdmUoUmVuZGVyR2VvbWV0cnlNYXAmIGdlb21l dHJ5CiAgICAgICAgICAgICBzaXplX3QgbGlzdFNpemUgPSBuZWdaT3JkZXJMaXN0LT5zaXplKCk7 CiAgICAgICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGxpc3RTaXplOyArK2kpIHsKICAg ICAgICAgICAgICAgICBSZW5kZXJMYXllciogY3VyTGF5ZXIgPSBuZWdaT3JkZXJMaXN0LT5hdChp KTsKLSAgICAgICAgICAgICAgICBhZGRUb092ZXJsYXBNYXBSZWN1cnNpdmUoZ2VvbWV0cnlNYXAs IG92ZXJsYXBNYXAsIGN1ckxheWVyLCBsYXllcik7CisgICAgICAgICAgICAgICAgYWRkVG9PdmVy bGFwTWFwUmVjdXJzaXZlKG92ZXJsYXBNYXAsIGN1ckxheWVyLCBsYXllcik7CiAgICAgICAgICAg ICB9CiAgICAgICAgIH0KICAgICB9CkBAIC02ODcsNyArNjg5LDcgQEAgdm9pZCBSZW5kZXJMYXll ckNvbXBvc2l0b3I6OmFkZFRvT3ZlcmxhcE1hcFJlY3Vyc2l2ZShSZW5kZXJHZW9tZXRyeU1hcCYg Z2VvbWV0cnkKICAgICAgICAgc2l6ZV90IGxpc3RTaXplID0gbm9ybWFsRmxvd0xpc3QtPnNpemUo KTsKICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsaXN0U2l6ZTsgKytpKSB7CiAgICAg ICAgICAgICBSZW5kZXJMYXllciogY3VyTGF5ZXIgPSBub3JtYWxGbG93TGlzdC0+YXQoaSk7Ci0g ICAgICAgICAgICBhZGRUb092ZXJsYXBNYXBSZWN1cnNpdmUoZ2VvbWV0cnlNYXAsIG92ZXJsYXBN YXAsIGN1ckxheWVyLCBsYXllcik7CisgICAgICAgICAgICBhZGRUb092ZXJsYXBNYXBSZWN1cnNp dmUob3ZlcmxhcE1hcCwgY3VyTGF5ZXIsIGxheWVyKTsKICAgICAgICAgfQogICAgIH0KIApAQCAt Njk2LDEzICs2OTgsMTMgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmFkZFRvT3Zlcmxh cE1hcFJlY3Vyc2l2ZShSZW5kZXJHZW9tZXRyeU1hcCYgZ2VvbWV0cnkKICAgICAgICAgICAgIHNp emVfdCBsaXN0U2l6ZSA9IHBvc1pPcmRlckxpc3QtPnNpemUoKTsKICAgICAgICAgICAgIGZvciAo c2l6ZV90IGkgPSAwOyBpIDwgbGlzdFNpemU7ICsraSkgewogICAgICAgICAgICAgICAgIFJlbmRl ckxheWVyKiBjdXJMYXllciA9IHBvc1pPcmRlckxpc3QtPmF0KGkpOwotICAgICAgICAgICAgICAg IGFkZFRvT3ZlcmxhcE1hcFJlY3Vyc2l2ZShnZW9tZXRyeU1hcCwgb3ZlcmxhcE1hcCwgY3VyTGF5 ZXIsIGxheWVyKTsKKyAgICAgICAgICAgICAgICBhZGRUb092ZXJsYXBNYXBSZWN1cnNpdmUob3Zl cmxhcE1hcCwgY3VyTGF5ZXIsIGxheWVyKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAg IH0KICAgICAKICAgICBpZiAoYW5jZXN0b3JMYXllcikKLSAgICAgICAgZ2VvbWV0cnlNYXAucG9w TWFwcGluZ3NUb0FuY2VzdG9yKGFuY2VzdG9yTGF5ZXItPnJlbmRlcmVyKCkpOworICAgICAgICBv dmVybGFwTWFwLmdlb21ldHJ5TWFwKCkucG9wTWFwcGluZ3NUb0FuY2VzdG9yKGFuY2VzdG9yTGF5 ZXItPnJlbmRlcmVyKCkpOwogfQogCiAvLyAgUmVjdXJzZSB0aHJvdWdoIHRoZSBsYXllcnMgaW4g ei1pbmRleCBhbmQgb3ZlcmZsb3cgb3JkZXIgKHdoaWNoIGlzIGVxdWl2YWxlbnQgdG8gcGFpbnRp bmcgb3JkZXIpCkBAIC03MTQsMTMgKzcxNiwxMiBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRv cjo6YWRkVG9PdmVybGFwTWFwUmVjdXJzaXZlKFJlbmRlckdlb21ldHJ5TWFwJiBnZW9tZXRyeQog Ly8gICAgICBtdXN0IGJlIGNvbXBvc2l0aW5nIHNvIHRoYXQgaXRzIGNvbnRlbnRzIHJlbmRlciBv dmVyIHRoYXQgY2hpbGQuCiAvLyAgICAgIFRoaXMgaW1wbGllcyB0aGF0IGl0cyBwb3NpdGl2ZSB6 LWluZGV4IGNoaWxkcmVuIG11c3QgYWxzbyBiZSBjb21wb3NpdGluZy4KIC8vCi12b2lkIFJlbmRl ckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZUNvbXBvc2l0aW5nUmVxdWlyZW1lbnRzKFJlbmRlckxh eWVyKiBhbmNlc3RvckxheWVyLCBSZW5kZXJMYXllciogbGF5ZXIsIFJlbmRlckdlb21ldHJ5TWFw KiBnZW9tZXRyeU1hcCwgT3ZlcmxhcE1hcCogb3ZlcmxhcE1hcCwgQ29tcG9zaXRpbmdTdGF0ZSYg Y29tcG9zaXRpbmdTdGF0ZSwgYm9vbCYgbGF5ZXJzQ2hhbmdlZCkKK3ZvaWQgUmVuZGVyTGF5ZXJD b21wb3NpdG9yOjpjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoUmVuZGVyTGF5ZXIqIGFu Y2VzdG9yTGF5ZXIsIFJlbmRlckxheWVyKiBsYXllciwgT3ZlcmxhcE1hcCogb3ZlcmxhcE1hcCwg Q29tcG9zaXRpbmdTdGF0ZSYgY29tcG9zaXRpbmdTdGF0ZSwgYm9vbCYgbGF5ZXJzQ2hhbmdlZCkK IHsKICAgICBsYXllci0+dXBkYXRlTGF5ZXJMaXN0c0lmTmVlZGVkKCk7CiAgICAgCi0gICAgLy8g U2hvdWxkIGdlb21ldHJ5TWFwIGJlIHBhcnQgb2YgdGhlIG92ZXJsYXAgbWFwPwotICAgIGlmIChn ZW9tZXRyeU1hcCkKLSAgICAgICAgZ2VvbWV0cnlNYXAtPnB1c2hNYXBwaW5nc1RvQW5jZXN0b3Io bGF5ZXItPnJlbmRlcmVyKCksIGFuY2VzdG9yTGF5ZXIgPyBhbmNlc3RvckxheWVyLT5yZW5kZXJl cigpIDogMCk7CisgICAgaWYgKG92ZXJsYXBNYXApCisgICAgICAgIG92ZXJsYXBNYXAtPmdlb21l dHJ5TWFwKCkucHVzaE1hcHBpbmdzVG9BbmNlc3RvcihsYXllci0+cmVuZGVyZXIoKSwgYW5jZXN0 b3JMYXllciA/IGFuY2VzdG9yTGF5ZXItPnJlbmRlcmVyKCkgOiAwKTsKICAgICAKICAgICAvLyBD bGVhciB0aGUgZmxhZwogICAgIGxheWVyLT5zZXRIYXNDb21wb3NpdGluZ0Rlc2NlbmRhbnQoZmFs c2UpOwpAQCAtNzMxLDcgKzczMiw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjb21w dXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoUmVuZGVyTGF5ZXIqIGFuY2VzdG9yCiAgICAgSW50 UmVjdCBhYnNCb3VuZHM7CiAgICAgaWYgKG92ZXJsYXBNYXAgJiYgIW92ZXJsYXBNYXAtPmlzRW1w dHkoKSAmJiBjb21wb3NpdGluZ1N0YXRlLm1fdGVzdGluZ092ZXJsYXApIHsKICAgICAgICAgLy8g SWYgd2UncmUgdGVzdGluZyBmb3Igb3ZlcmxhcCwgd2Ugb25seSBuZWVkIHRvIGNvbXBvc2l0ZSBp ZiB3ZSBvdmVybGFwIHNvbWV0aGluZyB0aGF0IGlzIGFscmVhZHkgY29tcG9zaXRlZC4KLSAgICAg ICAgYWJzQm91bmRzID0gZW5jbG9zaW5nSW50UmVjdChnZW9tZXRyeU1hcC0+YWJzb2x1dGVSZWN0 KGxheWVyLT5sb2NhbEJvdW5kaW5nQm94KCkpKTsKKyAgICAgICAgYWJzQm91bmRzID0gZW5jbG9z aW5nSW50UmVjdChvdmVybGFwTWFwLT5nZW9tZXRyeU1hcCgpLmFic29sdXRlUmVjdChsYXllci0+ bG9jYWxCb3VuZGluZ0JveCgpKSk7CiAKICAgICAgICAgLy8gRW1wdHkgcmVjdHMgbmV2ZXIgaW50 ZXJzZWN0LCBidXQgd2UgbmVlZCB0aGVtIHRvIGZvciB0aGUgcHVycG9zZXMgb2Ygb3ZlcmxhcCB0 ZXN0aW5nLgogICAgICAgICBpZiAoYWJzQm91bmRzLmlzRW1wdHkoKSkKQEAgLTc4MSw3ICs3ODIs NyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZUNvbXBvc2l0aW5nUmVxdWly ZW1lbnRzKFJlbmRlckxheWVyKiBhbmNlc3RvcgogICAgICAgICAgICAgc2l6ZV90IGxpc3RTaXpl ID0gbmVnWk9yZGVyTGlzdC0+c2l6ZSgpOwogICAgICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7 IGkgPCBsaXN0U2l6ZTsgKytpKSB7CiAgICAgICAgICAgICAgICAgUmVuZGVyTGF5ZXIqIGN1ckxh eWVyID0gbmVnWk9yZGVyTGlzdC0+YXQoaSk7Ci0gICAgICAgICAgICAgICAgY29tcHV0ZUNvbXBv c2l0aW5nUmVxdWlyZW1lbnRzKGxheWVyLCBjdXJMYXllciwgZ2VvbWV0cnlNYXAsIG92ZXJsYXBN YXAsIGNoaWxkU3RhdGUsIGxheWVyc0NoYW5nZWQpOworICAgICAgICAgICAgICAgIGNvbXB1dGVD b21wb3NpdGluZ1JlcXVpcmVtZW50cyhsYXllciwgY3VyTGF5ZXIsIG92ZXJsYXBNYXAsIGNoaWxk U3RhdGUsIGxheWVyc0NoYW5nZWQpOwogCiAgICAgICAgICAgICAgICAgLy8gSWYgd2UgaGF2ZSB0 byBtYWtlIGEgbGF5ZXIgZm9yIHRoaXMgY2hpbGQsIG1ha2Ugb25lIG5vdyBzbyB3ZSBjYW4gaGF2 ZSBhIGNvbnRlbnRzIGxheWVyCiAgICAgICAgICAgICAgICAgLy8gKHNpbmNlIHdlIG5lZWQgdG8g ZW5zdXJlIHRoYXQgdGhlIC12ZSB6LW9yZGVyIGNoaWxkIHJlbmRlcnMgdW5kZXJuZWF0aCBvdXIg Y29udGVudHMpLgpAQCAtODAxLDcgKzgwMiw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9y Ojpjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoUmVuZGVyTGF5ZXIqIGFuY2VzdG9yCiAg ICAgICAgIHNpemVfdCBsaXN0U2l6ZSA9IG5vcm1hbEZsb3dMaXN0LT5zaXplKCk7CiAgICAgICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbGlzdFNpemU7ICsraSkgewogICAgICAgICAgICAgUmVu ZGVyTGF5ZXIqIGN1ckxheWVyID0gbm9ybWFsRmxvd0xpc3QtPmF0KGkpOwotICAgICAgICAgICAg Y29tcHV0ZUNvbXBvc2l0aW5nUmVxdWlyZW1lbnRzKGxheWVyLCBjdXJMYXllciwgZ2VvbWV0cnlN YXAsIG92ZXJsYXBNYXAsIGNoaWxkU3RhdGUsIGxheWVyc0NoYW5nZWQpOworICAgICAgICAgICAg Y29tcHV0ZUNvbXBvc2l0aW5nUmVxdWlyZW1lbnRzKGxheWVyLCBjdXJMYXllciwgb3ZlcmxhcE1h cCwgY2hpbGRTdGF0ZSwgbGF5ZXJzQ2hhbmdlZCk7CiAgICAgICAgIH0KICAgICB9CiAKQEAgLTgx MCw3ICs4MTEsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZUNvbXBvc2l0 aW5nUmVxdWlyZW1lbnRzKFJlbmRlckxheWVyKiBhbmNlc3RvcgogICAgICAgICAgICAgc2l6ZV90 IGxpc3RTaXplID0gcG9zWk9yZGVyTGlzdC0+c2l6ZSgpOwogICAgICAgICAgICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBsaXN0U2l6ZTsgKytpKSB7CiAgICAgICAgICAgICAgICAgUmVuZGVyTGF5 ZXIqIGN1ckxheWVyID0gcG9zWk9yZGVyTGlzdC0+YXQoaSk7Ci0gICAgICAgICAgICAgICAgY29t cHV0ZUNvbXBvc2l0aW5nUmVxdWlyZW1lbnRzKGxheWVyLCBjdXJMYXllciwgZ2VvbWV0cnlNYXAs IG92ZXJsYXBNYXAsIGNoaWxkU3RhdGUsIGxheWVyc0NoYW5nZWQpOworICAgICAgICAgICAgICAg IGNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50cyhsYXllciwgY3VyTGF5ZXIsIG92ZXJsYXBN YXAsIGNoaWxkU3RhdGUsIGxheWVyc0NoYW5nZWQpOwogICAgICAgICAgICAgfQogICAgICAgICB9 CiAgICAgfQpAQCAtODI3LDcgKzgyOCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpj b21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoUmVuZGVyTGF5ZXIqIGFuY2VzdG9yCiAgICAg Ly8gdGhlIG92ZXJsYXAgbWFwLiBMYXllcnMgdGhhdCBkbyBub3QgY29tcG9zaXRlIHdpbGwgZHJh dyBpbnRvIHRoZWlyCiAgICAgLy8gY29tcG9zaXRpbmcgYW5jZXN0b3IncyBiYWNraW5nLCBhbmQg c28gYXJlIHN0aWxsIGNvbnNpZGVyZWQgZm9yIG92ZXJsYXAuCiAgICAgaWYgKG92ZXJsYXBNYXAg JiYgY2hpbGRTdGF0ZS5tX2NvbXBvc2l0aW5nQW5jZXN0b3IgJiYgIWNoaWxkU3RhdGUubV9jb21w b3NpdGluZ0FuY2VzdG9yLT5pc1Jvb3RMYXllcigpKQotICAgICAgICBhZGRUb092ZXJsYXBNYXAo Kmdlb21ldHJ5TWFwLCAqb3ZlcmxhcE1hcCwgbGF5ZXIsIGFic0JvdW5kcywgaGF2ZUNvbXB1dGVk Qm91bmRzKTsKKyAgICAgICAgYWRkVG9PdmVybGFwTWFwKCpvdmVybGFwTWFwLCBsYXllciwgYWJz Qm91bmRzLCBoYXZlQ29tcHV0ZWRCb3VuZHMpOwogCiAgICAgLy8gSWYgd2UgaGF2ZSBhIHNvZnR3 YXJlIHRyYW5zZm9ybSwgYW5kIHdlIGhhdmUgbGF5ZXJzIHVuZGVyIHVzLCB3ZSBuZWVkIHRvIGFs c28KICAgICAvLyBiZSBjb21wb3NpdGVkLiBBbHNvLCBpZiB3ZSBoYXZlIG9wYWNpdHkgPCAxLCB0 aGVuIHdlIG5lZWQgdG8gYmUgYSBsYXllciBzbyB0aGF0CkBAIC04MzcsNyArODM4LDcgQEAgdm9p ZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50cyhS ZW5kZXJMYXllciogYW5jZXN0b3IKICAgICAgICAgY2hpbGRTdGF0ZS5tX2NvbXBvc2l0aW5nQW5j ZXN0b3IgPSBsYXllcjsKICAgICAgICAgaWYgKG92ZXJsYXBNYXApIHsKICAgICAgICAgICAgIG92 ZXJsYXBNYXAtPnB1c2hDb21wb3NpdGluZ0NvbnRhaW5lcigpOwotICAgICAgICAgICAgYWRkVG9P dmVybGFwTWFwUmVjdXJzaXZlKCpnZW9tZXRyeU1hcCwgKm92ZXJsYXBNYXAsIGxheWVyKTsKKyAg ICAgICAgICAgIGFkZFRvT3ZlcmxhcE1hcFJlY3Vyc2l2ZSgqb3ZlcmxhcE1hcCwgbGF5ZXIpOwog ICAgICAgICB9CiAgICAgICAgIHdpbGxCZUNvbXBvc2l0ZWQgPSB0cnVlOwogICAgIH0KQEAgLTg2 Niw3ICs4NjcsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZUNvbXBvc2l0 aW5nUmVxdWlyZW1lbnRzKFJlbmRlckxheWVyKiBhbmNlc3RvcgogICAgICAgICAgICAgY2hpbGRT dGF0ZS5tX2NvbXBvc2l0aW5nQW5jZXN0b3IgPSBsYXllcjsKICAgICAgICAgICAgIGlmIChvdmVy bGFwTWFwKSB7CiAgICAgICAgICAgICAgICAgb3ZlcmxhcE1hcC0+cHVzaENvbXBvc2l0aW5nQ29u dGFpbmVyKCk7Ci0gICAgICAgICAgICAgICAgYWRkVG9PdmVybGFwTWFwUmVjdXJzaXZlKCpnZW9t ZXRyeU1hcCwgKm92ZXJsYXBNYXAsIGxheWVyKTsKKyAgICAgICAgICAgICAgICBhZGRUb092ZXJs YXBNYXBSZWN1cnNpdmUoKm92ZXJsYXBNYXAsIGxheWVyKTsKICAgICAgICAgICAgIH0KICAgICAg ICAgICAgIHdpbGxCZUNvbXBvc2l0ZWQgPSB0cnVlOwogICAgICAgICAgfQpAQCAtODk4LDggKzg5 OSw4IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjb21wdXRlQ29tcG9zaXRpbmdSZXF1 aXJlbWVudHMoUmVuZGVyTGF5ZXIqIGFuY2VzdG9yCiAgICAgaWYgKGxheWVyLT5yZWZsZWN0aW9u TGF5ZXIoKSAmJiB1cGRhdGVMYXllckNvbXBvc2l0aW5nU3RhdGUobGF5ZXItPnJlZmxlY3Rpb25M YXllcigpLCBDb21wb3NpdGluZ0NoYW5nZVJlcGFpbnROb3cpKQogICAgICAgICBsYXllcnNDaGFu Z2VkID0gdHJ1ZTsKIAotICAgIGlmIChnZW9tZXRyeU1hcCkKLSAgICAgICAgZ2VvbWV0cnlNYXAt PnBvcE1hcHBpbmdzVG9BbmNlc3RvcihhbmNlc3RvckxheWVyID8gYW5jZXN0b3JMYXllci0+cmVu ZGVyZXIoKSA6IDApOworICAgIGlmIChvdmVybGFwTWFwKQorICAgICAgICBvdmVybGFwTWFwLT5n ZW9tZXRyeU1hcCgpLnBvcE1hcHBpbmdzVG9BbmNlc3RvcihhbmNlc3RvckxheWVyID8gYW5jZXN0 b3JMYXllci0+cmVuZGVyZXIoKSA6IDApOwogfQogCiB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRv cjo6c2V0Q29tcG9zaXRpbmdQYXJlbnQoUmVuZGVyTGF5ZXIqIGNoaWxkTGF5ZXIsIFJlbmRlckxh eWVyKiBwYXJlbnRMYXllcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllckNvbXBvc2l0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllckNvbXBvc2l0b3IuaAppbmRleCBiZTJhNTNlYTQ0ZjA3NmQ5YjI5ZDQwNWEyMDY2Nzk0MTU3 NWFkMzcxLi43YWE3MjVlMDNiNzdkYTZmMWFmMDFiMTNmOTgxNzIyYTYwN2E0NjNmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCkBAIC0z NCw3ICszNCw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgR3JhcGhpY3NMYXllcjsK IGNsYXNzIFJlbmRlckVtYmVkZGVkT2JqZWN0OwotY2xhc3MgUmVuZGVyR2VvbWV0cnlNYXA7CiBj bGFzcyBSZW5kZXJQYXJ0OwogY2xhc3MgU2Nyb2xsaW5nQ29vcmRpbmF0b3I7CiAjaWYgRU5BQkxF KFZJREVPKQpAQCAtMjQxLDEzICsyNDAsMTMgQEAgcHJpdmF0ZToKICAgICAvLyBSZXBhaW50IHRo ZSBnaXZlbiByZWN0ICh3aGljaCBpcyBsYXllcidzIGNvb3JkcyksIGFuZCByZWdpb25zIG9mIGNo aWxkIGxheWVycyB0aGF0IGludGVyc2VjdCB0aGF0IHJlY3QuCiAgICAgdm9pZCByZWN1cnNpdmVS ZXBhaW50TGF5ZXJSZWN0KFJlbmRlckxheWVyKiwgY29uc3QgSW50UmVjdCYpOwogCi0gICAgdm9p ZCBhZGRUb092ZXJsYXBNYXAoUmVuZGVyR2VvbWV0cnlNYXAmLCBPdmVybGFwTWFwJiwgUmVuZGVy TGF5ZXIqLCBJbnRSZWN0JiBsYXllckJvdW5kcywgYm9vbCYgYm91bmRzQ29tcHV0ZWQpOwotICAg IHZvaWQgYWRkVG9PdmVybGFwTWFwUmVjdXJzaXZlKFJlbmRlckdlb21ldHJ5TWFwJiwgT3Zlcmxh cE1hcCYsIFJlbmRlckxheWVyKiwgUmVuZGVyTGF5ZXIqIGFuY2VzdG9yTGF5ZXIgPSAwKTsKKyAg ICB2b2lkIGFkZFRvT3ZlcmxhcE1hcChPdmVybGFwTWFwJiwgUmVuZGVyTGF5ZXIqLCBJbnRSZWN0 JiBsYXllckJvdW5kcywgYm9vbCYgYm91bmRzQ29tcHV0ZWQpOworICAgIHZvaWQgYWRkVG9PdmVy bGFwTWFwUmVjdXJzaXZlKE92ZXJsYXBNYXAmLCBSZW5kZXJMYXllciosIFJlbmRlckxheWVyKiBh bmNlc3RvckxheWVyID0gMCk7CiAKICAgICB2b2lkIHVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzVGlt ZXJGaXJlZChUaW1lcjxSZW5kZXJMYXllckNvbXBvc2l0b3I+Kik7CiAKICAgICAvLyBSZXR1cm5z IHRydWUgaWYgYW55IGxheWVyJ3MgY29tcG9zaXRpbmcgY2hhbmdlZAotICAgIHZvaWQgY29tcHV0 ZUNvbXBvc2l0aW5nUmVxdWlyZW1lbnRzKFJlbmRlckxheWVyKiBhbmNlc3RvckxheWVyLCBSZW5k ZXJMYXllciosIFJlbmRlckdlb21ldHJ5TWFwKiwgT3ZlcmxhcE1hcCosIHN0cnVjdCBDb21wb3Np dGluZ1N0YXRlJiwgYm9vbCYgbGF5ZXJzQ2hhbmdlZCk7CisgICAgdm9pZCBjb21wdXRlQ29tcG9z aXRpbmdSZXF1aXJlbWVudHMoUmVuZGVyTGF5ZXIqIGFuY2VzdG9yTGF5ZXIsIFJlbmRlckxheWVy KiwgT3ZlcmxhcE1hcCosIHN0cnVjdCBDb21wb3NpdGluZ1N0YXRlJiwgYm9vbCYgbGF5ZXJzQ2hh bmdlZCk7CiAgICAgCiAgICAgLy8gUmVjdXJzZXMgZG93biB0aGUgdHJlZSwgcGFyZW50aW5nIGRl c2NlbmRhbnQgY29tcG9zaXRpbmcgbGF5ZXJzIGFuZCBjb2xsZWN0aW5nIGFuIGFycmF5IG9mIGNo aWxkIGxheWVycyBmb3IgdGhlIGN1cnJlbnQgY29tcG9zaXRpbmcgbGF5ZXIuCiAgICAgdm9pZCBy ZWJ1aWxkQ29tcG9zaXRpbmdMYXllclRyZWUoUmVuZGVyTGF5ZXIqLCBWZWN0b3I8R3JhcGhpY3NM YXllcio+JiBjaGlsZEdyYXBoaWNzTGF5ZXJzT2ZFbmNsb3NpbmdMYXllciwgaW50IGRlcHRoKTsK