85521 2012-05-03 11:34:51 -0700 Remove non-overlap testing code in RenderLayerCompositor 2013-04-19 13:40:16 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser shawnsingh commit-queue danakj enne esprehn+autocc jamesr shawnsingh simon.fraser oldest_to_newest 615443 0 simon.fraser 2012-05-03 11:34:51 -0700 Overlap testing is now always active in RenderLayerCompositor. We should remove code related to the non-overlap path. I think this also eliminates the 'partial updates' notion in RenderLayerCompositor::updateCompositingLayers(). 878251 1 198806 shawnsingh 2013-04-18 23:05:42 -0700 Created attachment 198806 Patch 878524 2 198806 simon.fraser 2013-04-19 08:59:17 -0700 Comment on attachment 198806 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=198806&action=review I would like to be able to reintroduce partial updates at some point, but OK. > Source/WebCore/rendering/RenderLayerCompositor.cpp:547 > + CompositingState compState(updateRoot, true); Mysterious 'true'. Can that be a parameter default value? 878626 3 198911 shawnsingh 2013-04-19 13:11:26 -0700 Created attachment 198911 Patch for landing 878635 4 198911 commit-queue 2013-04-19 13:40:12 -0700 Comment on attachment 198911 Patch for landing Clearing flags on attachment: 198911 Committed r148765: <http://trac.webkit.org/changeset/148765> 878636 5 commit-queue 2013-04-19 13:40:16 -0700 All reviewed patches have been landed. Closing bug. 198806 2013-04-18 23:05:42 -0700 2013-04-19 13:11:23 -0700 Patch bug-85521-20130418230512.patch text/plain 8830 shawnsingh U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4NzIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODkxNWY4MjRkNWM1MjIx Y2IwZGI3YWU1Mzk2ZTliYjBkMjNiNjMxNS4uMzNhNzMzOTFlZWIwMGVmNTEwYzExOTA0NDE0YjA3 NTdjYTIwOGUwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEzLTA0LTE4ICBTaGF3 biBTaW5naCAgPHNoYXduc2luZ2hAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJlbW92ZSBub24t b3ZlcmxhcCB0ZXN0aW5nIGNvZGUgaW4gUmVuZGVyTGF5ZXJDb21wb3NpdG9yCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTUyMQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIG1fY29tcG9zaXRpbmdDb25zdWx0 c092ZXJsYXAgaXMgYWx3YXlzIHRydWUgaW4gdGhlIGN1cnJlbnQKKyAgICAgICAgY29kZS4gVGhp cyBwYXRjaCByZW1vdmVzIHRoaXMgZmxhZywgYW5kIHJlbW92ZXMgZGVhZCBjb2RlIHRoYXQgaXMK KyAgICAgICAgbmV2ZXIgZXhlY3V0ZWQgYmVjYXVzZSBpdCB3YXMgbmV2ZXIgZmFsc2UuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzLCBubyBjaGFuZ2UgaW4gYmVoYXZpb3IuICBUaGUgY2xlYW51cCBp cyBjb3ZlcmVkIGJ5CisgICAgICAgIGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjp1cGRh dGVDb21wb3NpdGluZ0xheWVyc0FmdGVyU2Nyb2xsKToKKyAgICAgICAgcmVtb3ZlZCBpZi1zdGF0 ZW1lbnQgdGhhdCBpcyBhbHdheXMgdHJ1ZS4KKyAgICAgICAgCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckxheWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJh Y2tpbmc6OnNob3VsZENsaXBDb21wb3NpdGVkQm91bmRzKToKKyAgICAgICAgcmVtb3ZlZCBpZi1z dGF0ZW1lbnQgdGhhdCB3b3VsZCBuZXZlciBnZXQgdHJpZ2dlcmVkLgorCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJMYXllckNvbXBvc2l0b3I6OlJlbmRlckxheWVyQ29tcG9zaXRvcik6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzKToKKyAg ICAgICAgcmVtb3ZlZCBtX2NvbXBvc2l0aW5nQ29uc3VsdHNPdmVybGFwLCBhbmQgcmV0YWluZWQg dGhlIGNvZGUgYXMgaWYgdGhlIGZsYWcgd2VyZSAidHJ1ZSIuCisgICAgICAgIAorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaDoKKyAgICAgICAgKFJlbmRlckxheWVy Q29tcG9zaXRvcik6CisKIDIwMTMtMDQtMTggIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBnYXJkZW5pbmc7IGZpeCBiaW5kaW5ncyB0ZXN0cyBh ZnRlciByMTQ4NzAwLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5k ZXggZWQwZmM2YmM1MmY2MGFjYjVlZDkzOGMyNGJiMWRmMjRiNjQ3NjMzMi4uMGFkNjViZjIxMGVi OWE4YTg0ZDA5MThmMzIwMWM5OGQzYzMyMzQ0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXIuY3BwCkBAIC0yMzcwLDEzICsyMzcwLDEwIEBAIHZvaWQgUmVuZGVyTGF5ZXI6 OnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzQWZ0ZXJTY3JvbGwoKQogICAgICAgICAvLyBPdXIgc3Rh Y2tpbmcgY29udGFpbmVyIGlzIGd1YXJhbnRlZWQgdG8gY29udGFpbiBhbGwgb2Ygb3VyIGRlc2Nl bmRhbnRzIHRoYXQgbWF5IG5lZWQKICAgICAgICAgLy8gcmVwb3NpdGlvbmluZywgc28gdXBkYXRl IGNvbXBvc2l0aW5nIGxheWVycyBmcm9tIHRoZXJlLgogICAgICAgICBpZiAoUmVuZGVyTGF5ZXIq IGNvbXBvc2l0aW5nQW5jZXN0b3IgPSBzdGFja2luZ0NvbnRhaW5lcigpLT5lbmNsb3NpbmdDb21w b3NpdGluZ0xheWVyKCkpIHsKLSAgICAgICAgICAgIGlmIChjb21wb3NpdG9yKCktPmNvbXBvc2l0 aW5nQ29uc3VsdHNPdmVybGFwKCkpIHsKLSAgICAgICAgICAgICAgICBpZiAodXNlc0NvbXBvc2l0 ZWRTY3JvbGxpbmcoKSAmJiAhaGFzT3V0T2ZGbG93UG9zaXRpb25lZERlc2NlbmRhbnQoKSkKLSAg ICAgICAgICAgICAgICAgICAgY29tcG9zaXRvcigpLT51cGRhdGVDb21wb3NpdGluZ0xheWVycyhD b21wb3NpdGluZ1VwZGF0ZU9uQ29tcG9zaXRlZFNjcm9sbCwgY29tcG9zaXRpbmdBbmNlc3Rvcik7 Ci0gICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICBjb21wb3NpdG9yKCkt PnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzKENvbXBvc2l0aW5nVXBkYXRlT25TY3JvbGwsIGNvbXBv c2l0aW5nQW5jZXN0b3IpOwotICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICAgICAgY29t cG9zaXRpbmdBbmNlc3Rvci0+YmFja2luZygpLT51cGRhdGVBZnRlckxheW91dChSZW5kZXJMYXll ckJhY2tpbmc6OklzVXBkYXRlUm9vdCk7CisgICAgICAgICAgICBpZiAodXNlc0NvbXBvc2l0ZWRT Y3JvbGxpbmcoKSAmJiAhaGFzT3V0T2ZGbG93UG9zaXRpb25lZERlc2NlbmRhbnQoKSkKKyAgICAg ICAgICAgICAgICBjb21wb3NpdG9yKCktPnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzKENvbXBvc2l0 aW5nVXBkYXRlT25Db21wb3NpdGVkU2Nyb2xsLCBjb21wb3NpdGluZ0FuY2VzdG9yKTsKKyAgICAg ICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBjb21wb3NpdG9yKCktPnVwZGF0ZUNvbXBvc2l0 aW5nTGF5ZXJzKENvbXBvc2l0aW5nVXBkYXRlT25TY3JvbGwsIGNvbXBvc2l0aW5nQW5jZXN0b3Ip OwogICAgICAgICB9CiAgICAgfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCmluZGV4IDMzYWQwOTBiM2RjOTA4OGRkOGJmNmIyNDll Y2FkMTZiYWQwMzI3YjEuLmVkMTkzNmZmZTUyMmE3OTcwOGIxMzdiMTJjY2FlNzZmZGYzN2NhYjkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3Bw CkBAIC00MTksOSArNDE5LDYgQEAgYm9vbCBSZW5kZXJMYXllckJhY2tpbmc6OnNob3VsZENsaXBD b21wb3NpdGVkQm91bmRzKCkgY29uc3QKICAgICBpZiAobV91c2luZ1RpbGVkQ2FjaGVMYXllcikK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKCFjb21wb3NpdG9yKCktPmNvbXBvc2l0 aW5nQ29uc3VsdHNPdmVybGFwKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQogICAgIGlmIChs YXllck9yQW5jZXN0b3JJc1RyYW5zZm9ybWVkT3JVc2luZ0NvbXBvc2l0ZWRTY3JvbGxpbmcobV9v d25pbmdMYXllcikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAppbmRleCA1MDBkZjE3YTU5 ZjlmYjY3YjA0ZDE4OGYwMWRiMzY0MmYzMWIzZDViLi45MDYzZmFmN2I4ODk2NjhlMTg3NTc4ODU4 NjFmNDVlNWFiNDU3ODE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtMjAyLDcgKzIwMiw2IEBAIFJlbmRlckxheWVyQ29t cG9zaXRvcjo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yKFJlbmRlclZpZXcqIHJlbmRlclZpZXcpCiAg ICAgLCBtX3Nob3dEZWJ1Z0JvcmRlcnMoZmFsc2UpCiAgICAgLCBtX3Nob3dSZXBhaW50Q291bnRl cihmYWxzZSkKICAgICAsIG1fYWNjZWxlcmF0ZWREcmF3aW5nRW5hYmxlZChmYWxzZSkKLSAgICAs IG1fY29tcG9zaXRpbmdDb25zdWx0c092ZXJsYXAodHJ1ZSkKICAgICAsIG1fcmVldmFsdWF0ZUNv bXBvc2l0aW5nQWZ0ZXJMYXlvdXQoZmFsc2UpCiAgICAgLCBtX2NvbXBvc2l0aW5nKGZhbHNlKQog ICAgICwgbV9jb21wb3NpdGluZ0xheWVyc05lZWRSZWJ1aWxkKGZhbHNlKQpAQCAtNTEyLDggKzUx MSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVDb21wb3NpdGluZ0xheWVy cyhDb21wb3NpdGluZ1VwZGF0ZVR5cGUgdXBkYXRlCiAgICAgICAgIGNoZWNrRm9ySGllcmFyY2h5 VXBkYXRlID0gdHJ1ZTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBDb21wb3NpdGluZ1VwZGF0 ZU9uU2Nyb2xsOgotICAgICAgICBpZiAobV9jb21wb3NpdGluZ0NvbnN1bHRzT3ZlcmxhcCkKLSAg ICAgICAgICAgIGNoZWNrRm9ySGllcmFyY2h5VXBkYXRlID0gdHJ1ZTsgLy8gT3ZlcmxhcCBjYW4g Y2hhbmdlIHdpdGggc2Nyb2xsaW5nLCBzbyBuZWVkIHRvIGNoZWNrIGZvciBoaWVyYXJjaHkgdXBk YXRlcy4KKyAgICAgICAgY2hlY2tGb3JIaWVyYXJjaHlVcGRhdGUgPSB0cnVlOyAvLyBPdmVybGFw IGNhbiBjaGFuZ2Ugd2l0aCBzY3JvbGxpbmcsIHNvIG5lZWQgdG8gY2hlY2sgZm9yIGhpZXJhcmNo eSB1cGRhdGVzLgogCiAgICAgICAgIG5lZWRHZW9tZXRyeVVwZGF0ZSA9IHRydWU7CiAgICAgICAg IGJyZWFrOwpAQCAtNTI3LDExICs1MjUsMTAgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6 OnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzKENvbXBvc2l0aW5nVXBkYXRlVHlwZSB1cGRhdGUKIAog ICAgIGJvb2wgbmVlZEhpZXJhcmNoeVVwZGF0ZSA9IG1fY29tcG9zaXRpbmdMYXllcnNOZWVkUmVi dWlsZDsKICAgICBib29sIGlzRnVsbFVwZGF0ZSA9ICF1cGRhdGVSb290OwotICAgIGlmICghdXBk YXRlUm9vdCB8fCBtX2NvbXBvc2l0aW5nQ29uc3VsdHNPdmVybGFwKSB7Ci0gICAgICAgIC8vIE9u bHkgY2xlYXIgdGhlIGZsYWcgaWYgd2UncmUgdXBkYXRpbmcgdGhlIGVudGlyZSBoaWVyYXJjaHku Ci0gICAgICAgIG1fY29tcG9zaXRpbmdMYXllcnNOZWVkUmVidWlsZCA9IGZhbHNlOwotICAgICAg ICB1cGRhdGVSb290ID0gcm9vdFJlbmRlckxheWVyKCk7Ci0gICAgfQorCisgICAgLy8gT25seSBj bGVhciB0aGUgZmxhZyBpZiB3ZSdyZSB1cGRhdGluZyB0aGUgZW50aXJlIGhpZXJhcmNoeS4KKyAg ICBtX2NvbXBvc2l0aW5nTGF5ZXJzTmVlZFJlYnVpbGQgPSBmYWxzZTsKKyAgICB1cGRhdGVSb290 ID0gcm9vdFJlbmRlckxheWVyKCk7CiAKICAgICBpZiAoaXNGdWxsVXBkYXRlICYmIHVwZGF0ZVR5 cGUgPT0gQ29tcG9zaXRpbmdVcGRhdGVBZnRlckxheW91dCkKICAgICAgICAgbV9yZWV2YWx1YXRl Q29tcG9zaXRpbmdBZnRlckxheW91dCA9IGZhbHNlOwpAQCAtNTQ3LDE1ICs1NDQsMTEgQEAgdm9p ZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzKENvbXBvc2l0 aW5nVXBkYXRlVHlwZSB1cGRhdGUKICAgICBpZiAoY2hlY2tGb3JIaWVyYXJjaHlVcGRhdGUpIHsK ICAgICAgICAgLy8gR28gdGhyb3VnaCB0aGUgbGF5ZXJzIGluIHByZXNlbnRhdGlvbiBvcmRlciwg c28gdGhhdCB3ZSBjYW4gY29tcHV0ZSB3aGljaCBSZW5kZXJMYXllcnMgbmVlZCBjb21wb3NpdGlu ZyBsYXllcnMuCiAgICAgICAgIC8vIEZJWE1FOiB3ZSBjb3VsZCBtYXliZSBkbyB0aGlzIGFuZCB0 aGUgaGllcmFyY2h5IHVkcGF0ZSBpbiBvbmUgcGFzcywgYnV0IHRoZSBwYXJlbnRpbmcgbG9naWMg d291bGQgYmUgbW9yZSBjb21wbGV4LgotICAgICAgICBDb21wb3NpdGluZ1N0YXRlIGNvbXBTdGF0 ZSh1cGRhdGVSb290LCBtX2NvbXBvc2l0aW5nQ29uc3VsdHNPdmVybGFwKTsKKyAgICAgICAgQ29t cG9zaXRpbmdTdGF0ZSBjb21wU3RhdGUodXBkYXRlUm9vdCwgdHJ1ZSk7CiAgICAgICAgIGJvb2wg bGF5ZXJzQ2hhbmdlZCA9IGZhbHNlOwogICAgICAgICBib29sIHNhdzNEVHJhbnNmb3JtID0gZmFs c2U7Ci0gICAgICAgIGlmIChtX2NvbXBvc2l0aW5nQ29uc3VsdHNPdmVybGFwKSB7Ci0gICAgICAg ICAgICBPdmVybGFwTWFwIG92ZXJsYXBUZXN0UmVxdWVzdE1hcDsKLSAgICAgICAgICAgIGNvbXB1 dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50cygwLCB1cGRhdGVSb290LCAmb3ZlcmxhcFRlc3RSZXF1 ZXN0TWFwLCBjb21wU3RhdGUsIGxheWVyc0NoYW5nZWQsIHNhdzNEVHJhbnNmb3JtKTsKLSAgICAg ICAgfSBlbHNlCi0gICAgICAgICAgICBjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoMCwg dXBkYXRlUm9vdCwgMCwgY29tcFN0YXRlLCBsYXllcnNDaGFuZ2VkLCBzYXczRFRyYW5zZm9ybSk7 Ci0gICAgICAgIAorICAgICAgICBPdmVybGFwTWFwIG92ZXJsYXBUZXN0UmVxdWVzdE1hcDsKKyAg ICAgICAgY29tcHV0ZUNvbXBvc2l0aW5nUmVxdWlyZW1lbnRzKDAsIHVwZGF0ZVJvb3QsICZvdmVy bGFwVGVzdFJlcXVlc3RNYXAsIGNvbXBTdGF0ZSwgbGF5ZXJzQ2hhbmdlZCwgc2F3M0RUcmFuc2Zv cm0pOwogICAgICAgICBuZWVkSGllcmFyY2h5VXBkYXRlIHw9IGxheWVyc0NoYW5nZWQ7CiAgICAg fQogCkBAIC01NjgsOCArNTYxLDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0 ZUNvbXBvc2l0aW5nTGF5ZXJzKENvbXBvc2l0aW5nVXBkYXRlVHlwZSB1cGRhdGUKIAogICAgICAg ICBGcmFtZSogZnJhbWUgPSBtX3JlbmRlclZpZXctPmZyYW1lVmlldygpLT5mcmFtZSgpOwogICAg ICAgICBib29sIGlzTWFpbkZyYW1lID0gIW1fcmVuZGVyVmlldy0+ZG9jdW1lbnQoKS0+b3duZXJF bGVtZW50KCk7Ci0gICAgICAgIExPRyhDb21wb3NpdGluZywgIlxuVXBkYXRlICVkIG9mICVzLiBP dmVybGFwIHRlc3RpbmcgaXMgJXNcbiIsIG1fcm9vdExheWVyVXBkYXRlQ291bnQsIGlzTWFpbkZy YW1lID8gIm1haW4gZnJhbWUiIDogZnJhbWUtPnRyZWUoKS0+dW5pcXVlTmFtZSgpLnN0cmluZygp LnV0ZjgoKS5kYXRhKCksCi0gICAgICAgICAgICBtX2NvbXBvc2l0aW5nQ29uc3VsdHNPdmVybGFw ID8gIm9uIiA6ICJvZmYiKTsKKyAgICAgICAgTE9HKENvbXBvc2l0aW5nLCAiXG5VcGRhdGUgJWQg b2YgJXMuXG4iLCBtX3Jvb3RMYXllclVwZGF0ZUNvdW50LCBpc01haW5GcmFtZSA/ICJtYWluIGZy YW1lIiA6IGZyYW1lLT50cmVlKCktPnVuaXF1ZU5hbWUoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgp KTsKICAgICB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyQ29tcG9zaXRvci5oCmluZGV4IGU5MjkyZTY5N2ExN2E3Y2ExNzdkZWU1MTdmNjRlMzg1 ODI4NWIzOTkuLjA1OTYwYmI0ZmNiYjJjZGE5NTRhNzUwOWYxZDVhYjYyZTJkY2U3ZDMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKQEAg LTExOSwxMSArMTE5LDYgQEAgcHVibGljOgogICAgIHZvaWQgc2V0Q29tcG9zaXRpbmdMYXllcnNO ZWVkUmVidWlsZChib29sIG5lZWRSZWJ1aWxkID0gdHJ1ZSk7CiAgICAgYm9vbCBjb21wb3NpdGlu Z0xheWVyc05lZWRSZWJ1aWxkKCkgY29uc3QgeyByZXR1cm4gbV9jb21wb3NpdGluZ0xheWVyc05l ZWRSZWJ1aWxkOyB9CiAKLSAgICAvLyBDb250cm9scyB3aGV0aGVyIG9yIG5vdCB0byBjb25zdWx0 IGdlb21ldHJ5IHdoZW4gZGVjaWRpbmcgd2hpY2ggbGF5ZXJzIG5lZWQKLSAgICAvLyB0byBiZSBj b21wb3NpdGVkLiBEZWZhdWx0cyB0byB0cnVlLgotICAgIHZvaWQgc2V0Q29tcG9zaXRpbmdDb25z dWx0c092ZXJsYXAoYm9vbCBiKSB7IG1fY29tcG9zaXRpbmdDb25zdWx0c092ZXJsYXAgPSBiOyB9 Ci0gICAgYm9vbCBjb21wb3NpdGluZ0NvbnN1bHRzT3ZlcmxhcCgpIGNvbnN0IHsgcmV0dXJuIG1f Y29tcG9zaXRpbmdDb25zdWx0c092ZXJsYXA7IH0KLSAgICAKICAgICAvLyBHcmFwaGljc0xheWVy cyBidWZmZXIgc3RhdGUsIHdoaWNoIGdldHMgcHVzaGVkIHRvIHRoZSB1bmRlcmx5aW5nIHBsYXRm b3JtIGxheWVycwogICAgIC8vIGF0IHNwZWNpZmljIHRpbWVzLgogICAgIHZvaWQgc2NoZWR1bGVM YXllckZsdXNoKGJvb2wgY2FuVGhyb3R0bGUpOwpAQCAtNDA1LDcgKzQwMCw2IEBAIHByaXZhdGU6 CiAgICAgYm9vbCBtX3Nob3dEZWJ1Z0JvcmRlcnM7CiAgICAgYm9vbCBtX3Nob3dSZXBhaW50Q291 bnRlcjsKICAgICBib29sIG1fYWNjZWxlcmF0ZWREcmF3aW5nRW5hYmxlZDsKLSAgICBib29sIG1f Y29tcG9zaXRpbmdDb25zdWx0c092ZXJsYXA7CiAKICAgICAvLyBXaGVuIHRydWUsIHdlIGhhdmUg dG8gd2FpdCB1bnRpbCBsYXlvdXQgaGFzIGhhcHBlbmVkIGJlZm9yZSB3ZSBjYW4gZGVjaWRlIHdo ZXRoZXIgdG8gZW50ZXIgY29tcG9zaXRpbmcgbW9kZSwKICAgICAvLyBiZWNhdXNlIG9ubHkgdGhl biBkbyB3ZSBrbm93IHRoZSBmaW5hbCBzaXplIG9mIHBsdWdpbnMgYW5kIGlmcmFtZXMuCg== 198911 2013-04-19 13:11:26 -0700 2013-04-19 13:40:12 -0700 Patch for landing bug-85521-20130419131055.patch text/plain 9131 shawnsingh U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4NzU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzk4NGZhNzBiNjZkNzFj NjgxNjhmNGFlNzYxOTQyYmRiNGI4NGIzNS4uMmE0ZmU3Y2FhMTVhOWFjOTRhNjRmZTNjY2VmYzg3 Y2NmZGI2MzkzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEzLTA0LTE4ICBTaGF3 biBTaW5naCAgPHNoYXduc2luZ2hAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJlbW92ZSBub24t b3ZlcmxhcCB0ZXN0aW5nIGNvZGUgaW4gUmVuZGVyTGF5ZXJDb21wb3NpdG9yCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTUyMQorCisgICAgICAgIFJl dmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KKworICAgICAgICBtX2NvbXBvc2l0aW5nQ29uc3VsdHNP dmVybGFwIGlzIGFsd2F5cyB0cnVlIGluIHRoZSBjdXJyZW50CisgICAgICAgIGNvZGUuIFRoaXMg cGF0Y2ggcmVtb3ZlcyB0aGlzIGZsYWcsIGFuZCByZW1vdmVzIGRlYWQgY29kZSB0aGF0IGlzCisg ICAgICAgIG5ldmVyIGV4ZWN1dGVkIGJlY2F1c2UgaXQgd2FzIG5ldmVyIGZhbHNlLgorCisgICAg ICAgIE5vIG5ldyB0ZXN0cywgbm8gY2hhbmdlIGluIGJlaGF2aW9yLiAgVGhlIGNsZWFudXAgaXMg Y292ZXJlZCBieQorICAgICAgICBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6dXBkYXRl Q29tcG9zaXRpbmdMYXllcnNBZnRlclNjcm9sbCk6CisgICAgICAgIHJlbW92ZWQgaWYtc3RhdGVt ZW50IHRoYXQgaXMgYWx3YXlzIHRydWUuCisgICAgICAgIAorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJMYXllckJhY2tpbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNr aW5nOjpzaG91bGRDbGlwQ29tcG9zaXRlZEJvdW5kcyk6CisgICAgICAgIHJlbW92ZWQgaWYtc3Rh dGVtZW50IHRoYXQgd291bGQgbmV2ZXIgZ2V0IHRyaWdnZXJlZC4KKworICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy TGF5ZXJDb21wb3NpdG9yOjpSZW5kZXJMYXllckNvbXBvc2l0b3IpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVDb21wb3NpdGluZ0xheWVycyk6CisgICAg ICAgIHJlbW92ZWQgbV9jb21wb3NpdGluZ0NvbnN1bHRzT3ZlcmxhcCwgYW5kIHJldGFpbmVkIHRo ZSBjb2RlIGFzIGlmIHRoZSBmbGFnIHdlcmUgInRydWUiLgorICAgICAgICAKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmg6CisgICAgICAgIChSZW5kZXJMYXllckNv bXBvc2l0b3IpOgorCiAyMDEzLTA0LTE5ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdh bGlhLmNvbT4KIAogICAgICAgICBSZW1vdmUgdGhlIE9wZW5WRyBiYWNrZW5kCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAppbmRleCBlZDBmYzZiYzUyZjYwYWNiNWVkOTM4 YzI0YmIxZGYyNGI2NDc2MzMyLi4wYWQ2NWJmMjEwZWI5YThhODRkMDkxOGYzMjAxYzk4ZDNjMzIz NDQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTIzNzAs MTMgKzIzNzAsMTAgQEAgdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlQ29tcG9zaXRpbmdMYXllcnNB ZnRlclNjcm9sbCgpCiAgICAgICAgIC8vIE91ciBzdGFja2luZyBjb250YWluZXIgaXMgZ3VhcmFu dGVlZCB0byBjb250YWluIGFsbCBvZiBvdXIgZGVzY2VuZGFudHMgdGhhdCBtYXkgbmVlZAogICAg ICAgICAvLyByZXBvc2l0aW9uaW5nLCBzbyB1cGRhdGUgY29tcG9zaXRpbmcgbGF5ZXJzIGZyb20g dGhlcmUuCiAgICAgICAgIGlmIChSZW5kZXJMYXllciogY29tcG9zaXRpbmdBbmNlc3RvciA9IHN0 YWNraW5nQ29udGFpbmVyKCktPmVuY2xvc2luZ0NvbXBvc2l0aW5nTGF5ZXIoKSkgewotICAgICAg ICAgICAgaWYgKGNvbXBvc2l0b3IoKS0+Y29tcG9zaXRpbmdDb25zdWx0c092ZXJsYXAoKSkgewot ICAgICAgICAgICAgICAgIGlmICh1c2VzQ29tcG9zaXRlZFNjcm9sbGluZygpICYmICFoYXNPdXRP ZkZsb3dQb3NpdGlvbmVkRGVzY2VuZGFudCgpKQotICAgICAgICAgICAgICAgICAgICBjb21wb3Np dG9yKCktPnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzKENvbXBvc2l0aW5nVXBkYXRlT25Db21wb3Np dGVkU2Nyb2xsLCBjb21wb3NpdGluZ0FuY2VzdG9yKTsKLSAgICAgICAgICAgICAgICBlbHNlCi0g ICAgICAgICAgICAgICAgICAgIGNvbXBvc2l0b3IoKS0+dXBkYXRlQ29tcG9zaXRpbmdMYXllcnMo Q29tcG9zaXRpbmdVcGRhdGVPblNjcm9sbCwgY29tcG9zaXRpbmdBbmNlc3Rvcik7Ci0gICAgICAg ICAgICB9IGVsc2UKLSAgICAgICAgICAgICAgICBjb21wb3NpdGluZ0FuY2VzdG9yLT5iYWNraW5n KCktPnVwZGF0ZUFmdGVyTGF5b3V0KFJlbmRlckxheWVyQmFja2luZzo6SXNVcGRhdGVSb290KTsK KyAgICAgICAgICAgIGlmICh1c2VzQ29tcG9zaXRlZFNjcm9sbGluZygpICYmICFoYXNPdXRPZkZs b3dQb3NpdGlvbmVkRGVzY2VuZGFudCgpKQorICAgICAgICAgICAgICAgIGNvbXBvc2l0b3IoKS0+ dXBkYXRlQ29tcG9zaXRpbmdMYXllcnMoQ29tcG9zaXRpbmdVcGRhdGVPbkNvbXBvc2l0ZWRTY3Jv bGwsIGNvbXBvc2l0aW5nQW5jZXN0b3IpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAg ICAgIGNvbXBvc2l0b3IoKS0+dXBkYXRlQ29tcG9zaXRpbmdMYXllcnMoQ29tcG9zaXRpbmdVcGRh dGVPblNjcm9sbCwgY29tcG9zaXRpbmdBbmNlc3Rvcik7CiAgICAgICAgIH0KICAgICB9CiAjZW5k aWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tp bmcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAK aW5kZXggZTRiODRlMTIzOTUzZWUwYWJmOTAyYTVhNDRkMjExZTc4MWU0N2JhNy4uZTczNzdkNjYy Mzk3OGU4YzExNzA2YTE0NjI1MDRmNTUwZGNjNTA1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKQEAgLTQxOSw5ICs0MTksNiBAQCBib29s IFJlbmRlckxheWVyQmFja2luZzo6c2hvdWxkQ2xpcENvbXBvc2l0ZWRCb3VuZHMoKSBjb25zdAog ICAgIGlmIChtX3VzaW5nVGlsZWRDYWNoZUxheWVyKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAK LSAgICBpZiAoIWNvbXBvc2l0b3IoKS0+Y29tcG9zaXRpbmdDb25zdWx0c092ZXJsYXAoKSkKLSAg ICAgICAgcmV0dXJuIGZhbHNlOwotCiAgICAgaWYgKGxheWVyT3JBbmNlc3RvcklzVHJhbnNmb3Jt ZWRPclVzaW5nQ29tcG9zaXRlZFNjcm9sbGluZyhtX293bmluZ0xheWVyKSkKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXJDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckNvbXBvc2l0b3IuY3BwCmluZGV4IDUwMGRmMTdhNTlmOWZiNjdiMDRkMTg4ZjAxZGIzNjQyZjMx YjNkNWIuLjhlZWE5MGZmYzc3YzhiMDQwMDFmNGMwYjA1YTkyZGRkZjY5MThjZjIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBA IC0xNTUsNyArMTU1LDcgQEAgcHJpdmF0ZToKIH07CiAKIHN0cnVjdCBDb21wb3NpdGluZ1N0YXRl IHsKLSAgICBDb21wb3NpdGluZ1N0YXRlKFJlbmRlckxheWVyKiBjb21wQW5jZXN0b3IsIGJvb2wg dGVzdE92ZXJsYXApCisgICAgQ29tcG9zaXRpbmdTdGF0ZShSZW5kZXJMYXllciogY29tcEFuY2Vz dG9yLCBib29sIHRlc3RPdmVybGFwID0gdHJ1ZSkKICAgICAgICAgOiBtX2NvbXBvc2l0aW5nQW5j ZXN0b3IoY29tcEFuY2VzdG9yKQogICAgICAgICAsIG1fc3VidHJlZUlzQ29tcG9zaXRpbmcoZmFs c2UpCiAgICAgICAgICwgbV90ZXN0aW5nT3ZlcmxhcCh0ZXN0T3ZlcmxhcCkKQEAgLTIwMiw3ICsy MDIsNiBAQCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OlJlbmRlckxheWVyQ29tcG9zaXRvcihSZW5k ZXJWaWV3KiByZW5kZXJWaWV3KQogICAgICwgbV9zaG93RGVidWdCb3JkZXJzKGZhbHNlKQogICAg ICwgbV9zaG93UmVwYWludENvdW50ZXIoZmFsc2UpCiAgICAgLCBtX2FjY2VsZXJhdGVkRHJhd2lu Z0VuYWJsZWQoZmFsc2UpCi0gICAgLCBtX2NvbXBvc2l0aW5nQ29uc3VsdHNPdmVybGFwKHRydWUp CiAgICAgLCBtX3JlZXZhbHVhdGVDb21wb3NpdGluZ0FmdGVyTGF5b3V0KGZhbHNlKQogICAgICwg bV9jb21wb3NpdGluZyhmYWxzZSkKICAgICAsIG1fY29tcG9zaXRpbmdMYXllcnNOZWVkUmVidWls ZChmYWxzZSkKQEAgLTUxMiw4ICs1MTEsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6 dXBkYXRlQ29tcG9zaXRpbmdMYXllcnMoQ29tcG9zaXRpbmdVcGRhdGVUeXBlIHVwZGF0ZQogICAg ICAgICBjaGVja0ZvckhpZXJhcmNoeVVwZGF0ZSA9IHRydWU7CiAgICAgICAgIGJyZWFrOwogICAg IGNhc2UgQ29tcG9zaXRpbmdVcGRhdGVPblNjcm9sbDoKLSAgICAgICAgaWYgKG1fY29tcG9zaXRp bmdDb25zdWx0c092ZXJsYXApCi0gICAgICAgICAgICBjaGVja0ZvckhpZXJhcmNoeVVwZGF0ZSA9 IHRydWU7IC8vIE92ZXJsYXAgY2FuIGNoYW5nZSB3aXRoIHNjcm9sbGluZywgc28gbmVlZCB0byBj aGVjayBmb3IgaGllcmFyY2h5IHVwZGF0ZXMuCisgICAgICAgIGNoZWNrRm9ySGllcmFyY2h5VXBk YXRlID0gdHJ1ZTsgLy8gT3ZlcmxhcCBjYW4gY2hhbmdlIHdpdGggc2Nyb2xsaW5nLCBzbyBuZWVk IHRvIGNoZWNrIGZvciBoaWVyYXJjaHkgdXBkYXRlcy4KIAogICAgICAgICBuZWVkR2VvbWV0cnlV cGRhdGUgPSB0cnVlOwogICAgICAgICBicmVhazsKQEAgLTUyNywxMSArNTI1LDEwIEBAIHZvaWQg UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVDb21wb3NpdGluZ0xheWVycyhDb21wb3NpdGlu Z1VwZGF0ZVR5cGUgdXBkYXRlCiAKICAgICBib29sIG5lZWRIaWVyYXJjaHlVcGRhdGUgPSBtX2Nv bXBvc2l0aW5nTGF5ZXJzTmVlZFJlYnVpbGQ7CiAgICAgYm9vbCBpc0Z1bGxVcGRhdGUgPSAhdXBk YXRlUm9vdDsKLSAgICBpZiAoIXVwZGF0ZVJvb3QgfHwgbV9jb21wb3NpdGluZ0NvbnN1bHRzT3Zl cmxhcCkgewotICAgICAgICAvLyBPbmx5IGNsZWFyIHRoZSBmbGFnIGlmIHdlJ3JlIHVwZGF0aW5n IHRoZSBlbnRpcmUgaGllcmFyY2h5LgotICAgICAgICBtX2NvbXBvc2l0aW5nTGF5ZXJzTmVlZFJl YnVpbGQgPSBmYWxzZTsKLSAgICAgICAgdXBkYXRlUm9vdCA9IHJvb3RSZW5kZXJMYXllcigpOwot ICAgIH0KKworICAgIC8vIE9ubHkgY2xlYXIgdGhlIGZsYWcgaWYgd2UncmUgdXBkYXRpbmcgdGhl IGVudGlyZSBoaWVyYXJjaHkuCisgICAgbV9jb21wb3NpdGluZ0xheWVyc05lZWRSZWJ1aWxkID0g ZmFsc2U7CisgICAgdXBkYXRlUm9vdCA9IHJvb3RSZW5kZXJMYXllcigpOwogCiAgICAgaWYgKGlz RnVsbFVwZGF0ZSAmJiB1cGRhdGVUeXBlID09IENvbXBvc2l0aW5nVXBkYXRlQWZ0ZXJMYXlvdXQp CiAgICAgICAgIG1fcmVldmFsdWF0ZUNvbXBvc2l0aW5nQWZ0ZXJMYXlvdXQgPSBmYWxzZTsKQEAg LTU0NywxNSArNTQ0LDExIEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVDb21w b3NpdGluZ0xheWVycyhDb21wb3NpdGluZ1VwZGF0ZVR5cGUgdXBkYXRlCiAgICAgaWYgKGNoZWNr Rm9ySGllcmFyY2h5VXBkYXRlKSB7CiAgICAgICAgIC8vIEdvIHRocm91Z2ggdGhlIGxheWVycyBp biBwcmVzZW50YXRpb24gb3JkZXIsIHNvIHRoYXQgd2UgY2FuIGNvbXB1dGUgd2hpY2ggUmVuZGVy TGF5ZXJzIG5lZWQgY29tcG9zaXRpbmcgbGF5ZXJzLgogICAgICAgICAvLyBGSVhNRTogd2UgY291 bGQgbWF5YmUgZG8gdGhpcyBhbmQgdGhlIGhpZXJhcmNoeSB1ZHBhdGUgaW4gb25lIHBhc3MsIGJ1 dCB0aGUgcGFyZW50aW5nIGxvZ2ljIHdvdWxkIGJlIG1vcmUgY29tcGxleC4KLSAgICAgICAgQ29t cG9zaXRpbmdTdGF0ZSBjb21wU3RhdGUodXBkYXRlUm9vdCwgbV9jb21wb3NpdGluZ0NvbnN1bHRz T3ZlcmxhcCk7CisgICAgICAgIENvbXBvc2l0aW5nU3RhdGUgY29tcFN0YXRlKHVwZGF0ZVJvb3Qp OwogICAgICAgICBib29sIGxheWVyc0NoYW5nZWQgPSBmYWxzZTsKICAgICAgICAgYm9vbCBzYXcz RFRyYW5zZm9ybSA9IGZhbHNlOwotICAgICAgICBpZiAobV9jb21wb3NpdGluZ0NvbnN1bHRzT3Zl cmxhcCkgewotICAgICAgICAgICAgT3ZlcmxhcE1hcCBvdmVybGFwVGVzdFJlcXVlc3RNYXA7Ci0g ICAgICAgICAgICBjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoMCwgdXBkYXRlUm9vdCwg Jm92ZXJsYXBUZXN0UmVxdWVzdE1hcCwgY29tcFN0YXRlLCBsYXllcnNDaGFuZ2VkLCBzYXczRFRy YW5zZm9ybSk7Ci0gICAgICAgIH0gZWxzZQotICAgICAgICAgICAgY29tcHV0ZUNvbXBvc2l0aW5n UmVxdWlyZW1lbnRzKDAsIHVwZGF0ZVJvb3QsIDAsIGNvbXBTdGF0ZSwgbGF5ZXJzQ2hhbmdlZCwg c2F3M0RUcmFuc2Zvcm0pOwotICAgICAgICAKKyAgICAgICAgT3ZlcmxhcE1hcCBvdmVybGFwVGVz dFJlcXVlc3RNYXA7CisgICAgICAgIGNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50cygwLCB1 cGRhdGVSb290LCAmb3ZlcmxhcFRlc3RSZXF1ZXN0TWFwLCBjb21wU3RhdGUsIGxheWVyc0NoYW5n ZWQsIHNhdzNEVHJhbnNmb3JtKTsKICAgICAgICAgbmVlZEhpZXJhcmNoeVVwZGF0ZSB8PSBsYXll cnNDaGFuZ2VkOwogICAgIH0KIApAQCAtNTY4LDggKzU2MSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJD b21wb3NpdG9yOjp1cGRhdGVDb21wb3NpdGluZ0xheWVycyhDb21wb3NpdGluZ1VwZGF0ZVR5cGUg dXBkYXRlCiAKICAgICAgICAgRnJhbWUqIGZyYW1lID0gbV9yZW5kZXJWaWV3LT5mcmFtZVZpZXco KS0+ZnJhbWUoKTsKICAgICAgICAgYm9vbCBpc01haW5GcmFtZSA9ICFtX3JlbmRlclZpZXctPmRv Y3VtZW50KCktPm93bmVyRWxlbWVudCgpOwotICAgICAgICBMT0coQ29tcG9zaXRpbmcsICJcblVw ZGF0ZSAlZCBvZiAlcy4gT3ZlcmxhcCB0ZXN0aW5nIGlzICVzXG4iLCBtX3Jvb3RMYXllclVwZGF0 ZUNvdW50LCBpc01haW5GcmFtZSA/ICJtYWluIGZyYW1lIiA6IGZyYW1lLT50cmVlKCktPnVuaXF1 ZU5hbWUoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpLAotICAgICAgICAgICAgbV9jb21wb3NpdGlu Z0NvbnN1bHRzT3ZlcmxhcCA/ICJvbiIgOiAib2ZmIik7CisgICAgICAgIExPRyhDb21wb3NpdGlu ZywgIlxuVXBkYXRlICVkIG9mICVzLlxuIiwgbV9yb290TGF5ZXJVcGRhdGVDb3VudCwgaXNNYWlu RnJhbWUgPyAibWFpbiBmcmFtZSIgOiBmcmFtZS0+dHJlZSgpLT51bmlxdWVOYW1lKCkuc3RyaW5n KCkudXRmOCgpLmRhdGEoKSk7CiAgICAgfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaAppbmRleCBlOTI5MmU2OTdhMTdhN2Nh MTc3ZGVlNTE3ZjY0ZTM4NTgyODViMzk5Li4wNTk2MGJiNGZjYmIyY2RhOTU0YTc1MDlmMWQ1YWI2 MmUyZGNlN2QzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJDb21wb3NpdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy Q29tcG9zaXRvci5oCkBAIC0xMTksMTEgKzExOSw2IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldENv bXBvc2l0aW5nTGF5ZXJzTmVlZFJlYnVpbGQoYm9vbCBuZWVkUmVidWlsZCA9IHRydWUpOwogICAg IGJvb2wgY29tcG9zaXRpbmdMYXllcnNOZWVkUmVidWlsZCgpIGNvbnN0IHsgcmV0dXJuIG1fY29t cG9zaXRpbmdMYXllcnNOZWVkUmVidWlsZDsgfQogCi0gICAgLy8gQ29udHJvbHMgd2hldGhlciBv ciBub3QgdG8gY29uc3VsdCBnZW9tZXRyeSB3aGVuIGRlY2lkaW5nIHdoaWNoIGxheWVycyBuZWVk Ci0gICAgLy8gdG8gYmUgY29tcG9zaXRlZC4gRGVmYXVsdHMgdG8gdHJ1ZS4KLSAgICB2b2lkIHNl dENvbXBvc2l0aW5nQ29uc3VsdHNPdmVybGFwKGJvb2wgYikgeyBtX2NvbXBvc2l0aW5nQ29uc3Vs dHNPdmVybGFwID0gYjsgfQotICAgIGJvb2wgY29tcG9zaXRpbmdDb25zdWx0c092ZXJsYXAoKSBj b25zdCB7IHJldHVybiBtX2NvbXBvc2l0aW5nQ29uc3VsdHNPdmVybGFwOyB9Ci0gICAgCiAgICAg Ly8gR3JhcGhpY3NMYXllcnMgYnVmZmVyIHN0YXRlLCB3aGljaCBnZXRzIHB1c2hlZCB0byB0aGUg dW5kZXJseWluZyBwbGF0Zm9ybSBsYXllcnMKICAgICAvLyBhdCBzcGVjaWZpYyB0aW1lcy4KICAg ICB2b2lkIHNjaGVkdWxlTGF5ZXJGbHVzaChib29sIGNhblRocm90dGxlKTsKQEAgLTQwNSw3ICs0 MDAsNiBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9zaG93RGVidWdCb3JkZXJzOwogICAgIGJvb2wg bV9zaG93UmVwYWludENvdW50ZXI7CiAgICAgYm9vbCBtX2FjY2VsZXJhdGVkRHJhd2luZ0VuYWJs ZWQ7Ci0gICAgYm9vbCBtX2NvbXBvc2l0aW5nQ29uc3VsdHNPdmVybGFwOwogCiAgICAgLy8gV2hl biB0cnVlLCB3ZSBoYXZlIHRvIHdhaXQgdW50aWwgbGF5b3V0IGhhcyBoYXBwZW5lZCBiZWZvcmUg d2UgY2FuIGRlY2lkZSB3aGV0aGVyIHRvIGVudGVyIGNvbXBvc2l0aW5nIG1vZGUsCiAgICAgLy8g YmVjYXVzZSBvbmx5IHRoZW4gZG8gd2Uga25vdyB0aGUgZmluYWwgc2l6ZSBvZiBwbHVnaW5zIGFu ZCBpZnJhbWVzLgo=