158941 2016-06-20 06:50:46 -0700 When navigating, discard decoded image data that is only live due to page cache. 2016-06-21 21:46:17 -0700 1 1 1 Unclassified WebKit Images WebKit Nightly Build Unspecified Unspecified REOPENED Performance P2 Normal --- 1 kling kling cdumez commit-queue esprehn+autocc glenn japhet koivisto kondapallykalyan sabouhallawa simon.fraser thorton oldest_to_newest 1203748 0 kling 2016-06-20 06:50:46 -0700 We could hasten the dropping of decoded image data when a CachedImage is really only used by page cached pages. 1203749 1 281649 kling 2016-06-20 06:53:03 -0700 Created attachment 281649 Patch thing 1203750 2 281650 kling 2016-06-20 06:54:38 -0700 Created attachment 281650 Patch thing 1203753 3 281650 commit-queue 2016-06-20 08:04:51 -0700 Comment on attachment 281650 Patch thing Rejecting attachment 281650 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 281650, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: ing rebase: :040000 040000 52ddce205a5ea636dcff0e63495fa587c341e608 f3f1d4fa1265a983a518943e7e3a0f794477e6bd M Source Current branch master is up to date. ERROR: Not all changes have been committed into SVN, however the committed ones (if any) seem to be successfully integrated into the working tree. Please see the above messages for details. Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Updating OpenSource Current branch master is up to date. Full output: http://webkit-queues.webkit.org/results/1536811 1203763 4 281650 commit-queue 2016-06-20 09:43:42 -0700 Comment on attachment 281650 Patch thing Rejecting attachment 281650 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 281650, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: ng: https://bugs.webkit.org/show_bug.cgi?id=158941&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Updating working directory Processing patch 281650 from bug 158941. /Volumes/Data/EWS/WebKit/Source/WebKit2/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Updating OpenSource From git://git.webkit.org/WebKit + d894a6a...705033b master -> origin/master (forced update) Current branch master is up to date. Full output: http://webkit-queues.webkit.org/results/1537172 1203780 5 281650 commit-queue 2016-06-20 10:23:57 -0700 Comment on attachment 281650 Patch thing Clearing flags on attachment: 281650 Committed r202231: <http://trac.webkit.org/changeset/202231> 1203781 6 commit-queue 2016-06-20 10:24:02 -0700 All reviewed patches have been landed. Closing bug. 1204184 7 cdumez 2016-06-21 09:59:04 -0700 Note that it seems that the Mac PLT regressed around the time this patch landed. I am working on confirming the regression came from this change. 1204185 8 cdumez 2016-06-21 10:06:00 -0700 Reverted r202231 for reason: Seems to have regressed PLT on both iOS and Mac (very obvious on iOS Warm PLT) Committed r202278: <http://trac.webkit.org/changeset/202278> 1204381 9 cdumez 2016-06-21 18:46:49 -0700 (In reply to comment #8) > Reverted r202231 for reason: > > Seems to have regressed PLT on both iOS and Mac (very obvious on iOS Warm > PLT) > > Committed r202278: <http://trac.webkit.org/changeset/202278> Clear 1% progression on MacBookPro PLT from the roll out. 1204417 10 cdumez 2016-06-21 21:46:17 -0700 (In reply to comment #9) > (In reply to comment #8) > > Reverted r202231 for reason: > > > > Seems to have regressed PLT on both iOS and Mac (very obvious on iOS Warm > > PLT) > > > > Committed r202278: <http://trac.webkit.org/changeset/202278> > > Clear 1% progression on MacBookPro PLT from the roll out. Similar progression on iOS from the rollout. 281649 2016-06-20 06:53:03 -0700 2016-06-20 06:54:38 -0700 Patch thing bug-158941.diff text/plain 8011 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlNDZkNmViLi5lMTFkMDI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDMg QEAKKzIwMTYtMDYtMjAgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIFdoZW4gbmF2aWdhdGluZywgZGlzY2FyZCBkZWNvZGVkIGltYWdlIGRhdGEgdGhhdCBpcyBv bmx5IGxpdmUgZHVlIHRvIHBhZ2UgY2FjaGUuCisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcv Yi8xNTg5NDE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQSByZXNvdXJjZSBpcyAibGl2ZSIgaWYgaXQncyBjdXJyZW50bHkgaW4gdXNlIGJ5IGEgd2Vi IHBhZ2UsIGFuZCAiZGVhZCIgaWYgaXQncworICAgICAgICBvbmx5IGtlcHQgYWxpdmUgYnkgdGhl IG1lbW9yeSBjYWNoZS4KKworICAgICAgICBUaGlzIHBhdGNoIGFkZHMgYSBtZWNoYW5pc20gdGhh dCBsb29rcyBhdCBDYWNoZWRJbWFnZSByZXNvdXJjZXMgdG8gc2VlIGlmIGFsbCB0aGUKKyAgICAg ICAgY2xpZW50cyB0aGF0IG1ha2UgdGhlbSBhcHBlYXIgImxpdmUiIGFyZSBhY3R1YWxseSBwYWdl cyBpbiB0aGUgcGFnZSBjYWNoZS4KKworICAgICAgICBJZiBzbywgd2UgbGV0IHRoZSAiamV0dGlz b24gZXhwZW5zaXZlIG9iamVjdHMgb24gdG9wLWxldmVsIG5hdmlnYXRpb24iIG1lY2hhbmlzbQor ICAgICAgICBkaXNjYXJkIHRoZSBkZWNvZGVkIGRhdGEgZm9yIHN1Y2ggaGFsZi1saXZlIGltYWdl cy4gVGhpcyBjYW4gcmVkdWNlIHRoZSBwZWFrCisgICAgICAgIG1lbW9yeSB1c2FnZSBkdXJpbmcg bmF2aWdhdGlvbnMgcXVpdGUgYSBiaXQuCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9h ZCk6IE1vdmUgdGhlIGNhbGwgdG8gTWVtb3J5UHJlc3N1cmVIYW5kbGVyCisgICAgICAgIGJlZm9y ZSB3ZSBhZGQgdGhlIG91dGdvaW5nIHBhZ2UgdG8gdGhlIHBhZ2UgY2FjaGUuIFRoaXMgYWxsb3dz IHRoZSBqZXR0aXNvbmluZyBjb2RlCisgICAgICAgIHRvIG1ha2UgZGVjaXNpb25zIGJhc2VkIG9u IHdoaWNoIHBhZ2VzIHdlcmUgY2FjaGVkICpiZWZvcmUqIHRoZSBuYXZpZ2F0aW9uLgorCisgICAg ICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlQ2xpZW50Lmg6CisgICAgICAgIChXZWJDb3Jl OjpDYWNoZWRJbWFnZUNsaWVudDo6aW5QYWdlQ2FjaGUpOgorICAgICAgICAqIGxvYWRlci9JbWFn ZUxvYWRlci5oOgorICAgICAgICAqIGxvYWRlci9JbWFnZUxvYWRlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpJbWFnZUxvYWRlcjo6aW5QYWdlQ2FjaGUpOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJPYmplY3QuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6aW5QYWdlQ2Fj aGUpOiBBZGRlZCBhIENhY2hlZEltYWdlQ2xpZW50OjppblBhZ2VDYWNoZSgpIHZpcnR1YWwKKyAg ICAgICAgdG8gZGV0ZXJtaW5lIHdoaWNoIGNsaWVudHMgYXJlIGN1cnJlbnRseSBpbiBwYWdlIGNh Y2hlIChhbnN3ZXJlZCBieSB0aGVpciBEb2N1bWVudC4pCisKKyAgICAgICAgKiBsb2FkZXIvY2Fj aGUvQ2FjaGVkSW1hZ2UuaDoKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkSW1hZ2U6OmFyZUFsbENsaWVudHNJblBhZ2VDYWNo ZSk6IFdhbGtzIGFsbCBDYWNoZWRJbWFnZUNsaWVudCBjbGllbnRzCisgICAgICAgIGFuZCByZXR1 cm5zIHRydWUgaWYgYWxsIG9mIHRoZW0gYXJlIGluUGFnZUNhY2hlKCkuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9NZW1vcnlQcmVzc3VyZUhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVt b3J5UHJlc3N1cmVIYW5kbGVyOjpqZXR0aXNvbkV4cGVuc2l2ZU9iamVjdHNPblRvcExldmVsTmF2 aWdhdGlvbik6CisKKwogMjAxNi0wNi0xOCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5j b20+CiAKICAgICAgICAgVXNlIHRpbWUgbGl0ZXJhbHMgaW4gV2ViQ29yZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggMGIwZmJlOC4uNTMyZTAyMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC0xNzgzLDExICsxNzgzLDExIEBAIHZvaWQgRnJh bWVMb2FkZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCgpCiAgICAgd2lsbFRyYW5zaXRpb25Ub0Nv bW1pdHRlZCgpOwogCiAgICAgaWYgKCFtX2ZyYW1lLnRyZWUoKS5wYXJlbnQoKSAmJiBoaXN0b3J5 KCkuY3VycmVudEl0ZW0oKSkgeworICAgICAgICBNZW1vcnlQcmVzc3VyZUhhbmRsZXI6OnNpbmds ZXRvbigpLmpldHRpc29uRXhwZW5zaXZlT2JqZWN0c09uVG9wTGV2ZWxOYXZpZ2F0aW9uKCk7CisK ICAgICAgICAgLy8gQ2hlY2sgdG8gc2VlIGlmIHdlIG5lZWQgdG8gY2FjaGUgdGhlIHBhZ2Ugd2Ug YXJlIG5hdmlnYXRpbmcgYXdheSBmcm9tIGludG8gdGhlIGJhY2svZm9yd2FyZCBjYWNoZS4KICAg ICAgICAgLy8gV2UgYXJlIGRvaW5nIHRoaXMgaGVyZSBiZWNhdXNlIHdlIGtub3cgZm9yIHN1cmUg dGhhdCBhIG5ldyBwYWdlIGlzIGFib3V0IHRvIGJlIGxvYWRlZC4KICAgICAgICAgUGFnZUNhY2hl OjpzaW5nbGV0b24oKS5hZGRJZkNhY2hlYWJsZSgqaGlzdG9yeSgpLmN1cnJlbnRJdGVtKCksIG1f ZnJhbWUucGFnZSgpKTsKLSAgICAgICAgCi0gICAgICAgIE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6 c2luZ2xldG9uKCkuamV0dGlzb25FeHBlbnNpdmVPYmplY3RzT25Ub3BMZXZlbE5hdmlnYXRpb24o KTsKICAgICB9CiAKICAgICBpZiAobV9sb2FkVHlwZSAhPSBGcmFtZUxvYWRUeXBlOjpSZXBsYWNl KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9JbWFnZUxvYWRlci5jcHAKaW5kZXggMGYyYjdkNS4uYTkyOTc3 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuY3BwCkBAIC00NzIsNCArNDcyLDkg QEAgaW5saW5lIHZvaWQgSW1hZ2VMb2FkZXI6OmNsZWFyRmFpbGVkTG9hZFVSTCgpCiAgICAgbV9m YWlsZWRMb2FkVVJMID0gQXRvbWljU3RyaW5nKCk7CiB9CiAKK2Jvb2wgSW1hZ2VMb2FkZXI6Omlu UGFnZUNhY2hlKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9lbGVtZW50LmRvY3VtZW50KCkuaW5Q YWdlQ2FjaGUoKTsKK30KKwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0lt YWdlTG9hZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuaAppbmRleCA1 NjYwNWI4Li5lMWI0NWEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VM b2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuaApAQCAtNzks NiArNzksOCBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaExvYWRFdmVudCgp ID0gMDsKICAgICB2aXJ0dWFsIFN0cmluZyBzb3VyY2VVUkkoY29uc3QgQXRvbWljU3RyaW5nJikg Y29uc3QgPSAwOwogCisgICAgYm9vbCBpblBhZ2VDYWNoZSgpIGNvbnN0IGZpbmFsOworCiAgICAg dm9pZCB1cGRhdGVkSGFzUGVuZGluZ0V2ZW50KCk7CiAKICAgICB2b2lkIGRpc3BhdGNoUGVuZGlu Z0JlZm9yZUxvYWRFdmVudCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Nh Y2hlL0NhY2hlZEltYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJ bWFnZS5jcHAKaW5kZXggNGY1NDUyNS4uMDU5ZjM1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuY3BwCkBAIC01MjcsNCArNTI3LDE2IEBAIENhY2hlZFJlc291 cmNlOjpSZXZhbGlkYXRpb25EZWNpc2lvbiBDYWNoZWRJbWFnZTo6bWFrZVJldmFsaWRhdGlvbkRl Y2lzaW9uKENhY2hlCiAgICAgcmV0dXJuIENhY2hlZFJlc291cmNlOjptYWtlUmV2YWxpZGF0aW9u RGVjaXNpb24oY2FjaGVQb2xpY3kpOwogfQogCitib29sIENhY2hlZEltYWdlOjphcmVBbGxDbGll bnRzSW5QYWdlQ2FjaGUoKSBjb25zdAoreworICAgIGZvciAoYXV0byYgZW50cnkgOiBtX2NsaWVu dHMpIHsKKyAgICAgICAgYXV0byYgY2xpZW50ID0gKmVudHJ5LmtleTsKKyAgICAgICAgaWYgKGNs aWVudC5yZXNvdXJjZUNsaWVudFR5cGUoKSAhPSBDYWNoZWRJbWFnZUNsaWVudDo6ZXhwZWN0ZWRU eXBlKCkpCisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgaWYgKCFzdGF0aWNfY2FzdDxD YWNoZWRJbWFnZUNsaWVudCY+KGNsaWVudCkuaW5QYWdlQ2FjaGUoKSkKKyAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICB9CisgICAgcmV0dXJuIHRydWU7Cit9CisKIH0gLy8gbmFtZXNwYWNl IFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJ bWFnZS5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmgKaW5kZXgg MzRlYWVjMC4uOWVjY2M2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hl L0NhY2hlZEltYWdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZElt YWdlLmgKQEAgLTc1LDYgKzc1LDggQEAgcHVibGljOgogICAgIHZvaWQgYWRkRGF0YUJ1ZmZlcihT aGFyZWRCdWZmZXImKSBvdmVycmlkZTsKICAgICB2b2lkIGZpbmlzaExvYWRpbmcoU2hhcmVkQnVm ZmVyKikgb3ZlcnJpZGU7CiAKKyAgICBib29sIGFyZUFsbENsaWVudHNJblBhZ2VDYWNoZSgpIGNv bnN0OworCiAgICAgZW51bSBTaXplVHlwZSB7CiAgICAgICAgIFVzZWRTaXplLAogICAgICAgICBJ bnRyaW5zaWNTaXplCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2Fj aGVkSW1hZ2VDbGllbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFn ZUNsaWVudC5oCmluZGV4IDcyMjM1YWMuLjUxNjNjOGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZUNsaWVudC5oCkBAIC00Miw2ICs0Miw4IEBAIHB1Ymxp YzoKIAogICAgIC8vIENhbGxlZCB3aGVuIEdJRiBhbmltYXRpb24gcHJvZ3Jlc3Nlcy4KICAgICB2 aXJ0dWFsIHZvaWQgbmV3SW1hZ2VBbmltYXRpb25GcmFtZUF2YWlsYWJsZShDYWNoZWRJbWFnZSYg aW1hZ2UpIHsgaW1hZ2VDaGFuZ2VkKCZpbWFnZSk7IH0KKworICAgIHZpcnR1YWwgYm9vbCBpblBh Z2VDYWNoZSgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiB9OwogCiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NZW1vcnlQcmVzc3VyZUhhbmRsZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vTWVtb3J5UHJlc3N1cmVIYW5kbGVyLmNwcAppbmRleCBlZDBlODhm Li5lNDJkOTAyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTWVtb3J5UHJl c3N1cmVIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NZW1vcnlQcmVz c3VyZUhhbmRsZXIuY3BwCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAx MSwgMjAxNCBBcHBsZSBJbmMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMp IDIwMTEtMjAxNiBBcHBsZSBJbmMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJNZW1vcnlQcmVz c3VyZUhhbmRsZXIuaCIKIAogI2luY2x1ZGUgIkNTU1ZhbHVlUG9vbC5oIgorI2luY2x1ZGUgIkNh Y2hlZEltYWdlLmgiCiAjaW5jbHVkZSAiQ2hyb21lLmgiCiAjaW5jbHVkZSAiQ2hyb21lQ2xpZW50 LmgiCiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKQEAgLTE2Miw3ICsxNjMsNiBAQCB2b2lkIE1lbW9y eVByZXNzdXJlSGFuZGxlcjo6cmVsZWFzZUNyaXRpY2FsTWVtb3J5KFN5bmNocm9ub3VzIHN5bmNo cm9ub3VzKQogCiB2b2lkIE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6amV0dGlzb25FeHBlbnNpdmVP YmplY3RzT25Ub3BMZXZlbE5hdmlnYXRpb24oKQogewotI2lmIFBMQVRGT1JNKElPUykKICAgICAv LyBQcm90ZWN0IGFnYWluc3QgZG9pbmcgZXhjZXNzaXZlIGpldHRpc29uaW5nIGR1cmluZyByZXBl YXRlZCBuYXZpZ2F0aW9ucy4KICAgICBjb25zdCBhdXRvIG1pbmltdW1UaW1lU2luY2VOYXZpZ2F0 aW9uID0gMnM7CiAKQEAgLTE3NCw2ICsxNzQsMTUgQEAgdm9pZCBNZW1vcnlQcmVzc3VyZUhhbmRs ZXI6OmpldHRpc29uRXhwZW5zaXZlT2JqZWN0c09uVG9wTGV2ZWxOYXZpZ2F0aW9uKCkKICAgICBp ZiAoIXNob3VsZEpldHRpc29uKQogICAgICAgICByZXR1cm47CiAKKyAgICBNZW1vcnlDYWNoZTo6 c2luZ2xldG9uKCkuZm9yRWFjaFJlc291cmNlKFtdKENhY2hlZFJlc291cmNlJiByZXNvdXJjZSkg eworICAgICAgICBpZiAocmVzb3VyY2UuaXNJbWFnZSgpCisgICAgICAgICAgICAmJiByZXNvdXJj ZS5kZWNvZGVkU2l6ZSgpCisgICAgICAgICAgICAmJiBkb3duY2FzdDxDYWNoZWRJbWFnZT4ocmVz b3VyY2UpLmFyZUFsbENsaWVudHNJblBhZ2VDYWNoZSgpKSB7CisgICAgICAgICAgICByZXNvdXJj ZS5kZXN0cm95RGVjb2RlZERhdGEoKTsKKyAgICAgICAgfQorICAgIH0pOworCisjaWYgUExBVEZP Uk0oSU9TKQogICAgIC8vIFRocm93IGF3YXkgbGlua2VkIEpTIGNvZGUuIExpbmtlZCBjb2RlIGlz IHRpZWQgdG8gYSBnbG9iYWwgb2JqZWN0IGFuZCBpcyBub3QgcmV1c2FibGUuCiAgICAgLy8gVGhl IGltbWVkaWF0ZSBtZW1vcnkgc2F2aW5ncyBvdXR3ZWlnaCB0aGUgY29zdCBvZiByZWNvbXBpbGF0 aW9uIGluIGNhc2Ugd2UgZ28gYmFjayBhZ2Fpbi4KICAgICBHQ0NvbnRyb2xsZXI6OnNpbmdsZXRv bigpLmRlbGV0ZUFsbExpbmtlZENvZGUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJP YmplY3QuaAppbmRleCBlM2E3ZDdmLi44NDc0Y2JiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck9iamVjdC5oCkBAIC04NDQsNiArODQ0LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIHNl dE5lZWRzTGF5b3V0SXNGb3JiaWRkZW4oYm9vbCBmbGFnKSB7IG1fc2V0TmVlZHNMYXlvdXRGb3Ji aWRkZW4gPSBmbGFnOyB9CiAjZW5kaWYKIAorICAgIGJvb2wgaW5QYWdlQ2FjaGUoKSBjb25zdCBm aW5hbCB7IHJldHVybiBkb2N1bWVudCgpLmluUGFnZUNhY2hlKCk7IH0KKwogICAgIHZvaWQgYWRk QWJzb2x1dGVSZWN0Rm9yTGF5ZXIoTGF5b3V0UmVjdCYgcmVzdWx0KTsKICAgICB2b2lkIHNldExh eWVyTmVlZHNGdWxsUmVwYWludCgpOwogICAgIHZvaWQgc2V0TGF5ZXJOZWVkc0Z1bGxSZXBhaW50 Rm9yUG9zaXRpb25lZE1vdmVtZW50TGF5b3V0KCk7Cg== 281650 2016-06-20 06:54:38 -0700 2016-06-20 10:23:57 -0700 Patch thing bug-158941.diff text/plain 8169 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlNDZkNmViLi43NjRiMDJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDQg QEAKKzIwMTYtMDYtMjAgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIFdoZW4gbmF2aWdhdGluZywgZGlzY2FyZCBkZWNvZGVkIGltYWdlIGRhdGEgdGhhdCBpcyBv bmx5IGxpdmUgZHVlIHRvIHBhZ2UgY2FjaGUuCisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcv Yi8xNTg5NDE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQSByZXNvdXJjZSBpcyAibGl2ZSIgaWYgaXQncyBjdXJyZW50bHkgaW4gdXNlIGJ5IGEgd2Vi IHBhZ2UsIGFuZCAiZGVhZCIgaWYgaXQncworICAgICAgICBvbmx5IGtlcHQgYWxpdmUgYnkgdGhl IG1lbW9yeSBjYWNoZS4KKworICAgICAgICBUaGlzIHBhdGNoIGFkZHMgYSBtZWNoYW5pc20gdGhh dCBsb29rcyBhdCBDYWNoZWRJbWFnZSByZXNvdXJjZXMgdG8gc2VlIGlmIGFsbCB0aGUKKyAgICAg ICAgY2xpZW50cyB0aGF0IG1ha2UgdGhlbSBhcHBlYXIgImxpdmUiIGFyZSBhY3R1YWxseSBwYWdl cyBpbiB0aGUgcGFnZSBjYWNoZS4KKworICAgICAgICBJZiBzbywgd2UgbGV0IHRoZSAiamV0dGlz b24gZXhwZW5zaXZlIG9iamVjdHMgb24gdG9wLWxldmVsIG5hdmlnYXRpb24iIG1lY2hhbmlzbQor ICAgICAgICBkaXNjYXJkIHRoZSBkZWNvZGVkIGRhdGEgZm9yIHN1Y2ggaGFsZi1saXZlIGltYWdl cy4gVGhpcyBjYW4gcmVkdWNlIHRoZSBwZWFrCisgICAgICAgIG1lbW9yeSB1c2FnZSBkdXJpbmcg bmF2aWdhdGlvbnMgcXVpdGUgYSBiaXQuCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9h ZCk6IE1vdmUgdGhlIGNhbGwgdG8gTWVtb3J5UHJlc3N1cmVIYW5kbGVyCisgICAgICAgIGJlZm9y ZSB3ZSBhZGQgdGhlIG91dGdvaW5nIHBhZ2UgdG8gdGhlIHBhZ2UgY2FjaGUuIFRoaXMgYWxsb3dz IHRoZSBqZXR0aXNvbmluZyBjb2RlCisgICAgICAgIHRvIG1ha2UgZGVjaXNpb25zIGJhc2VkIG9u IHdoaWNoIHBhZ2VzIHdlcmUgY2FjaGVkICpiZWZvcmUqIHRoZSBuYXZpZ2F0aW9uLgorCisgICAg ICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlQ2xpZW50Lmg6CisgICAgICAgIChXZWJDb3Jl OjpDYWNoZWRJbWFnZUNsaWVudDo6aW5QYWdlQ2FjaGUpOgorICAgICAgICAqIGxvYWRlci9JbWFn ZUxvYWRlci5oOgorICAgICAgICAqIGxvYWRlci9JbWFnZUxvYWRlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpJbWFnZUxvYWRlcjo6aW5QYWdlQ2FjaGUpOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJPYmplY3QuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6aW5QYWdlQ2Fj aGUpOiBBZGRlZCBhIENhY2hlZEltYWdlQ2xpZW50OjppblBhZ2VDYWNoZSgpIHZpcnR1YWwKKyAg ICAgICAgdG8gZGV0ZXJtaW5lIHdoaWNoIGNsaWVudHMgYXJlIGN1cnJlbnRseSBpbiBwYWdlIGNh Y2hlIChhbnN3ZXJlZCBieSB0aGVpciBEb2N1bWVudC4pCisKKyAgICAgICAgKiBsb2FkZXIvY2Fj aGUvQ2FjaGVkSW1hZ2UuaDoKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkSW1hZ2U6OmFyZUFsbENsaWVudHNJblBhZ2VDYWNo ZSk6IFdhbGtzIGFsbCBDYWNoZWRJbWFnZUNsaWVudCBjbGllbnRzCisgICAgICAgIGFuZCByZXR1 cm5zIHRydWUgaWYgYWxsIG9mIHRoZW0gYXJlIGluUGFnZUNhY2hlKCkuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9NZW1vcnlQcmVzc3VyZUhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVt b3J5UHJlc3N1cmVIYW5kbGVyOjpqZXR0aXNvbkV4cGVuc2l2ZU9iamVjdHNPblRvcExldmVsTmF2 aWdhdGlvbik6CisgICAgICAgIFdhbGsgYWxsIHRoZSBrbm93biBDYWNoZWRJbWFnZXMgYW5kIG51 a2UgZGVjb2RlZCBkYXRhIGZvciB0aG9zZSB0aGF0IGhhdmUgc29tZSBidXQKKyAgICAgICAgYXJl IG9ubHkgY29uc2lkZXJlZCBsaXZlIGR1ZSB0byBjbGllbnRzIGluIHRoZSBwYWdlIGNhY2hlLgor CiAyMDE2LTA2LTE4ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAg ICBVc2UgdGltZSBsaXRlcmFscyBpbiBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZGVyLmNwcAppbmRleCAwYjBmYmU4Li41MzJlMDIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlci5jcHAKQEAgLTE3ODMsMTEgKzE3ODMsMTEgQEAgdm9pZCBGcmFtZUxvYWRlcjo6Y29t bWl0UHJvdmlzaW9uYWxMb2FkKCkKICAgICB3aWxsVHJhbnNpdGlvblRvQ29tbWl0dGVkKCk7CiAK ICAgICBpZiAoIW1fZnJhbWUudHJlZSgpLnBhcmVudCgpICYmIGhpc3RvcnkoKS5jdXJyZW50SXRl bSgpKSB7CisgICAgICAgIE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6c2luZ2xldG9uKCkuamV0dGlz b25FeHBlbnNpdmVPYmplY3RzT25Ub3BMZXZlbE5hdmlnYXRpb24oKTsKKwogICAgICAgICAvLyBD aGVjayB0byBzZWUgaWYgd2UgbmVlZCB0byBjYWNoZSB0aGUgcGFnZSB3ZSBhcmUgbmF2aWdhdGlu ZyBhd2F5IGZyb20gaW50byB0aGUgYmFjay9mb3J3YXJkIGNhY2hlLgogICAgICAgICAvLyBXZSBh cmUgZG9pbmcgdGhpcyBoZXJlIGJlY2F1c2Ugd2Uga25vdyBmb3Igc3VyZSB0aGF0IGEgbmV3IHBh Z2UgaXMgYWJvdXQgdG8gYmUgbG9hZGVkLgogICAgICAgICBQYWdlQ2FjaGU6OnNpbmdsZXRvbigp LmFkZElmQ2FjaGVhYmxlKCpoaXN0b3J5KCkuY3VycmVudEl0ZW0oKSwgbV9mcmFtZS5wYWdlKCkp OwotICAgICAgICAKLSAgICAgICAgTWVtb3J5UHJlc3N1cmVIYW5kbGVyOjpzaW5nbGV0b24oKS5q ZXR0aXNvbkV4cGVuc2l2ZU9iamVjdHNPblRvcExldmVsTmF2aWdhdGlvbigpOwogICAgIH0KIAog ICAgIGlmIChtX2xvYWRUeXBlICE9IEZyYW1lTG9hZFR5cGU6OlJlcGxhY2UpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL0ltYWdlTG9hZGVyLmNwcAppbmRleCAwZjJiN2Q1Li5hOTI5Nzc1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9JbWFnZUxvYWRlci5jcHAKQEAgLTQ3Miw0ICs0NzIsOSBAQCBpbmxpbmUgdm9p ZCBJbWFnZUxvYWRlcjo6Y2xlYXJGYWlsZWRMb2FkVVJMKCkKICAgICBtX2ZhaWxlZExvYWRVUkwg PSBBdG9taWNTdHJpbmcoKTsKIH0KIAorYm9vbCBJbWFnZUxvYWRlcjo6aW5QYWdlQ2FjaGUoKSBj b25zdAoreworICAgIHJldHVybiBtX2VsZW1lbnQuZG9jdW1lbnQoKS5pblBhZ2VDYWNoZSgpOwor fQorCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuaCBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9JbWFnZUxvYWRlci5oCmluZGV4IDU2NjA1YjguLmUxYjQ1 YTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9JbWFnZUxvYWRlci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9JbWFnZUxvYWRlci5oCkBAIC03OSw2ICs3OSw4IEBAIHBy aXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoTG9hZEV2ZW50KCkgPSAwOwogICAgIHZp cnR1YWwgU3RyaW5nIHNvdXJjZVVSSShjb25zdCBBdG9taWNTdHJpbmcmKSBjb25zdCA9IDA7CiAK KyAgICBib29sIGluUGFnZUNhY2hlKCkgY29uc3QgZmluYWw7CisKICAgICB2b2lkIHVwZGF0ZWRI YXNQZW5kaW5nRXZlbnQoKTsKIAogICAgIHZvaWQgZGlzcGF0Y2hQZW5kaW5nQmVmb3JlTG9hZEV2 ZW50KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1h Z2UuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcAppbmRl eCA0ZjU0NTI1Li4wNTlmMzVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2Fj aGUvQ2FjaGVkSW1hZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNo ZWRJbWFnZS5jcHAKQEAgLTUyNyw0ICs1MjcsMTYgQEAgQ2FjaGVkUmVzb3VyY2U6OlJldmFsaWRh dGlvbkRlY2lzaW9uIENhY2hlZEltYWdlOjptYWtlUmV2YWxpZGF0aW9uRGVjaXNpb24oQ2FjaGUK ICAgICByZXR1cm4gQ2FjaGVkUmVzb3VyY2U6Om1ha2VSZXZhbGlkYXRpb25EZWNpc2lvbihjYWNo ZVBvbGljeSk7CiB9CiAKK2Jvb2wgQ2FjaGVkSW1hZ2U6OmFyZUFsbENsaWVudHNJblBhZ2VDYWNo ZSgpIGNvbnN0Cit7CisgICAgZm9yIChhdXRvJiBlbnRyeSA6IG1fY2xpZW50cykgeworICAgICAg ICBhdXRvJiBjbGllbnQgPSAqZW50cnkua2V5OworICAgICAgICBpZiAoY2xpZW50LnJlc291cmNl Q2xpZW50VHlwZSgpICE9IENhY2hlZEltYWdlQ2xpZW50OjpleHBlY3RlZFR5cGUoKSkKKyAgICAg ICAgICAgIGNvbnRpbnVlOworICAgICAgICBpZiAoIXN0YXRpY19jYXN0PENhY2hlZEltYWdlQ2xp ZW50Jj4oY2xpZW50KS5pblBhZ2VDYWNoZSgpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgIH0KKyAgICByZXR1cm4gdHJ1ZTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmggYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuaAppbmRleCAzNGVhZWMwLi45ZWNj YzZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2Uu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuaApAQCAtNzUs NiArNzUsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBhZGREYXRhQnVmZmVyKFNoYXJlZEJ1ZmZlciYp IG92ZXJyaWRlOwogICAgIHZvaWQgZmluaXNoTG9hZGluZyhTaGFyZWRCdWZmZXIqKSBvdmVycmlk ZTsKIAorICAgIGJvb2wgYXJlQWxsQ2xpZW50c0luUGFnZUNhY2hlKCkgY29uc3Q7CisKICAgICBl bnVtIFNpemVUeXBlIHsKICAgICAgICAgVXNlZFNpemUsCiAgICAgICAgIEludHJpbnNpY1NpemUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZUNsaWVu dC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlQ2xpZW50LmgKaW5k ZXggNzIyMzVhYy4uNTE2M2M4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Nh Y2hlL0NhY2hlZEltYWdlQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hl L0NhY2hlZEltYWdlQ2xpZW50LmgKQEAgLTQyLDYgKzQyLDggQEAgcHVibGljOgogCiAgICAgLy8g Q2FsbGVkIHdoZW4gR0lGIGFuaW1hdGlvbiBwcm9ncmVzc2VzLgogICAgIHZpcnR1YWwgdm9pZCBu ZXdJbWFnZUFuaW1hdGlvbkZyYW1lQXZhaWxhYmxlKENhY2hlZEltYWdlJiBpbWFnZSkgeyBpbWFn ZUNoYW5nZWQoJmltYWdlKTsgfQorCisgICAgdmlydHVhbCBib29sIGluUGFnZUNhY2hlKCkgY29u c3QgeyByZXR1cm4gZmFsc2U7IH0KIH07CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL01lbW9yeVByZXNzdXJlSGFuZGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9NZW1vcnlQcmVzc3VyZUhhbmRsZXIuY3BwCmluZGV4IGVkMGU4OGYuLmU0MmQ5MDIwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NZW1vcnlQcmVzc3VyZUhhbmRsZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL01lbW9yeVByZXNzdXJlSGFuZGxlci5j cHAKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDExLCAyMDE0IEFwcGxl IEluYy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMS0yMDE2IEFw cGxlIEluYy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQg dXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlm aWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0 aW9ucwpAQCAtMjcsNiArMjcsNyBAQAogI2luY2x1ZGUgIk1lbW9yeVByZXNzdXJlSGFuZGxlci5o IgogCiAjaW5jbHVkZSAiQ1NTVmFsdWVQb29sLmgiCisjaW5jbHVkZSAiQ2FjaGVkSW1hZ2UuaCIK ICNpbmNsdWRlICJDaHJvbWUuaCIKICNpbmNsdWRlICJDaHJvbWVDbGllbnQuaCIKICNpbmNsdWRl ICJEb2N1bWVudC5oIgpAQCAtMTYyLDcgKzE2Myw2IEBAIHZvaWQgTWVtb3J5UHJlc3N1cmVIYW5k bGVyOjpyZWxlYXNlQ3JpdGljYWxNZW1vcnkoU3luY2hyb25vdXMgc3luY2hyb25vdXMpCiAKIHZv aWQgTWVtb3J5UHJlc3N1cmVIYW5kbGVyOjpqZXR0aXNvbkV4cGVuc2l2ZU9iamVjdHNPblRvcExl dmVsTmF2aWdhdGlvbigpCiB7Ci0jaWYgUExBVEZPUk0oSU9TKQogICAgIC8vIFByb3RlY3QgYWdh aW5zdCBkb2luZyBleGNlc3NpdmUgamV0dGlzb25pbmcgZHVyaW5nIHJlcGVhdGVkIG5hdmlnYXRp b25zLgogICAgIGNvbnN0IGF1dG8gbWluaW11bVRpbWVTaW5jZU5hdmlnYXRpb24gPSAyczsKIApA QCAtMTc0LDYgKzE3NCwxNSBAQCB2b2lkIE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6amV0dGlzb25F eHBlbnNpdmVPYmplY3RzT25Ub3BMZXZlbE5hdmlnYXRpb24oKQogICAgIGlmICghc2hvdWxkSmV0 dGlzb24pCiAgICAgICAgIHJldHVybjsKIAorICAgIE1lbW9yeUNhY2hlOjpzaW5nbGV0b24oKS5m b3JFYWNoUmVzb3VyY2UoW10oQ2FjaGVkUmVzb3VyY2UmIHJlc291cmNlKSB7CisgICAgICAgIGlm IChyZXNvdXJjZS5pc0ltYWdlKCkKKyAgICAgICAgICAgICYmIHJlc291cmNlLmRlY29kZWRTaXpl KCkKKyAgICAgICAgICAgICYmIGRvd25jYXN0PENhY2hlZEltYWdlPihyZXNvdXJjZSkuYXJlQWxs Q2xpZW50c0luUGFnZUNhY2hlKCkpIHsKKyAgICAgICAgICAgIHJlc291cmNlLmRlc3Ryb3lEZWNv ZGVkRGF0YSgpOworICAgICAgICB9CisgICAgfSk7CisKKyNpZiBQTEFURk9STShJT1MpCiAgICAg Ly8gVGhyb3cgYXdheSBsaW5rZWQgSlMgY29kZS4gTGlua2VkIGNvZGUgaXMgdGllZCB0byBhIGds b2JhbCBvYmplY3QgYW5kIGlzIG5vdCByZXVzYWJsZS4KICAgICAvLyBUaGUgaW1tZWRpYXRlIG1l bW9yeSBzYXZpbmdzIG91dHdlaWdoIHRoZSBjb3N0IG9mIHJlY29tcGlsYXRpb24gaW4gY2FzZSB3 ZSBnbyBiYWNrIGFnYWluLgogICAgIEdDQ29udHJvbGxlcjo6c2luZ2xldG9uKCkuZGVsZXRlQWxs TGlua2VkQ29kZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ck9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCmluZGV4 IGUzYTdkN2YuLjg0NzRjYmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0 LmgKQEAgLTg0NCw2ICs4NDQsOCBAQCBwcml2YXRlOgogICAgIHZvaWQgc2V0TmVlZHNMYXlvdXRJ c0ZvcmJpZGRlbihib29sIGZsYWcpIHsgbV9zZXROZWVkc0xheW91dEZvcmJpZGRlbiA9IGZsYWc7 IH0KICNlbmRpZgogCisgICAgYm9vbCBpblBhZ2VDYWNoZSgpIGNvbnN0IGZpbmFsIHsgcmV0dXJu IGRvY3VtZW50KCkuaW5QYWdlQ2FjaGUoKTsgfQorCiAgICAgdm9pZCBhZGRBYnNvbHV0ZVJlY3RG b3JMYXllcihMYXlvdXRSZWN0JiByZXN1bHQpOwogICAgIHZvaWQgc2V0TGF5ZXJOZWVkc0Z1bGxS ZXBhaW50KCk7CiAgICAgdm9pZCBzZXRMYXllck5lZWRzRnVsbFJlcGFpbnRGb3JQb3NpdGlvbmVk TW92ZW1lbnRMYXlvdXQoKTsK