112083 2013-03-11 17:12:45 -0700 Keep track of the number of GraphicsLayers with tiled backing in RenderLayerCompositor 2013-03-12 10:57:03 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser andersca dino eric esprehn+autocc ojan.autocc simon.fraser thorton webkit.review.bot oldest_to_newest 852901 0 simon.fraser 2013-03-11 17:12:45 -0700 Keep track of the number of GraphicsLayers with tiled backing in RenderLayerCompositor 852912 1 192603 simon.fraser 2013-03-11 17:22:14 -0700 Created attachment 192603 Patch 853615 2 simon.fraser 2013-03-12 10:57:03 -0700 http://trac.webkit.org/changeset/145563 192603 2013-03-11 17:22:14 -0700 2013-03-12 10:49:38 -0700 Patch bug-112083-20130311171815.patch text/plain 19942 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MzcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTgxZTc5ZjAyMWFhMTI5 NzBmZDc3YjgzYzU1ZWRiMTA0ZmE0ZmIxYy4uZjMxNjAzY2YyZTVjYjdmNzc2NzFiMTc5YzYxZjkw NDE0ZDlmOGE3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU3IEBACisyMDEzLTAzLTExICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEtlZXAgdHJhY2sg b2YgdGhlIG51bWJlciBvZiBHcmFwaGljc0xheWVycyB3aXRoIHRpbGVkIGJhY2tpbmcgaW4gUmVu ZGVyTGF5ZXJDb21wb3NpdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMTIwODMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBIYXZlIFJlbmRlckxheWVyQ29tcG9zaXRvciBrZWVwIHRyYWNrIG9mIGhvdyBt YW55IG9mIGl0cyBHcmFwaGljc0xheWVycyB1c2UgVGlsZWRCYWNraW5nLgorICAgICAgICBUaGlz IGlzIHVzZWZ1bCBmb3IgcGxhdGZvcm1zIHRvIGRlY2lkZSB3aGV0aGVyIGl0J3MgbmVjZXNzYXJ5 IHRvIGZvcmNlIEdyYXBoaWNzTGF5ZXIgZmx1c2hlcworICAgICAgICB0byB1cGRhdGUgdGhlIHZp c2libGVSZWN0IG9mIHRob3NlIFRpbGVkQmFja2luZ3MuCisgICAgICAgIAorICAgICAgICBHcmFw aGljc0xheWVycyBhcmUgYWx3YXlzIGNyZWF0ZWQgd2l0aG91dCBUaWxlZEJhY2tpbmcuIFRoZXJl IGFyZSB0d28KKyAgICAgICAgd2F5cyB0aGUgY291bnQgY2FuIGNoYW5nZToKKyAgICAgICAgMS4g QSBHcmFwaGljc0xheWVyQ0EgdG9nZ2xlcyBpbnRvIG9yIG91dCBvZiB0aWxlZCBtb2RlLiBJdCBu b3RpZmllcyBpdHMKKyAgICAgICAgICAgY2xpZW50IHZpYSBhIG5ldyB0aWxlZEJhY2tpbmdVc2Fn ZUNoYW5nZWQoKSBjYWxsYmFjayBvbiBHcmFwaGljc0xheWVyQ2xpZW50LgorICAgICAgICAyLiBB IHRpbGVkIEdyYXBoaWNzTGF5ZXJDQSBpcyBkZXN0cm95ZWQuIEFkZGVkIGEgbmV3IGJvdHRsZW5l Y2sgZnVuY3Rpb24gdG8KKyAgICAgICAgICAgUmVuZGVyTGF5ZXJCYWNraW5nOjp3aWxsRGVzdHJv eUxheWVyKCkgdGhhdCBpcyBjYWxsZWQgZXZlcnl3aGVyZSB3ZSBkZXN0cm95IGxheWVycy4KKyAg ICAgICAgICAgCisgICAgICAgIFRoZSBtYWluIHBhZ2UgVGlsZWRCYWNraW5nIGlzIG5vdCBjb3Vu dGVkIGFzIHBhcnQgb2YgdGhpcy4KKyAgICAgICAgCisgICAgICAgIEFsc28gcmVuYW1lZCB1c2Vz IG9mICJ0aWxlZExheWVyIiB0byAidGlsZWRCYWNraW5nIiBpbiBHcmFwaGljc0xheWVyW0NBXS4K KyAgICAKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI6OkdyYXBoaWNzTGF5ZXIpOgorICAgICAgICAo V2ViQ29yZTo6R3JhcGhpY3NMYXllcjo6Z2V0RGVidWdCb3JkZXJJbmZvKToKKyAgICAgICAgKFdl YkNvcmU6OkdyYXBoaWNzTGF5ZXI6OmR1bXBQcm9wZXJ0aWVzKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmg6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xh eWVyOjp1c2luZ1RpbGVkQmFja2luZyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3Jh cGhpY3NMYXllckNsaWVudC5oOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNsaWVu dDo6dGlsZWRCYWNraW5nVXNhZ2VDaGFuZ2VkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXll ckNBOjpyZWN1cnNpdmVDb21taXRDaGFuZ2VzKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNz TGF5ZXJDQTo6dXBkYXRlR2VvbWV0cnkpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXll ckNBOjp1cGRhdGVMYXllckRyYXdzQ29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGlj c0xheWVyQ0E6OnVwZGF0ZUNvbnRlbnRzU2NhbGUpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhp Y3NMYXllckNBOjpzd2FwRnJvbU9yVG9UaWxlZExheWVyKToKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFj a2luZzo6d2lsbERlc3Ryb3lMYXllcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJh Y2tpbmc6OnRpbGVkQmFja2luZ1VzYWdlQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJMYXllckJhY2tpbmc6OmRlc3Ryb3lHcmFwaGljc0xheWVycyk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUNsaXBwaW5nTGF5ZXJzKToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlT3ZlcmZsb3dDb250cm9sc0xheWVycyk6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUZvcmVncm91bmRM YXllcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUJhY2tn cm91bmRMYXllcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0 ZU1hc2tMYXllcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0 ZVNjcm9sbGluZ0xheWVycyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6 OmNvbXBvc2l0aW5nTGF5ZXJUeXBlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJC YWNraW5nLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OlJlbmRlckxheWVyQ29t cG9zaXRvcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmxheWVy VGlsZWRCYWNraW5nVXNhZ2VDaGFuZ2VkKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5 ZXJDb21wb3NpdG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6 OmhhdmVOb25NYWluTGF5ZXJzV2l0aFRpbGVkQmFja2luZyk6CisKIDIwMTMtMDMtMTEgIFhhbiBM b3BleiAgPHhsb3BlekBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBQbGF0Zm9y bUJsYWNrQmVycnkuY21ha2U6IGNyZWF0ZSB0aGluIEFSIGFyY2hpdmVzCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwCmluZGV4IGNiYjk4 MmJjZTdhOGRkODhhZmVjYjYzNzE0ZGU3YjEwMGRiZTlhMGQuLjUxZDYxYjI5N2EyNWMwMzUwOThj OWNkNjMzYmQyM2NhNjJmNzJhMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwCkBAIC04Myw3ICs4Myw3IEBAIEdyYXBoaWNzTGF5 ZXI6OkdyYXBoaWNzTGF5ZXIoR3JhcGhpY3NMYXllckNsaWVudCogY2xpZW50KQogICAgICwgbV9j b250ZW50c09wYXF1ZShmYWxzZSkKICAgICAsIG1fcHJlc2VydmVzM0QoZmFsc2UpCiAgICAgLCBt X2JhY2tmYWNlVmlzaWJpbGl0eSh0cnVlKQotICAgICwgbV91c2luZ1RpbGVkTGF5ZXIoZmFsc2Up CisgICAgLCBtX3VzaW5nVGlsZWRCYWNraW5nKGZhbHNlKQogICAgICwgbV9tYXNrc1RvQm91bmRz KGZhbHNlKQogICAgICwgbV9kcmF3c0NvbnRlbnQoZmFsc2UpCiAgICAgLCBtX2NvbnRlbnRzVmlz aWJsZSh0cnVlKQpAQCAtMzQ4LDcgKzM0OCw3IEBAIHZvaWQgR3JhcGhpY3NMYXllcjo6cmVzdW1l QW5pbWF0aW9ucygpCiB2b2lkIEdyYXBoaWNzTGF5ZXI6OmdldERlYnVnQm9yZGVySW5mbyhDb2xv ciYgY29sb3IsIGZsb2F0JiB3aWR0aCkgY29uc3QKIHsKICAgICBpZiAoZHJhd3NDb250ZW50KCkp IHsKLSAgICAgICAgaWYgKG1fdXNpbmdUaWxlZExheWVyKSB7CisgICAgICAgIGlmIChtX3VzaW5n VGlsZWRCYWNraW5nKSB7CiAgICAgICAgICAgICBjb2xvciA9IENvbG9yKDI1NSwgMTI4LCAwLCAx MjgpOyAvLyB0aWxlZCBsYXllcjogb3JhbmdlCiAgICAgICAgICAgICB3aWR0aCA9IDI7CiAgICAg ICAgICAgICByZXR1cm47CkBAIC02MDUsOSArNjA1LDkgQEAgdm9pZCBHcmFwaGljc0xheWVyOjpk dW1wUHJvcGVydGllcyhUZXh0U3RyZWFtJiB0cywgaW50IGluZGVudCwgTGF5ZXJUcmVlQXNUZXh0 QmUKICAgICAgICAgdHMgPDwgIihvcGFjaXR5ICIgPDwgbV9vcGFjaXR5IDw8ICIpXG4iOwogICAg IH0KICAgICAKLSAgICBpZiAobV91c2luZ1RpbGVkTGF5ZXIpIHsKKyAgICBpZiAobV91c2luZ1Rp bGVkQmFja2luZykgewogICAgICAgICB3cml0ZUluZGVudCh0cywgaW5kZW50ICsgMSk7Ci0gICAg ICAgIHRzIDw8ICIodXNpbmdUaWxlZExheWVyICIgPDwgbV91c2luZ1RpbGVkTGF5ZXIgPDwgIilc biI7CisgICAgICAgIHRzIDw8ICIodXNpbmdUaWxlZExheWVyICIgPDwgbV91c2luZ1RpbGVkQmFj a2luZyA8PCAiKVxuIjsKICAgICB9CiAKICAgICBpZiAobV9jb250ZW50c09wYXF1ZSkgewpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5o IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5oCmluZGV4 IGZkZjg3NjY5YmMxOWQ4NGRiYTE1ZWE1MzVmNzZjZGJhYjhmNzUwMDIuLjc5NmZhNTFkMzRmY2Uz ZGI1ZGZhZWU4NGQ2ZTczMzg3MjkzNGMyZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmgKQEAgLTQxNiw4ICs0MTYsNyBAQCBwdWJsaWM6 CiAgICAgLy8gUmV0dXJuIGFuIGVzdGltYXRlIG9mIHRoZSBiYWNraW5nIHN0b3JlIG1lbW9yeSBj b3N0IChpbiBieXRlcykuIE1heSBiZSBpbmNvcnJlY3QgZm9yIHRpbGVkIGxheWVycy4KICAgICB2 aXJ0dWFsIGRvdWJsZSBiYWNraW5nU3RvcmVNZW1vcnlFc3RpbWF0ZSgpIGNvbnN0OwogCi0gICAg Ym9vbCB1c2luZ1RpbGVkTGF5ZXIoKSBjb25zdCB7IHJldHVybiBtX3VzaW5nVGlsZWRMYXllcjsg fQotCisgICAgYm9vbCB1c2luZ1RpbGVkQmFja2luZygpIGNvbnN0IHsgcmV0dXJuIG1fdXNpbmdU aWxlZEJhY2tpbmc7IH0KICAgICB2aXJ0dWFsIFRpbGVkQmFja2luZyogdGlsZWRCYWNraW5nKCkg Y29uc3QgeyByZXR1cm4gMDsgfQogCiAgICAgdm9pZCByZXNldFRyYWNrZWRSZXBhaW50cygpOwpA QCAtNDk4LDcgKzQ5Nyw3IEBAIHByb3RlY3RlZDoKICAgICBib29sIG1fY29udGVudHNPcGFxdWUg OiAxOwogICAgIGJvb2wgbV9wcmVzZXJ2ZXMzRDogMTsKICAgICBib29sIG1fYmFja2ZhY2VWaXNp YmlsaXR5IDogMTsKLSAgICBib29sIG1fdXNpbmdUaWxlZExheWVyIDogMTsKKyAgICBib29sIG1f dXNpbmdUaWxlZEJhY2tpbmcgOiAxOwogICAgIGJvb2wgbV9tYXNrc1RvQm91bmRzIDogMTsKICAg ICBib29sIG1fZHJhd3NDb250ZW50IDogMTsKICAgICBib29sIG1fY29udGVudHNWaXNpYmxlIDog MTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNz TGF5ZXJDbGllbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNz TGF5ZXJDbGllbnQuaAppbmRleCA5NmY2NWE0OGJmYWNhZDliNmRlZDZiNjgzMGQxYjhkODg5NzEw MGU2Li5jNTlkOGFhYTQ0MzU4Y2MxOTZjMGJmNDUwNjVjZjU3Mzk3MDY1NGMyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyQ2xpZW50LmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllckNsaWVu dC5oCkBAIC02MCw2ICs2MCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5HcmFwaGljc0xheWVy Q2xpZW50KCkge30KIAogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRVc2VUaWxlZEJhY2tpbmcoY29u c3QgR3JhcGhpY3NMYXllciopIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CisgICAgdmlydHVhbCB2 b2lkIHRpbGVkQmFja2luZ1VzYWdlQ2hhbmdlZChjb25zdCBHcmFwaGljc0xheWVyKiwgYm9vbCAv KnVzaW5nVGlsZWRCYWNraW5nKi8pIHsgfQogICAgIAogICAgIC8vIENhbGxiYWNrIGZvciB3aGVu IGhhcmR3YXJlLWFjY2VsZXJhdGVkIGFuaW1hdGlvbiBzdGFydGVkLgogICAgIHZpcnR1YWwgdm9p ZCBub3RpZnlBbmltYXRpb25TdGFydGVkKGNvbnN0IEdyYXBoaWNzTGF5ZXIqLCBkb3VibGUgdGlt ZSkgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Ev R3JhcGhpY3NMYXllckNBLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nh L0dyYXBoaWNzTGF5ZXJDQS5jcHAKaW5kZXggMzc0NTFiMTBjMzczNGEwMjAyODY1Nzg0ZDUyNDM4 YmMxOTI4MjUyYS4uN2JiOTE1MjFkZGM1MjViODJiOTgyYWE1MzkzYzYxM2FlZjliYzE2NiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXll ckNBLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGlj c0xheWVyQ0EuY3BwCkBAIC05NzcsNyArOTc3LDcgQEAgdm9pZCBHcmFwaGljc0xheWVyQ0E6OnJl Y3Vyc2l2ZUNvbW1pdENoYW5nZXMoY29uc3QgQ29tbWl0U3RhdGUmIGNvbW1pdFN0YXRlLCBjb24K ICNpZmRlZiBWSVNJQkxFX1RJTEVfV0FTSAogICAgIC8vIFVzZSBoYXZpbmcgYSB0cmFuc2Zvcm0g YXMgYSBrZXkgdG8gbWFraW5nIHRoZSB0aWxlIHdhc2ggbGF5ZXIuIElmIGV2ZXJ5IGxheWVyIGdl dHMgYSB3YXNoLAogICAgIC8vIHRoZXkgc3RhcnQgdG8gb2JzY3VyZSB1c2VmdWwgaW5mb3JtYXRp b24uCi0gICAgaWYgKCghbV90cmFuc2Zvcm0uaXNJZGVudGl0eSgpIHx8IG1fdXNpbmdUaWxlZExh eWVyKSAmJiAhbV92aXNpYmxlVGlsZVdhc2hMYXllcikgeworICAgIGlmICgoIW1fdHJhbnNmb3Jt LmlzSWRlbnRpdHkoKSB8fCBtX3VzaW5nVGlsZWRCYWNraW5nKSAmJiAhbV92aXNpYmxlVGlsZVdh c2hMYXllcikgewogICAgICAgICBzdGF0aWMgQ29sb3Igd2FzaEZpbGxDb2xvcigyNTUsIDAsIDAs IDUwKTsKICAgICAgICAgc3RhdGljIENvbG9yIHdhc2hCb3JkZXJDb2xvcigyNTUsIDAsIDAsIDEw MCk7CiAgICAgICAgIApAQCAtMTI1MiwxMCArMTI1MiwxMCBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJD QTo6dXBkYXRlR2VvbWV0cnkoZmxvYXQgcGFnZVNjYWxlRmFjdG9yLCBjb25zdCBGbG9hdFBvaW50 JiBwbwogICAgIGNvbXB1dGVQaXhlbEFsaWdubWVudChwYWdlU2NhbGVGYWN0b3IsIHBvc2l0aW9u UmVsYXRpdmVUb0Jhc2UsIHNjYWxlZFBvc2l0aW9uLCBzY2FsZWRTaXplLCBzY2FsZWRBbmNob3JQ b2ludCwgcGl4ZWxBbGlnbm1lbnRPZmZzZXQpOwogCiAgICAgYm9vbCBuZWVkVGlsZWRMYXllciA9 IHJlcXVpcmVzVGlsZWRMYXllcihwYWdlU2NhbGVGYWN0b3IpOwotICAgIGlmIChuZWVkVGlsZWRM YXllciAhPSBtX3VzaW5nVGlsZWRMYXllcikKKyAgICBpZiAobmVlZFRpbGVkTGF5ZXIgIT0gbV91 c2luZ1RpbGVkQmFja2luZykKICAgICAgICAgc3dhcEZyb21PclRvVGlsZWRMYXllcihuZWVkVGls ZWRMYXllcik7CiAKLSAgICBGbG9hdFNpemUgdXNlZFNpemUgPSBtX3VzaW5nVGlsZWRMYXllciA/ IGNvbnN0cmFpbmVkU2l6ZSgpIDogc2NhbGVkU2l6ZTsKKyAgICBGbG9hdFNpemUgdXNlZFNpemUg PSBtX3VzaW5nVGlsZWRCYWNraW5nID8gY29uc3RyYWluZWRTaXplKCkgOiBzY2FsZWRTaXplOwog ICAgIEZsb2F0UmVjdCBhZGp1c3RlZEJvdW5kcyhtX2JvdW5kc09yaWdpbiAtIHBpeGVsQWxpZ25t ZW50T2Zmc2V0LCB1c2VkU2l6ZSk7CiAKICAgICAvLyBVcGRhdGUgcG9zaXRpb24uCkBAIC0xNTI0 LDcgKzE1MjQsNyBAQCBHcmFwaGljc0xheWVyQ0E6OlN0cnVjdHVyYWxMYXllclB1cnBvc2UgR3Jh cGhpY3NMYXllckNBOjpzdHJ1Y3R1cmFsTGF5ZXJQdXJwb3NlKAogdm9pZCBHcmFwaGljc0xheWVy Q0E6OnVwZGF0ZUxheWVyRHJhd3NDb250ZW50KGZsb2F0IHBhZ2VTY2FsZUZhY3RvcikKIHsKICAg ICBib29sIG5lZWRUaWxlZExheWVyID0gcmVxdWlyZXNUaWxlZExheWVyKHBhZ2VTY2FsZUZhY3Rv cik7Ci0gICAgaWYgKG5lZWRUaWxlZExheWVyICE9IG1fdXNpbmdUaWxlZExheWVyKQorICAgIGlm IChuZWVkVGlsZWRMYXllciAhPSBtX3VzaW5nVGlsZWRCYWNraW5nKQogICAgICAgICBzd2FwRnJv bU9yVG9UaWxlZExheWVyKG5lZWRUaWxlZExheWVyKTsKIAogICAgIGlmIChtX2RyYXdzQ29udGVu dCkKQEAgLTI1MjIsNyArMjUyMiw3IEBAIHN0YXRpYyBmbG9hdCBjbGFtcGVkQ29udGVudHNTY2Fs ZUZvclNjYWxlKGZsb2F0IHNjYWxlKQogdm9pZCBHcmFwaGljc0xheWVyQ0E6OnVwZGF0ZUNvbnRl bnRzU2NhbGUoZmxvYXQgcGFnZVNjYWxlRmFjdG9yKQogewogICAgIGJvb2wgbmVlZFRpbGVkTGF5 ZXIgPSByZXF1aXJlc1RpbGVkTGF5ZXIocGFnZVNjYWxlRmFjdG9yKTsKLSAgICBpZiAobmVlZFRp bGVkTGF5ZXIgIT0gbV91c2luZ1RpbGVkTGF5ZXIpCisgICAgaWYgKG5lZWRUaWxlZExheWVyICE9 IG1fdXNpbmdUaWxlZEJhY2tpbmcpCiAgICAgICAgIHN3YXBGcm9tT3JUb1RpbGVkTGF5ZXIobmVl ZFRpbGVkTGF5ZXIpOwogCiAgICAgZmxvYXQgY29udGVudHNTY2FsZSA9IGNsYW1wZWRDb250ZW50 c1NjYWxlRm9yU2NhbGUocGFnZVNjYWxlRmFjdG9yICogZGV2aWNlU2NhbGVGYWN0b3IoKSk7CkBA IC0yNjQzLDExICsyNjQzLDExIEBAIGJvb2wgR3JhcGhpY3NMYXllckNBOjpyZXF1aXJlc1RpbGVk TGF5ZXIoZmxvYXQgcGFnZVNjYWxlRmFjdG9yKSBjb25zdAogdm9pZCBHcmFwaGljc0xheWVyQ0E6 OnN3YXBGcm9tT3JUb1RpbGVkTGF5ZXIoYm9vbCB1c2VUaWxlZExheWVyKQogewogICAgIEFTU0VS VChtX2xheWVyLT5sYXllclR5cGUoKSAhPSBQbGF0Zm9ybUNBTGF5ZXI6OkxheWVyVHlwZVBhZ2VU aWxlZEJhY2tpbmdMYXllcik7Ci0gICAgQVNTRVJUKHVzZVRpbGVkTGF5ZXIgIT0gbV91c2luZ1Rp bGVkTGF5ZXIpOworICAgIEFTU0VSVCh1c2VUaWxlZExheWVyICE9IG1fdXNpbmdUaWxlZEJhY2tp bmcpOwogICAgIFJlZlB0cjxQbGF0Zm9ybUNBTGF5ZXI+IG9sZExheWVyID0gbV9sYXllcjsKICAg ICAKICAgICBtX2xheWVyID0gUGxhdGZvcm1DQUxheWVyOjpjcmVhdGUodXNlVGlsZWRMYXllciA/ IFBsYXRmb3JtQ0FMYXllcjo6TGF5ZXJUeXBlVGlsZWRCYWNraW5nTGF5ZXIgOiBQbGF0Zm9ybUNB TGF5ZXI6OkxheWVyVHlwZVdlYkxheWVyLCB0aGlzKTsKLSAgICBtX3VzaW5nVGlsZWRMYXllciA9 IHVzZVRpbGVkTGF5ZXI7CisgICAgbV91c2luZ1RpbGVkQmFja2luZyA9IHVzZVRpbGVkTGF5ZXI7 CiAgICAgCiAgICAgbV9sYXllci0+YWRvcHRTdWJsYXllcnMob2xkTGF5ZXIuZ2V0KCkpOwogCkBA IC0yNjc2LDcgKzI2NzYsNyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6c3dhcEZyb21PclRvVGls ZWRMYXllcihib29sIHVzZVRpbGVkTGF5ZXIpCiAgICAgICAgIHwgT3BhY2l0eUNoYW5nZWQKICAg ICAgICAgfCBEZWJ1Z0luZGljYXRvcnNDaGFuZ2VkOwogICAgIAotICAgIGlmIChtX3VzaW5nVGls ZWRMYXllcikKKyAgICBpZiAobV91c2luZ1RpbGVkQmFja2luZykKICAgICAgICAgbV91bmNvbW1p dHRlZENoYW5nZXMgfD0gVmlzaWJsZVJlY3RDaGFuZ2VkOwogCiAjaWZuZGVmIE5ERUJVRwpAQCAt MjY4OSw2ICsyNjg5LDkgQEAgdm9pZCBHcmFwaGljc0xheWVyQ0E6OnN3YXBGcm9tT3JUb1RpbGVk TGF5ZXIoYm9vbCB1c2VUaWxlZExheWVyKQogICAgIAogICAgIC8vIG5lZWQgdG8gdGVsbCBuZXcg bGF5ZXIgdG8gZHJhdyBpdHNlbGYKICAgICBzZXROZWVkc0Rpc3BsYXkoKTsKKyAgICAKKyAgICBp ZiAoY2xpZW50KCkpCisgICAgICAgIGNsaWVudCgpLT50aWxlZEJhY2tpbmdVc2FnZUNoYW5nZWQo dGhpcywgbV91c2luZ1RpbGVkQmFja2luZyk7CiB9CiAKIEdyYXBoaWNzTGF5ZXI6OkNvbXBvc2l0 aW5nQ29vcmRpbmF0ZXNPcmllbnRhdGlvbiBHcmFwaGljc0xheWVyQ0E6OmRlZmF1bHRDb250ZW50 c09yaWVudGF0aW9uKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllckJhY2tpbmcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyQmFja2luZy5jcHAKaW5kZXggMGMxMjU5ZDJlZGM0OTZjYzdjOWVjOWNkMTVjMjkyOWY4 MGVjOTJlMi4uMzJhNmZjMDZkNmM2YjM4ZGE1OGI2MGRlMTY4NTU1OWVkZGE3MDNjNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKQEAgLTE2 Miw2ICsxNjIsMTQgQEAgUmVuZGVyTGF5ZXJCYWNraW5nOjp+UmVuZGVyTGF5ZXJCYWNraW5nKCkK ICAgICBkZXN0cm95R3JhcGhpY3NMYXllcnMoKTsKIH0KIAordm9pZCBSZW5kZXJMYXllckJhY2tp bmc6OndpbGxEZXN0cm95TGF5ZXIoY29uc3QgR3JhcGhpY3NMYXllciogbGF5ZXIpCit7CisgICAg aWYgKGxheWVyICYmIGxheWVyLT51c2luZ1RpbGVkQmFja2luZygpKSB7CisgICAgICAgIGlmIChS ZW5kZXJMYXllckNvbXBvc2l0b3IqIGNvbXBvc2l0b3IgPSB0aGlzLT5jb21wb3NpdG9yKCkpCisg ICAgICAgICAgICBjb21wb3NpdG9yLT5sYXllclRpbGVkQmFja2luZ1VzYWdlQ2hhbmdlZChsYXll ciwgZmFsc2UpOworICAgIH0KK30KKwogUGFzc093blB0cjxHcmFwaGljc0xheWVyPiBSZW5kZXJM YXllckJhY2tpbmc6OmNyZWF0ZUdyYXBoaWNzTGF5ZXIoY29uc3QgU3RyaW5nJiBuYW1lKQogewog ICAgIEdyYXBoaWNzTGF5ZXJGYWN0b3J5KiBncmFwaGljc0xheWVyRmFjdG9yeSA9IDA7CkBAIC0x ODksNiArMTk3LDExIEBAIGJvb2wgUmVuZGVyTGF5ZXJCYWNraW5nOjpzaG91bGRVc2VUaWxlZEJh Y2tpbmcoY29uc3QgR3JhcGhpY3NMYXllciopIGNvbnN0CiAgICAgcmV0dXJuIG1fdXNpbmdUaWxl ZENhY2hlTGF5ZXIgJiYgbV9jcmVhdGluZ1ByaW1hcnlHcmFwaGljc0xheWVyOwogfQogCit2b2lk IFJlbmRlckxheWVyQmFja2luZzo6dGlsZWRCYWNraW5nVXNhZ2VDaGFuZ2VkKGNvbnN0IEdyYXBo aWNzTGF5ZXIqIGxheWVyLCBib29sIHVzaW5nVGlsZWRCYWNraW5nKQoreworICAgIGNvbXBvc2l0 b3IoKS0+bGF5ZXJUaWxlZEJhY2tpbmdVc2FnZUNoYW5nZWQobGF5ZXIsIHVzaW5nVGlsZWRCYWNr aW5nKTsKK30KKwogVGlsZWRCYWNraW5nKiBSZW5kZXJMYXllckJhY2tpbmc6OnRpbGVkQmFja2lu ZygpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fZ3JhcGhpY3NMYXllci0+dGlsZWRCYWNraW5nKCk7 CkBAIC0zMTAsOCArMzIzLDEwIEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjpjcmVhdGVQcmlt YXJ5R3JhcGhpY3NMYXllcigpCiAKIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjpkZXN0cm95R3Jh cGhpY3NMYXllcnMoKQogewotICAgIGlmIChtX2dyYXBoaWNzTGF5ZXIpCisgICAgaWYgKG1fZ3Jh cGhpY3NMYXllcikgeworICAgICAgICB3aWxsRGVzdHJveUxheWVyKG1fZ3JhcGhpY3NMYXllci5n ZXQoKSk7CiAgICAgICAgIG1fZ3JhcGhpY3NMYXllci0+cmVtb3ZlRnJvbVBhcmVudCgpOworICAg IH0KIAogICAgIG1fYW5jZXN0b3JDbGlwcGluZ0xheWVyID0gbnVsbHB0cjsKICAgICBtX2NvbnRl bnRzQ29udGFpbm1lbnRMYXllciA9IG51bGxwdHI7CkBAIC05NjAsNiArOTc1LDcgQEAgYm9vbCBS ZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUNsaXBwaW5nTGF5ZXJzKGJvb2wgbmVlZHNBbmNlc3Rv ckNsaXAsIGJvb2wgbmVlZHMKICAgICAgICAgICAgIGxheWVyc0NoYW5nZWQgPSB0cnVlOwogICAg ICAgICB9CiAgICAgfSBlbHNlIGlmIChtX2FuY2VzdG9yQ2xpcHBpbmdMYXllcikgeworICAgICAg ICB3aWxsRGVzdHJveUxheWVyKG1fYW5jZXN0b3JDbGlwcGluZ0xheWVyLmdldCgpKTsKICAgICAg ICAgbV9hbmNlc3RvckNsaXBwaW5nTGF5ZXItPnJlbW92ZUZyb21QYXJlbnQoKTsKICAgICAgICAg bV9hbmNlc3RvckNsaXBwaW5nTGF5ZXIgPSBudWxscHRyOwogICAgICAgICBsYXllcnNDaGFuZ2Vk ID0gdHJ1ZTsKQEAgLTk3Miw2ICs5ODgsNyBAQCBib29sIFJlbmRlckxheWVyQmFja2luZzo6dXBk YXRlQ2xpcHBpbmdMYXllcnMoYm9vbCBuZWVkc0FuY2VzdG9yQ2xpcCwgYm9vbCBuZWVkcwogICAg ICAgICAgICAgbGF5ZXJzQ2hhbmdlZCA9IHRydWU7CiAgICAgICAgIH0KICAgICB9IGVsc2UgaWYg KGhhc0NsaXBwaW5nTGF5ZXIoKSkgeworICAgICAgICB3aWxsRGVzdHJveUxheWVyKG1fY2hpbGRD b250YWlubWVudExheWVyLmdldCgpKTsKICAgICAgICAgbV9jaGlsZENvbnRhaW5tZW50TGF5ZXIt PnJlbW92ZUZyb21QYXJlbnQoKTsKICAgICAgICAgbV9jaGlsZENvbnRhaW5tZW50TGF5ZXIgPSBu dWxscHRyOwogICAgICAgICBsYXllcnNDaGFuZ2VkID0gdHJ1ZTsKQEAgLTEwMjEsNyArMTAzOCw4 IEBAIGJvb2wgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVPdmVyZmxvd0NvbnRyb2xzTGF5ZXJz KGJvb2wgbmVlZHNIb3Jpem9udGFsU2Nyb2xsCiAgICAgICAgICAgICBob3Jpem9udGFsU2Nyb2xs YmFyTGF5ZXJDaGFuZ2VkID0gdHJ1ZTsKICAgICAgICAgfQogICAgIH0gZWxzZSBpZiAobV9sYXll ckZvckhvcml6b250YWxTY3JvbGxiYXIpIHsKLSAgICAgICAgbV9sYXllckZvckhvcml6b250YWxT Y3JvbGxiYXIuY2xlYXIoKTsKKyAgICAgICAgd2lsbERlc3Ryb3lMYXllcihtX2xheWVyRm9ySG9y aXpvbnRhbFNjcm9sbGJhci5nZXQoKSk7CisgICAgICAgIG1fbGF5ZXJGb3JIb3Jpem9udGFsU2Ny b2xsYmFyID0gbnVsbHB0cjsKICAgICAgICAgaG9yaXpvbnRhbFNjcm9sbGJhckxheWVyQ2hhbmdl ZCA9IHRydWU7CiAgICAgfQogCkBAIC0xMDMyLDcgKzEwNTAsOCBAQCBib29sIFJlbmRlckxheWVy QmFja2luZzo6dXBkYXRlT3ZlcmZsb3dDb250cm9sc0xheWVycyhib29sIG5lZWRzSG9yaXpvbnRh bFNjcm9sbAogICAgICAgICAgICAgdmVydGljYWxTY3JvbGxiYXJMYXllckNoYW5nZWQgPSB0cnVl OwogICAgICAgICB9CiAgICAgfSBlbHNlIGlmIChtX2xheWVyRm9yVmVydGljYWxTY3JvbGxiYXIp IHsKLSAgICAgICAgbV9sYXllckZvclZlcnRpY2FsU2Nyb2xsYmFyLmNsZWFyKCk7CisgICAgICAg IHdpbGxEZXN0cm95TGF5ZXIobV9sYXllckZvclZlcnRpY2FsU2Nyb2xsYmFyLmdldCgpKTsKKyAg ICAgICAgbV9sYXllckZvclZlcnRpY2FsU2Nyb2xsYmFyID0gbnVsbHB0cjsKICAgICAgICAgdmVy dGljYWxTY3JvbGxiYXJMYXllckNoYW5nZWQgPSB0cnVlOwogICAgIH0KIApAQCAtMTA0Myw3ICsx MDYyLDggQEAgYm9vbCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZU92ZXJmbG93Q29udHJvbHNM YXllcnMoYm9vbCBuZWVkc0hvcml6b250YWxTY3JvbGwKICAgICAgICAgICAgIHNjcm9sbENvcm5l ckxheWVyQ2hhbmdlZCA9IHRydWU7CiAgICAgICAgIH0KICAgICB9IGVsc2UgaWYgKG1fbGF5ZXJG b3JTY3JvbGxDb3JuZXIpIHsKLSAgICAgICAgbV9sYXllckZvclNjcm9sbENvcm5lci5jbGVhcigp OworICAgICAgICB3aWxsRGVzdHJveUxheWVyKG1fbGF5ZXJGb3JTY3JvbGxDb3JuZXIuZ2V0KCkp OworICAgICAgICBtX2xheWVyRm9yU2Nyb2xsQ29ybmVyID0gbnVsbHB0cjsKICAgICAgICAgc2Ny b2xsQ29ybmVyTGF5ZXJDaGFuZ2VkID0gdHJ1ZTsKICAgICB9CiAKQEAgLTExMjIsNiArMTE0Miw3 IEBAIGJvb2wgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVGb3JlZ3JvdW5kTGF5ZXIoYm9vbCBu ZWVkc0ZvcmVncm91bmRMYXllcikKICAgICAgICAgICAgIGxheWVyQ2hhbmdlZCA9IHRydWU7CiAg ICAgICAgIH0KICAgICB9IGVsc2UgaWYgKG1fZm9yZWdyb3VuZExheWVyKSB7CisgICAgICAgIHdp bGxEZXN0cm95TGF5ZXIobV9mb3JlZ3JvdW5kTGF5ZXIuZ2V0KCkpOwogICAgICAgICBtX2ZvcmVn cm91bmRMYXllci0+cmVtb3ZlRnJvbVBhcmVudCgpOwogICAgICAgICBtX2ZvcmVncm91bmRMYXll ciA9IG51bGxwdHI7CiAgICAgICAgIGxheWVyQ2hhbmdlZCA9IHRydWU7CkBAIC0xMTYxLDExICsx MTgyLDEzIEBAIGJvb2wgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVCYWNrZ3JvdW5kTGF5ZXIo Ym9vbCBuZWVkc0JhY2tncm91bmRMYXllcikKICAgICAgICAgfQogICAgIH0gZWxzZSB7CiAgICAg ICAgIGlmIChtX2JhY2tncm91bmRMYXllcikgeworICAgICAgICAgICAgd2lsbERlc3Ryb3lMYXll cihtX2JhY2tncm91bmRMYXllci5nZXQoKSk7CiAgICAgICAgICAgICBtX2JhY2tncm91bmRMYXll ci0+cmVtb3ZlRnJvbVBhcmVudCgpOwogICAgICAgICAgICAgbV9iYWNrZ3JvdW5kTGF5ZXIgPSBu dWxscHRyOwogICAgICAgICAgICAgbGF5ZXJDaGFuZ2VkID0gdHJ1ZTsKICAgICAgICAgfQogICAg ICAgICBpZiAobV9jb250ZW50c0NvbnRhaW5tZW50TGF5ZXIpIHsKKyAgICAgICAgICAgIHdpbGxE ZXN0cm95TGF5ZXIobV9jb250ZW50c0NvbnRhaW5tZW50TGF5ZXIuZ2V0KCkpOwogICAgICAgICAg ICAgbV9jb250ZW50c0NvbnRhaW5tZW50TGF5ZXItPnJlbW92ZUZyb21QYXJlbnQoKTsKICAgICAg ICAgICAgIG1fY29udGVudHNDb250YWlubWVudExheWVyID0gbnVsbHB0cjsKICAgICAgICAgICAg IGxheWVyQ2hhbmdlZCA9IHRydWU7CkBAIC0xMTkzLDYgKzEyMTYsNyBAQCBib29sIFJlbmRlckxh eWVyQmFja2luZzo6dXBkYXRlTWFza0xheWVyKGJvb2wgbmVlZHNNYXNrTGF5ZXIpCiAgICAgICAg ICAgICBsYXllckNoYW5nZWQgPSB0cnVlOwogICAgICAgICB9CiAgICAgfSBlbHNlIGlmIChtX21h c2tMYXllcikgeworICAgICAgICB3aWxsRGVzdHJveUxheWVyKG1fbWFza0xheWVyLmdldCgpKTsK ICAgICAgICAgbV9tYXNrTGF5ZXIgPSBudWxscHRyOwogICAgICAgICBsYXllckNoYW5nZWQgPSB0 cnVlOwogICAgIH0KQEAgLTEyMjksNiArMTI1Myw4IEBAIGJvb2wgUmVuZGVyTGF5ZXJCYWNraW5n Ojp1cGRhdGVTY3JvbGxpbmdMYXllcnMoYm9vbCBuZWVkc1Njcm9sbGluZ0xheWVycykKICAgICAg ICAgICAgICAgICBzY3JvbGxpbmdDb29yZGluYXRvci0+c2Nyb2xsYWJsZUFyZWFTY3JvbGxMYXll ckRpZENoYW5nZShtX293bmluZ0xheWVyKTsKICAgICAgICAgfQogICAgIH0gZWxzZSBpZiAobV9z Y3JvbGxpbmdMYXllcikgeworICAgICAgICB3aWxsRGVzdHJveUxheWVyKG1fc2Nyb2xsaW5nTGF5 ZXIuZ2V0KCkpOworICAgICAgICB3aWxsRGVzdHJveUxheWVyKG1fc2Nyb2xsaW5nQ29udGVudHNM YXllci5nZXQoKSk7CiAgICAgICAgIG1fc2Nyb2xsaW5nTGF5ZXIgPSBudWxscHRyOwogICAgICAg ICBtX3Njcm9sbGluZ0NvbnRlbnRzTGF5ZXIgPSBudWxscHRyOwogICAgICAgICBsYXllckNoYW5n ZWQgPSB0cnVlOwpAQCAtMjE4OCw3ICsyMjE0LDcgQEAgQ29tcG9zaXRpbmdMYXllclR5cGUgUmVu ZGVyTGF5ZXJCYWNraW5nOjpjb21wb3NpdGluZ0xheWVyVHlwZSgpIGNvbnN0CiAgICAgICAgIHJl dHVybiBNZWRpYUNvbXBvc2l0aW5nTGF5ZXI7CiAKICAgICBpZiAobV9ncmFwaGljc0xheWVyLT5k cmF3c0NvbnRlbnQoKSkKLSAgICAgICAgcmV0dXJuIG1fZ3JhcGhpY3NMYXllci0+dXNpbmdUaWxl ZExheWVyKCkgPyBUaWxlZENvbXBvc2l0aW5nTGF5ZXIgOiBOb3JtYWxDb21wb3NpdGluZ0xheWVy OworICAgICAgICByZXR1cm4gbV9ncmFwaGljc0xheWVyLT51c2luZ1RpbGVkQmFja2luZygpID8g VGlsZWRDb21wb3NpdGluZ0xheWVyIDogTm9ybWFsQ29tcG9zaXRpbmdMYXllcjsKICAgICAKICAg ICByZXR1cm4gQ29udGFpbmVyQ29tcG9zaXRpbmdMYXllcjsKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaAppbmRleCA5NGYxMDc4NjkzMzEzNGNhMTZj MWU0MjM0MGVkODcyMGYyMjZkOTU0Li44OWQ4YzE0NWM3NTFmMjI1YmUzYTJiZmZhNmNlZjA4ZGYy ZjBhNmNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJC YWNraW5nLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2lu Zy5oCkBAIC0xNTUsNiArMTU1LDcgQEAgcHVibGljOgogCiAgICAgLy8gR3JhcGhpY3NMYXllckNs aWVudCBpbnRlcmZhY2UKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkVXNlVGlsZWRCYWNraW5nKGNv bnN0IEdyYXBoaWNzTGF5ZXIqKSBjb25zdCBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHZvaWQgdGls ZWRCYWNraW5nVXNhZ2VDaGFuZ2VkKGNvbnN0IEdyYXBoaWNzTGF5ZXIqLCBib29sIC8qdXNpbmdU aWxlZEJhY2tpbmcqLykgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIG5vdGlmeUFuaW1hdGlv blN0YXJ0ZWQoY29uc3QgR3JhcGhpY3NMYXllciosIGRvdWJsZSBzdGFydFRpbWUpIE9WRVJSSURF OwogICAgIHZpcnR1YWwgdm9pZCBub3RpZnlGbHVzaFJlcXVpcmVkKGNvbnN0IEdyYXBoaWNzTGF5 ZXIqKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgbm90aWZ5Rmx1c2hCZWZvcmVEaXNwbGF5 UmVmcmVzaChjb25zdCBHcmFwaGljc0xheWVyKikgT1ZFUlJJREU7CkBAIC0xOTgsNiArMTk5LDgg QEAgcHJpdmF0ZToKICAgICB2b2lkIGNyZWF0ZVByaW1hcnlHcmFwaGljc0xheWVyKCk7CiAgICAg dm9pZCBkZXN0cm95R3JhcGhpY3NMYXllcnMoKTsKICAgICAKKyAgICB2b2lkIHdpbGxEZXN0cm95 TGF5ZXIoY29uc3QgR3JhcGhpY3NMYXllciopOworICAgIAogICAgIFBhc3NPd25QdHI8R3JhcGhp Y3NMYXllcj4gY3JlYXRlR3JhcGhpY3NMYXllcihjb25zdCBTdHJpbmcmKTsKIAogICAgIFJlbmRl ckxheWVyTW9kZWxPYmplY3QqIHJlbmRlcmVyKCkgY29uc3QgeyByZXR1cm4gbV9vd25pbmdMYXll ci0+cmVuZGVyZXIoKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXJDb21wb3NpdG9yLmNwcAppbmRleCBhOTVjMThhZmFmMmJkOTg5NmVhODZjZTg5OTJlMmYy NzRhMWExNGNjLi41NzBiZDYxZjNmNDEyZDYzYTBhOWUyNjdmNzk0ZThjMjdjZWNhM2JlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNw cApAQCAtMjA5LDYgKzIwOSw3IEBAIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6UmVuZGVyTGF5ZXJD b21wb3NpdG9yKFJlbmRlclZpZXcqIHJlbmRlclZpZXcpCiAgICAgLCBtX2ZvcmNlQ29tcG9zaXRp bmdNb2RlKGZhbHNlKQogICAgICwgbV9pblBvc3RMYXlvdXRVcGRhdGUoZmFsc2UpCiAgICAgLCBt X2lzVHJhY2tpbmdSZXBhaW50cyhmYWxzZSkKKyAgICAsIG1fbGF5ZXJzV2l0aFRpbGVkQmFja2lu Z0NvdW50KDApCiAgICAgLCBtX3Jvb3RMYXllckF0dGFjaG1lbnQoUm9vdExheWVyVW5hdHRhY2hl ZCkKICNpZiAhTE9HX0RJU0FCTEVECiAgICAgLCBtX3Jvb3RMYXllclVwZGF0ZUNvdW50KDApCkBA IC0zOTAsNiArMzkxLDE2IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpmbHVzaExheWVy cyhHcmFwaGljc0xheWVyVXBkYXRlciopCiAgICAgZmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzKHRy dWUpOyAvLyBGSVhNRTogZGVhbCB3aXRoIGlmcmFtZXMKIH0KIAordm9pZCBSZW5kZXJMYXllckNv bXBvc2l0b3I6OmxheWVyVGlsZWRCYWNraW5nVXNhZ2VDaGFuZ2VkKGNvbnN0IEdyYXBoaWNzTGF5 ZXIqLCBib29sIHVzaW5nVGlsZWRCYWNraW5nKQoreworICAgIGlmICh1c2luZ1RpbGVkQmFja2lu ZykKKyAgICAgICAgKyttX2xheWVyc1dpdGhUaWxlZEJhY2tpbmdDb3VudDsKKyAgICBlbHNlIHsK KyAgICAgICAgQVNTRVJUKG1fbGF5ZXJzV2l0aFRpbGVkQmFja2luZ0NvdW50ID4gMCk7CisgICAg ICAgIC0tbV9sYXllcnNXaXRoVGlsZWRCYWNraW5nQ291bnQ7CisgICAgfQorfQorCiBSZW5kZXJM YXllckNvbXBvc2l0b3IqIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZW5jbG9zaW5nQ29tcG9zaXRv ckZsdXNoaW5nTGF5ZXJzKCkgY29uc3QKIHsKICAgICBpZiAoIW1fcmVuZGVyVmlldy0+ZnJhbWVW aWV3KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJD b21wb3NpdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3Np dG9yLmgKaW5kZXggYjRjZWM2YjI2N2E2NTdlMGIwZTgyYmUwNGM2ZTI4NjljOWQ1NTY1YS4uMDMy NzFjMTExOTdlMGY5ZGQ2NTBjNjM1ZGU3OTMwY2UzMmY4NTc5ZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaApAQCAtMjQxLDYgKzI0MSw4 IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGZsb2F0IHBhZ2VTY2FsZUZhY3RvcigpIGNvbnN0IE9W RVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBkaWRDb21taXRDaGFuZ2VzRm9yTGF5ZXIoY29uc3Qg R3JhcGhpY3NMYXllciopIGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBub3RpZnlG bHVzaEJlZm9yZURpc3BsYXlSZWZyZXNoKGNvbnN0IEdyYXBoaWNzTGF5ZXIqKSBPVkVSUklERTsK KworICAgIHZvaWQgbGF5ZXJUaWxlZEJhY2tpbmdVc2FnZUNoYW5nZWQoY29uc3QgR3JhcGhpY3NM YXllciosIGJvb2wgLyp1c2luZ1RpbGVkQmFja2luZyovKTsKICAgICAKICAgICBib29sIGtlZXBM YXllcnNQaXhlbEFsaWduZWQoKSBjb25zdDsKICAgICBib29sIGFjY2VsZXJhdGVkRHJhd2luZ0Vu YWJsZWQoKSBjb25zdCB7IHJldHVybiBtX2FjY2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQ7IH0KQEAg LTM0MCw2ICszNDIsOCBAQCBwcml2YXRlOgogICAgIAogICAgIFBhZ2UqIHBhZ2UoKSBjb25zdDsK ICAgICBUaWxlZEJhY2tpbmcqIHBhZ2VUaWxlZEJhY2tpbmcoKSBjb25zdDsKKyAgICAKKyAgICBi b29sIGhhdmVOb25NYWluTGF5ZXJzV2l0aFRpbGVkQmFja2luZygpIGNvbnN0IHsgcmV0dXJuIG1f bGF5ZXJzV2l0aFRpbGVkQmFja2luZ0NvdW50OyB9CiAKICAgICBHcmFwaGljc0xheWVyRmFjdG9y eSogZ3JhcGhpY3NMYXllckZhY3RvcnkoKSBjb25zdDsKICAgICBTY3JvbGxpbmdDb29yZGluYXRv ciogc2Nyb2xsaW5nQ29vcmRpbmF0b3IoKSBjb25zdDsKQEAgLTQwNSw2ICs0MDksOCBAQCBwcml2 YXRlOgogICAgIGJvb2wgbV9pblBvc3RMYXlvdXRVcGRhdGU7IC8vIHRydWUgd2hlbiBpdCdzIE9L IHRvIHRydXN0IGxheW91dCBpbmZvcm1hdGlvbiAoZS5nLiBsYXllciBzaXplcyBhbmQgcG9zaXRp b25zKQogCiAgICAgYm9vbCBtX2lzVHJhY2tpbmdSZXBhaW50czsgLy8gVXNlZCBmb3IgdGVzdGlu Zy4KKyAgICAKKyAgICB1bnNpZ25lZCBtX2xheWVyc1dpdGhUaWxlZEJhY2tpbmdDb3VudDsKIAog ICAgIFJvb3RMYXllckF0dGFjaG1lbnQgbV9yb290TGF5ZXJBdHRhY2htZW50OwogCg==