103238 2012-11-26 03:52:32 -0800 Web Inspector: unify agents handling in Page and Worker inspector controllers 2012-11-26 07:45:26 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 yurys yurys apavlov keishi loislo ossy pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 775329 0 yurys 2012-11-26 03:52:32 -0800 The logic is the same in both cases, we should encapsulate it in a single class. 775331 1 175961 yurys 2012-11-26 03:56:40 -0800 Created attachment 175961 Patch 775410 2 175961 webkit.review.bot 2012-11-26 06:07:46 -0800 Comment on attachment 175961 Patch Clearing flags on attachment: 175961 Committed r135713: <http://trac.webkit.org/changeset/135713> 775411 3 webkit.review.bot 2012-11-26 06:07:49 -0800 All reviewed patches have been landed. Closing bug. 775424 4 ossy 2012-11-26 06:26:39 -0800 (In reply to comment #2) > (From update of attachment 175961 [details]) > Clearing flags on attachment: 175961 > > Committed r135713: <http://trac.webkit.org/changeset/135713> It broke the build on !ENABLE(INSPECTOR) platforms. (for example the Qt's minimal bot) See http://build.webkit.org/builders/Qt%20Linux%20Release%20minimal/builds/65940/steps/compile-webkit/logs/stdio for details. 775427 5 175961 pfeldman 2012-11-26 06:32:37 -0800 Comment on attachment 175961 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175961&action=review > Source/WebCore/inspector/InspectorBaseAgent.h:68 > +class InspectorAgentRegistry { Nit: I'd call it InspectorAgents or InspectorAgentCollection. It is not yet a registry. 775465 6 yurys 2012-11-26 07:29:14 -0800 (In reply to comment #4) > (In reply to comment #2) > > (From update of attachment 175961 [details] [details]) > > Clearing flags on attachment: 175961 > > > > Committed r135713: <http://trac.webkit.org/changeset/135713> > > It broke the build on !ENABLE(INSPECTOR) platforms. (for example the Qt's minimal bot) See http://build.webkit.org/builders/Qt%20Linux%20Release%20minimal/builds/65940/steps/compile-webkit/logs/stdio for details. Fix landed http://trac.webkit.org/changeset/135721, sorry about that. 775474 7 ossy 2012-11-26 07:45:26 -0800 Not problem, thanks for the quick fix. 175961 2012-11-26 03:56:40 -0800 2012-11-26 06:32:37 -0800 Patch bug-103238-20121126155418.patch text/plain 14164 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1NjgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjM1NTk5ZWIyNTcwMTU2 M2IxZWFiMmQ5MWYwNWQ3Yjg5ZDljZmQyZi4uNDllZGEwMDkzNTdhMzJkNGY1YTMwMDgxOTljZDky YTRhNzE4NTU1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEyLTExLTI2ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHVuaWZ5IGFnZW50cyBoYW5kbGluZyBpbiBQYWdlIGFuZCBXb3JrZXIgaW5zcGVjdG9yIGNv bnRyb2xsZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMDMyMzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBJbnRyb2R1Y2VkIGEgY2xhc3MgdGhhdCByZXByZXNlbnRzIGEgY29sbGVjdGlvbiBvZiBpbnNw ZWN0b3IgYWdlbnRzIGFuZCBhbGxvd3MKKyAgICAgICAgdG8gY2FsbCBtZXRob2RzIGRlY2xhcmVk IG9uIEluc3BlY3RvckFnZW50QmFzZUludGVyZmFjZSBmb3IgYWxsIHJlZ2lzdGVyZWQgYWdlbnRz LgorICAgICAgICBJbnNwZWN0b3JDb250cm9sbGVyIGFuZCBXb3JrZXJJbnNwZWN0b3JDb250cm9s bGVyIHN3aXRjaGVkIHRvIHRoaXMgY2xhc3MuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVj dG9yQmFzZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckFnZW50UmVnaXN0 cnk6OmFwcGVuZCk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3RvckFnZW50UmVnaXN0cnk6OnNldEZyb250ZW5kKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3RvckFnZW50UmVnaXN0cnk6OmNsZWFyRnJvbnRlbmQpOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yQWdlbnRSZWdpc3RyeTo6cmVzdG9yZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JBZ2VudFJlZ2lzdHJ5OjpyZWdpc3RlckluRGlzcGF0Y2hlcik6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JBZ2VudFJlZ2lzdHJ5OjpkaXNjYXJkQWdlbnRzKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvSW5zcGVjdG9yQmFzZUFnZW50Lmg6CisgICAgICAgIChJbnNwZWN0b3JBZ2VudFJlZ2lz dHJ5KToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JD b250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6On5J bnNwZWN0b3JDb250cm9sbGVyKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xs ZXI6OmNvbm5lY3RGcm9udGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9s bGVyOjpkaXNjb25uZWN0RnJvbnRlbmQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29u dHJvbGxlcjo6cmVjb25uZWN0RnJvbnRlbmQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0 b3JDb250cm9sbGVyLmg6CisgICAgICAgIChJbnNwZWN0b3JDb250cm9sbGVyKToKKwogMjAxMi0x MS0yNSAgTmlraXRhIFZhc2lseWV2ICA8bWVAZWx2MXMucnU+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogdXNlIG5hdGl2ZSBFbGVtZW50LnByb3RvdHlwZS5ub3JtYWxpemUgaW5zdGVhZCBvZiBj dXN0b20gZGVmaW5lZCBFbGVtZW50LnByb3RvdHlwZS5wcnVuZUVtcHR5VGV4dE5vZGVzCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFzZUFnZW50LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYXNlQWdlbnQuY3BwCmluZGV4IGZm YTk1NTVkNGEyYmE5ZTc3ZTgyYzc1NmI0Y2JhZGE2MzY2YWJiN2YuLmU5MjY0OTRlZmI4MzBmNjhj YmY4OTRkZjY5MDAxYTkxZDM5ZGViNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JCYXNlQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JCYXNlQWdlbnQuY3BwCkBAIC01Nyw2ICs1Nyw0MSBAQCB2b2lkIEluc3BlY3Rv ckJhc2VBZ2VudEludGVyZmFjZTo6cmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyog bWVtb3J5T2JqZQogICAgIGluZm8uYWRkV2Vha1BvaW50ZXIobV9zdGF0ZSk7CiB9CiAKK3ZvaWQg SW5zcGVjdG9yQWdlbnRSZWdpc3RyeTo6YXBwZW5kKFBhc3NPd25QdHI8SW5zcGVjdG9yQmFzZUFn ZW50SW50ZXJmYWNlPiBhZ2VudCkKK3sKKyAgICBtX2FnZW50cy5hcHBlbmQoYWdlbnQpOworfQor Cit2b2lkIEluc3BlY3RvckFnZW50UmVnaXN0cnk6OnNldEZyb250ZW5kKEluc3BlY3RvckZyb250 ZW5kKiBmcm9udGVuZCkKK3sKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1fYWdlbnRzLnNp emUoKTsgaSsrKQorICAgICAgICBtX2FnZW50c1tpXS0+c2V0RnJvbnRlbmQoZnJvbnRlbmQpOwor fQorCit2b2lkIEluc3BlY3RvckFnZW50UmVnaXN0cnk6OmNsZWFyRnJvbnRlbmQoKQoreworICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9hZ2VudHMuc2l6ZSgpOyBpKyspCisgICAgICAgIG1f YWdlbnRzW2ldLT5jbGVhckZyb250ZW5kKCk7Cit9CisKK3ZvaWQgSW5zcGVjdG9yQWdlbnRSZWdp c3RyeTo6cmVzdG9yZSgpCit7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX2FnZW50cy5z aXplKCk7IGkrKykKKyAgICAgICAgbV9hZ2VudHNbaV0tPnJlc3RvcmUoKTsKK30KKwordm9pZCBJ bnNwZWN0b3JBZ2VudFJlZ2lzdHJ5OjpyZWdpc3RlckluRGlzcGF0Y2hlcihJbnNwZWN0b3JCYWNr ZW5kRGlzcGF0Y2hlciogZGlzcGF0Y2hlcikKK3sKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IG1fYWdlbnRzLnNpemUoKTsgaSsrKQorICAgICAgICBtX2FnZW50c1tpXS0+cmVnaXN0ZXJJbkRp c3BhdGNoZXIoZGlzcGF0Y2hlcik7Cit9CisKK3ZvaWQgSW5zcGVjdG9yQWdlbnRSZWdpc3RyeTo6 ZGlzY2FyZEFnZW50cygpCit7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX2FnZW50cy5z aXplKCk7IGkrKykKKyAgICAgICAgbV9hZ2VudHNbaV0tPmRpc2NhcmRBZ2VudCgpOworfQorCiB9 IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBFTkFCTEUoSU5TUEVDVE9SKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckJhc2VBZ2VudC5oIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckJhc2VBZ2VudC5oCmluZGV4IDg0OTc2 M2ZhNWNlMzExOTNhNzZjYzI0YWViNWNjZWNhZjAyZTZjMWEuLjQ4ZmE4ZTRjMzgyODlkZTk1Zjcy ZTE1ZTkxYzViNmM0NDNmYzU4ODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JCYXNlQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yQmFzZUFnZW50LmgKQEAgLTY1LDYgKzY1LDIwIEBAIHByaXZhdGU6CiAgICAgU3RyaW5n IG1fbmFtZTsKIH07CiAKK2NsYXNzIEluc3BlY3RvckFnZW50UmVnaXN0cnkgeworcHVibGljOgor ICAgIHZvaWQgYXBwZW5kKFBhc3NPd25QdHI8SW5zcGVjdG9yQmFzZUFnZW50SW50ZXJmYWNlPik7 CisKKyAgICB2b2lkIHNldEZyb250ZW5kKEluc3BlY3RvckZyb250ZW5kKik7CisgICAgdm9pZCBj bGVhckZyb250ZW5kKCk7CisgICAgdm9pZCByZXN0b3JlKCk7CisgICAgdm9pZCByZWdpc3Rlcklu RGlzcGF0Y2hlcihJbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlciopOworICAgIHZvaWQgZGlzY2Fy ZEFnZW50cygpOworCitwcml2YXRlOgorICAgIFZlY3RvcjxPd25QdHI8SW5zcGVjdG9yQmFzZUFn ZW50SW50ZXJmYWNlPiA+IG1fYWdlbnRzOworfTsKKwogdGVtcGxhdGU8dHlwZW5hbWUgVD4KIGNs YXNzIEluc3BlY3RvckJhc2VBZ2VudCA6IHB1YmxpYyBJbnNwZWN0b3JCYXNlQWdlbnRJbnRlcmZh Y2UgewogcHVibGljOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNv bnRyb2xsZXIuY3BwCmluZGV4IGY1NTg2NWJkZjg5NjAxZmNmY2NlOWU5MDUyYzFmNWQ4MGM2YWE2 NWUuLmNhOTJjNGFlMjM2ZDA1YWUzYmY4NDNkZjhkYWU3ODhhMzZhMDQ3NWUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKQEAgLTE3MSw5 ICsxNzEsNyBAQCBJbnNwZWN0b3JDb250cm9sbGVyOjpJbnNwZWN0b3JDb250cm9sbGVyKFBhZ2Uq IHBhZ2UsIEluc3BlY3RvckNsaWVudCogaW5zcGVjdG9yQwogCiBJbnNwZWN0b3JDb250cm9sbGVy Ojp+SW5zcGVjdG9yQ29udHJvbGxlcigpCiB7Ci0gICAgZm9yIChBZ2VudHM6Oml0ZXJhdG9yIGl0 ID0gbV9hZ2VudHMuYmVnaW4oKTsgaXQgIT0gbV9hZ2VudHMuZW5kKCk7ICsraXQpCi0gICAgICAg ICgqaXQpLT5kaXNjYXJkQWdlbnQoKTsKLQorICAgIG1fYWdlbnRzLmRpc2NhcmRBZ2VudHMoKTsK ICAgICBBU1NFUlQoIW1faW5zcGVjdG9yQ2xpZW50KTsKIH0KIApAQCAtMjIxLDE4ICsyMTksMTQg QEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpjb25uZWN0RnJvbnRlbmQoSW5zcGVjdG9yRnJv bnRlbmRDaGFubmVsKiBmcm9udGVuZENoYW4KICAgICAvLyBXZSBjYW4gcmVjb25uZWN0IHRvIGV4 aXN0aW5nIGZyb250LWVuZCAtPiB1bm11dGUgc3RhdGUuCiAgICAgbV9zdGF0ZS0+dW5tdXRlKCk7 CiAKLSAgICBJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQgPSBtX2luc3BlY3RvckZyb250ZW5k LmdldCgpOwotICAgIGZvciAoQWdlbnRzOjppdGVyYXRvciBpdCA9IG1fYWdlbnRzLmJlZ2luKCk7 IGl0ICE9IG1fYWdlbnRzLmVuZCgpOyArK2l0KQotICAgICAgICAoKml0KS0+c2V0RnJvbnRlbmQo ZnJvbnRlbmQpOworICAgIG1fYWdlbnRzLnNldEZyb250ZW5kKG1faW5zcGVjdG9yRnJvbnRlbmQu Z2V0KCkpOwogCiAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpmcm9udGVuZENyZWF0ZWQo KTsKIAogICAgIEFTU0VSVChtX2luc3BlY3RvckNsaWVudCk7CiAgICAgbV9pbnNwZWN0b3JCYWNr ZW5kRGlzcGF0Y2hlciA9IEluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyOjpjcmVhdGUoZnJvbnRl bmRDaGFubmVsKTsKIAotICAgIEluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyKiBkaXNwYXRjaGVy ID0gbV9pbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlci5nZXQoKTsKLSAgICBmb3IgKEFnZW50czo6 aXRlcmF0b3IgaXQgPSBtX2FnZW50cy5iZWdpbigpOyBpdCAhPSBtX2FnZW50cy5lbmQoKTsgKytp dCkKLSAgICAgICAgKCppdCktPnJlZ2lzdGVySW5EaXNwYXRjaGVyKGRpc3BhdGNoZXIpOworICAg IG1fYWdlbnRzLnJlZ2lzdGVySW5EaXNwYXRjaGVyKG1faW5zcGVjdG9yQmFja2VuZERpc3BhdGNo ZXIuZ2V0KCkpOwogfQogCiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpc2Nvbm5lY3RGcm9u dGVuZCgpCkBAIC0yNDYsOCArMjQwLDcgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaXNj b25uZWN0RnJvbnRlbmQoKQogICAgIC8vIFByZS1kaXNjb25uZWN0IHN0YXRlIHdpbGwgYmUgdXNl ZCB0byByZXN0b3JlIGluc3BlY3RvciBhZ2VudHMuCiAgICAgbV9zdGF0ZS0+bXV0ZSgpOwogCi0g ICAgZm9yIChBZ2VudHM6Oml0ZXJhdG9yIGl0ID0gbV9hZ2VudHMuYmVnaW4oKTsgaXQgIT0gbV9h Z2VudHMuZW5kKCk7ICsraXQpCi0gICAgICAgICgqaXQpLT5jbGVhckZyb250ZW5kKCk7CisgICAg bV9hZ2VudHMuY2xlYXJGcm9udGVuZCgpOwogCiAgICAgbV9pbnNwZWN0b3JGcm9udGVuZC5jbGVh cigpOwogCkBAIC0yODEsOSArMjc0LDcgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpyZWNv bm5lY3RGcm9udGVuZChJbnNwZWN0b3JGcm9udGVuZENoYW5uZWwqIGZyb250ZW5kQ2gKICAgICBB U1NFUlQoIW1faW5zcGVjdG9yRnJvbnRlbmQpOwogICAgIGNvbm5lY3RGcm9udGVuZChmcm9udGVu ZENoYW5uZWwpOwogICAgIG1fc3RhdGUtPmxvYWRGcm9tQ29va2llKGluc3BlY3RvclN0YXRlQ29v a2llKTsKLQotICAgIGZvciAoQWdlbnRzOjppdGVyYXRvciBpdCA9IG1fYWdlbnRzLmJlZ2luKCk7 IGl0ICE9IG1fYWdlbnRzLmVuZCgpOyArK2l0KQotICAgICAgICAoKml0KS0+cmVzdG9yZSgpOwor ICAgIG1fYWdlbnRzLnJlc3RvcmUoKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpz ZXRQcm9jZXNzSWQobG9uZyBwcm9jZXNzSWQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckNvbnRyb2xsZXIuaAppbmRleCAyZTg5MDkyZTIwYmM3NDA5YmE3MTEyYTJkZTVj ZGQyNGQ3M2M0ZTQ3Li5lMGUyYzU5N2ZiMDQzZmEyMjYyOGI2ZjA2MjBkZDNmNDVkOWI5Zjk0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKQEAg LTMxLDYgKzMxLDcgQEAKICNpZm5kZWYgSW5zcGVjdG9yQ29udHJvbGxlcl9oCiAjZGVmaW5lIElu c3BlY3RvckNvbnRyb2xsZXJfaAogCisjaW5jbHVkZSAiSW5zcGVjdG9yQmFzZUFnZW50LmgiCiAj aW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgogI2luY2x1 ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgpAQCAtMTQxLDggKzE0Miw3IEBAIHByaXZhdGU6CiAgICAg T3duUHRyPEluc3BlY3RvckZyb250ZW5kPiBtX2luc3BlY3RvckZyb250ZW5kOwogICAgIFBhZ2Uq IG1fcGFnZTsKICAgICBJbnNwZWN0b3JDbGllbnQqIG1faW5zcGVjdG9yQ2xpZW50OwotICAgIHR5 cGVkZWYgVmVjdG9yPE93blB0cjxJbnNwZWN0b3JCYXNlQWdlbnRJbnRlcmZhY2U+ID4gQWdlbnRz OwotICAgIEFnZW50cyBtX2FnZW50czsKKyAgICBJbnNwZWN0b3JBZ2VudFJlZ2lzdHJ5IG1fYWdl bnRzOwogfTsKIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1dvcmtl ckluc3BlY3RvckNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1dvcmtl ckluc3BlY3RvckNvbnRyb2xsZXIuY3BwCmluZGV4IGUwNGU3ZWVlZDkyZTQ1ZjEyNjVkYjNiNTNj YzM2ZjU3OWJjOGMzNTcuLmQ5YjM5MGZmNmY1M2ZhMzQwZGUwZDE5N2ZiMDAzNmM4MjUwYjljYWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Xb3JrZXJJbnNwZWN0b3JDb250 cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvV29ya2VySW5zcGVjdG9y Q29udHJvbGxlci5jcHAKQEAgLTk2LDE2ICs5NiwyMyBAQCBXb3JrZXJJbnNwZWN0b3JDb250cm9s bGVyOjpXb3JrZXJJbnNwZWN0b3JDb250cm9sbGVyKFdvcmtlckNvbnRleHQqIHdvcmtlckNvbnRl eAogICAgICwgbV9zdGF0ZShhZG9wdFB0cihuZXcgSW5zcGVjdG9yU3RhdGUobV9zdGF0ZUNsaWVu dC5nZXQoKSkpKQogICAgICwgbV9pbnN0cnVtZW50aW5nQWdlbnRzKGFkb3B0UHRyKG5ldyBJbnN0 cnVtZW50aW5nQWdlbnRzKCkpKQogICAgICwgbV9pbmplY3RlZFNjcmlwdE1hbmFnZXIoSW5qZWN0 ZWRTY3JpcHRNYW5hZ2VyOjpjcmVhdGVGb3JXb3JrZXIoKSkKKyAgICAsIG1fcnVudGltZUFnZW50 KDApCiB7CisgICAgT3duUHRyPEluc3BlY3RvclJ1bnRpbWVBZ2VudD4gcnVudGltZUFnZW50ID0g V29ya2VyUnVudGltZUFnZW50OjpjcmVhdGUobV9pbnN0cnVtZW50aW5nQWdlbnRzLmdldCgpLCBt X3N0YXRlLmdldCgpLCBtX2luamVjdGVkU2NyaXB0TWFuYWdlci5nZXQoKSwgd29ya2VyQ29udGV4 dCk7CisgICAgbV9ydW50aW1lQWdlbnQgPSBydW50aW1lQWdlbnQuZ2V0KCk7CisgICAgbV9hZ2Vu dHMuYXBwZW5kKHJ1bnRpbWVBZ2VudC5yZWxlYXNlKCkpOwogCi0gICAgbV9ydW50aW1lQWdlbnQg PSBXb3JrZXJSdW50aW1lQWdlbnQ6OmNyZWF0ZShtX2luc3RydW1lbnRpbmdBZ2VudHMuZ2V0KCks IG1fc3RhdGUuZ2V0KCksIG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLmdldCgpLCB3b3JrZXJDb250 ZXh0KTsKLSAgICBtX2NvbnNvbGVBZ2VudCA9IFdvcmtlckNvbnNvbGVBZ2VudDo6Y3JlYXRlKG1f aW5zdHJ1bWVudGluZ0FnZW50cy5nZXQoKSwgbV9zdGF0ZS5nZXQoKSwgbV9pbmplY3RlZFNjcmlw dE1hbmFnZXIuZ2V0KCkpOwotCisgICAgT3duUHRyPEluc3BlY3RvckNvbnNvbGVBZ2VudD4gY29u c29sZUFnZW50ID0gV29ya2VyQ29uc29sZUFnZW50OjpjcmVhdGUobV9pbnN0cnVtZW50aW5nQWdl bnRzLmdldCgpLCBtX3N0YXRlLmdldCgpLCBtX2luamVjdGVkU2NyaXB0TWFuYWdlci5nZXQoKSk7 CiAjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCi0gICAgbV9kZWJ1Z2dlckFnZW50ID0g V29ya2VyRGVidWdnZXJBZ2VudDo6Y3JlYXRlKG1faW5zdHJ1bWVudGluZ0FnZW50cy5nZXQoKSwg bV9zdGF0ZS5nZXQoKSwgd29ya2VyQ29udGV4dCwgbV9pbmplY3RlZFNjcmlwdE1hbmFnZXIuZ2V0 KCkpOwotICAgIG1fcHJvZmlsZXJBZ2VudCA9IEluc3BlY3RvclByb2ZpbGVyQWdlbnQ6OmNyZWF0 ZShtX2luc3RydW1lbnRpbmdBZ2VudHMuZ2V0KCksIG1fY29uc29sZUFnZW50LmdldCgpLCB3b3Jr ZXJDb250ZXh0LCBtX3N0YXRlLmdldCgpLCBtX2luamVjdGVkU2NyaXB0TWFuYWdlci5nZXQoKSk7 CisgICAgT3duUHRyPEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ+IGRlYnVnZ2VyQWdlbnQgPSBXb3Jr ZXJEZWJ1Z2dlckFnZW50OjpjcmVhdGUobV9pbnN0cnVtZW50aW5nQWdlbnRzLmdldCgpLCBtX3N0 YXRlLmdldCgpLCB3b3JrZXJDb250ZXh0LCBtX2luamVjdGVkU2NyaXB0TWFuYWdlci5nZXQoKSk7 CisgICAgSW5zcGVjdG9yRGVidWdnZXJBZ2VudCogZGVidWdnZXJBZ2VudFB0ciA9IGRlYnVnZ2Vy QWdlbnQuZ2V0KCk7CisgICAgbV9ydW50aW1lQWdlbnQtPnNldFNjcmlwdERlYnVnU2VydmVyKCZk ZWJ1Z2dlckFnZW50LT5zY3JpcHREZWJ1Z1NlcnZlcigpKTsKKyAgICBtX2FnZW50cy5hcHBlbmQo ZGVidWdnZXJBZ2VudC5yZWxlYXNlKCkpOworCisgICAgbV9hZ2VudHMuYXBwZW5kKEluc3BlY3Rv clByb2ZpbGVyQWdlbnQ6OmNyZWF0ZShtX2luc3RydW1lbnRpbmdBZ2VudHMuZ2V0KCksIGNvbnNv bGVBZ2VudC5nZXQoKSwgd29ya2VyQ29udGV4dCwgbV9zdGF0ZS5nZXQoKSwgbV9pbmplY3RlZFNj cmlwdE1hbmFnZXIuZ2V0KCkpKTsKICNlbmRpZgotICAgIG1fdGltZWxpbmVBZ2VudCA9IEluc3Bl Y3RvclRpbWVsaW5lQWdlbnQ6OmNyZWF0ZShtX2luc3RydW1lbnRpbmdBZ2VudHMuZ2V0KCksIDAs IG1fc3RhdGUuZ2V0KCksIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6Oldvcmtlckluc3BlY3Rvciwg MCk7CisgICAgbV9hZ2VudHMuYXBwZW5kKEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmNyZWF0ZSht X2luc3RydW1lbnRpbmdBZ2VudHMuZ2V0KCksIDAsIG1fc3RhdGUuZ2V0KCksIEluc3BlY3RvclRp bWVsaW5lQWdlbnQ6Oldvcmtlckluc3BlY3RvciwgMCkpOworICAgIG1fYWdlbnRzLmFwcGVuZChj b25zb2xlQWdlbnQucmVsZWFzZSgpKTsKIAogICAgIG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLT5p bmplY3RlZFNjcmlwdEhvc3QoKS0+aW5pdCgwCiAgICAgICAgICwgMApAQCAtMTE1LDEzICsxMjIs OSBAQCBXb3JrZXJJbnNwZWN0b3JDb250cm9sbGVyOjpXb3JrZXJJbnNwZWN0b3JDb250cm9sbGVy KFdvcmtlckNvbnRleHQqIHdvcmtlckNvbnRleAogICAgICAgICAsIDAKICAgICAgICAgLCAwCiAj aWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCi0gICAgICAgICwgbV9kZWJ1Z2dlckFnZW50 LmdldCgpCisgICAgICAgICwgZGVidWdnZXJBZ2VudFB0cgogI2VuZGlmCiAgICAgKTsKLQotI2lm IEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQotICAgIG1fcnVudGltZUFnZW50LT5zZXRTY3Jp cHREZWJ1Z1NlcnZlcigmbV9kZWJ1Z2dlckFnZW50LT5zY3JpcHREZWJ1Z1NlcnZlcigpKTsKLSNl bmRpZgogfQogIAogV29ya2VySW5zcGVjdG9yQ29udHJvbGxlcjo6fldvcmtlckluc3BlY3RvckNv bnRyb2xsZXIoKQpAQCAtMTM2LDIwICsxMzksOCBAQCB2b2lkIFdvcmtlckluc3BlY3RvckNvbnRy b2xsZXI6OmNvbm5lY3RGcm9udGVuZCgpCiAgICAgbV9mcm9udGVuZENoYW5uZWwgPSBhZG9wdFB0 cihuZXcgUGFnZUluc3BlY3RvclByb3h5KG1fd29ya2VyQ29udGV4dCkpOwogICAgIG1fZnJvbnRl bmQgPSBhZG9wdFB0cihuZXcgSW5zcGVjdG9yRnJvbnRlbmQobV9mcm9udGVuZENoYW5uZWwuZ2V0 KCkpKTsKICAgICBtX2JhY2tlbmREaXNwYXRjaGVyID0gSW5zcGVjdG9yQmFja2VuZERpc3BhdGNo ZXI6OmNyZWF0ZShtX2Zyb250ZW5kQ2hhbm5lbC5nZXQoKSk7Ci0gICAgbV9jb25zb2xlQWdlbnQt PnJlZ2lzdGVySW5EaXNwYXRjaGVyKG1fYmFja2VuZERpc3BhdGNoZXIuZ2V0KCkpOwotICAgIG1f dGltZWxpbmVBZ2VudC0+cmVnaXN0ZXJJbkRpc3BhdGNoZXIobV9iYWNrZW5kRGlzcGF0Y2hlci5n ZXQoKSk7Ci0jaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCi0gICAgbV9kZWJ1Z2dlckFn ZW50LT5yZWdpc3RlckluRGlzcGF0Y2hlcihtX2JhY2tlbmREaXNwYXRjaGVyLmdldCgpKTsKLSAg ICBtX3Byb2ZpbGVyQWdlbnQtPnJlZ2lzdGVySW5EaXNwYXRjaGVyKG1fYmFja2VuZERpc3BhdGNo ZXIuZ2V0KCkpOwotI2VuZGlmCi0gICAgbV9ydW50aW1lQWdlbnQtPnJlZ2lzdGVySW5EaXNwYXRj aGVyKG1fYmFja2VuZERpc3BhdGNoZXIuZ2V0KCkpOwotCi0jaWYgRU5BQkxFKEpBVkFTQ1JJUFRf REVCVUdHRVIpCi0gICAgbV9kZWJ1Z2dlckFnZW50LT5zZXRGcm9udGVuZChtX2Zyb250ZW5kLmdl dCgpKTsKLSAgICBtX3Byb2ZpbGVyQWdlbnQtPnNldEZyb250ZW5kKG1fZnJvbnRlbmQuZ2V0KCkp OwotI2VuZGlmCi0gICAgbV9jb25zb2xlQWdlbnQtPnNldEZyb250ZW5kKG1fZnJvbnRlbmQuZ2V0 KCkpOwotICAgIG1fdGltZWxpbmVBZ2VudC0+c2V0RnJvbnRlbmQobV9mcm9udGVuZC5nZXQoKSk7 CisgICAgbV9hZ2VudHMucmVnaXN0ZXJJbkRpc3BhdGNoZXIobV9iYWNrZW5kRGlzcGF0Y2hlci5n ZXQoKSk7CisgICAgbV9hZ2VudHMuc2V0RnJvbnRlbmQobV9mcm9udGVuZC5nZXQoKSk7CiB9CiAK IHZvaWQgV29ya2VySW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlzY29ubmVjdEZyb250ZW5kKCkKQEAg LTE2MSwxMyArMTUyLDcgQEAgdm9pZCBXb3JrZXJJbnNwZWN0b3JDb250cm9sbGVyOjpkaXNjb25u ZWN0RnJvbnRlbmQoKQogICAgIC8vIERlc3Ryb3lpbmcgYWdlbnRzIHdvdWxkIGNoYW5nZSB0aGUg c3RhdGUsIGJ1dCB3ZSBkb24ndCB3YW50IHRoYXQuCiAgICAgLy8gUHJlLWRpc2Nvbm5lY3Qgc3Rh dGUgd2lsbCBiZSB1c2VkIHRvIHJlc3RvcmUgaW5zcGVjdG9yIGFnZW50cy4KICAgICBtX3N0YXRl LT5tdXRlKCk7Ci0jaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCi0gICAgbV9kZWJ1Z2dl ckFnZW50LT5jbGVhckZyb250ZW5kKCk7Ci0gICAgbV9wcm9maWxlckFnZW50LT5jbGVhckZyb250 ZW5kKCk7Ci0jZW5kaWYKLSAgICBtX2NvbnNvbGVBZ2VudC0+Y2xlYXJGcm9udGVuZCgpOwotICAg IG1fdGltZWxpbmVBZ2VudC0+Y2xlYXJGcm9udGVuZCgpOwotCisgICAgbV9hZ2VudHMuY2xlYXJG cm9udGVuZCgpOwogICAgIG1fZnJvbnRlbmQuY2xlYXIoKTsKICAgICBtX2Zyb250ZW5kQ2hhbm5l bC5jbGVhcigpOwogfQpAQCAtMTc4LDEyICsxNjMsNyBAQCB2b2lkIFdvcmtlckluc3BlY3RvckNv bnRyb2xsZXI6OnJlc3RvcmVJbnNwZWN0b3JTdGF0ZUZyb21Db29raWUoY29uc3QgU3RyaW5nJiBp bgogICAgIGNvbm5lY3RGcm9udGVuZCgpOwogICAgIG1fc3RhdGUtPmxvYWRGcm9tQ29va2llKGlu c3BlY3RvckNvb2tpZSk7CiAKLSNpZiBFTkFCTEUoSkFWQVNDUklQVF9ERUJVR0dFUikKLSAgICBt X2RlYnVnZ2VyQWdlbnQtPnJlc3RvcmUoKTsKLSAgICBtX3Byb2ZpbGVyQWdlbnQtPnJlc3RvcmUo KTsKLSNlbmRpZgotICAgIG1fY29uc29sZUFnZW50LT5yZXN0b3JlKCk7Ci0gICAgbV90aW1lbGlu ZUFnZW50LT5yZXN0b3JlKCk7CisgICAgbV9hZ2VudHMucmVzdG9yZSgpOwogfQogCiB2b2lkIFdv cmtlckluc3BlY3RvckNvbnRyb2xsZXI6OmRpc3BhdGNoTWVzc2FnZUZyb21Gcm9udGVuZChjb25z dCBTdHJpbmcmIG1lc3NhZ2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv V29ya2VySW5zcGVjdG9yQ29udHJvbGxlci5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1dv cmtlckluc3BlY3RvckNvbnRyb2xsZXIuaAppbmRleCAwZTYxZTliMWM0MTE5ZmZhMGY3MjdkMDFk OGU0ZWQ4ZGZiNTE3MWIxLi4yMWRjNzIzZmUzYWRkMDY5MTE3MzVmZDQyODJjZDdhNjU3MjkxZmFi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvV29ya2VySW5zcGVjdG9yQ29u dHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Xb3JrZXJJbnNwZWN0b3JD b250cm9sbGVyLmgKQEAgLTMzLDYgKzMzLDcgQEAKIAogI2lmIEVOQUJMRShJTlNQRUNUT1IpICYm IEVOQUJMRShXT1JLRVJTKQogCisjaW5jbHVkZSAiSW5zcGVjdG9yQmFzZUFnZW50LmgiCiAjaW5j bHVkZSA8d3RmL0Zhc3RBbGxvY0Jhc2UuaD4KICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgogI2lu Y2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgpAQCAtNDIsMjAgKzQzLDEzIEBACiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKIGNsYXNzIEluamVjdGVkU2NyaXB0TWFuYWdlcjsKLSNpZiBFTkFCTEUoSkFW QVNDUklQVF9ERUJVR0dFUikKLWNsYXNzIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ7Ci0jZW5kaWYK IGNsYXNzIEluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyOwotY2xhc3MgSW5zcGVjdG9yQ29uc29s ZUFnZW50OwogY2xhc3MgSW5zcGVjdG9yRnJvbnRlbmQ7CiBjbGFzcyBJbnNwZWN0b3JGcm9udGVu ZENoYW5uZWw7Ci1jbGFzcyBJbnNwZWN0b3JDb25zb2xlQWdlbnQ7CiBjbGFzcyBJbnNwZWN0b3JJ bnN0cnVtZW50YXRpb247Ci1jbGFzcyBJbnNwZWN0b3JQcm9maWxlckFnZW50OwogY2xhc3MgSW5z cGVjdG9yUnVudGltZUFnZW50OwogY2xhc3MgSW5zcGVjdG9yU3RhdGU7CiBjbGFzcyBJbnNwZWN0 b3JTdGF0ZUNsaWVudDsKLWNsYXNzIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ7CiBjbGFzcyBJbnN0 cnVtZW50aW5nQWdlbnRzOwogY2xhc3MgV29ya2VyQ29udGV4dDsKIApAQCAtODMsMTQgKzc3LDgg QEAgcHJpdmF0ZToKICAgICBPd25QdHI8SW5zcGVjdG9yU3RhdGU+IG1fc3RhdGU7CiAgICAgT3du UHRyPEluc3RydW1lbnRpbmdBZ2VudHM+IG1faW5zdHJ1bWVudGluZ0FnZW50czsKICAgICBPd25Q dHI8SW5qZWN0ZWRTY3JpcHRNYW5hZ2VyPiBtX2luamVjdGVkU2NyaXB0TWFuYWdlcjsKLSNpZiBF TkFCTEUoSkFWQVNDUklQVF9ERUJVR0dFUikKLSAgICBPd25QdHI8SW5zcGVjdG9yRGVidWdnZXJB Z2VudD4gbV9kZWJ1Z2dlckFnZW50OwotICAgIE93blB0cjxJbnNwZWN0b3JQcm9maWxlckFnZW50 PiBtX3Byb2ZpbGVyQWdlbnQ7Ci0jZW5kaWYKLSAgICBPd25QdHI8SW5zcGVjdG9yUnVudGltZUFn ZW50PiBtX3J1bnRpbWVBZ2VudDsKLSAgICBPd25QdHI8SW5zcGVjdG9yQ29uc29sZUFnZW50PiBt X2NvbnNvbGVBZ2VudDsKLSAgICBPd25QdHI8SW5zcGVjdG9yVGltZWxpbmVBZ2VudD4gbV90aW1l bGluZUFnZW50OwotCisgICAgSW5zcGVjdG9yUnVudGltZUFnZW50KiBtX3J1bnRpbWVBZ2VudDsK KyAgICBJbnNwZWN0b3JBZ2VudFJlZ2lzdHJ5IG1fYWdlbnRzOwogICAgIE93blB0cjxJbnNwZWN0 b3JGcm9udGVuZENoYW5uZWw+IG1fZnJvbnRlbmRDaGFubmVsOwogICAgIE93blB0cjxJbnNwZWN0 b3JGcm9udGVuZD4gbV9mcm9udGVuZDsKICAgICBSZWZQdHI8SW5zcGVjdG9yQmFja2VuZERpc3Bh dGNoZXI+IG1fYmFja2VuZERpc3BhdGNoZXI7Cg==