119589 2013-08-08 12:26:34 -0700 [BlackBerry] Don't release the canvas Drawable, flush it directly instead 2013-08-09 08:27:17 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jpetsovits jpetsovits anilsson commit-queue kpiascik mlattanzio rwlbuis staikos oldest_to_newest 915558 0 jpetsovits 2013-08-08 12:26:34 -0700 The current compositing code uses releaseBufferDrawable() to flush painted ImageBuffer contents, but then proceeds to use that released Drawable for further painting without ever locking a new one. In an implementation that actually releases the Drawable rather than keeping it around and just flushing it, this will wreak havoc as bad as black screens or crashes. As a solution that doesn't require the ImageBuffer object to swap out its m_canvas member for a new Drawable, we can access the PlatformGraphicsContext::flush() method directly to achieve the same effect as was previously intended by calling releaseBufferDrawable(). All it needs is letting the canvas layer know about the Drawable so it can call that flush() method by itself. Related: BlackBerry JIRA 444857, https://jira.bbqnx.net/browse/BRWSR-12531 915562 1 208362 jpetsovits 2013-08-08 12:46:14 -0700 Created attachment 208362 Patch 915838 2 208362 commit-queue 2013-08-09 08:27:15 -0700 Comment on attachment 208362 Patch Clearing flags on attachment: 208362 Committed r153895: <http://trac.webkit.org/changeset/153895> 915839 3 commit-queue 2013-08-09 08:27:17 -0700 All reviewed patches have been landed. Closing bug. 208362 2013-08-08 12:46:14 -0700 2013-08-09 08:27:15 -0700 Patch bug-119589-20130808194528.patch text/plain 8613 jpetsovits U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzNTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTgxYTg0NWJjYTM3NjUz MWFlNDc3ZmU5YmU5ZTBiMzNhZGIwNmIzNS4uN2MyMWIwOTQzYzA0OTZiM2NhNDA1YTAxMjA1OTQ0 M2RlZGIwNjk4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDEzLTA4LTA4ICBKYWtv YiBQZXRzb3ZpdHMgIDxqcGV0c292aXRzQGJsYWNrYmVycnkuY29tPgorCisgICAgICAgIFtCbGFj a0JlcnJ5XSBEb24ndCByZWxlYXNlIHRoZSBjYW52YXMgRHJhd2FibGUsIGZsdXNoIGl0IGRpcmVj dGx5IGluc3RlYWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMTk1ODkKKyAgICAgICAgaHR0cHM6Ly9qaXJhLmJicW54Lm5ldC9icm93c2UvQlJXU1It MTI1MzEKKyAgICAgICAgSklSQSA0NDQ4NTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGUgcHJldmlvdXMgY29kZSBoZXJlIHVzZWQgcmVsZWFzZUJ1 ZmZlckRyYXdhYmxlKCkgdG8KKyAgICAgICAgZmx1c2ggcGFpbnRlZCBJbWFnZUJ1ZmZlciBjb250 ZW50cywgYnV0IHRoZW4gcHJvY2VlZGVkCisgICAgICAgIHRvIHVzZSB0aGF0IHJlbGVhc2VkIERy YXdhYmxlIGZvciBmdXJ0aGVyIHBhaW50aW5nCisgICAgICAgIHdpdGhvdXQgZXZlciBsb2NraW5n IGEgbmV3IG9uZS4KKworICAgICAgICBJbiBhbiBpbXBsZW1lbnRhdGlvbiB0aGF0IGFjdHVhbGx5 IHJlbGVhc2VzIHRoZSBEcmF3YWJsZQorICAgICAgICByYXRoZXIgdGhhbiBrZWVwaW5nIGl0IGFy b3VuZCBhbmQganVzdCBmbHVzaGluZyBpdCwKKyAgICAgICAgdGhpcyB3aWxsIHdyZWFrIGhhdm9j IGFzIGJhZCBhcyBibGFjayBzY3JlZW5zIG9yIGNyYXNoZXMuCisKKyAgICAgICAgQXMgYSBzb2x1 dGlvbiB0aGF0IGRvZXNuJ3QgcmVxdWlyZSB0aGUgSW1hZ2VCdWZmZXIgb2JqZWN0CisgICAgICAg IHRvIHN3YXAgb3V0IGl0cyBtX2NhbnZhcyBtZW1iZXIgZm9yIGEgbmV3IERyYXdhYmxlLCB3ZSBj YW4KKyAgICAgICAgYWNjZXNzIHRoZSBQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDo6Zmx1c2goKSBt ZXRob2QgZGlyZWN0bHkKKyAgICAgICAgdG8gYWNoaWV2ZSB0aGUgc2FtZSBlZmZlY3QgYXMgd2Fz IHByZXZpb3VzbHkgaW50ZW5kZWQgYnkKKyAgICAgICAgY2FsbGluZyByZWxlYXNlQnVmZmVyRHJh d2FibGUoKS4gQWxsIGl0IG5lZWRzIGlzIGxldHRpbmcKKyAgICAgICAgdGhlIGNhbnZhcyBsYXll ciBrbm93IGFib3V0IHRoZSBEcmF3YWJsZSBzbyBpdCBjYW4gY2FsbAorICAgICAgICB0aGF0IGZs dXNoKCkgbWV0aG9kIGJ5IGl0c2VsZi4KKworICAgICAgICBObyBuZXcgdGVzdHMsIHZlcmlmaWVk IGJ5IG5vdCBjcmFzaGluZyB3aXRoIGFuIGFmb3JlbWVudGlvbmVkCisgICAgICAgIGltcGxlbWVu dGF0aW9uIG9mIHJlbGVhc2VCdWZmZXJEcmF3YWJsZSgpLgorCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvYmxhY2tiZXJyeS9DYW52YXNMYXllcldlYktpdFRocmVhZC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpDYW52YXNMYXllckNvbXBvc2l0aW5nVGhyZWFkQ2xpZW50OjpDYW52YXNMYXll ckNvbXBvc2l0aW5nVGhyZWFkQ2xpZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhc0xheWVy Q29tcG9zaXRpbmdUaHJlYWRDbGllbnQ6OmNvbW1pdFBlbmRpbmdUZXh0dXJlVXBsb2Fkcyk6Cisg ICAgICAgIChXZWJDb3JlOjpDYW52YXNMYXllcldlYktpdFRocmVhZDo6Q2FudmFzTGF5ZXJXZWJL aXRUaHJlYWQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvQ2FudmFz TGF5ZXJXZWJLaXRUaHJlYWQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhc0xheWVyV2ViS2l0 VGhyZWFkOjpjcmVhdGUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkv SW1hZ2VCdWZmZXJCbGFja0JlcnJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlQnVmZmVy OjpJbWFnZUJ1ZmZlcik6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUJ1ZmZlcjo6fkltYWdlQnVm ZmVyKToKKwogMjAxMy0wNS0xNCAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAg ICAgICAgUkVHUkVTU0lPTjogdW5pdGVkLmNvbSBoYXMgb3ZlcmxhcHBpbmcgZWxlbWVudHMgYW5k IGlzIGJyb2tlbiBieSBmbGV4IGJveCBjaGFuZ2VzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9DYW52YXNMYXllcldlYktpdFRocmVhZC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0NhbnZhc0xh eWVyV2ViS2l0VGhyZWFkLmNwcAppbmRleCBjOGE5ZjhjY2RjMzI0MWQzOWFhMjFkMTA5NDIwMzQy ZTY1NjhiMWJmLi44MDg4ZDE0NDVjZjBjZDBiMjczYTBlMTE4NmY3MWE3MDA3NGVhODYyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0NhbnZh c0xheWVyV2ViS2l0VGhyZWFkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9ibGFja2JlcnJ5L0NhbnZhc0xheWVyV2ViS2l0VGhyZWFkLmNwcApAQCAtMzUsNyArMzUs NyBAQCB2b2lkIENhbnZhc0xheWVyV2ViS2l0VGhyZWFkOjpkZWxldGVUZXh0dXJlcygpCiAKIGNs YXNzIENhbnZhc0xheWVyQ29tcG9zaXRpbmdUaHJlYWRDbGllbnQgOiBwdWJsaWMgTGF5ZXJDb21w b3NpdGluZ1RocmVhZENsaWVudCB7CiBwdWJsaWM6Ci0gICAgQ2FudmFzTGF5ZXJDb21wb3NpdGlu Z1RocmVhZENsaWVudChCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M6OkJ1ZmZlciosIGNv bnN0IEludFNpemUmKTsKKyAgICBDYW52YXNMYXllckNvbXBvc2l0aW5nVGhyZWFkQ2xpZW50KEJs YWNrQmVycnk6OlBsYXRmb3JtOjpHcmFwaGljczo6QnVmZmVyKiwgQmxhY2tCZXJyeTo6UGxhdGZv cm06OkdyYXBoaWNzOjpQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFNpemUmKTsK IAogICAgIHZvaWQgbGF5ZXJDb21wb3NpdGluZ1RocmVhZERlc3Ryb3llZChMYXllckNvbXBvc2l0 aW5nVGhyZWFkKikgeyB9CiAgICAgdm9pZCBsYXllclZpc2liaWxpdHlDaGFuZ2VkKExheWVyQ29t cG9zaXRpbmdUaHJlYWQqLCBib29sKSB7IH0KQEAgLTUwLDExICs1MCwxMyBAQCBwdWJsaWM6CiAK IHByaXZhdGU6CiAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNzOjpCdWZmZXIqIG1f YnVmZmVyOworICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpHcmFwaGljczo6UGxhdGZvcm1HcmFw aGljc0NvbnRleHQqIG1fY29udGV4dDsKICAgICBJbnRTaXplIG1fc2l6ZTsKIH07CiAKLUNhbnZh c0xheWVyQ29tcG9zaXRpbmdUaHJlYWRDbGllbnQ6OkNhbnZhc0xheWVyQ29tcG9zaXRpbmdUaHJl YWRDbGllbnQoQmxhY2tCZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNzOjpCdWZmZXIqIGJ1ZmZlciwg Y29uc3QgSW50U2l6ZSYgc2l6ZSkKK0NhbnZhc0xheWVyQ29tcG9zaXRpbmdUaHJlYWRDbGllbnQ6 OkNhbnZhc0xheWVyQ29tcG9zaXRpbmdUaHJlYWRDbGllbnQoQmxhY2tCZXJyeTo6UGxhdGZvcm06 OkdyYXBoaWNzOjpCdWZmZXIqIGJ1ZmZlciwgQmxhY2tCZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNz OjpQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50U2l6ZSYgc2l6ZSkK ICAgICA6IG1fYnVmZmVyKGJ1ZmZlcikKKyAgICAsIG1fY29udGV4dChjb250ZXh0KQogICAgICwg bV9zaXplKHNpemUpCiB7CiB9CkBAIC03OCwyMyArODAsMjMgQEAgdm9pZCBDYW52YXNMYXllckNv bXBvc2l0aW5nVGhyZWFkQ2xpZW50OjpkZWxldGVUZXh0dXJlcyhMYXllckNvbXBvc2l0aW5nVGhy ZWFkKikKIAogdm9pZCBDYW52YXNMYXllckNvbXBvc2l0aW5nVGhyZWFkQ2xpZW50Ojpjb21taXRQ ZW5kaW5nVGV4dHVyZVVwbG9hZHMoTGF5ZXJDb21wb3NpdGluZ1RocmVhZCopCiB7Ci0gICAgaWYg KCFtX2J1ZmZlcikKKyAgICBpZiAoIW1fYnVmZmVyIHx8ICFtX2NvbnRleHQpCiAgICAgICAgIHJl dHVybjsKIAogICAgIC8vIFRoaXMgbWV0aG9kIGlzIGNhbGxlZCBkdXJpbmcgYSBzeW5jaHJvbml6 YXRpb24gcG9pbnQgYmV0d2VlbiBXZWJLaXQgYW5kIGNvbXBvc2l0aW5nIHRocmVhZC4KICAgICAv LyBUaGlzIGlzIG91ciBvbmx5IGNoYW5jZSB0byB0cmFuc2ZlciB0aGUgYmFjayBkaXNwbGF5IGxp c3QgdG8gdGhlIGZyb250IGRpc3BsYXkgbGlzdCB3aXRob3V0CiAgICAgLy8gcmFjZSBjb25kaXRp b25zLgogICAgIC8vIDEuIEZsdXNoIGJhY2sgZGlzcGxheSBsaXN0IHRvIGZyb250Ci0gICAgQmxh Y2tCZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNzOjpyZWxlYXNlQnVmZmVyRHJhd2FibGUobV9idWZm ZXIpOworICAgIG1fY29udGV4dC0+Zmx1c2goKTsKICAgICAvLyAyLiBEcmF3IGZyb250IGRpc3Bs YXkgbGlzdCB0byBGQk8KICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M6OnVwZGF0 ZUJ1ZmZlckJhY2tpbmdTdXJmYWNlKG1fYnVmZmVyKTsKIH0KIAogCi1DYW52YXNMYXllcldlYktp dFRocmVhZDo6Q2FudmFzTGF5ZXJXZWJLaXRUaHJlYWQoQmxhY2tCZXJyeTo6UGxhdGZvcm06Okdy YXBoaWNzOjpCdWZmZXIqIGJ1ZmZlciwgY29uc3QgSW50U2l6ZSYgc2l6ZSkKK0NhbnZhc0xheWVy V2ViS2l0VGhyZWFkOjpDYW52YXNMYXllcldlYktpdFRocmVhZChCbGFja0JlcnJ5OjpQbGF0Zm9y bTo6R3JhcGhpY3M6OkJ1ZmZlciogYnVmZmVyLCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhp Y3M6OlBsYXRmb3JtR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRTaXplJiBzaXpl KQogICAgIDogTGF5ZXJXZWJLaXRUaHJlYWQoQ2FudmFzTGF5ZXIsIDApCiB7Ci0gICAgbV9jb21w b3NpdGluZ1RocmVhZENsaWVudCA9IG5ldyBDYW52YXNMYXllckNvbXBvc2l0aW5nVGhyZWFkQ2xp ZW50KGJ1ZmZlciwgc2l6ZSk7CisgICAgbV9jb21wb3NpdGluZ1RocmVhZENsaWVudCA9IG5ldyBD YW52YXNMYXllckNvbXBvc2l0aW5nVGhyZWFkQ2xpZW50KGJ1ZmZlciwgY29udGV4dCwgc2l6ZSk7 CiAgICAgbGF5ZXJDb21wb3NpdGluZ1RocmVhZCgpLT5zZXRDbGllbnQobV9jb21wb3NpdGluZ1Ro cmVhZENsaWVudCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2JsYWNrYmVycnkvQ2FudmFzTGF5ZXJXZWJLaXRUaHJlYWQuaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvQ2FudmFzTGF5ZXJXZWJLaXRUaHJlYWQu aAppbmRleCBhMGZmMTkyYjY4MmIwMDA5ZTk4NjFlYTA0OGViZWRhMGVjMmFhNmViLi5lZTRmYTIz MGQ5ZTgxMmY2MjgyNzJiYmViMGFkM2FlNjQ2MWUzOWMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0NhbnZhc0xheWVyV2ViS2l0VGhyZWFk LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9DYW52 YXNMYXllcldlYktpdFRocmVhZC5oCkBAIC0yMywxNSArMjMsMTggQEAKIAogI2luY2x1ZGUgIkVH TEltYWdlTGF5ZXJXZWJLaXRUaHJlYWQuaCIKIAorI2luY2x1ZGUgPEJsYWNrQmVycnlQbGF0Zm9y bUdyYXBoaWNzLmg+CisjaW5jbHVkZSA8QmxhY2tCZXJyeVBsYXRmb3JtR3JhcGhpY3NDb250ZXh0 Lmg+CisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgQ2FudmFzTGF5ZXJDb21wb3NpdGlu Z1RocmVhZENsaWVudDsKIAogY2xhc3MgQ2FudmFzTGF5ZXJXZWJLaXRUaHJlYWQgOiBwdWJsaWMg TGF5ZXJXZWJLaXRUaHJlYWQgewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzUmVmUHRyPENhbnZh c0xheWVyV2ViS2l0VGhyZWFkPiBjcmVhdGUoQmxhY2tCZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNz OjpCdWZmZXIqIGJ1ZmZlciwgY29uc3QgSW50U2l6ZSYgc2l6ZSkKKyAgICBzdGF0aWMgUGFzc1Jl ZlB0cjxDYW52YXNMYXllcldlYktpdFRocmVhZD4gY3JlYXRlKEJsYWNrQmVycnk6OlBsYXRmb3Jt OjpHcmFwaGljczo6QnVmZmVyKiBidWZmZXIsIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpHcmFwaGlj czo6UGxhdGZvcm1HcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEludFNpemUmIHNpemUp CiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IENhbnZhc0xheWVyV2ViS2l0VGhy ZWFkKGJ1ZmZlciwgc2l6ZSkpOworICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IENhbnZhc0xh eWVyV2ViS2l0VGhyZWFkKGJ1ZmZlciwgY29udGV4dCwgc2l6ZSkpOwogICAgIH0KIAogICAgIHZp cnR1YWwgfkNhbnZhc0xheWVyV2ViS2l0VGhyZWFkKCk7CkBAIC00Miw3ICs0NSw3IEBAIHByb3Rl Y3RlZDoKICAgICB2aXJ0dWFsIHZvaWQgZGVsZXRlVGV4dHVyZXMoKTsKIAogcHJpdmF0ZToKLSAg ICBDYW52YXNMYXllcldlYktpdFRocmVhZChCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M6 OkJ1ZmZlciosIGNvbnN0IEludFNpemUmKTsKKyAgICBDYW52YXNMYXllcldlYktpdFRocmVhZChC bGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M6OkJ1ZmZlciosIEJsYWNrQmVycnk6OlBsYXRm b3JtOjpHcmFwaGljczo6UGxhdGZvcm1HcmFwaGljc0NvbnRleHQqLCBjb25zdCBJbnRTaXplJik7 CiAgICAgQ2FudmFzTGF5ZXJDb21wb3NpdGluZ1RocmVhZENsaWVudCogbV9jb21wb3NpdGluZ1Ro cmVhZENsaWVudDsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2JsYWNrYmVycnkvSW1hZ2VCdWZmZXJCbGFja0JlcnJ5LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvSW1hZ2VCdWZmZXJCbGFja0JlcnJ5LmNw cAppbmRleCA4NTA1YmE0OTFmNjQ3NTY0ODQ0YTVjYjIxYzI2MmY5ZjJmMzk3ZjJhLi4wZWJhODA5 NDVkYjliMTdiOThmNTA3MTkxMGMzODYwNDFiYTI1YzAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0ltYWdlQnVmZmVyQmxhY2tCZXJyeS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9JbWFn ZUJ1ZmZlckJsYWNrQmVycnkuY3BwCkBAIC0xOTYsOSArMTk2LDE2IEBAIEltYWdlQnVmZmVyOjpJ bWFnZUJ1ZmZlcihjb25zdCBJbnRTaXplJiBzaXplLCBmbG9hdCwgQ29sb3JTcGFjZSwgUmVuZGVy aW5nTW9kZSByCiAgICAgfQogCiAgICAgbV9kYXRhLm1fYnVmZmVyID0gQmxhY2tCZXJyeTo6UGxh dGZvcm06OkdyYXBoaWNzOjpjcmVhdGVCdWZmZXIobV9zaXplLCBCbGFja0JlcnJ5OjpQbGF0Zm9y bTo6R3JhcGhpY3M6OkFsd2F5c0JhY2tlZCk7Ci0gICAgbV9kYXRhLm1fcGxhdGZvcm1MYXllciA9 IENhbnZhc0xheWVyV2ViS2l0VGhyZWFkOjpjcmVhdGUobV9kYXRhLm1fYnVmZmVyLCBtX3NpemUp OworICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpHcmFwaGljczo6RHJhd2FibGUqIGRyYXdhYmxl ID0gQmxhY2tCZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNzOjpsb2NrQnVmZmVyRHJhd2FibGUobV9k YXRhLm1fYnVmZmVyKTsKKyAgICBpZiAoIWRyYXdhYmxlKSB7CisgICAgICAgIEJsYWNrQmVycnk6 OlBsYXRmb3JtOjpHcmFwaGljczo6ZGVzdHJveUJ1ZmZlcihtX2RhdGEubV9idWZmZXIpOworICAg ICAgICBtX2RhdGEubV9idWZmZXIgPSAwOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAg bV9kYXRhLm1fcGxhdGZvcm1MYXllciA9IENhbnZhc0xheWVyV2ViS2l0VGhyZWFkOjpjcmVhdGUo bV9kYXRhLm1fYnVmZmVyLCBkcmF3YWJsZSwgbV9zaXplKTsKICAgICBtX2RhdGEubV93aW5kb3cg PSB3aW5kb3c7Ci0gICAgbV9jb250ZXh0ID0gYWRvcHRQdHIobmV3IEdyYXBoaWNzQ29udGV4dChs b2NrQnVmZmVyRHJhd2FibGUobV9kYXRhLm1fYnVmZmVyKSkpOworICAgIG1fY29udGV4dCA9IGFk b3B0UHRyKG5ldyBHcmFwaGljc0NvbnRleHQoZHJhd2FibGUpKTsKICAgICBtX2NvbnRleHQtPnNj YWxlKEZsb2F0U2l6ZShtX3Jlc29sdXRpb25TY2FsZSwgbV9yZXNvbHV0aW9uU2NhbGUpKTsKICAg ICBtX2NvbnRleHQtPnNldElzQWNjZWxlcmF0ZWRDb250ZXh0KHJlbmRlcmluZ01vZGUgPT0gQWNj ZWxlcmF0ZWQpOwogICAgIHN1Y2Nlc3MgPSB0cnVlOwpAQCAtMjE1LDYgKzIyMiw3IEBAIEltYWdl QnVmZmVyOjp+SW1hZ2VCdWZmZXIoKQogICAgICAgICAgICAgJkNhbnZhc0xheWVyV2ViS2l0VGhy ZWFkOjpjbGVhckJ1ZmZlciwgbV9kYXRhLm1fcGxhdGZvcm1MYXllci5nZXQoKSkpOwogICAgIH0K IAorICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpHcmFwaGljczo6cmVsZWFzZUJ1ZmZlckRyYXdh YmxlKG1fZGF0YS5tX2J1ZmZlcik7CiAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNz OjpkZXN0cm95QnVmZmVyKG1fZGF0YS5tX2J1ZmZlcik7CiAgICAgbV9kYXRhLm1fYnVmZmVyID0g MDsKIH0K