80181 2012-03-02 12:21:03 -0800 [BlackBerry] Make accelerated compositing work again with direct rendering 2012-03-05 08:37:58 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED http://www.webkit.org/blog-files/3d-transforms/poster-circle.html P2 Normal --- 1 jpetsovits jpetsovits manyoso tonikitoo webkit.review.bot oldest_to_newest 569844 0 jpetsovits 2012-03-02 12:21:03 -0800 When the backingstore is disabled, accelerated compositing is currently really broken on the BlackBerry port. Patch coming up to fix (many parts of) this problem. 569848 1 129938 jpetsovits 2012-03-02 12:29:00 -0800 Created attachment 129938 Patch 570243 2 129938 tonikitoo 2012-03-04 08:21:34 -0800 Comment on attachment 129938 Patch patch does not apply 570689 3 130132 jpetsovits 2012-03-05 07:48:04 -0800 Created attachment 130132 Same patch, with updated changelog diff I believe the last patch just didn't apply because Arvid's patch from bug 79020 wasn't in at the time. Trying again with a version that's just updating the ChangeLog diff (and adding [BlackBerry] there), everything else is the same though. 570710 4 130132 webkit.review.bot 2012-03-05 08:09:09 -0800 Comment on attachment 130132 Same patch, with updated changelog diff Rejecting attachment 130132 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: emotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 109747 = 7cd898d46788eb5e7a4234796ec715cd8457ba85 r109748 = 5422070cd70305c35846ca39f76be2fcc5e9b591 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc RA layer request failed: OPTIONS of 'http://svn.webkit.org/repository/webkit': could not connect to server (http://svn.webkit.org) at /usr/lib/git-core/git-svn line 2295 Died at Tools/Scripts/update-webkit line 164. Full output: http://queues.webkit.org/results/11819024 570730 5 130132 webkit.review.bot 2012-03-05 08:37:52 -0800 Comment on attachment 130132 Same patch, with updated changelog diff Clearing flags on attachment: 130132 Committed r109751: <http://trac.webkit.org/changeset/109751> 570731 6 webkit.review.bot 2012-03-05 08:37:58 -0800 All reviewed patches have been landed. Closing bug. 129938 2012-03-02 12:29:00 -0800 2012-03-05 07:48:00 -0800 Patch bug-80181-20120302152903.patch text/plain 14557 jpetsovits U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5NTc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCBjOGQ5NmMxNzY1MWQ0M2FiZjcyODE1Mjg0YmQyOTUyNjQ3ZTVlNzFiLi44NDg2MGU1MzMx ZThlZDMzMzYyYTM5MmRhMjg2Y2I4MmExNzAzNTliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSw2NyBAQAorMjAxMi0wMy0wMiAgSmFrb2IgUGV0c292aXRzICA8anBl dHNvdml0c0ByaW0uY29tPgorCisgICAgICAgIE1ha2UgYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcg d29yayBhZ2FpbiB3aXRoIGRpcmVjdCByZW5kZXJpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDE4MQorICAgICAgICBSSU0gUFI6IDEzOTExMAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICBJbnRlcm5hbGx5 IHJldmlld2VkIGJ5IEFydmlkIE5pbHNzb24uCisKKyAgICAgICAgVGhlIHNpZ25pZmljYW50IGFt b3VudCBvZiByZWZhY3RvcmluZyBhbmQgb3B0aW1pemF0aW9uIHdvcmsKKyAgICAgICAgdGhhdCBo YXMgZ29uZSBpbnRvIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nIG1pc3NlZCBvdXQgb24KKyAgICAg ICAgc29tZSBvZiB0aGUgY29kZSBwYXRocyB0aGF0IGFyZSBiZWluZyB1c2VkIGluIGRpcmVjdCBy ZW5kZXJpbmcuCisKKyAgICAgICAgQW5pbWF0aW9ucyB3ZXJlIHJlbHlpbmcgb24gYmxpdFZpc2li bGVDb250ZW50cygpIG9ubHkgKHdoaWNoCisgICAgICAgIGlzIGEgbm8tb3AgaW4gZGlyZWN0IHJl bmRlcmluZyBtb2RlKS4gVGhlcmUgd2VyZSBlYXJseSByZXR1cm5zCisgICAgICAgIHdoaWNoIGFy ZSBzdWl0YWJsZSB0byBkZXRlcm1pbmUgd2hldGhlciBzY3JlZW4gY29udGVudHMgbmVlZAorICAg ICAgICB0byBiZSB1cGRhdGVkIGF0IGFsbDsgaG93ZXZlciwgd2hlbiB3ZSdyZSBhbHJlYWR5IGZv cmNpbmcgYQorICAgICAgICByZS1yZW5kZXIgdGhlbiB0aG9zZSBjaGVja3Mgd291bGQgY2F1c2Ug dGhlIGNvbXBvc2l0aW9uIHN1cmZhY2UKKyAgICAgICAgbm90IHRvIGFwcGVhciBhdCBhbGwsIG9y IGF2b2lkIGRyYXdpbmcgbmV3IGFuaW1hdGlvbiBmcmFtZXMuCisKKyAgICAgICAgV2Ugd2VudCB0 aHJvdWdoIGRpc3BhdGNoTWVzc2FnZSgpLCBwb3RlbnRpYWxseSBjYXVzaW5nCisgICAgICAgIG1p c21hdGNoZXMgYmV0d2VlbiByZW5kZXJlZCAoYnV0IG5vdCB5ZXQgcG9zdGVkKSBiYWNrIGNvbnRl bnQKKyAgICAgICAgYW5kIGxheWVycyBjb21wb3NpdGVkIG9uIHRvcCBvZiBpdC4gQXMgd2UncmUg cmVuZGVyaW5nIG9udG8KKyAgICAgICAgdGhlIHNvbGUgdGFyZ2V0IHN1cmZhY2UgKHRoZSB3aW5k b3cpIGRpcmVjdGx5IGFuZCBwb3N0aW5nCisgICAgICAgIGZyb20gdGhlIHNhbWUgdGhyZWFkLCB3 ZSBoYXZlIHRvIHdhaXQgZm9yIGNvbXBvc2l0aW5nIG9uIHRoZQorICAgICAgICBVSSB0aHJlYWQg dG8gZmluaXNoIGJlZm9yZSBwb3N0aW5nIHRoZSB3aW5kb3cuCisKKyAgICAgICAgSW4gdHVybiwg dGhpcyBwYXRjaCBjb21iaW5lcyBib3RoIGRyYXdTdWJMYXllcnMoKSBhbmQKKyAgICAgICAgYmxl bmRDb21wb3NpdGluZ1N1cmZhY2UoKSBjYWxscyBpbnRvIG9uZSBtZXRob2QsIHJlZHVjaW5nCisg ICAgICAgIHRoZSBudW1iZXIgb2YgbWVzc2FnZXMgdG8gdGhlIFVJIHRocmVhZCB3aXRoaW4KKyAg ICAgICAgcmVuZGVyRGlyZWN0VG9XaW5kb3coKSB0byBvbmUuCisKKyAgICAgICAgYmxlbmRDb21w b3NpdGluZ01lc3NhZ2UoKSBpbiByZW5kZXJEaXJlY3RUb1NjcmVlbigpIHdhcyBjYWxsZWQKKyAg ICAgICAgd2l0aCBjb250ZW50cyBjb29yZGluYXRlcyByYXRoZXIgdGhhbiB2aWV3cG9ydCBjb29y ZGluYXRlcy4KKyAgICAgICAgVGhhdCBjYXVzZWQgc29tZSBvZiB0aGUgY29tcG9zaXRlZCBjb250 ZW50IHRvIGJlIGN1dCBvZmYgd2hlbgorICAgICAgICB0aGUgc2Nyb2xsIHBvc2l0aW9uIHdhc24n dCAoMCwgMCkuCisKKyAgICAgICAgV2UgY2FsbGVkIGNvcHlQcmV2aW91c0NvbnRlbnRzVG9CYWNr U3VyZmFjZU9mV2luZG93KCkgdHdpY2UgZm9yCisgICAgICAgIG9uZSBmcmFtZSwgaW4gYm90aCBy ZW5kZXJEaXJlY3RUb1dpbmRvdygpIGFuZCBpbnZhbGlkYXRlV2luZG93KCkuCisgICAgICAgIE9u bHkgb25lIG9mIHRob3NlICh0aGUgbGF0dGVyIG9uZSkgaXMgbmVjZXNzYXJ5LgorCisgICAgICAg ICogQXBpL0JhY2tpbmdTdG9yZS5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkJh Y2tpbmdTdG9yZVByaXZhdGU6OkJhY2tpbmdTdG9yZVByaXZhdGUpOgorICAgICAgICAoQmxhY2tC ZXJyeTo6V2ViS2l0OjpCYWNraW5nU3RvcmVQcml2YXRlOjpyZW5kZXJEaXJlY3RUb1dpbmRvdyk6 CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkJhY2tpbmdTdG9yZVByaXZhdGU6OmRyYXdT dWJMYXllcnMpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktp dDo6QmFja2luZ1N0b3JlUHJpdmF0ZTo6ZHJhd0FuZEJsZW5kTGF5ZXJzRm9yRGlyZWN0UmVuZGVy aW5nKToKKyAgICAgICAgKiBBcGkvQmFja2luZ1N0b3JlLmg6CisgICAgICAgIChXZWJLaXQpOgor ICAgICAgICAqIEFwaS9CYWNraW5nU3RvcmVfcC5oOgorICAgICAgICAoQmFja2luZ1N0b3JlUHJp dmF0ZSk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkJhY2tpbmdTdG9yZVByaXZhdGU6 OmlzRGlyZWN0UmVuZGVyaW5nQW5pbWF0aW9uTWVzc2FnZVNjaGVkdWxlZCk6CisgICAgICAgIChC bGFja0JlcnJ5OjpXZWJLaXQ6OkJhY2tpbmdTdG9yZVByaXZhdGU6OnNldERpcmVjdFJlbmRlcmlu Z0FuaW1hdGlvbk1lc3NhZ2VTY2hlZHVsZWQpOgorICAgICAgICAqIEFwaS9XZWJQYWdlX3AuaDoK KyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OmlzQWNjZWxlcmF0 ZWRDb21wb3NpdGluZ0FjdGl2ZSk6CisgICAgICAgIChXZWJQYWdlUHJpdmF0ZSk6CisgICAgICAg ICogV2ViS2l0U3VwcG9ydC9XZWJQYWdlQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChCbGFja0Jl cnJ5OjpXZWJLaXQ6OldlYlBhZ2VDb21wb3NpdG9yOjpXZWJQYWdlQ29tcG9zaXRvcik6CisgICAg ICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VDb21wb3NpdG9yOjp+V2ViUGFnZUNvbXBv c2l0b3IpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlQ29tcG9zaXRvcjo6 ZHJhd0xheWVycyk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VDb21wb3Np dG9yOjphbmltYXRpb25UaW1lckZpcmVkKToKKyAgICAgICAgKiBXZWJLaXRTdXBwb3J0L1dlYlBh Z2VDb21wb3NpdG9yLmg6CisgICAgICAgIChXZWJQYWdlQ29tcG9zaXRvcik6CisKIDIwMTItMDMt MDIgIEFydmlkIE5pbHNzb24gIDxhbmlsc3NvbkByaW0uY29tPgogCiAgICAgICAgIEFjY2VsZXJh dGVkIGNvbXBvc2l0aW5nOiBDaGVja2VyYm9hcmQgbmV2ZXIgZ29lcyBhd2F5CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZS5jcHAKaW5kZXggY2NlOTE3NTJhNDZm NmY5NjA3OGM1MzAxNDJhMGJiZDdhYTgyMzY4MS4uMmNhYmY0NjQ4M2ZkODZhNjZkZGI3OTMzZDJk OTkwMTY5NjhmMjVhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9C YWNraW5nU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2lu Z1N0b3JlLmNwcApAQCAtMjAzLDYgKzIwMyw3IEBAIEJhY2tpbmdTdG9yZVByaXZhdGU6OkJhY2tp bmdTdG9yZVByaXZhdGUoKQogICAgICwgbV9ibGl0R2VuZXJhdGlvbigtMSkKICNpZiBVU0UoQUND RUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgLCBtX25lZWRzRHJhd0xheWVyc09uQ29tbWl0KGZh bHNlKQorICAgICwgbV9pc0RpcmVjdFJlbmRlcmluZ0FuaW1hdGlvbk1lc3NhZ2VTY2hlZHVsZWQo ZmFsc2UpCiAjZW5kaWYKIHsKICAgICBtX2Zyb250U3RhdGUgPSByZWludGVycHJldF9jYXN0PHVu c2lnbmVkPihuZXcgQmFja2luZ1N0b3JlR2VvbWV0cnkpOwpAQCAtOTQ1LDcgKzk0Niw2IEBAIGJv b2wgQmFja2luZ1N0b3JlUHJpdmF0ZTo6cmVuZGVyRGlyZWN0VG9XaW5kb3coY29uc3QgUGxhdGZv cm06OkludFJlY3QmIHJlY3QpCiAKICAgICBQbGF0Zm9ybTo6SW50UmVjdCBzY3JlZW5SZWN0ID0g bV9jbGllbnQtPm1hcEZyb21UcmFuc2Zvcm1lZENvbnRlbnRzVG9UcmFuc2Zvcm1lZFZpZXdwb3J0 KGRpcnR5UmVjdCk7CiAgICAgd2luZG93RnJvbnRCdWZmZXJTdGF0ZSgpLT5jbGVhckJsaXR0ZWRS ZWdpb24oc2NyZWVuUmVjdCk7Ci0gICAgY29weVByZXZpb3VzQ29udGVudHNUb0JhY2tTdXJmYWNl T2ZXaW5kb3coKTsKIAogICAgIHBhaW50RGVmYXVsdEJhY2tncm91bmQoZGlydHlSZWN0LCBUcmFu c2Zvcm1hdGlvbk1hdHJpeCgpLCB0cnVlIC8qZmx1c2gqLyk7CiAKQEAgLTk1NSwxNCArOTU1LDE1 IEBAIGJvb2wgQmFja2luZ1N0b3JlUHJpdmF0ZTo6cmVuZGVyRGlyZWN0VG9XaW5kb3coY29uc3Qg UGxhdGZvcm06OkludFJlY3QmIHJlY3QpCiAgICAgd2luZG93QmFja0J1ZmZlclN0YXRlKCktPmFk ZEJsaXR0ZWRSZWdpb24oc2NyZWVuUmVjdCk7CiAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9T SVRJTkcpCi0gICAgZHJhd0xheWVyc09uQ29tbWl0SWZOZWVkZWQoKTsKLSNpZiBFTkFCTEVfQ09N UE9TSVRJTkdfU1VSRkFDRQotICAgIGlmIChtX3dlYlBhZ2UtPmQtPm1fY2xpZW50LT53aW5kb3co KS0+d2luZG93VXNhZ2UoKSAhPSBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M6OldpbmRv dzo6R0xFUzJVc2FnZSkgewotICAgICAgICBQbGF0Zm9ybTo6SW50UmVjdCBjbGlwcGVkUmVjdCA9 IGludGVyc2VjdGlvbihkaXJ0eVJlY3QsIHZpc2libGVDb250ZW50c1JlY3QoKSk7Ci0gICAgICAg IGJsZW5kQ29tcG9zaXRpbmdTdXJmYWNlKGNsaXBwZWRSZWN0KTsKKyAgICBtX2lzRGlyZWN0UmVu ZGVyaW5nQW5pbWF0aW9uTWVzc2FnZVNjaGVkdWxlZCA9IGZhbHNlOworCisgICAgaWYgKG1fd2Vi UGFnZS0+ZC0+aXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKCkpIHsKKyAgICAgICAgQmxh Y2tCZXJyeTo6UGxhdGZvcm06OnVzZXJJbnRlcmZhY2VUaHJlYWRNZXNzYWdlQ2xpZW50KCktPmRp c3BhdGNoU3luY01lc3NhZ2UoCisgICAgICAgICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6Y3Jl YXRlTWV0aG9kQ2FsbE1lc3NhZ2UoCisgICAgICAgICAgICAgICAgJkJhY2tpbmdTdG9yZVByaXZh dGU6OmRyYXdBbmRCbGVuZExheWVyc0ZvckRpcmVjdFJlbmRlcmluZywKKyAgICAgICAgICAgICAg ICB0aGlzLCBkaXJ0eVJlY3QpKTsKICAgICB9CiAjZW5kaWYKLSNlbmRpZgogCiAgICAgaW52YWxp ZGF0ZVdpbmRvdyhzY3JlZW5SZWN0KTsKICAgICByZXR1cm4gdHJ1ZTsKQEAgLTI1MDMsNyArMjUw NCw5IEBAIGJvb2wgQmFja2luZ1N0b3JlUHJpdmF0ZTo6ZHJhd1N1YkxheWVycygpCiAgICAgaWYg KCFCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6dXNlckludGVyZmFjZVRocmVhZE1lc3NhZ2VDbGllbnQo KS0+aXNDdXJyZW50VGhyZWFkKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmICht X3N1c3BlbmRCYWNraW5nU3RvcmVVcGRhdGVzKQorICAgIGJvb2wgYmxpdHRpbmdEaXJlY3RseVRv Q29tcG9zaXRpbmdXaW5kb3cgPSBtX3dlYlBhZ2UtPmQtPm1fY2xpZW50LT53aW5kb3coKS0+d2lu ZG93VXNhZ2UoKSA9PSBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M6OldpbmRvdzo6R0xF UzJVc2FnZTsKKworICAgIGlmIChtX3N1c3BlbmRCYWNraW5nU3RvcmVVcGRhdGVzICYmICFibGl0 dGluZ0RpcmVjdGx5VG9Db21wb3NpdGluZ1dpbmRvdykKICAgICAgICAgcmV0dXJuIGZhbHNlOwog CiAgICAgUGxhdGZvcm06OkludFJlY3QgZHN0ID0gbV93ZWJQYWdlLT5jbGllbnQoKS0+dXNlcklu dGVyZmFjZUJsaXR0ZWREZXN0aW5hdGlvblJlY3QoKTsKQEAgLTI1MjcsNiArMjUzMCwzNCBAQCBi b29sIEJhY2tpbmdTdG9yZVByaXZhdGU6OmRyYXdMYXllcnNPbkNvbW1pdElmTmVlZGVkKCkKIAog ICAgIHJldHVybiB0cnVlOwogfQorCit2b2lkIEJhY2tpbmdTdG9yZVByaXZhdGU6OmRyYXdBbmRC bGVuZExheWVyc0ZvckRpcmVjdFJlbmRlcmluZyhjb25zdCBQbGF0Zm9ybTo6SW50UmVjdCYgZGly dHlSZWN0KQoreworICAgIEFTU0VSVChCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6dXNlckludGVyZmFj ZVRocmVhZE1lc3NhZ2VDbGllbnQoKS0+aXNDdXJyZW50VGhyZWFkKCkpOworICAgIGlmICghQmxh Y2tCZXJyeTo6UGxhdGZvcm06OnVzZXJJbnRlcmZhY2VUaHJlYWRNZXNzYWdlQ2xpZW50KCktPmlz Q3VycmVudFRocmVhZCgpKQorICAgICAgICByZXR1cm47CisKKyAgICAvLyBCZWNhdXNlIHdlJ3Jl IGJlaW5nIGNhbGxlZCBzeW5jIGZyb20gdGhlIFdlYktpdCB0aHJlYWQsIHdlIGNhbiB1c2UKKyAg ICAvLyByZWd1bGFyIFdlYlBhZ2Ugc2l6ZSBhbmQgdHJhbnNmb3JtYXRpb24gZnVuY3Rpb25zIHdp dGhvdXQgY29uY2VybnMuCisgICAgV2ViQ29yZTo6SW50UmVjdCBjb250ZW50c1JlY3QgPSB2aXNp YmxlQ29udGVudHNSZWN0KCk7CisgICAgV2ViQ29yZTo6RmxvYXRSZWN0IHVudHJhbnNmb3JtZWRD b250ZW50c1JlY3QgPSBtX3dlYlBhZ2UtPmQtPm1hcEZyb21UcmFuc2Zvcm1lZEZsb2F0UmVjdChX ZWJDb3JlOjpGbG9hdFJlY3QoY29udGVudHNSZWN0KSk7CisgICAgV2ViQ29yZTo6SW50UmVjdCBj b250ZW50c1NjcmVlblJlY3QgPSBtX2NsaWVudC0+bWFwRnJvbVRyYW5zZm9ybWVkQ29udGVudHNU b1RyYW5zZm9ybWVkVmlld3BvcnQoY29udGVudHNSZWN0KTsKKyAgICBXZWJDb3JlOjpJbnRSZWN0 IGRzdFJlY3QgPSBpbnRlcnNlY3Rpb24oY29udGVudHNTY3JlZW5SZWN0LAorICAgICAgICBXZWJD b3JlOjpJbnRSZWN0KFdlYkNvcmU6OkludFBvaW50KDAsIDApLCBtX3dlYlBhZ2UtPmQtPnRyYW5z Zm9ybWVkVmlld3BvcnRTaXplKCkpKTsKKworICAgIC8vIENoZWNrIGlmIHJlbmRlcmluZyBjYXVz ZWQgYSBjb21taXQgYW5kIHdlIG5lZWQgdG8gcmVkcmF3IHRoZSBsYXllcnMuCisgICAgbV9uZWVk c0RyYXdMYXllcnNPbkNvbW1pdCA9IGZhbHNlOworICAgIG1fd2ViUGFnZS0+ZC0+ZHJhd1N1Ykxh eWVycyhkc3RSZWN0LCB1bnRyYW5zZm9ybWVkQ29udGVudHNSZWN0KTsKKworI2lmIEVOQUJMRV9D T01QT1NJVElOR19TVVJGQUNFCisgICAgLy8gU2VlIGFib3ZlIGNvbW1lbnQgYWJvdXQgc3luYyBj YWxsaW5nLCB2aXNpYmxlQ29udGVudHNSZWN0KCkgaXMgc2FmZSBoZXJlLgorICAgIFBsYXRmb3Jt OjpJbnRSZWN0IHZpc2libGVEaXJ0eVJlY3QgPSBkaXJ0eVJlY3Q7CisgICAgdmlzaWJsZURpcnR5 UmVjdC5pbnRlcnNlY3QodmlzaWJsZUNvbnRlbnRzUmVjdCgpKTsKKyAgICB2aXNpYmxlRGlydHlS ZWN0ID0gbV9jbGllbnQtPm1hcEZyb21UcmFuc2Zvcm1lZENvbnRlbnRzVG9UcmFuc2Zvcm1lZFZp ZXdwb3J0KHZpc2libGVEaXJ0eVJlY3QpOworCisgICAgYmxlbmRDb21wb3NpdGluZ1N1cmZhY2Uo dmlzaWJsZURpcnR5UmVjdCk7CisjZW5kaWYKK30KICNlbmRpZgogCiBib29sIEJhY2tpbmdTdG9y ZVByaXZhdGU6OmlzQWN0aXZlKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlLmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBp L0JhY2tpbmdTdG9yZS5oCmluZGV4IDg2NzMyNjhhZTYxODY3MzhkZjc2ZTYxY2JlNGJiZmM1OTQx NjZkMTMuLjczMTk0ODU5ZmYzNTlmN2IzNTgwOTNkZTk4N2Y3MGZlMWFlMmNjN2QgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlLmgKKysrIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmUuaApAQCAtNDAsNiArNDAsNyBA QCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgV2ViUGFnZTsKIGNsYXNzIFdlYlBhZ2VQcml2 YXRlOworY2xhc3MgV2ViUGFnZUNvbXBvc2l0b3I7CiBjbGFzcyBCYWNraW5nU3RvcmVQcml2YXRl OwogY2xhc3MgQmFja2luZ1N0b3JlQ2xpZW50OwogCkBAIC03Nyw2ICs3OCw3IEBAIHByaXZhdGU6 CiAgICAgZnJpZW5kIGNsYXNzIEJsYWNrQmVycnk6OldlYktpdDo6QmFja2luZ1N0b3JlQ2xpZW50 OwogICAgIGZyaWVuZCBjbGFzcyBCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2U7CiAgICAgZnJp ZW5kIGNsYXNzIEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU7IC8vIEZJWE1FOiBG b3Igbm93LCB3ZSBleHBvc2Ugb3VyIGludGVybmFscyB0byBXZWJQYWdlUHJpdmF0ZS4gU2VlIFBS ICMxMjAzMDEuCisgICAgZnJpZW5kIGNsYXNzIEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZUNv bXBvc2l0b3I7CiAgICAgZnJpZW5kIGNsYXNzIFdlYkNvcmU6OkNocm9tZUNsaWVudEJsYWNrQmVy cnk7CiAgICAgZnJpZW5kIGNsYXNzIFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJy eTsKICAgICBmcmllbmQgY2xhc3MgV2ViQ29yZTo6R0xFUzJDb250ZXh0OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmVfcC5oIGIvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmVfcC5oCmluZGV4IDQ5OTkyZTM0ZGM1NDJh MDIwZWRmYTFjOWE4YWQ2OWIyNTRmYWY3ZGMuLjc5NWI3NzExYjE1ZmU2MDQyNmVmZjk5MmRmMmFi YjYyOTBlNWE4MzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFj a2luZ1N0b3JlX3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdT dG9yZV9wLmgKQEAgLTE5Nyw4ICsxOTcsMTIgQEAgcHVibGljOgogICAgIHZvaWQgY2xlYXJDb21w b3NpdGluZ1N1cmZhY2UoKTsKICAgICBib29sIGRyYXdTdWJMYXllcnMoKTsKICAgICBib29sIGRy YXdMYXllcnNPbkNvbW1pdElmTmVlZGVkKCk7CisgICAgdm9pZCBkcmF3QW5kQmxlbmRMYXllcnNG b3JEaXJlY3RSZW5kZXJpbmcoY29uc3QgUGxhdGZvcm06OkludFJlY3QmIGRpcnR5UmVjdCk7CiAg ICAgLy8gV2ViUGFnZSB3aWxsIGNhbGwgdGhpcyB3aGVuIGRyYXdpbmcgbGF5ZXJzIHRvIHRlbGwg dXMgd2UgZG9uJ3QgbmVlZCB0bwogICAgIHZvaWQgd2lsbERyYXdMYXllcnNPbkNvbW1pdCgpIHsg bV9uZWVkc0RyYXdMYXllcnNPbkNvbW1pdCA9IGZhbHNlOyB9CisgICAgLy8gV2ViUGFnZUNvbXBv c2l0b3IgdXNlcyB0aGlzIHRvIGN1dCBkb3duIG9uIGV4Y2Vzc2l2ZSBtZXNzYWdlIHNlbmRpbmcu CisgICAgYm9vbCBpc0RpcmVjdFJlbmRlcmluZ0FuaW1hdGlvbk1lc3NhZ2VTY2hlZHVsZWQoKSB7 IHJldHVybiBtX2lzRGlyZWN0UmVuZGVyaW5nQW5pbWF0aW9uTWVzc2FnZVNjaGVkdWxlZDsgfQor ICAgIHZvaWQgc2V0RGlyZWN0UmVuZGVyaW5nQW5pbWF0aW9uTWVzc2FnZVNjaGVkdWxlZCgpIHsg bV9pc0RpcmVjdFJlbmRlcmluZ0FuaW1hdGlvbk1lc3NhZ2VTY2hlZHVsZWQgPSB0cnVlOyB9CiAj ZW5kaWYKIAogICAgIHZvaWQgYmxpdEhvcml6b250YWxTY3JvbGxiYXIoY29uc3QgUGxhdGZvcm06 OkludFBvaW50Jik7CkBAIC0zNTMsNiArMzU3LDcgQEAgcHVibGljOgogCiAjaWYgVVNFKEFDQ0VM RVJBVEVEX0NPTVBPU0lUSU5HKQogICAgIG11dGFibGUgYm9vbCBtX25lZWRzRHJhd0xheWVyc09u Q29tbWl0OyAvLyBOb3QgdGhyZWFkIHNhZmUsIFdlYktpdCB0aHJlYWQgb25seQorICAgIGJvb2wg bV9pc0RpcmVjdFJlbmRlcmluZ0FuaW1hdGlvbk1lc3NhZ2VTY2hlZHVsZWQ7CiAjZW5kaWYKIH07 CiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9BcGkvV2ViUGFnZV9wLmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBh Z2VfcC5oCmluZGV4IDRkMjhmZGFhNjljOWQwMDlhNmIzYTBjMTg0YjUyMmYyMGMxMDlhZWEuLmVk MzczOWMyMjhiYzY1M2JhOTg3MDlkMDEyY2NhZWRiMzYwMzNhOGUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9wLmgKKysrIGIvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaApAQCAtMzczLDYgKzM3Myw3IEBAIHB1YmxpYzoKICAg ICB2b2lkIHNldFJvb3RMYXllckNvbXBvc2l0aW5nVGhyZWFkKFdlYkNvcmU6OkxheWVyQ29tcG9z aXRpbmdUaHJlYWQqKTsKICAgICB2b2lkIGNvbW1pdFJvb3RMYXllcihjb25zdCBXZWJDb3JlOjpJ bnRSZWN0JiwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYpOwogICAgIHZvaWQgc2V0SXNBY2NlbGVy YXRlZENvbXBvc2l0aW5nQWN0aXZlKGJvb2wpOworICAgIGJvb2wgaXNBY2NlbGVyYXRlZENvbXBv c2l0aW5nQWN0aXZlKCkgY29uc3QgeyByZXR1cm4gbV9pc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdB Y3RpdmU7IH0KICAgICB2b2lkIGRlc3Ryb3lDb21wb3NpdG9yKCk7CiAgICAgdm9pZCBzeW5jRGVz dHJveUNvbXBvc2l0b3JPbkNvbXBvc2l0aW5nVGhyZWFkKCk7CiAgICAgdm9pZCBkZXN0cm95TGF5 ZXJSZXNvdXJjZXMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJL aXRTdXBwb3J0L1dlYlBhZ2VDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9XZWJLaXRTdXBwb3J0L1dlYlBhZ2VDb21wb3NpdG9yLmNwcAppbmRleCBmY2JjMWFjZmY3Zjk3 ZWMwMjUyZDc5MzMzMmM2OTBmNGVjYzcwZjU1Li45MWE0ZWIyMWQyNGZjMTQ4ZmM2NzFlNjI2MWRi YWMwNDlkYzNjMzNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0 U3VwcG9ydC9XZWJQYWdlQ29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L1dlYktpdFN1cHBvcnQvV2ViUGFnZUNvbXBvc2l0b3IuY3BwCkBAIC0yMSw5ICsyMSwxMyBA QAogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICNpbmNsdWRlICJXZWJQYWdlQ29t cG9zaXRvci5oIgogCisjaW5jbHVkZSAiQmFja2luZ1N0b3JlX3AuaCIKICNpbmNsdWRlICJMYXll cldlYktpdFRocmVhZC5oIgogI2luY2x1ZGUgIldlYlBhZ2VfcC5oIgogCisjaW5jbHVkZSA8Qmxh Y2tCZXJyeVBsYXRmb3JtRXhlY3V0YWJsZU1lc3NhZ2UuaD4KKyNpbmNsdWRlIDxCbGFja0JlcnJ5 UGxhdGZvcm1NZXNzYWdlLmg+CisjaW5jbHVkZSA8QmxhY2tCZXJyeVBsYXRmb3JtTWVzc2FnZUNs aWVudC5oPgogI2luY2x1ZGUgPEdlbmVyaWNUaW1lckNsaWVudC5oPgogI2luY2x1ZGUgPFRocmVh ZFRpbWVyQ2xpZW50Lmg+CiAKQEAgLTM4LDE1ICs0MiwxNSBAQCBXZWJQYWdlQ29tcG9zaXRvcjo6 V2ViUGFnZUNvbXBvc2l0b3IoV2ViUGFnZVByaXZhdGUqIHBhZ2UpCiAgICAgLCBtX2dlbmVyYXRp b24oMCkKICAgICAsIG1fY29tcG9zaXRlZEdlbmVyYXRpb24oLTEpCiAgICAgLCBtX2NvbXBvc2l0 aW5nT250b01haW5XaW5kb3coZmFsc2UpCi0gICAgLCBtX2JsaXRUaW1lcih0aGlzLCAmQmxhY2tC ZXJyeTo6V2ViS2l0OjpXZWJQYWdlQ29tcG9zaXRvcjo6YmxpdFRpbWVyRmlyZWQpCi0gICAgLCBt X3RpbWVyQ2xpZW50KG5ldyBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R2VuZXJpY1RpbWVyQ2xpZW50 KEJsYWNrQmVycnk6OlBsYXRmb3JtOjp1c2VySW50ZXJmYWNlVGhyZWFkVGltZXJDbGllbnQoKSkp CisgICAgLCBtX2FuaW1hdGlvblRpbWVyKHRoaXMsICZXZWJQYWdlQ29tcG9zaXRvcjo6YW5pbWF0 aW9uVGltZXJGaXJlZCkKKyAgICAsIG1fdGltZXJDbGllbnQobmV3IFBsYXRmb3JtOjpHZW5lcmlj VGltZXJDbGllbnQoUGxhdGZvcm06OnVzZXJJbnRlcmZhY2VUaHJlYWRUaW1lckNsaWVudCgpKSkK IHsKLSAgICBtX2JsaXRUaW1lci5zZXRDbGllbnQobV90aW1lckNsaWVudCk7CisgICAgbV9hbmlt YXRpb25UaW1lci5zZXRDbGllbnQobV90aW1lckNsaWVudCk7CiB9CiAKIFdlYlBhZ2VDb21wb3Np dG9yOjp+V2ViUGFnZUNvbXBvc2l0b3IoKQogewotICAgIG1fYmxpdFRpbWVyLnN0b3AoKTsKKyAg ICBtX2FuaW1hdGlvblRpbWVyLnN0b3AoKTsKICAgICBkZWxldGUgbV90aW1lckNsaWVudDsKIH0K IApAQCAtOTMsNyArOTcsNyBAQCBib29sIFdlYlBhZ2VDb21wb3NpdG9yOjpkcmF3TGF5ZXJzKGNv bnN0IEludFJlY3QmIGRzdFJlY3QsIGNvbnN0IEZsb2F0UmVjdCYgY29udAogICAgIGlmIChtX2xh c3RDb21wb3NpdGluZ1Jlc3VsdHMubmVlZHNBbmltYXRpb25GcmFtZSkgewogICAgICAgICArK21f Z2VuZXJhdGlvbjsgLy8gVGhlIGFuaW1hdGlvbiB1cGRhdGUgbW92ZXMgdXMgYWxvbmcgb25lIGdl bmVyYXRpb24uCiAgICAgICAgIC8vIFVzaW5nIGEgdGltZW91dCBvZiAwIGFjdHVhbGx5IHdvbid0 IHN0YXJ0IGEgdGltZXIsIGl0IHdpbGwgc2VuZCBhIG1lc3NhZ2UuCi0gICAgICAgIG1fYmxpdFRp bWVyLnN0YXJ0KDEuMCAvIDYwLjApOworICAgICAgICBtX2FuaW1hdGlvblRpbWVyLnN0YXJ0KDEu MCAvIDYwLjApOwogICAgICAgICBtX3dlYlBhZ2UtPnVwZGF0ZURlbGVnYXRlZE92ZXJsYXlzKCk7 CiAgICAgfQogCkBAIC0xMDUsOCArMTA5LDE4IEBAIHZvaWQgV2ViUGFnZUNvbXBvc2l0b3I6OnJl bGVhc2VMYXllclJlc291cmNlcygpCiAgICAgbV9sYXllclJlbmRlcmVyLT5yZWxlYXNlTGF5ZXJS ZXNvdXJjZXMoKTsKIH0KIAotdm9pZCBXZWJQYWdlQ29tcG9zaXRvcjo6YmxpdFRpbWVyRmlyZWQo KQordm9pZCBXZWJQYWdlQ29tcG9zaXRvcjo6YW5pbWF0aW9uVGltZXJGaXJlZCgpCiB7CisgICAg aWYgKG1fd2ViUGFnZS0+bV9iYWNraW5nU3RvcmUtPmQtPnNob3VsZERpcmVjdFJlbmRlcmluZ1Rv V2luZG93KCkpIHsKKyAgICAgICAgaWYgKG1fd2ViUGFnZS0+bV9iYWNraW5nU3RvcmUtPmQtPmlz RGlyZWN0UmVuZGVyaW5nQW5pbWF0aW9uTWVzc2FnZVNjaGVkdWxlZCgpKQorICAgICAgICAgICAg cmV0dXJuOyAvLyBkb24ndCBzZW5kIG5ldyBtZXNzYWdlcyBhcyBsb25nIGFzIHdlIGhhdmVuJ3Qg cmVyZW5kZXJlZAorCisgICAgICAgIG1fd2ViUGFnZS0+bV9iYWNraW5nU3RvcmUtPmQtPnNldERp cmVjdFJlbmRlcmluZ0FuaW1hdGlvbk1lc3NhZ2VTY2hlZHVsZWQoKTsKKyAgICAgICAgQmxhY2tC ZXJyeTo6UGxhdGZvcm06OndlYktpdFRocmVhZE1lc3NhZ2VDbGllbnQoKS0+ZGlzcGF0Y2hNZXNz YWdlKAorICAgICAgICAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OmNyZWF0ZU1ldGhvZENhbGxN ZXNzYWdlKAorICAgICAgICAgICAgICAgICZCYWNraW5nU3RvcmVQcml2YXRlOjpyZW5kZXJWaXNp YmxlQ29udGVudHMsIG1fd2ViUGFnZS0+bV9iYWNraW5nU3RvcmUtPmQpKTsKKyAgICAgICAgcmV0 dXJuOworICAgIH0KICAgICBtX3dlYlBhZ2UtPmJsaXRWaXNpYmxlQ29udGVudHMoKTsKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvV2ViUGFn ZUNvbXBvc2l0b3IuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1dl YlBhZ2VDb21wb3NpdG9yLmgKaW5kZXggNDM3YWI5NWUwOGVkYjIyZjY4NGMyYTMyYzUyNjNiY2Y2 ZTAzNDg0Ni4uYWEwYTlhOGMwZGMzZTc4MjMxYTcxODRkOWQ2ZmFkOWY0OWI1MDMwNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvV2ViUGFnZUNvbXBv c2l0b3IuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9XZWJQ YWdlQ29tcG9zaXRvci5oCkBAIC02NSw3ICs2NSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlbGVh c2VMYXllclJlc291cmNlcygpOwogCiBwcml2YXRlOgotICAgIHZvaWQgYmxpdFRpbWVyRmlyZWQo KTsKKyAgICB2b2lkIGFuaW1hdGlvblRpbWVyRmlyZWQoKTsKIAogICAgIFdlYlBhZ2VQcml2YXRl KiBtX3dlYlBhZ2U7CiAgICAgT3duUHRyPFdlYkNvcmU6OkxheWVyUmVuZGVyZXI+IG1fbGF5ZXJS ZW5kZXJlcjsKQEAgLTc4LDcgKzc4LDcgQEAgcHJpdmF0ZToKICAgICBXZWJDb3JlOjpJbnRSZWN0 IG1fY29tcG9zaXRlZERzdFJlY3Q7CiAgICAgV2ViQ29yZTo6RmxvYXRSZWN0IG1fY29tcG9zaXRl ZENvbnRlbnRzUmVjdDsKICAgICBib29sIG1fY29tcG9zaXRpbmdPbnRvTWFpbldpbmRvdzsKLSAg ICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6VGltZXI8V2ViUGFnZUNvbXBvc2l0b3I+IG1fYmxpdFRp bWVyOworICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpUaW1lcjxXZWJQYWdlQ29tcG9zaXRvcj4g bV9hbmltYXRpb25UaW1lcjsKICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6VGltZXJDbGllbnQq IG1fdGltZXJDbGllbnQ7CiB9OwogCg== 130132 2012-03-05 07:48:04 -0800 2012-03-05 08:37:51 -0800 Same patch, with updated changelog diff bug-80181-20120305104806.patch text/plain 14602 jpetsovits U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5NzQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAzMmY4MzczODIxOGNjZGFhMzlhNzkwNWRkNDQ3OTBiYTM5ZDc4ZjliLi5mYzNkMGQ0NmEw MTM0N2M4YTAxZmFjZGQ4NTJlN2U5NzllZTAxZGJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSw2NyBAQAorMjAxMi0wMy0wMiAgSmFrb2IgUGV0c292aXRzICA8anBl dHNvdml0c0ByaW0uY29tPgorCisgICAgICAgIE1ha2UgYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcg d29yayBhZ2FpbiB3aXRoIGRpcmVjdCByZW5kZXJpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDE4MQorICAgICAgICBSSU0gUFI6IDEzOTExMAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICBJbnRlcm5hbGx5 IHJldmlld2VkIGJ5IEFydmlkIE5pbHNzb24uCisKKyAgICAgICAgVGhlIHNpZ25pZmljYW50IGFt b3VudCBvZiByZWZhY3RvcmluZyBhbmQgb3B0aW1pemF0aW9uIHdvcmsKKyAgICAgICAgdGhhdCBo YXMgZ29uZSBpbnRvIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nIG1pc3NlZCBvdXQgb24KKyAgICAg ICAgc29tZSBvZiB0aGUgY29kZSBwYXRocyB0aGF0IGFyZSBiZWluZyB1c2VkIGluIGRpcmVjdCBy ZW5kZXJpbmcuCisKKyAgICAgICAgQW5pbWF0aW9ucyB3ZXJlIHJlbHlpbmcgb24gYmxpdFZpc2li bGVDb250ZW50cygpIG9ubHkgKHdoaWNoCisgICAgICAgIGlzIGEgbm8tb3AgaW4gZGlyZWN0IHJl bmRlcmluZyBtb2RlKS4gVGhlcmUgd2VyZSBlYXJseSByZXR1cm5zCisgICAgICAgIHdoaWNoIGFy ZSBzdWl0YWJsZSB0byBkZXRlcm1pbmUgd2hldGhlciBzY3JlZW4gY29udGVudHMgbmVlZAorICAg ICAgICB0byBiZSB1cGRhdGVkIGF0IGFsbDsgaG93ZXZlciwgd2hlbiB3ZSdyZSBhbHJlYWR5IGZv cmNpbmcgYQorICAgICAgICByZS1yZW5kZXIgdGhlbiB0aG9zZSBjaGVja3Mgd291bGQgY2F1c2Ug dGhlIGNvbXBvc2l0aW9uIHN1cmZhY2UKKyAgICAgICAgbm90IHRvIGFwcGVhciBhdCBhbGwsIG9y IGF2b2lkIGRyYXdpbmcgbmV3IGFuaW1hdGlvbiBmcmFtZXMuCisKKyAgICAgICAgV2Ugd2VudCB0 aHJvdWdoIGRpc3BhdGNoTWVzc2FnZSgpLCBwb3RlbnRpYWxseSBjYXVzaW5nCisgICAgICAgIG1p c21hdGNoZXMgYmV0d2VlbiByZW5kZXJlZCAoYnV0IG5vdCB5ZXQgcG9zdGVkKSBiYWNrIGNvbnRl bnQKKyAgICAgICAgYW5kIGxheWVycyBjb21wb3NpdGVkIG9uIHRvcCBvZiBpdC4gQXMgd2UncmUg cmVuZGVyaW5nIG9udG8KKyAgICAgICAgdGhlIHNvbGUgdGFyZ2V0IHN1cmZhY2UgKHRoZSB3aW5k b3cpIGRpcmVjdGx5IGFuZCBwb3N0aW5nCisgICAgICAgIGZyb20gdGhlIHNhbWUgdGhyZWFkLCB3 ZSBoYXZlIHRvIHdhaXQgZm9yIGNvbXBvc2l0aW5nIG9uIHRoZQorICAgICAgICBVSSB0aHJlYWQg dG8gZmluaXNoIGJlZm9yZSBwb3N0aW5nIHRoZSB3aW5kb3cuCisKKyAgICAgICAgSW4gdHVybiwg dGhpcyBwYXRjaCBjb21iaW5lcyBib3RoIGRyYXdTdWJMYXllcnMoKSBhbmQKKyAgICAgICAgYmxl bmRDb21wb3NpdGluZ1N1cmZhY2UoKSBjYWxscyBpbnRvIG9uZSBtZXRob2QsIHJlZHVjaW5nCisg ICAgICAgIHRoZSBudW1iZXIgb2YgbWVzc2FnZXMgdG8gdGhlIFVJIHRocmVhZCB3aXRoaW4KKyAg ICAgICAgcmVuZGVyRGlyZWN0VG9XaW5kb3coKSB0byBvbmUuCisKKyAgICAgICAgYmxlbmRDb21w b3NpdGluZ01lc3NhZ2UoKSBpbiByZW5kZXJEaXJlY3RUb1NjcmVlbigpIHdhcyBjYWxsZWQKKyAg ICAgICAgd2l0aCBjb250ZW50cyBjb29yZGluYXRlcyByYXRoZXIgdGhhbiB2aWV3cG9ydCBjb29y ZGluYXRlcy4KKyAgICAgICAgVGhhdCBjYXVzZWQgc29tZSBvZiB0aGUgY29tcG9zaXRlZCBjb250 ZW50IHRvIGJlIGN1dCBvZmYgd2hlbgorICAgICAgICB0aGUgc2Nyb2xsIHBvc2l0aW9uIHdhc24n dCAoMCwgMCkuCisKKyAgICAgICAgV2UgY2FsbGVkIGNvcHlQcmV2aW91c0NvbnRlbnRzVG9CYWNr U3VyZmFjZU9mV2luZG93KCkgdHdpY2UgZm9yCisgICAgICAgIG9uZSBmcmFtZSwgaW4gYm90aCBy ZW5kZXJEaXJlY3RUb1dpbmRvdygpIGFuZCBpbnZhbGlkYXRlV2luZG93KCkuCisgICAgICAgIE9u bHkgb25lIG9mIHRob3NlICh0aGUgbGF0dGVyIG9uZSkgaXMgbmVjZXNzYXJ5LgorCisgICAgICAg ICogQXBpL0JhY2tpbmdTdG9yZS5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkJh Y2tpbmdTdG9yZVByaXZhdGU6OkJhY2tpbmdTdG9yZVByaXZhdGUpOgorICAgICAgICAoQmxhY2tC ZXJyeTo6V2ViS2l0OjpCYWNraW5nU3RvcmVQcml2YXRlOjpyZW5kZXJEaXJlY3RUb1dpbmRvdyk6 CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkJhY2tpbmdTdG9yZVByaXZhdGU6OmRyYXdT dWJMYXllcnMpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktp dDo6QmFja2luZ1N0b3JlUHJpdmF0ZTo6ZHJhd0FuZEJsZW5kTGF5ZXJzRm9yRGlyZWN0UmVuZGVy aW5nKToKKyAgICAgICAgKiBBcGkvQmFja2luZ1N0b3JlLmg6CisgICAgICAgIChXZWJLaXQpOgor ICAgICAgICAqIEFwaS9CYWNraW5nU3RvcmVfcC5oOgorICAgICAgICAoQmFja2luZ1N0b3JlUHJp dmF0ZSk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkJhY2tpbmdTdG9yZVByaXZhdGU6 OmlzRGlyZWN0UmVuZGVyaW5nQW5pbWF0aW9uTWVzc2FnZVNjaGVkdWxlZCk6CisgICAgICAgIChC bGFja0JlcnJ5OjpXZWJLaXQ6OkJhY2tpbmdTdG9yZVByaXZhdGU6OnNldERpcmVjdFJlbmRlcmlu Z0FuaW1hdGlvbk1lc3NhZ2VTY2hlZHVsZWQpOgorICAgICAgICAqIEFwaS9XZWJQYWdlX3AuaDoK KyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OmlzQWNjZWxlcmF0 ZWRDb21wb3NpdGluZ0FjdGl2ZSk6CisgICAgICAgIChXZWJQYWdlUHJpdmF0ZSk6CisgICAgICAg ICogV2ViS2l0U3VwcG9ydC9XZWJQYWdlQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChCbGFja0Jl cnJ5OjpXZWJLaXQ6OldlYlBhZ2VDb21wb3NpdG9yOjpXZWJQYWdlQ29tcG9zaXRvcik6CisgICAg ICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VDb21wb3NpdG9yOjp+V2ViUGFnZUNvbXBv c2l0b3IpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlQ29tcG9zaXRvcjo6 ZHJhd0xheWVycyk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VDb21wb3Np dG9yOjphbmltYXRpb25UaW1lckZpcmVkKToKKyAgICAgICAgKiBXZWJLaXRTdXBwb3J0L1dlYlBh Z2VDb21wb3NpdG9yLmg6CisgICAgICAgIChXZWJQYWdlQ29tcG9zaXRvcik6CisKIDIwMTItMDMt MDQgIEpvbmF0aGFuIERvbmcgIDxqb25hdGhhbi5kb25nQHRvcmNobW9iaWxlLmNvbS5jbj4KIAog ICAgICAgICBbQmxhY2tCZXJyeV0gdXBzdHJlYW0gQ3JlZGVudGlhbE1hbmFnZXIgYW5kIENyZWRl bnRpYWxUcmFuc2Zvcm1EYXRhIGltcGxlbWVudGF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvQXBpL0JhY2tpbmdTdG9yZS5jcHAKaW5kZXggNTk2OGZkMjE1ZDE0Mjc1M2ZiY2Q3MmIx Y2Q0MDIyNzQ0NDg2NjNhYi4uMGRmNjEzN2M2MGY1YWFiYWJiY2MxODUwNTY4ZTE2ZTA1Mzg5MTli ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmUu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlLmNwcApA QCAtMjAzLDYgKzIwMyw3IEBAIEJhY2tpbmdTdG9yZVByaXZhdGU6OkJhY2tpbmdTdG9yZVByaXZh dGUoKQogICAgICwgbV9ibGl0R2VuZXJhdGlvbigtMSkKICNpZiBVU0UoQUNDRUxFUkFURURfQ09N UE9TSVRJTkcpCiAgICAgLCBtX25lZWRzRHJhd0xheWVyc09uQ29tbWl0KGZhbHNlKQorICAgICwg bV9pc0RpcmVjdFJlbmRlcmluZ0FuaW1hdGlvbk1lc3NhZ2VTY2hlZHVsZWQoZmFsc2UpCiAjZW5k aWYKIHsKICAgICBtX2Zyb250U3RhdGUgPSByZWludGVycHJldF9jYXN0PHVuc2lnbmVkPihuZXcg QmFja2luZ1N0b3JlR2VvbWV0cnkpOwpAQCAtOTQ1LDcgKzk0Niw2IEBAIGJvb2wgQmFja2luZ1N0 b3JlUHJpdmF0ZTo6cmVuZGVyRGlyZWN0VG9XaW5kb3coY29uc3QgUGxhdGZvcm06OkludFJlY3Qm IHJlY3QpCiAKICAgICBQbGF0Zm9ybTo6SW50UmVjdCBzY3JlZW5SZWN0ID0gbV9jbGllbnQtPm1h cEZyb21UcmFuc2Zvcm1lZENvbnRlbnRzVG9UcmFuc2Zvcm1lZFZpZXdwb3J0KGRpcnR5UmVjdCk7 CiAgICAgd2luZG93RnJvbnRCdWZmZXJTdGF0ZSgpLT5jbGVhckJsaXR0ZWRSZWdpb24oc2NyZWVu UmVjdCk7Ci0gICAgY29weVByZXZpb3VzQ29udGVudHNUb0JhY2tTdXJmYWNlT2ZXaW5kb3coKTsK IAogICAgIHBhaW50RGVmYXVsdEJhY2tncm91bmQoZGlydHlSZWN0LCBUcmFuc2Zvcm1hdGlvbk1h dHJpeCgpLCB0cnVlIC8qZmx1c2gqLyk7CiAKQEAgLTk1NSwxNCArOTU1LDE1IEBAIGJvb2wgQmFj a2luZ1N0b3JlUHJpdmF0ZTo6cmVuZGVyRGlyZWN0VG9XaW5kb3coY29uc3QgUGxhdGZvcm06Oklu dFJlY3QmIHJlY3QpCiAgICAgd2luZG93QmFja0J1ZmZlclN0YXRlKCktPmFkZEJsaXR0ZWRSZWdp b24oc2NyZWVuUmVjdCk7CiAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCi0gICAg ZHJhd0xheWVyc09uQ29tbWl0SWZOZWVkZWQoKTsKLSNpZiBFTkFCTEVfQ09NUE9TSVRJTkdfU1VS RkFDRQotICAgIGlmIChtX3dlYlBhZ2UtPmQtPm1fY2xpZW50LT53aW5kb3coKS0+d2luZG93VXNh Z2UoKSAhPSBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M6OldpbmRvdzo6R0xFUzJVc2Fn ZSkgewotICAgICAgICBQbGF0Zm9ybTo6SW50UmVjdCBjbGlwcGVkUmVjdCA9IGludGVyc2VjdGlv bihkaXJ0eVJlY3QsIHZpc2libGVDb250ZW50c1JlY3QoKSk7Ci0gICAgICAgIGJsZW5kQ29tcG9z aXRpbmdTdXJmYWNlKGNsaXBwZWRSZWN0KTsKKyAgICBtX2lzRGlyZWN0UmVuZGVyaW5nQW5pbWF0 aW9uTWVzc2FnZVNjaGVkdWxlZCA9IGZhbHNlOworCisgICAgaWYgKG1fd2ViUGFnZS0+ZC0+aXNB Y2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKCkpIHsKKyAgICAgICAgQmxhY2tCZXJyeTo6UGxh dGZvcm06OnVzZXJJbnRlcmZhY2VUaHJlYWRNZXNzYWdlQ2xpZW50KCktPmRpc3BhdGNoU3luY01l c3NhZ2UoCisgICAgICAgICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6Y3JlYXRlTWV0aG9kQ2Fs bE1lc3NhZ2UoCisgICAgICAgICAgICAgICAgJkJhY2tpbmdTdG9yZVByaXZhdGU6OmRyYXdBbmRC bGVuZExheWVyc0ZvckRpcmVjdFJlbmRlcmluZywKKyAgICAgICAgICAgICAgICB0aGlzLCBkaXJ0 eVJlY3QpKTsKICAgICB9CiAjZW5kaWYKLSNlbmRpZgogCiAgICAgaW52YWxpZGF0ZVdpbmRvdyhz Y3JlZW5SZWN0KTsKICAgICByZXR1cm4gdHJ1ZTsKQEAgLTI1MDMsNyArMjUwNCw5IEBAIGJvb2wg QmFja2luZ1N0b3JlUHJpdmF0ZTo6ZHJhd1N1YkxheWVycygpCiAgICAgaWYgKCFCbGFja0JlcnJ5 OjpQbGF0Zm9ybTo6dXNlckludGVyZmFjZVRocmVhZE1lc3NhZ2VDbGllbnQoKS0+aXNDdXJyZW50 VGhyZWFkKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmIChtX3N1c3BlbmRCYWNr aW5nU3RvcmVVcGRhdGVzKQorICAgIGJvb2wgYmxpdHRpbmdEaXJlY3RseVRvQ29tcG9zaXRpbmdX aW5kb3cgPSBtX3dlYlBhZ2UtPmQtPm1fY2xpZW50LT53aW5kb3coKS0+d2luZG93VXNhZ2UoKSA9 PSBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M6OldpbmRvdzo6R0xFUzJVc2FnZTsKKwor ICAgIGlmIChtX3N1c3BlbmRCYWNraW5nU3RvcmVVcGRhdGVzICYmICFibGl0dGluZ0RpcmVjdGx5 VG9Db21wb3NpdGluZ1dpbmRvdykKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgUGxhdGZv cm06OkludFJlY3QgZHN0ID0gbV93ZWJQYWdlLT5jbGllbnQoKS0+dXNlckludGVyZmFjZUJsaXR0 ZWREZXN0aW5hdGlvblJlY3QoKTsKQEAgLTI1MjcsNiArMjUzMCwzNCBAQCBib29sIEJhY2tpbmdT dG9yZVByaXZhdGU6OmRyYXdMYXllcnNPbkNvbW1pdElmTmVlZGVkKCkKIAogICAgIHJldHVybiB0 cnVlOwogfQorCit2b2lkIEJhY2tpbmdTdG9yZVByaXZhdGU6OmRyYXdBbmRCbGVuZExheWVyc0Zv ckRpcmVjdFJlbmRlcmluZyhjb25zdCBQbGF0Zm9ybTo6SW50UmVjdCYgZGlydHlSZWN0KQorewor ICAgIEFTU0VSVChCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6dXNlckludGVyZmFjZVRocmVhZE1lc3Nh Z2VDbGllbnQoKS0+aXNDdXJyZW50VGhyZWFkKCkpOworICAgIGlmICghQmxhY2tCZXJyeTo6UGxh dGZvcm06OnVzZXJJbnRlcmZhY2VUaHJlYWRNZXNzYWdlQ2xpZW50KCktPmlzQ3VycmVudFRocmVh ZCgpKQorICAgICAgICByZXR1cm47CisKKyAgICAvLyBCZWNhdXNlIHdlJ3JlIGJlaW5nIGNhbGxl ZCBzeW5jIGZyb20gdGhlIFdlYktpdCB0aHJlYWQsIHdlIGNhbiB1c2UKKyAgICAvLyByZWd1bGFy IFdlYlBhZ2Ugc2l6ZSBhbmQgdHJhbnNmb3JtYXRpb24gZnVuY3Rpb25zIHdpdGhvdXQgY29uY2Vy bnMuCisgICAgV2ViQ29yZTo6SW50UmVjdCBjb250ZW50c1JlY3QgPSB2aXNpYmxlQ29udGVudHNS ZWN0KCk7CisgICAgV2ViQ29yZTo6RmxvYXRSZWN0IHVudHJhbnNmb3JtZWRDb250ZW50c1JlY3Qg PSBtX3dlYlBhZ2UtPmQtPm1hcEZyb21UcmFuc2Zvcm1lZEZsb2F0UmVjdChXZWJDb3JlOjpGbG9h dFJlY3QoY29udGVudHNSZWN0KSk7CisgICAgV2ViQ29yZTo6SW50UmVjdCBjb250ZW50c1NjcmVl blJlY3QgPSBtX2NsaWVudC0+bWFwRnJvbVRyYW5zZm9ybWVkQ29udGVudHNUb1RyYW5zZm9ybWVk Vmlld3BvcnQoY29udGVudHNSZWN0KTsKKyAgICBXZWJDb3JlOjpJbnRSZWN0IGRzdFJlY3QgPSBp bnRlcnNlY3Rpb24oY29udGVudHNTY3JlZW5SZWN0LAorICAgICAgICBXZWJDb3JlOjpJbnRSZWN0 KFdlYkNvcmU6OkludFBvaW50KDAsIDApLCBtX3dlYlBhZ2UtPmQtPnRyYW5zZm9ybWVkVmlld3Bv cnRTaXplKCkpKTsKKworICAgIC8vIENoZWNrIGlmIHJlbmRlcmluZyBjYXVzZWQgYSBjb21taXQg YW5kIHdlIG5lZWQgdG8gcmVkcmF3IHRoZSBsYXllcnMuCisgICAgbV9uZWVkc0RyYXdMYXllcnNP bkNvbW1pdCA9IGZhbHNlOworICAgIG1fd2ViUGFnZS0+ZC0+ZHJhd1N1YkxheWVycyhkc3RSZWN0 LCB1bnRyYW5zZm9ybWVkQ29udGVudHNSZWN0KTsKKworI2lmIEVOQUJMRV9DT01QT1NJVElOR19T VVJGQUNFCisgICAgLy8gU2VlIGFib3ZlIGNvbW1lbnQgYWJvdXQgc3luYyBjYWxsaW5nLCB2aXNp YmxlQ29udGVudHNSZWN0KCkgaXMgc2FmZSBoZXJlLgorICAgIFBsYXRmb3JtOjpJbnRSZWN0IHZp c2libGVEaXJ0eVJlY3QgPSBkaXJ0eVJlY3Q7CisgICAgdmlzaWJsZURpcnR5UmVjdC5pbnRlcnNl Y3QodmlzaWJsZUNvbnRlbnRzUmVjdCgpKTsKKyAgICB2aXNpYmxlRGlydHlSZWN0ID0gbV9jbGll bnQtPm1hcEZyb21UcmFuc2Zvcm1lZENvbnRlbnRzVG9UcmFuc2Zvcm1lZFZpZXdwb3J0KHZpc2li bGVEaXJ0eVJlY3QpOworCisgICAgYmxlbmRDb21wb3NpdGluZ1N1cmZhY2UodmlzaWJsZURpcnR5 UmVjdCk7CisjZW5kaWYKK30KICNlbmRpZgogCiBib29sIEJhY2tpbmdTdG9yZVByaXZhdGU6Omlz QWN0aXZlKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkv QmFja2luZ1N0b3JlLmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9y ZS5oCmluZGV4IDg2NzMyNjhhZTYxODY3MzhkZjc2ZTYxY2JlNGJiZmM1OTQxNjZkMTMuLjczMTk0 ODU5ZmYzNTlmN2IzNTgwOTNkZTk4N2Y3MGZlMWFlMmNjN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlLmgKKysrIGIvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmUuaApAQCAtNDAsNiArNDAsNyBAQCBuYW1lc3BhY2Ug V2ViS2l0IHsKIAogY2xhc3MgV2ViUGFnZTsKIGNsYXNzIFdlYlBhZ2VQcml2YXRlOworY2xhc3Mg V2ViUGFnZUNvbXBvc2l0b3I7CiBjbGFzcyBCYWNraW5nU3RvcmVQcml2YXRlOwogY2xhc3MgQmFj a2luZ1N0b3JlQ2xpZW50OwogCkBAIC03Nyw2ICs3OCw3IEBAIHByaXZhdGU6CiAgICAgZnJpZW5k IGNsYXNzIEJsYWNrQmVycnk6OldlYktpdDo6QmFja2luZ1N0b3JlQ2xpZW50OwogICAgIGZyaWVu ZCBjbGFzcyBCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2U7CiAgICAgZnJpZW5kIGNsYXNzIEJs YWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU7IC8vIEZJWE1FOiBGb3Igbm93LCB3ZSBl eHBvc2Ugb3VyIGludGVybmFscyB0byBXZWJQYWdlUHJpdmF0ZS4gU2VlIFBSICMxMjAzMDEuCisg ICAgZnJpZW5kIGNsYXNzIEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZUNvbXBvc2l0b3I7CiAg ICAgZnJpZW5kIGNsYXNzIFdlYkNvcmU6OkNocm9tZUNsaWVudEJsYWNrQmVycnk7CiAgICAgZnJp ZW5kIGNsYXNzIFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeTsKICAgICBmcmll bmQgY2xhc3MgV2ViQ29yZTo6R0xFUzJDb250ZXh0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmVfcC5oIGIvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0FwaS9CYWNraW5nU3RvcmVfcC5oCmluZGV4IDQ5OTkyZTM0ZGM1NDJhMDIwZWRmYTFjOWE4 YWQ2OWIyNTRmYWY3ZGMuLjc5NWI3NzExYjE1ZmU2MDQyNmVmZjk5MmRmMmFiYjYyOTBlNWE4MzEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlX3Au aAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZV9wLmgKQEAg LTE5Nyw4ICsxOTcsMTIgQEAgcHVibGljOgogICAgIHZvaWQgY2xlYXJDb21wb3NpdGluZ1N1cmZh Y2UoKTsKICAgICBib29sIGRyYXdTdWJMYXllcnMoKTsKICAgICBib29sIGRyYXdMYXllcnNPbkNv bW1pdElmTmVlZGVkKCk7CisgICAgdm9pZCBkcmF3QW5kQmxlbmRMYXllcnNGb3JEaXJlY3RSZW5k ZXJpbmcoY29uc3QgUGxhdGZvcm06OkludFJlY3QmIGRpcnR5UmVjdCk7CiAgICAgLy8gV2ViUGFn ZSB3aWxsIGNhbGwgdGhpcyB3aGVuIGRyYXdpbmcgbGF5ZXJzIHRvIHRlbGwgdXMgd2UgZG9uJ3Qg bmVlZCB0bwogICAgIHZvaWQgd2lsbERyYXdMYXllcnNPbkNvbW1pdCgpIHsgbV9uZWVkc0RyYXdM YXllcnNPbkNvbW1pdCA9IGZhbHNlOyB9CisgICAgLy8gV2ViUGFnZUNvbXBvc2l0b3IgdXNlcyB0 aGlzIHRvIGN1dCBkb3duIG9uIGV4Y2Vzc2l2ZSBtZXNzYWdlIHNlbmRpbmcuCisgICAgYm9vbCBp c0RpcmVjdFJlbmRlcmluZ0FuaW1hdGlvbk1lc3NhZ2VTY2hlZHVsZWQoKSB7IHJldHVybiBtX2lz RGlyZWN0UmVuZGVyaW5nQW5pbWF0aW9uTWVzc2FnZVNjaGVkdWxlZDsgfQorICAgIHZvaWQgc2V0 RGlyZWN0UmVuZGVyaW5nQW5pbWF0aW9uTWVzc2FnZVNjaGVkdWxlZCgpIHsgbV9pc0RpcmVjdFJl bmRlcmluZ0FuaW1hdGlvbk1lc3NhZ2VTY2hlZHVsZWQgPSB0cnVlOyB9CiAjZW5kaWYKIAogICAg IHZvaWQgYmxpdEhvcml6b250YWxTY3JvbGxiYXIoY29uc3QgUGxhdGZvcm06OkludFBvaW50Jik7 CkBAIC0zNTMsNiArMzU3LDcgQEAgcHVibGljOgogCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBP U0lUSU5HKQogICAgIG11dGFibGUgYm9vbCBtX25lZWRzRHJhd0xheWVyc09uQ29tbWl0OyAvLyBO b3QgdGhyZWFkIHNhZmUsIFdlYktpdCB0aHJlYWQgb25seQorICAgIGJvb2wgbV9pc0RpcmVjdFJl bmRlcmluZ0FuaW1hdGlvbk1lc3NhZ2VTY2hlZHVsZWQ7CiAjZW5kaWYKIH07CiB9IC8vIG5hbWVz cGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2Vi UGFnZV9wLmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VfcC5oCmluZGV4 IDRkMjhmZGFhNjljOWQwMDlhNmIzYTBjMTg0YjUyMmYyMGMxMDlhZWEuLmVkMzczOWMyMjhiYzY1 M2JhOTg3MDlkMDEyY2NhZWRiMzYwMzNhOGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9BcGkvV2ViUGFnZV9wLmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9XZWJQYWdlX3AuaApAQCAtMzczLDYgKzM3Myw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFJv b3RMYXllckNvbXBvc2l0aW5nVGhyZWFkKFdlYkNvcmU6OkxheWVyQ29tcG9zaXRpbmdUaHJlYWQq KTsKICAgICB2b2lkIGNvbW1pdFJvb3RMYXllcihjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiwgY29u c3QgV2ViQ29yZTo6SW50U2l6ZSYpOwogICAgIHZvaWQgc2V0SXNBY2NlbGVyYXRlZENvbXBvc2l0 aW5nQWN0aXZlKGJvb2wpOworICAgIGJvb2wgaXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZl KCkgY29uc3QgeyByZXR1cm4gbV9pc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdBY3RpdmU7IH0KICAg ICB2b2lkIGRlc3Ryb3lDb21wb3NpdG9yKCk7CiAgICAgdm9pZCBzeW5jRGVzdHJveUNvbXBvc2l0 b3JPbkNvbXBvc2l0aW5nVGhyZWFkKCk7CiAgICAgdm9pZCBkZXN0cm95TGF5ZXJSZXNvdXJjZXMo KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1dl YlBhZ2VDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBw b3J0L1dlYlBhZ2VDb21wb3NpdG9yLmNwcAppbmRleCBmY2JjMWFjZmY3Zjk3ZWMwMjUyZDc5MzMz MmM2OTBmNGVjYzcwZjU1Li45MWE0ZWIyMWQyNGZjMTQ4ZmM2NzFlNjI2MWRiYWMwNDlkYzNjMzNj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9XZWJQ YWdlQ29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1 cHBvcnQvV2ViUGFnZUNvbXBvc2l0b3IuY3BwCkBAIC0yMSw5ICsyMSwxMyBAQAogI2lmIFVTRShB Q0NFTEVSQVRFRF9DT01QT1NJVElORykKICNpbmNsdWRlICJXZWJQYWdlQ29tcG9zaXRvci5oIgog CisjaW5jbHVkZSAiQmFja2luZ1N0b3JlX3AuaCIKICNpbmNsdWRlICJMYXllcldlYktpdFRocmVh ZC5oIgogI2luY2x1ZGUgIldlYlBhZ2VfcC5oIgogCisjaW5jbHVkZSA8QmxhY2tCZXJyeVBsYXRm b3JtRXhlY3V0YWJsZU1lc3NhZ2UuaD4KKyNpbmNsdWRlIDxCbGFja0JlcnJ5UGxhdGZvcm1NZXNz YWdlLmg+CisjaW5jbHVkZSA8QmxhY2tCZXJyeVBsYXRmb3JtTWVzc2FnZUNsaWVudC5oPgogI2lu Y2x1ZGUgPEdlbmVyaWNUaW1lckNsaWVudC5oPgogI2luY2x1ZGUgPFRocmVhZFRpbWVyQ2xpZW50 Lmg+CiAKQEAgLTM4LDE1ICs0MiwxNSBAQCBXZWJQYWdlQ29tcG9zaXRvcjo6V2ViUGFnZUNvbXBv c2l0b3IoV2ViUGFnZVByaXZhdGUqIHBhZ2UpCiAgICAgLCBtX2dlbmVyYXRpb24oMCkKICAgICAs IG1fY29tcG9zaXRlZEdlbmVyYXRpb24oLTEpCiAgICAgLCBtX2NvbXBvc2l0aW5nT250b01haW5X aW5kb3coZmFsc2UpCi0gICAgLCBtX2JsaXRUaW1lcih0aGlzLCAmQmxhY2tCZXJyeTo6V2ViS2l0 OjpXZWJQYWdlQ29tcG9zaXRvcjo6YmxpdFRpbWVyRmlyZWQpCi0gICAgLCBtX3RpbWVyQ2xpZW50 KG5ldyBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R2VuZXJpY1RpbWVyQ2xpZW50KEJsYWNrQmVycnk6 OlBsYXRmb3JtOjp1c2VySW50ZXJmYWNlVGhyZWFkVGltZXJDbGllbnQoKSkpCisgICAgLCBtX2Fu aW1hdGlvblRpbWVyKHRoaXMsICZXZWJQYWdlQ29tcG9zaXRvcjo6YW5pbWF0aW9uVGltZXJGaXJl ZCkKKyAgICAsIG1fdGltZXJDbGllbnQobmV3IFBsYXRmb3JtOjpHZW5lcmljVGltZXJDbGllbnQo UGxhdGZvcm06OnVzZXJJbnRlcmZhY2VUaHJlYWRUaW1lckNsaWVudCgpKSkKIHsKLSAgICBtX2Js aXRUaW1lci5zZXRDbGllbnQobV90aW1lckNsaWVudCk7CisgICAgbV9hbmltYXRpb25UaW1lci5z ZXRDbGllbnQobV90aW1lckNsaWVudCk7CiB9CiAKIFdlYlBhZ2VDb21wb3NpdG9yOjp+V2ViUGFn ZUNvbXBvc2l0b3IoKQogewotICAgIG1fYmxpdFRpbWVyLnN0b3AoKTsKKyAgICBtX2FuaW1hdGlv blRpbWVyLnN0b3AoKTsKICAgICBkZWxldGUgbV90aW1lckNsaWVudDsKIH0KIApAQCAtOTMsNyAr OTcsNyBAQCBib29sIFdlYlBhZ2VDb21wb3NpdG9yOjpkcmF3TGF5ZXJzKGNvbnN0IEludFJlY3Qm IGRzdFJlY3QsIGNvbnN0IEZsb2F0UmVjdCYgY29udAogICAgIGlmIChtX2xhc3RDb21wb3NpdGlu Z1Jlc3VsdHMubmVlZHNBbmltYXRpb25GcmFtZSkgewogICAgICAgICArK21fZ2VuZXJhdGlvbjsg Ly8gVGhlIGFuaW1hdGlvbiB1cGRhdGUgbW92ZXMgdXMgYWxvbmcgb25lIGdlbmVyYXRpb24uCiAg ICAgICAgIC8vIFVzaW5nIGEgdGltZW91dCBvZiAwIGFjdHVhbGx5IHdvbid0IHN0YXJ0IGEgdGlt ZXIsIGl0IHdpbGwgc2VuZCBhIG1lc3NhZ2UuCi0gICAgICAgIG1fYmxpdFRpbWVyLnN0YXJ0KDEu MCAvIDYwLjApOworICAgICAgICBtX2FuaW1hdGlvblRpbWVyLnN0YXJ0KDEuMCAvIDYwLjApOwog ICAgICAgICBtX3dlYlBhZ2UtPnVwZGF0ZURlbGVnYXRlZE92ZXJsYXlzKCk7CiAgICAgfQogCkBA IC0xMDUsOCArMTA5LDE4IEBAIHZvaWQgV2ViUGFnZUNvbXBvc2l0b3I6OnJlbGVhc2VMYXllclJl c291cmNlcygpCiAgICAgbV9sYXllclJlbmRlcmVyLT5yZWxlYXNlTGF5ZXJSZXNvdXJjZXMoKTsK IH0KIAotdm9pZCBXZWJQYWdlQ29tcG9zaXRvcjo6YmxpdFRpbWVyRmlyZWQoKQordm9pZCBXZWJQ YWdlQ29tcG9zaXRvcjo6YW5pbWF0aW9uVGltZXJGaXJlZCgpCiB7CisgICAgaWYgKG1fd2ViUGFn ZS0+bV9iYWNraW5nU3RvcmUtPmQtPnNob3VsZERpcmVjdFJlbmRlcmluZ1RvV2luZG93KCkpIHsK KyAgICAgICAgaWYgKG1fd2ViUGFnZS0+bV9iYWNraW5nU3RvcmUtPmQtPmlzRGlyZWN0UmVuZGVy aW5nQW5pbWF0aW9uTWVzc2FnZVNjaGVkdWxlZCgpKQorICAgICAgICAgICAgcmV0dXJuOyAvLyBk b24ndCBzZW5kIG5ldyBtZXNzYWdlcyBhcyBsb25nIGFzIHdlIGhhdmVuJ3QgcmVyZW5kZXJlZAor CisgICAgICAgIG1fd2ViUGFnZS0+bV9iYWNraW5nU3RvcmUtPmQtPnNldERpcmVjdFJlbmRlcmlu Z0FuaW1hdGlvbk1lc3NhZ2VTY2hlZHVsZWQoKTsKKyAgICAgICAgQmxhY2tCZXJyeTo6UGxhdGZv cm06OndlYktpdFRocmVhZE1lc3NhZ2VDbGllbnQoKS0+ZGlzcGF0Y2hNZXNzYWdlKAorICAgICAg ICAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OmNyZWF0ZU1ldGhvZENhbGxNZXNzYWdlKAorICAg ICAgICAgICAgICAgICZCYWNraW5nU3RvcmVQcml2YXRlOjpyZW5kZXJWaXNpYmxlQ29udGVudHMs IG1fd2ViUGFnZS0+bV9iYWNraW5nU3RvcmUtPmQpKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K ICAgICBtX3dlYlBhZ2UtPmJsaXRWaXNpYmxlQ29udGVudHMoKTsKIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvV2ViUGFnZUNvbXBvc2l0b3Iu aCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1dlYlBhZ2VDb21wb3Np dG9yLmgKaW5kZXggNDM3YWI5NWUwOGVkYjIyZjY4NGMyYTMyYzUyNjNiY2Y2ZTAzNDg0Ni4uYWEw YTlhOGMwZGMzZTc4MjMxYTcxODRkOWQ2ZmFkOWY0OWI1MDMwNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvV2ViUGFnZUNvbXBvc2l0b3IuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9XZWJQYWdlQ29tcG9zaXRv ci5oCkBAIC02NSw3ICs2NSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlbGVhc2VMYXllclJlc291 cmNlcygpOwogCiBwcml2YXRlOgotICAgIHZvaWQgYmxpdFRpbWVyRmlyZWQoKTsKKyAgICB2b2lk IGFuaW1hdGlvblRpbWVyRmlyZWQoKTsKIAogICAgIFdlYlBhZ2VQcml2YXRlKiBtX3dlYlBhZ2U7 CiAgICAgT3duUHRyPFdlYkNvcmU6OkxheWVyUmVuZGVyZXI+IG1fbGF5ZXJSZW5kZXJlcjsKQEAg LTc4LDcgKzc4LDcgQEAgcHJpdmF0ZToKICAgICBXZWJDb3JlOjpJbnRSZWN0IG1fY29tcG9zaXRl ZERzdFJlY3Q7CiAgICAgV2ViQ29yZTo6RmxvYXRSZWN0IG1fY29tcG9zaXRlZENvbnRlbnRzUmVj dDsKICAgICBib29sIG1fY29tcG9zaXRpbmdPbnRvTWFpbldpbmRvdzsKLSAgICBCbGFja0JlcnJ5 OjpQbGF0Zm9ybTo6VGltZXI8V2ViUGFnZUNvbXBvc2l0b3I+IG1fYmxpdFRpbWVyOworICAgIEJs YWNrQmVycnk6OlBsYXRmb3JtOjpUaW1lcjxXZWJQYWdlQ29tcG9zaXRvcj4gbV9hbmltYXRpb25U aW1lcjsKICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6VGltZXJDbGllbnQqIG1fdGltZXJDbGll bnQ7CiB9OwogCg==