136806 2014-09-14 11:46:49 -0700 Web Inspector: InjectedScripts should not be profiled or displayed in Timeline 2014-09-29 20:34:19 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 136805 136292 1 burg burg commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 1035103 0 burg 2014-09-14 11:46:49 -0700 It doesn't make sense to show these in the timeline, at least for inspector^1. They only really show up when debugging, they generate a lot of profile data, and are sort of irrelevant for the purpose of profiling user content. I can think of some uses for seeing injected scripts in the timeline for inspector^2 and above. But, I'm not quite sure how to distinguish that from inside the engine (look at the PageGroup or something?) 1035104 1 webkit-bug-importer 2014-09-14 11:46:57 -0700 <rdar://problem/18332123> 1035271 2 timothy 2014-09-15 11:09:33 -0700 Good point. We do hide the InjectedScript from backtraces in the Debugger. We should be able to do it for the profiler too. It would make sense to show it for Inspector^2. That would be via the PageGroup identifier. 1035284 3 burg 2014-09-15 12:15:30 -0700 (In reply to comment #2) > Good point. We do hide the InjectedScript from backtraces in the Debugger. We should be able to do it for the profiler too. > > It would make sense to show it for Inspector^2. That would be via the PageGroup identifier. The profiler can distinguish different page group ids, but I don't think the inspector "level" is exposed anywhere outside of UIProcess. What's a good way to expose that? WebInspectorClient? My WIP patch has a ProfileGenerator::setSuspended flag that is set and unset under the InspectorController will/didCallInjectedScript. 1037071 4 238621 burg 2014-09-24 16:15:43 -0700 Created attachment 238621 WIP 1037148 5 238621 timothy 2014-09-24 21:31:00 -0700 Comment on attachment 238621 WIP View in context: https://bugs.webkit.org/attachment.cgi?id=238621&action=review Makes sense to me. > Source/WebCore/inspector/InspectorController.cpp:-427 > - InspectorInstrumentationCookie cookie = InspectorInstrumentation::willCallFunction(scriptExecutionContext, scriptName, scriptLine); Yeah I never understood why this was instrumented. 1038105 6 238895 burg 2014-09-29 16:22:33 -0700 Created attachment 238895 Patch 1038107 7 commit-queue 2014-09-29 16:23:33 -0700 Attachment 238895 did not pass style-queue: ERROR: Source/JavaScriptCore/profiler/ProfileGenerator.cpp:53: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 1038141 8 238895 commit-queue 2014-09-29 20:34:16 -0700 Comment on attachment 238895 Patch Clearing flags on attachment: 238895 Committed r174095: <http://trac.webkit.org/changeset/174095> 1038142 9 commit-queue 2014-09-29 20:34:19 -0700 All reviewed patches have been landed. Closing bug. 238621 2014-09-24 16:15:43 -0700 2014-09-29 16:22:30 -0700 WIP bug-136806-20140924161536.patch text/plain 9039 burg U3VidmVyc2lvbiBSZXZpc2lvbjogMTczODAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3 MGRjNzMyYjZlMjYxY2U3ZmQ2ZGY3NzU0MDRiMTI5NDY2YTkzNTkzLi44MmM1ZjI3MGMyNDE4MzBm NmM5ODc3MWQxMjM2MTFmYmQzOGE4ZjU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyNiBAQAogMjAxNC0wOS0xNCAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rv bi5lZHU+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSW5qZWN0ZWRTY3JpcHRzIHNob3VsZCBu b3QgYmUgcHJvZmlsZWQgb3IgZGlzcGxheWVkIGluIFRpbWVsaW5lCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzY4MDYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJdCBkb2Vzbid0IG1ha2Ugc2Vuc2UgdG8g c2hvdyBwcm9maWxlIG5vZGVzIGZvciBpbmplY3RlZCBzY3JpcHRzIHdoZW4gcHJvZmlsaW5nIHVz ZXIgY29udGVudC4KKyAgICAgICAgRm9yIG5vdywgb21pdCBub2RlcyBieSBzdXNwZW5kaW5nIHBy b2ZpbGluZyBiZWZvcmUgYW5kIGFmdGVyIGV4ZWN1dGluZyBpbmplY3RlZCBzY3JpcHRzLgorCisg ICAgICAgICogcHJvZmlsZXIvTGVnYWN5UHJvZmlsZXIuY3BwOgorICAgICAgICAoSlNDOjpMZWdh Y3lQcm9maWxlcjo6c3VzcGVuZFByb2ZpbGluZyk6IEFkZGVkLgorICAgICAgICAoSlNDOjpMZWdh Y3lQcm9maWxlcjo6dW5zdXNwZW5kUHJvZmlsaW5nKTogQWRkZWQuCisgICAgICAgICogcHJvZmls ZXIvTGVnYWN5UHJvZmlsZXIuaDoKKyAgICAgICAgKiBwcm9maWxlci9Qcm9maWxlR2VuZXJhdG9y LmNwcDogQWRkIGlzU3VzcGVuZGVkKCkgZmxhZywgcmVtb3ZlIHVudXNlZCB0eXBlZGVmLgorICAg ICAgICAoSlNDOjpQcm9maWxlR2VuZXJhdG9yOjpQcm9maWxlR2VuZXJhdG9yKToKKyAgICAgICAg KEpTQzo6UHJvZmlsZUdlbmVyYXRvcjo6d2lsbEV4ZWN1dGUpOgorICAgICAgICAoSlNDOjpQcm9m aWxlR2VuZXJhdG9yOjpkaWRFeGVjdXRlKToKKyAgICAgICAgKiBwcm9maWxlci9Qcm9maWxlR2Vu ZXJhdG9yLmg6CisgICAgICAgIChKU0M6OlByb2ZpbGVHZW5lcmF0b3I6OnNldElzU3VzcGVuZGVk KTogQWRkZWQuCisKKzIwMTQtMDktMTQgIEJyaWFuIEouIEJ1cmcgIDxidXJnQGNzLndhc2hpbmd0 b24uZWR1PgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHN1YnRyYWN0IGVsYXBzZWQgdGltZSB3 aGlsZSBkZWJ1Z2dlciBpcyBwYXVzZWQgZnJvbSBwcm9maWxlIG5vZGVzCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzY3OTYKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4 IGE0YWFiNDM0ZjcxNzAyZWQ5MGU4YTViMWNmNjVmMzY2ZWU5NGQ0MzkuLjc0YjEyZmYxYTc0ZTlm NWFhZjEzZjNiZmU4NTE5ZGFlNTAyZGNkMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxOSBAQAog MjAxNC0wOS0xNCAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rvbi5lZHU+CiAKKyAg ICAgICAgV2ViIEluc3BlY3RvcjogSW5qZWN0ZWRTY3JpcHRzIHNob3VsZCBub3QgYmUgcHJvZmls ZWQgb3IgZGlzcGxheWVkIGluIFRpbWVsaW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzY4MDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBJbnN0ZWFkIG9mIGNyZWF0aW5nIHRpbWVsaW5lIHJlY29yZHMg Zm9yIGluamVjdGVkIHNjcmlwdHMsIHN1c3BlbmQgcHJvZmlsaW5nCisgICAgICAgIG9mIHRoZSBj dXJyZW50IHBhZ2UgYmVmb3JlIGFuZCBhZnRlciBjYWxsaW5nIGluamVjdGVkIHNjcmlwdCBmdW5j dGlvbnMuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjp3aWxsQ2FsbEluamVjdGVkU2Ny aXB0RnVuY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlk Q2FsbEluamVjdGVkU2NyaXB0RnVuY3Rpb24pOgorCisyMDE0LTA5LTE0ICBCcmlhbiBKLiBCdXJn ICA8YnVyZ0Bjcy53YXNoaW5ndG9uLmVkdT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBzdWJ0 cmFjdCBlbGFwc2VkIHRpbWUgd2hpbGUgZGVidWdnZXIgaXMgcGF1c2VkIGZyb20gcHJvZmlsZSBu b2RlcwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM2 Nzk2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wcm9maWxlci9MZWdhY3lQ cm9maWxlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcHJvZmlsZXIvTGVnYWN5UHJvZmls ZXIuY3BwCmluZGV4IDNhOTljYzRlYTIwZDQ3YjE2M2VkYzJhYjI5ZDZjZjEwMWM0YjMyNmEuLjRm ZTJiYTZiMWNlNDJiNjkyYTZjNDg1NzAzNjg2ZmE5ZTRmN2Y3ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9wcm9maWxlci9MZWdhY3lQcm9maWxlci5jcHAKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3Byb2ZpbGVyL0xlZ2FjeVByb2ZpbGVyLmNwcApAQCAtMTIzLDYgKzEy MywyMiBAQCBzdGF0aWMgaW5saW5lIHZvaWQgY2FsbEZ1bmN0aW9uRm9yUHJvZmlsZXNXaXRoR3Jv dXAoc3RkOjpmdW5jdGlvbjx2b2lkKFByb2ZpbGVHZQogICAgIH0KIH0KIAordm9pZCBMZWdhY3lQ cm9maWxlcjo6c3VzcGVuZFByb2ZpbGluZyhKU0M6OkV4ZWNTdGF0ZSogZXhlYykKK3sKKyAgICBp ZiAoIWV4ZWMpCisgICAgICAgIHJldHVybjsKKworICAgIGNhbGxGdW5jdGlvbkZvclByb2ZpbGVz V2l0aEdyb3VwKHN0ZDo6YmluZCgmUHJvZmlsZUdlbmVyYXRvcjo6c2V0SXNTdXNwZW5kZWQsIHN0 ZDo6cGxhY2Vob2xkZXJzOjpfMSwgdHJ1ZSksIG1fY3VycmVudFByb2ZpbGVzLCBleGVjLT5sZXhp Y2FsR2xvYmFsT2JqZWN0KCktPnByb2ZpbGVHcm91cCgpKTsKK30KKwordm9pZCBMZWdhY3lQcm9m aWxlcjo6dW5zdXNwZW5kUHJvZmlsaW5nKEpTQzo6RXhlY1N0YXRlKiBleGVjKQoreworICAgIGlm ICghZXhlYykKKyAgICAgICAgcmV0dXJuOworCisgICAgY2FsbEZ1bmN0aW9uRm9yUHJvZmlsZXNX aXRoR3JvdXAoc3RkOjpiaW5kKCZQcm9maWxlR2VuZXJhdG9yOjpzZXRJc1N1c3BlbmRlZCwgc3Rk OjpwbGFjZWhvbGRlcnM6Ol8xLCBmYWxzZSksIG1fY3VycmVudFByb2ZpbGVzLCBleGVjLT5sZXhp Y2FsR2xvYmFsT2JqZWN0KCktPnByb2ZpbGVHcm91cCgpKTsKK30KKwogdm9pZCBMZWdhY3lQcm9m aWxlcjo6d2lsbEV4ZWN1dGUoRXhlY1N0YXRlKiBjYWxsZXJDYWxsRnJhbWUsIEpTVmFsdWUgZnVu Y3Rpb24pCiB7CiAgICAgQVNTRVJUKCFtX2N1cnJlbnRQcm9maWxlcy5pc0VtcHR5KCkpOwpkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3Byb2ZpbGVyL0xlZ2FjeVByb2ZpbGVyLmgg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcHJvZmlsZXIvTGVnYWN5UHJvZmlsZXIuaAppbmRleCA3 ZTc5Y2JjYzA5NmMwZTNlYWQ3ODUyNTc1MWM5NTMxZjc1ODgzMGU5Li4xZDZjYjI2ZjgzZmYwMmY4 Y2FkMzI3MGQxNGUwMTQzNjYwYWI3NmFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcHJvZmlsZXIvTGVnYWN5UHJvZmlsZXIuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cHJvZmlsZXIvTGVnYWN5UHJvZmlsZXIuaApAQCAtNTUsNiArNTUsMTAgQEAgcHVibGljOgogICAg IEpTX0VYUE9SVF9QUklWQVRFIFBhc3NSZWZQdHI8UHJvZmlsZT4gc3RvcFByb2ZpbGluZyhFeGVj U3RhdGUqLCBjb25zdCBXVEY6OlN0cmluZyYgdGl0bGUpOwogICAgIHZvaWQgc3RvcFByb2ZpbGlu ZyhKU0dsb2JhbE9iamVjdCopOwogCisgICAgLy8gVXNlZCB0byBpZ25vcmUgcHJvZmlsZSBub2Rl IHN1YnRyZWVzIHJvb3RlZCBhdCBJbmplY3RlZFNjcmlwdCBjYWxscy4KKyAgICBKU19FWFBPUlRf UFJJVkFURSB2b2lkIHN1c3BlbmRQcm9maWxpbmcoRXhlY1N0YXRlKik7CisgICAgSlNfRVhQT1JU X1BSSVZBVEUgdm9pZCB1bnN1c3BlbmRQcm9maWxpbmcoRXhlY1N0YXRlKik7CisKICAgICB2b2lk IHdpbGxFeGVjdXRlKEV4ZWNTdGF0ZSogY2FsbGVyQ2FsbEZyYW1lLCBKU1ZhbHVlIGZ1bmN0aW9u KTsKICAgICB2b2lkIHdpbGxFeGVjdXRlKEV4ZWNTdGF0ZSogY2FsbGVyQ2FsbEZyYW1lLCBjb25z dCBXVEY6OlN0cmluZyYgc291cmNlVVJMLCB1bnNpZ25lZCBzdGFydGluZ0xpbmVOdW1iZXIsIHVu c2lnbmVkIHN0YXJ0aW5nQ29sdW1uTnVtYmVyKTsKICAgICB2b2lkIGRpZEV4ZWN1dGUoRXhlY1N0 YXRlKiBjYWxsZXJDYWxsRnJhbWUsIEpTVmFsdWUgZnVuY3Rpb24pOwpkaWZmIC0tZ2l0IGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL3Byb2ZpbGVyL1Byb2ZpbGVHZW5lcmF0b3IuY3BwIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3Byb2ZpbGVyL1Byb2ZpbGVHZW5lcmF0b3IuY3BwCmluZGV4IDdlNDM0 NDZmMzUwYTQ2ZTc1M2U5Y2NjNGE5ZDk3OTE0OTQ1N2JkOWEuLjMyZTg5MjYwZWVmYzc4ZjJhOGVi OTk2YWU5YTc3Zjg5NmVkOTQzNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9w cm9maWxlci9Qcm9maWxlR2VuZXJhdG9yLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cHJvZmlsZXIvUHJvZmlsZUdlbmVyYXRvci5jcHAKQEAgLTUwLDYgKzUwLDcgQEAgUHJvZmlsZUdl bmVyYXRvcjo6UHJvZmlsZUdlbmVyYXRvcihFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IFN0cmluZyYg dGl0bGUsIHVuc2lnbmUKICAgICAsIG1fcHJvZmlsZUdyb3VwKGV4ZWMgPyBleGVjLT5sZXhpY2Fs R2xvYmFsT2JqZWN0KCktPnByb2ZpbGVHcm91cCgpIDogMCkKICAgICAsIG1fZGVidWdnZXJQYXVz ZWRUaW1lc3RhbXAoTkFOKQogICAgICwgbV9mb3VuZENvbnNvbGVTdGFydFBhcmVudChmYWxzZSkK KyAgICAsIG1fc3VzcGVuZGVkKGZhbHNlKQogewogICAgIGlmIChEZWJ1Z2dlciogZGVidWdnZXIg PSBleGVjLT5sZXhpY2FsR2xvYmFsT2JqZWN0KCktPmRlYnVnZ2VyKCkpCiAgICAgICAgIG1fZGVi dWdnZXJQYXVzZWRUaW1lc3RhbXAgPSBkZWJ1Z2dlci0+aXNQYXVzZWQoKSA/IGN1cnJlbnRUaW1l KCkgOiBOQU47CkBAIC0xNjIsNiArMTYzLDkgQEAgdm9pZCBQcm9maWxlR2VuZXJhdG9yOjp3aWxs RXhlY3V0ZShFeGVjU3RhdGUqIGNhbGxlckNhbGxGcmFtZSwgY29uc3QgQ2FsbElkZW50aWYKICAg ICBpZiAoIW1fb3JpZ2luKQogICAgICAgICByZXR1cm47CiAKKyAgICBpZiAobV9zdXNwZW5kZWQp CisgICAgICAgIHJldHVybjsKKwogICAgIFJlZlB0cjxQcm9maWxlTm9kZT4gY2FsbGVlTm9kZSA9 IG51bGxwdHI7CiAKICAgICAvLyBGaW5kIG9yIGNyZWF0ZSBhIG5vZGUgZm9yIHRoZSBjYWxsZWUg Y2FsbCBmcmFtZS4KQEAgLTE5MCw2ICsxOTQsOSBAQCB2b2lkIFByb2ZpbGVHZW5lcmF0b3I6OmRp ZEV4ZWN1dGUoRXhlY1N0YXRlKiBjYWxsZXJDYWxsRnJhbWUsIGNvbnN0IENhbGxJZGVudGlmaQog ICAgIGlmICghbV9vcmlnaW4pCiAgICAgICAgIHJldHVybjsKIAorICAgIGlmIChtX3N1c3BlbmRl ZCkKKyAgICAgICAgcmV0dXJuOworCiAgICAgLy8gTWFrZSBhIG5ldyBub2RlIGlmIHRoZSBjYWxs ZXIgbm9kZSBoYXMgbmV2ZXIgc2VlbiB0aGlzIGNhbGxlZSBjYWxsIGZyYW1lIGJlZm9yZS4KICAg ICAvLyBUaGlzIGNhbiBoYXBwZW4gaWYgfGNvbnNvbGUucHJvZmlsZSgpfCBpcyBjYWxsZWQgc2V2 ZXJhbCBmcmFtZXMgZGVlcCBpbiB0aGUgY2FsbCBzdGFjay4KICAgICBBU1NFUlQobV9jdXJyZW50 Tm9kZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcHJvZmlsZXIvUHJvZmls ZUdlbmVyYXRvci5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3Byb2ZpbGVyL1Byb2ZpbGVHZW5l cmF0b3IuaAppbmRleCA3Yzk3MGQ2OWNjNjc4ZWM2NWRiNjc4YzZmZWRkNThiZDBmZWZmYTQwLi45 ZjUxYTNkYzg2Y2QzM2Y0MWE0ZTRiZWFmZTlmNTBjM2NjYzk0MWYyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcHJvZmlsZXIvUHJvZmlsZUdlbmVyYXRvci5oCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9wcm9maWxlci9Qcm9maWxlR2VuZXJhdG9yLmgKQEAgLTU3LDkgKzU3 LDkgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHZvaWQgZGlkUGF1c2UoUGFzc1JlZlB0cjxE ZWJ1Z2dlckNhbGxGcmFtZT4sIGNvbnN0IENhbGxJZGVudGlmaWVyJik7CiAgICAgICAgIHZvaWQg ZGlkQ29udGludWUoUGFzc1JlZlB0cjxEZWJ1Z2dlckNhbGxGcmFtZT4sIGNvbnN0IENhbGxJZGVu dGlmaWVyJik7CiAKLSAgICAgICAgdm9pZCBzdG9wUHJvZmlsaW5nKCk7CisgICAgICAgIHZvaWQg c2V0SXNTdXNwZW5kZWQoYm9vbCBzdXNwZW5kZWQpIHsgQVNTRVJUKG1fc3VzcGVuZGVkICE9IHN1 c3BlbmRlZCk7IG1fc3VzcGVuZGVkID0gc3VzcGVuZGVkOyB9CiAKLSAgICAgICAgdHlwZWRlZiB2 b2lkIChQcm9maWxlR2VuZXJhdG9yOjoqUHJvZmlsZUZ1bmN0aW9uKShFeGVjU3RhdGUqIGNhbGxl ck9ySGFuZGxlckNhbGxGcmFtZSwgY29uc3QgQ2FsbElkZW50aWZpZXImIGNhbGxJZGVudGlmaWVy KTsKKyAgICAgICAgdm9pZCBzdG9wUHJvZmlsaW5nKCk7CiAKICAgICBwcml2YXRlOgogICAgICAg ICBQcm9maWxlR2VuZXJhdG9yKEV4ZWNTdGF0ZSosIGNvbnN0IFdURjo6U3RyaW5nJiB0aXRsZSwg dW5zaWduZWQgdWlkKTsKQEAgLTc5LDYgKzc5LDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAg IFJlZlB0cjxQcm9maWxlTm9kZT4gbV9yb290Tm9kZTsKICAgICAgICAgUmVmUHRyPFByb2ZpbGVO b2RlPiBtX2N1cnJlbnROb2RlOwogICAgICAgICBib29sIG1fZm91bmRDb25zb2xlU3RhcnRQYXJl bnQ7CisgICAgICAgIGJvb2wgbV9zdXNwZW5kZWQ7CiAgICAgfTsKIAogfSAvLyBuYW1lc3BhY2Ug SlNDCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJv bGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5j cHAKaW5kZXggMjA0MjUxNGI5NmI2Njk0ZjRmOGVlNjJmYmJkY2ViYzNkZjNhMTFlMy4uNWE3ZjVi OTAwMmUxZjM4ODk3M2NjYmFjMzkzNTU3ZWViYzkxMjQzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcApAQCAtNzIsNiArNzIsNyBAQAog I2luY2x1ZGUgPGluc3BlY3Rvci9JZGVudGlmaWVyc0ZhY3RvcnkuaD4KICNpbmNsdWRlIDxpbnNw ZWN0b3IvSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXIuaD4KICNpbmNsdWRlIDxpbnNwZWN0b3Iv YWdlbnRzL0luc3BlY3RvckFnZW50Lmg+CisjaW5jbHVkZSA8cHJvZmlsZXIvTGVnYWN5UHJvZmls ZXIuaD4KICNpbmNsdWRlIDxydW50aW1lL0pTTG9jay5oPgogCiB1c2luZyBuYW1lc3BhY2UgSlND OwpAQCAtNDIxLDE5ICs0MjIsMTQgQEAgSW5zcGVjdG9yRXZhbHVhdGVIYW5kbGVyIEluc3BlY3Rv ckNvbnRyb2xsZXI6OmV2YWx1YXRlSGFuZGxlcigpIGNvbnN0CiAgICAgcmV0dXJuIFdlYkNvcmU6 OmV2YWx1YXRlSGFuZGxlckZyb21BbnlUaHJlYWQ7CiB9CiAKLXZvaWQgSW5zcGVjdG9yQ29udHJv bGxlcjo6d2lsbENhbGxJbmplY3RlZFNjcmlwdEZ1bmN0aW9uKEpTQzo6RXhlY1N0YXRlKiBzY3Jp cHRTdGF0ZSwgY29uc3QgU3RyaW5nJiBzY3JpcHROYW1lLCBpbnQgc2NyaXB0TGluZSkKK3ZvaWQg SW5zcGVjdG9yQ29udHJvbGxlcjo6d2lsbENhbGxJbmplY3RlZFNjcmlwdEZ1bmN0aW9uKEpTQzo6 RXhlY1N0YXRlKiBzY3JpcHRTdGF0ZSwgY29uc3QgU3RyaW5nJiwgaW50KQogewotICAgIFNjcmlw dEV4ZWN1dGlvbkNvbnRleHQqIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQgPSBzY3JpcHRFeGVjdXRp b25Db250ZXh0RnJvbUV4ZWNTdGF0ZShzY3JpcHRTdGF0ZSk7Ci0gICAgSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uQ29va2llIGNvb2tpZSA9IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbENh bGxGdW5jdGlvbihzY3JpcHRFeGVjdXRpb25Db250ZXh0LCBzY3JpcHROYW1lLCBzY3JpcHRMaW5l KTsKLSAgICBtX2luamVjdGVkU2NyaXB0SW5zdHJ1bWVudGF0aW9uQ29va2llcy5hcHBlbmQoY29v a2llKTsKKyAgICBMZWdhY3lQcm9maWxlcjo6cHJvZmlsZXIoKS0+c3VzcGVuZFByb2ZpbGluZyhz Y3JpcHRTdGF0ZSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkQ2FsbEluamVj dGVkU2NyaXB0RnVuY3Rpb24oSlNDOjpFeGVjU3RhdGUqIHNjcmlwdFN0YXRlKQogewotICAgIEFT U0VSVCghbV9pbmplY3RlZFNjcmlwdEluc3RydW1lbnRhdGlvbkNvb2tpZXMuaXNFbXB0eSgpKTsK LSAgICBTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBzY3JpcHRFeGVjdXRpb25Db250ZXh0ID0gc2Ny aXB0RXhlY3V0aW9uQ29udGV4dEZyb21FeGVjU3RhdGUoc2NyaXB0U3RhdGUpOwotICAgIEluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSBjb29raWUgPSBtX2luamVjdGVkU2NyaXB0SW5zdHJ1 bWVudGF0aW9uQ29va2llcy50YWtlTGFzdCgpOwotICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6ZGlkQ2FsbEZ1bmN0aW9uKGNvb2tpZSwgc2NyaXB0RXhlY3V0aW9uQ29udGV4dCk7CisgICAg TGVnYWN5UHJvZmlsZXI6OnByb2ZpbGVyKCktPnVuc3VzcGVuZFByb2ZpbGluZyhzY3JpcHRTdGF0 ZSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 238895 2014-09-29 16:22:33 -0700 2014-09-29 20:34:16 -0700 Patch bug-136806-20140929162207.patch text/plain 8886 burg U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0MDkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm YmM5MjkyODg3NDhhMTU4MWFlOWIwMjkyYjJiYmY5YmRlZDZjM2Q1Li42ZDlkZTc5Njc2MGU1NzJh ZTA4NzYxOGNiMjIwOTBkNjdkYmY2NzczIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAxNC0wOS0yOSAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rv bi5lZHU+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSW5qZWN0ZWRTY3JpcHRzIHNob3VsZCBu b3QgYmUgcHJvZmlsZWQgb3IgZGlzcGxheWVkIGluIFRpbWVsaW5lCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzY4MDYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJdCBkb2Vzbid0IG1ha2Ugc2Vuc2UgdG8g c2hvdyBwcm9maWxlIG5vZGVzIGZvciBpbmplY3RlZCBzY3JpcHRzIHdoZW4gcHJvZmlsaW5nIHVz ZXIgY29udGVudC4KKyAgICAgICAgRm9yIG5vdywgb21pdCBub2RlcyBieSBzdXNwZW5kaW5nIHBy b2ZpbGluZyBiZWZvcmUgYW5kIGFmdGVyIGV4ZWN1dGluZyBpbmplY3RlZCBzY3JpcHRzLgorCisg ICAgICAgICogcHJvZmlsZXIvTGVnYWN5UHJvZmlsZXIuY3BwOgorICAgICAgICAoSlNDOjpMZWdh Y3lQcm9maWxlcjo6c3VzcGVuZFByb2ZpbGluZyk6IEFkZGVkLgorICAgICAgICAoSlNDOjpMZWdh Y3lQcm9maWxlcjo6dW5zdXNwZW5kUHJvZmlsaW5nKTogQWRkZWQuCisgICAgICAgICogcHJvZmls ZXIvTGVnYWN5UHJvZmlsZXIuaDoKKyAgICAgICAgKiBwcm9maWxlci9Qcm9maWxlR2VuZXJhdG9y LmNwcDogQWRkIGlzU3VzcGVuZGVkKCkgZmxhZywgcmVtb3ZlIHVudXNlZCB0eXBlZGVmLgorICAg ICAgICAoSlNDOjpQcm9maWxlR2VuZXJhdG9yOjpQcm9maWxlR2VuZXJhdG9yKToKKyAgICAgICAg KEpTQzo6UHJvZmlsZUdlbmVyYXRvcjo6d2lsbEV4ZWN1dGUpOgorICAgICAgICAoSlNDOjpQcm9m aWxlR2VuZXJhdG9yOjpkaWRFeGVjdXRlKToKKyAgICAgICAgKiBwcm9maWxlci9Qcm9maWxlR2Vu ZXJhdG9yLmg6CisgICAgICAgIChKU0M6OlByb2ZpbGVHZW5lcmF0b3I6OnNldElzU3VzcGVuZGVk KTogQWRkZWQuCisKIDIwMTQtMDktMjkgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4K IAogICAgICAgICBERkcgSGFzU3RydWN0dXJlUHJvcGVydHkgY29kZWdlbiBzaG91bGQgdXNlIG9u ZSBmZXdlciByZWdpc3RlcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBi L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4MWJkOGQ3ZTEwZTg5MWE1ZWRjZTBkNzI0 MmY4NGQyNTg0MTkwYmI4Li41NTlkODE3ODc4YWM1YzVlOGQ4NDFiNmUzMTIxMzY2ZTI0YTVkMWJk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTQtMDktMjkgIEJyaWFuIEouIEJ1cmcg IDxidXJnQGNzLndhc2hpbmd0b24uZWR1PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEluamVj dGVkU2NyaXB0cyBzaG91bGQgbm90IGJlIHByb2ZpbGVkIG9yIGRpc3BsYXllZCBpbiBUaW1lbGlu ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM2ODA2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW5zdGVh ZCBvZiBjcmVhdGluZyB0aW1lbGluZSByZWNvcmRzIGZvciBpbmplY3RlZCBzY3JpcHRzLCBzdXNw ZW5kIHByb2ZpbGluZworICAgICAgICBvZiB0aGUgY3VycmVudCBwYWdlIGJlZm9yZSBhbmQgYWZ0 ZXIgY2FsbGluZyBpbmplY3RlZCBzY3JpcHQgZnVuY3Rpb25zLgorCisgICAgICAgICogaW5zcGVj dG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y Q29udHJvbGxlcjo6d2lsbENhbGxJbmplY3RlZFNjcmlwdEZ1bmN0aW9uKToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmRpZENhbGxJbmplY3RlZFNjcmlwdEZ1bmN0aW9u KToKKwogMjAxNC0wOS0yOSAgQ2hyaXN0b3BoZSBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAK ICAgICAgICAgVXNlIGlzPD4oKSAvIGRvd25jYXN0PD4oKSBmb3IgRG9jdW1lbnQKZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wcm9maWxlci9MZWdhY3lQcm9maWxlci5jcHAgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcHJvZmlsZXIvTGVnYWN5UHJvZmlsZXIuY3BwCmluZGV4IDNh OTljYzRlYTIwZDQ3YjE2M2VkYzJhYjI5ZDZjZjEwMWM0YjMyNmEuLjRmZTJiYTZiMWNlNDJiNjky YTZjNDg1NzAzNjg2ZmE5ZTRmN2Y3ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9wcm9maWxlci9MZWdhY3lQcm9maWxlci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L3Byb2ZpbGVyL0xlZ2FjeVByb2ZpbGVyLmNwcApAQCAtMTIzLDYgKzEyMywyMiBAQCBzdGF0aWMg aW5saW5lIHZvaWQgY2FsbEZ1bmN0aW9uRm9yUHJvZmlsZXNXaXRoR3JvdXAoc3RkOjpmdW5jdGlv bjx2b2lkKFByb2ZpbGVHZQogICAgIH0KIH0KIAordm9pZCBMZWdhY3lQcm9maWxlcjo6c3VzcGVu ZFByb2ZpbGluZyhKU0M6OkV4ZWNTdGF0ZSogZXhlYykKK3sKKyAgICBpZiAoIWV4ZWMpCisgICAg ICAgIHJldHVybjsKKworICAgIGNhbGxGdW5jdGlvbkZvclByb2ZpbGVzV2l0aEdyb3VwKHN0ZDo6 YmluZCgmUHJvZmlsZUdlbmVyYXRvcjo6c2V0SXNTdXNwZW5kZWQsIHN0ZDo6cGxhY2Vob2xkZXJz OjpfMSwgdHJ1ZSksIG1fY3VycmVudFByb2ZpbGVzLCBleGVjLT5sZXhpY2FsR2xvYmFsT2JqZWN0 KCktPnByb2ZpbGVHcm91cCgpKTsKK30KKwordm9pZCBMZWdhY3lQcm9maWxlcjo6dW5zdXNwZW5k UHJvZmlsaW5nKEpTQzo6RXhlY1N0YXRlKiBleGVjKQoreworICAgIGlmICghZXhlYykKKyAgICAg ICAgcmV0dXJuOworCisgICAgY2FsbEZ1bmN0aW9uRm9yUHJvZmlsZXNXaXRoR3JvdXAoc3RkOjpi aW5kKCZQcm9maWxlR2VuZXJhdG9yOjpzZXRJc1N1c3BlbmRlZCwgc3RkOjpwbGFjZWhvbGRlcnM6 Ol8xLCBmYWxzZSksIG1fY3VycmVudFByb2ZpbGVzLCBleGVjLT5sZXhpY2FsR2xvYmFsT2JqZWN0 KCktPnByb2ZpbGVHcm91cCgpKTsKK30KKwogdm9pZCBMZWdhY3lQcm9maWxlcjo6d2lsbEV4ZWN1 dGUoRXhlY1N0YXRlKiBjYWxsZXJDYWxsRnJhbWUsIEpTVmFsdWUgZnVuY3Rpb24pCiB7CiAgICAg QVNTRVJUKCFtX2N1cnJlbnRQcm9maWxlcy5pc0VtcHR5KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3Byb2ZpbGVyL0xlZ2FjeVByb2ZpbGVyLmggYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcHJvZmlsZXIvTGVnYWN5UHJvZmlsZXIuaAppbmRleCA3ZTc5Y2JjYzA5NmMwZTNl YWQ3ODUyNTc1MWM5NTMxZjc1ODgzMGU5Li4xZDZjYjI2ZjgzZmYwMmY4Y2FkMzI3MGQxNGUwMTQz NjYwYWI3NmFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcHJvZmlsZXIvTGVn YWN5UHJvZmlsZXIuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcHJvZmlsZXIvTGVnYWN5 UHJvZmlsZXIuaApAQCAtNTUsNiArNTUsMTAgQEAgcHVibGljOgogICAgIEpTX0VYUE9SVF9QUklW QVRFIFBhc3NSZWZQdHI8UHJvZmlsZT4gc3RvcFByb2ZpbGluZyhFeGVjU3RhdGUqLCBjb25zdCBX VEY6OlN0cmluZyYgdGl0bGUpOwogICAgIHZvaWQgc3RvcFByb2ZpbGluZyhKU0dsb2JhbE9iamVj dCopOwogCisgICAgLy8gVXNlZCB0byBpZ25vcmUgcHJvZmlsZSBub2RlIHN1YnRyZWVzIHJvb3Rl ZCBhdCBJbmplY3RlZFNjcmlwdCBjYWxscy4KKyAgICBKU19FWFBPUlRfUFJJVkFURSB2b2lkIHN1 c3BlbmRQcm9maWxpbmcoRXhlY1N0YXRlKik7CisgICAgSlNfRVhQT1JUX1BSSVZBVEUgdm9pZCB1 bnN1c3BlbmRQcm9maWxpbmcoRXhlY1N0YXRlKik7CisKICAgICB2b2lkIHdpbGxFeGVjdXRlKEV4 ZWNTdGF0ZSogY2FsbGVyQ2FsbEZyYW1lLCBKU1ZhbHVlIGZ1bmN0aW9uKTsKICAgICB2b2lkIHdp bGxFeGVjdXRlKEV4ZWNTdGF0ZSogY2FsbGVyQ2FsbEZyYW1lLCBjb25zdCBXVEY6OlN0cmluZyYg c291cmNlVVJMLCB1bnNpZ25lZCBzdGFydGluZ0xpbmVOdW1iZXIsIHVuc2lnbmVkIHN0YXJ0aW5n Q29sdW1uTnVtYmVyKTsKICAgICB2b2lkIGRpZEV4ZWN1dGUoRXhlY1N0YXRlKiBjYWxsZXJDYWxs RnJhbWUsIEpTVmFsdWUgZnVuY3Rpb24pOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRD b3JlL3Byb2ZpbGVyL1Byb2ZpbGVHZW5lcmF0b3IuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L3Byb2ZpbGVyL1Byb2ZpbGVHZW5lcmF0b3IuY3BwCmluZGV4IDdlNDM0NDZmMzUwYTQ2ZTc1M2U5 Y2NjNGE5ZDk3OTE0OTQ1N2JkOWEuLjMyZTg5MjYwZWVmYzc4ZjJhOGViOTk2YWU5YTc3Zjg5NmVk OTQzNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wcm9maWxlci9Qcm9maWxl R2VuZXJhdG9yLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcHJvZmlsZXIvUHJvZmls ZUdlbmVyYXRvci5jcHAKQEAgLTUwLDYgKzUwLDcgQEAgUHJvZmlsZUdlbmVyYXRvcjo6UHJvZmls ZUdlbmVyYXRvcihFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IFN0cmluZyYgdGl0bGUsIHVuc2lnbmUK ICAgICAsIG1fcHJvZmlsZUdyb3VwKGV4ZWMgPyBleGVjLT5sZXhpY2FsR2xvYmFsT2JqZWN0KCkt PnByb2ZpbGVHcm91cCgpIDogMCkKICAgICAsIG1fZGVidWdnZXJQYXVzZWRUaW1lc3RhbXAoTkFO KQogICAgICwgbV9mb3VuZENvbnNvbGVTdGFydFBhcmVudChmYWxzZSkKKyAgICAsIG1fc3VzcGVu ZGVkKGZhbHNlKQogewogICAgIGlmIChEZWJ1Z2dlciogZGVidWdnZXIgPSBleGVjLT5sZXhpY2Fs R2xvYmFsT2JqZWN0KCktPmRlYnVnZ2VyKCkpCiAgICAgICAgIG1fZGVidWdnZXJQYXVzZWRUaW1l c3RhbXAgPSBkZWJ1Z2dlci0+aXNQYXVzZWQoKSA/IGN1cnJlbnRUaW1lKCkgOiBOQU47CkBAIC0x NjIsNiArMTYzLDkgQEAgdm9pZCBQcm9maWxlR2VuZXJhdG9yOjp3aWxsRXhlY3V0ZShFeGVjU3Rh dGUqIGNhbGxlckNhbGxGcmFtZSwgY29uc3QgQ2FsbElkZW50aWYKICAgICBpZiAoIW1fb3JpZ2lu KQogICAgICAgICByZXR1cm47CiAKKyAgICBpZiAobV9zdXNwZW5kZWQpCisgICAgICAgIHJldHVy bjsKKwogICAgIFJlZlB0cjxQcm9maWxlTm9kZT4gY2FsbGVlTm9kZSA9IG51bGxwdHI7CiAKICAg ICAvLyBGaW5kIG9yIGNyZWF0ZSBhIG5vZGUgZm9yIHRoZSBjYWxsZWUgY2FsbCBmcmFtZS4KQEAg LTE5MCw2ICsxOTQsOSBAQCB2b2lkIFByb2ZpbGVHZW5lcmF0b3I6OmRpZEV4ZWN1dGUoRXhlY1N0 YXRlKiBjYWxsZXJDYWxsRnJhbWUsIGNvbnN0IENhbGxJZGVudGlmaQogICAgIGlmICghbV9vcmln aW4pCiAgICAgICAgIHJldHVybjsKIAorICAgIGlmIChtX3N1c3BlbmRlZCkKKyAgICAgICAgcmV0 dXJuOworCiAgICAgLy8gTWFrZSBhIG5ldyBub2RlIGlmIHRoZSBjYWxsZXIgbm9kZSBoYXMgbmV2 ZXIgc2VlbiB0aGlzIGNhbGxlZSBjYWxsIGZyYW1lIGJlZm9yZS4KICAgICAvLyBUaGlzIGNhbiBo YXBwZW4gaWYgfGNvbnNvbGUucHJvZmlsZSgpfCBpcyBjYWxsZWQgc2V2ZXJhbCBmcmFtZXMgZGVl cCBpbiB0aGUgY2FsbCBzdGFjay4KICAgICBBU1NFUlQobV9jdXJyZW50Tm9kZSk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcHJvZmlsZXIvUHJvZmlsZUdlbmVyYXRvci5oIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3Byb2ZpbGVyL1Byb2ZpbGVHZW5lcmF0b3IuaAppbmRleCA3 Yzk3MGQ2OWNjNjc4ZWM2NWRiNjc4YzZmZWRkNThiZDBmZWZmYTQwLi45ZjUxYTNkYzg2Y2QzM2Y0 MWE0ZTRiZWFmZTlmNTBjM2NjYzk0MWYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcHJvZmlsZXIvUHJvZmlsZUdlbmVyYXRvci5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9wcm9maWxlci9Qcm9maWxlR2VuZXJhdG9yLmgKQEAgLTU3LDkgKzU3LDkgQEAgbmFtZXNwYWNl IEpTQyB7CiAgICAgICAgIHZvaWQgZGlkUGF1c2UoUGFzc1JlZlB0cjxEZWJ1Z2dlckNhbGxGcmFt ZT4sIGNvbnN0IENhbGxJZGVudGlmaWVyJik7CiAgICAgICAgIHZvaWQgZGlkQ29udGludWUoUGFz c1JlZlB0cjxEZWJ1Z2dlckNhbGxGcmFtZT4sIGNvbnN0IENhbGxJZGVudGlmaWVyJik7CiAKLSAg ICAgICAgdm9pZCBzdG9wUHJvZmlsaW5nKCk7CisgICAgICAgIHZvaWQgc2V0SXNTdXNwZW5kZWQo Ym9vbCBzdXNwZW5kZWQpIHsgQVNTRVJUKG1fc3VzcGVuZGVkICE9IHN1c3BlbmRlZCk7IG1fc3Vz cGVuZGVkID0gc3VzcGVuZGVkOyB9CiAKLSAgICAgICAgdHlwZWRlZiB2b2lkIChQcm9maWxlR2Vu ZXJhdG9yOjoqUHJvZmlsZUZ1bmN0aW9uKShFeGVjU3RhdGUqIGNhbGxlck9ySGFuZGxlckNhbGxG cmFtZSwgY29uc3QgQ2FsbElkZW50aWZpZXImIGNhbGxJZGVudGlmaWVyKTsKKyAgICAgICAgdm9p ZCBzdG9wUHJvZmlsaW5nKCk7CiAKICAgICBwcml2YXRlOgogICAgICAgICBQcm9maWxlR2VuZXJh dG9yKEV4ZWNTdGF0ZSosIGNvbnN0IFdURjo6U3RyaW5nJiB0aXRsZSwgdW5zaWduZWQgdWlkKTsK QEAgLTc5LDYgKzc5LDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIFJlZlB0cjxQcm9maWxl Tm9kZT4gbV9yb290Tm9kZTsKICAgICAgICAgUmVmUHRyPFByb2ZpbGVOb2RlPiBtX2N1cnJlbnRO b2RlOwogICAgICAgICBib29sIG1fZm91bmRDb25zb2xlU3RhcnRQYXJlbnQ7CisgICAgICAgIGJv b2wgbV9zdXNwZW5kZWQ7CiAgICAgfTsKIAogfSAvLyBuYW1lc3BhY2UgSlNDCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXggNWI2ZWIy NTM1YmViZDA4NGI1MzdlMjIyZjE2NGNhNjk5YmJlMGNiMS4uNTk1ZmE4MWJjNGYyMjlmNjdkZWVj YzRlMTU3NDFkNmVkOGRjYzg0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JDb250cm9sbGVyLmNwcApAQCAtNzIsNiArNzIsNyBAQAogI2luY2x1ZGUgPGluc3Bl Y3Rvci9JZGVudGlmaWVyc0ZhY3RvcnkuaD4KICNpbmNsdWRlIDxpbnNwZWN0b3IvSW5zcGVjdG9y QmFja2VuZERpc3BhdGNoZXIuaD4KICNpbmNsdWRlIDxpbnNwZWN0b3IvYWdlbnRzL0luc3BlY3Rv ckFnZW50Lmg+CisjaW5jbHVkZSA8cHJvZmlsZXIvTGVnYWN5UHJvZmlsZXIuaD4KICNpbmNsdWRl IDxydW50aW1lL0pTTG9jay5oPgogCiAjaWYgRU5BQkxFKFJFTU9URV9JTlNQRUNUT1IpCkBAIC00 MzIsMTkgKzQzMywxNCBAQCBJbnNwZWN0b3JFdmFsdWF0ZUhhbmRsZXIgSW5zcGVjdG9yQ29udHJv bGxlcjo6ZXZhbHVhdGVIYW5kbGVyKCkgY29uc3QKICAgICByZXR1cm4gV2ViQ29yZTo6ZXZhbHVh dGVIYW5kbGVyRnJvbUFueVRocmVhZDsKIH0KIAotdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjp3 aWxsQ2FsbEluamVjdGVkU2NyaXB0RnVuY3Rpb24oSlNDOjpFeGVjU3RhdGUqIHNjcmlwdFN0YXRl LCBjb25zdCBTdHJpbmcmIHNjcmlwdE5hbWUsIGludCBzY3JpcHRMaW5lKQordm9pZCBJbnNwZWN0 b3JDb250cm9sbGVyOjp3aWxsQ2FsbEluamVjdGVkU2NyaXB0RnVuY3Rpb24oSlNDOjpFeGVjU3Rh dGUqIHNjcmlwdFN0YXRlLCBjb25zdCBTdHJpbmcmLCBpbnQpCiB7Ci0gICAgU2NyaXB0RXhlY3V0 aW9uQ29udGV4dCogc2NyaXB0RXhlY3V0aW9uQ29udGV4dCA9IHNjcmlwdEV4ZWN1dGlvbkNvbnRl eHRGcm9tRXhlY1N0YXRlKHNjcmlwdFN0YXRlKTsKLSAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b25Db29raWUgY29va2llID0gSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsQ2FsbEZ1bmN0 aW9uKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQsIHNjcmlwdE5hbWUsIHNjcmlwdExpbmUpOwotICAg IG1faW5qZWN0ZWRTY3JpcHRJbnN0cnVtZW50YXRpb25Db29raWVzLmFwcGVuZChjb29raWUpOwor ICAgIExlZ2FjeVByb2ZpbGVyOjpwcm9maWxlcigpLT5zdXNwZW5kUHJvZmlsaW5nKHNjcmlwdFN0 YXRlKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRDYWxsSW5qZWN0ZWRTY3Jp cHRGdW5jdGlvbihKU0M6OkV4ZWNTdGF0ZSogc2NyaXB0U3RhdGUpCiB7Ci0gICAgQVNTRVJUKCFt X2luamVjdGVkU2NyaXB0SW5zdHJ1bWVudGF0aW9uQ29va2llcy5pc0VtcHR5KCkpOwotICAgIFNj cmlwdEV4ZWN1dGlvbkNvbnRleHQqIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQgPSBzY3JpcHRFeGVj dXRpb25Db250ZXh0RnJvbUV4ZWNTdGF0ZShzY3JpcHRTdGF0ZSk7Ci0gICAgSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uQ29va2llIGNvb2tpZSA9IG1faW5qZWN0ZWRTY3JpcHRJbnN0cnVtZW50YXRp b25Db29raWVzLnRha2VMYXN0KCk7Ci0gICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRD YWxsRnVuY3Rpb24oY29va2llLCBzY3JpcHRFeGVjdXRpb25Db250ZXh0KTsKKyAgICBMZWdhY3lQ cm9maWxlcjo6cHJvZmlsZXIoKS0+dW5zdXNwZW5kUHJvZmlsaW5nKHNjcmlwdFN0YXRlKTsKIH0K IAogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpmcm9udGVuZEluaXRpYWxpemVkKCkK