110315 2013-02-20 01:54:58 -0800 Web Inspector: fix message for non-existent domain warning 2013-02-20 04:17:38 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 yurys yurys apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 837269 0 yurys 2013-02-20 01:54:58 -0800 1. Open inspector for some page and make sure that profiles panel hasn't been shown 2. Navigate inspected page to another URL 3. Open inspector on inspector and look at the console Result: Two errors that there were messages for non-existent profiler domains. 837272 1 189266 yurys 2013-02-20 01:57:18 -0800 Created attachment 189266 Patch 837273 2 189266 apavlov 2013-02-20 01:59:21 -0800 Comment on attachment 189266 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189266&action=review > Source/WebCore/inspector/InspectorHeapProfilerAgent.cpp:102 > // Revisit this. Is this comment still necessary? 837318 3 189281 yurys 2013-02-20 03:52:31 -0800 Created attachment 189281 Patch 837319 4 yurys 2013-02-20 03:52:56 -0800 (In reply to comment #2) > (From update of attachment 189266 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=189266&action=review > > > Source/WebCore/inspector/InspectorHeapProfilerAgent.cpp:102 > > // Revisit this. > > Is this comment still necessary? No. Removed. 837332 5 189281 webkit.review.bot 2013-02-20 04:17:34 -0800 Comment on attachment 189281 Patch Clearing flags on attachment: 189281 Committed r143449: <http://trac.webkit.org/changeset/143449> 837333 6 webkit.review.bot 2013-02-20 04:17:38 -0800 All reviewed patches have been landed. Closing bug. 189266 2013-02-20 01:57:18 -0800 2013-02-20 03:52:27 -0800 Patch bug-110315-20130220135340.patch text/plain 8974 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNDMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjA0OGM0Y2EyMDgwZDM4 NGQ0MzAyNjQ1MDYzZjk1ZTQzNmI2OTcwYy4uNjQzMjIwMDJiMDE0NDJiYTFkZDRmZmExOTZhMjM4 YzI1ZDIxOWMzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEzLTAyLTIwICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGZpeCBtZXNzYWdlIGZvciBub24tZXhpc3RlbnQgZG9tYWluIHdhcm5pbmcKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDMxNQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE9ubHkgc2VuZCAoSGVhcClQ cm9maWxlci5yZXNldFByb2ZpbGVzIGV2ZW50IGlmIHRoZSBjbGllbnQgaGFzCisgICAgICAgIHJl cXVlc3RlZCBwcm9maWxlIGhlYWRlcnMgYmVmb3JlLgorCisgICAgICAgICogaW5zcGVjdG9yL0lu c3BlY3RvckhlYXBQcm9maWxlckFnZW50LmNwcDoKKyAgICAgICAgKEhlYXBQcm9maWxlckFnZW50 U3RhdGUpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JI ZWFwUHJvZmlsZXJBZ2VudDo6SW5zcGVjdG9ySGVhcFByb2ZpbGVyQWdlbnQpOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9ySGVhcFByb2ZpbGVyQWdlbnQ6OnJlc2V0RnJvbnRlbmRQcm9maWxl cyk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JIZWFwUHJvZmlsZXJBZ2VudDo6Y2xlYXJG cm9udGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JIZWFwUHJvZmlsZXJBZ2VudDo6 cmVzdG9yZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JIZWFwUHJvZmlsZXJBZ2VudDo6 Z2V0UHJvZmlsZUhlYWRlcnMpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JIZWFwUHJv ZmlsZXJBZ2VudC5oOgorICAgICAgICAoSW5zcGVjdG9ySGVhcFByb2ZpbGVyQWdlbnQpOgorICAg ICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JQcm9maWxlckFnZW50LmNwcDoKKyAgICAgICAgKFBy b2ZpbGVyQWdlbnRTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JQcm9maWxlckFn ZW50OjpJbnNwZWN0b3JQcm9maWxlckFnZW50KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv clByb2ZpbGVyQWdlbnQ6OmFkZFByb2ZpbGUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y UHJvZmlsZXJBZ2VudDo6ZGlzYWJsZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JQcm9m aWxlckFnZW50OjpnZXRQcm9maWxlSGVhZGVycyk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAg ICAgKFdlYkNvcmU6Okluc3BlY3RvclByb2ZpbGVyQWdlbnQ6OnJlc2V0RnJvbnRlbmRQcm9maWxl cyk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JQcm9maWxlckFnZW50OjpyZXN0b3JlKToK KyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUHJvZmlsZXJBZ2VudC5oOgorICAgICAgICAo SW5zcGVjdG9yUHJvZmlsZXJBZ2VudCk6CisKIDIwMTMtMDItMTkgIFRpbSBIb3J0b24gIDx0aW1v dGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgQ2xhcmlmeSBpc0luV2luZG93IHZzLiBp c1Zpc2libGUgcGF0aCB0aHJvdWdoIHRvIFJlbmRlckxheWVyQ29tcG9zaXRvcgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckhlYXBQcm9maWxlckFnZW50LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JIZWFwUHJvZmlsZXJBZ2VudC5j cHAKaW5kZXggMjMzY2JkNWFiOTI1YTU5MTEwYTE5Y2M2MDUzZjEwYzkxM2MzNjczMC4uMDE3ZGE5 ZGQ4MDNlMTE0YTMxZTFkMjEwOTg1NGU1NGM5ZGJiMDliOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckhlYXBQcm9maWxlckFnZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySGVhcFByb2ZpbGVyQWdlbnQuY3BwCkBAIC0z NiwxMiArMzYsMTcgQEAKIAogI2luY2x1ZGUgIkluamVjdGVkU2NyaXB0LmgiCiAjaW5jbHVkZSAi SW5qZWN0ZWRTY3JpcHRIb3N0LmgiCisjaW5jbHVkZSAiSW5zcGVjdG9yU3RhdGUuaCIKICNpbmNs dWRlICJJbnN0cnVtZW50aW5nQWdlbnRzLmgiCiAjaW5jbHVkZSAiU2NyaXB0UHJvZmlsZXIuaCIK ICNpbmNsdWRlICJXZWJDb3JlTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmgiCiAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAorbmFtZXNwYWNlIEhlYXBQcm9maWxlckFnZW50U3RhdGUgeworc3RhdGljIGNv bnN0IGNoYXIgcHJvZmlsZUhlYWRlcnNSZXF1ZXN0ZWRbXSA9ICJwcm9maWxlSGVhZGVyc1JlcXVl c3RlZCI7Cit9CisKIHN0YXRpYyBjb25zdCBjaGFyKiBjb25zdCBVc2VySW5pdGlhdGVkUHJvZmls ZU5hbWVIZWFwID0gIm9yZy53ZWJraXQucHJvZmlsZXMudXNlci1pbml0aWF0ZWQiOwogCiBQYXNz T3duUHRyPEluc3BlY3RvckhlYXBQcm9maWxlckFnZW50PiBJbnNwZWN0b3JIZWFwUHJvZmlsZXJB Z2VudDo6Y3JlYXRlKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMsIElu c3BlY3RvckNvbXBvc2l0ZVN0YXRlKiBpbnNwZWN0b3JTdGF0ZSwgSW5qZWN0ZWRTY3JpcHRNYW5h Z2VyKiBpbmplY3RlZFNjcmlwdE1hbmFnZXIpCkBAIC01Myw3ICs1OCw2IEBAIEluc3BlY3Rvckhl YXBQcm9maWxlckFnZW50OjpJbnNwZWN0b3JIZWFwUHJvZmlsZXJBZ2VudChJbnN0cnVtZW50aW5n QWdlbnRzKiBpbnN0CiAgICAgOiBJbnNwZWN0b3JCYXNlQWdlbnQ8SW5zcGVjdG9ySGVhcFByb2Zp bGVyQWdlbnQ+KCJIZWFwUHJvZmlsZXIiLCBpbnN0cnVtZW50aW5nQWdlbnRzLCBpbnNwZWN0b3JT dGF0ZSkKICAgICAsIG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKGluamVjdGVkU2NyaXB0TWFuYWdl cikKICAgICAsIG1fZnJvbnRlbmQoMCkKLSAgICAsIG1faGVhZGVyc1JlcXVlc3RlZChmYWxzZSkK ICAgICAsIG1fbmV4dFVzZXJJbml0aWF0ZWRIZWFwU25hcHNob3ROdW1iZXIoMSkKIHsKICAgICBt X2luc3RydW1lbnRpbmdBZ2VudHMtPnNldEluc3BlY3RvckhlYXBQcm9maWxlckFnZW50KHRoaXMp OwpAQCAtNzQsNyArNzgsMTEgQEAgdm9pZCBJbnNwZWN0b3JIZWFwUHJvZmlsZXJBZ2VudDo6cmVz ZXRTdGF0ZSgpCiAKIHZvaWQgSW5zcGVjdG9ySGVhcFByb2ZpbGVyQWdlbnQ6OnJlc2V0RnJvbnRl bmRQcm9maWxlcygpCiB7Ci0gICAgaWYgKG1faGVhZGVyc1JlcXVlc3RlZCAmJiBtX2Zyb250ZW5k ICYmIG1fc25hcHNob3RzLmlzRW1wdHkoKSkKKyAgICBpZiAoIW1fZnJvbnRlbmQpCisgICAgICAg IHJldHVybjsKKyAgICBpZiAoIW1fc3RhdGUtPmdldEJvb2xlYW4oSGVhcFByb2ZpbGVyQWdlbnRT dGF0ZTo6cHJvZmlsZUhlYWRlcnNSZXF1ZXN0ZWQpKQorICAgICAgICByZXR1cm47CisgICAgaWYg KG1fc25hcHNob3RzLmlzRW1wdHkoKSkKICAgICAgICAgbV9mcm9udGVuZC0+cmVzZXRQcm9maWxl cygpOwogfQogCkBAIC04NSwxNCArOTMsMTMgQEAgdm9pZCBJbnNwZWN0b3JIZWFwUHJvZmlsZXJB Z2VudDo6c2V0RnJvbnRlbmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kKQogCiB2b2lkIElu c3BlY3RvckhlYXBQcm9maWxlckFnZW50OjpjbGVhckZyb250ZW5kKCkKIHsKLSAgICBtX2hlYWRl cnNSZXF1ZXN0ZWQgPSBmYWxzZTsKKyAgICBtX3N0YXRlLT5zZXRCb29sZWFuKEhlYXBQcm9maWxl ckFnZW50U3RhdGU6OnByb2ZpbGVIZWFkZXJzUmVxdWVzdGVkLCBmYWxzZSk7CiAgICAgbV9mcm9u dGVuZCA9IDA7CiB9CiAKIHZvaWQgSW5zcGVjdG9ySGVhcFByb2ZpbGVyQWdlbnQ6OnJlc3RvcmUo KQogewogICAgIC8vIFJldmlzaXQgdGhpcy4KLSAgICBtX2hlYWRlcnNSZXF1ZXN0ZWQgPSB0cnVl OwogICAgIHJlc2V0RnJvbnRlbmRQcm9maWxlcygpOwogfQogCkBAIC0xMTcsNyArMTI0LDcgQEAg dm9pZCBJbnNwZWN0b3JIZWFwUHJvZmlsZXJBZ2VudDo6aGFzSGVhcFByb2ZpbGVyKEVycm9yU3Ry aW5nKiwgYm9vbCogcmVzdWx0KQogCiB2b2lkIEluc3BlY3RvckhlYXBQcm9maWxlckFnZW50Ojpn ZXRQcm9maWxlSGVhZGVycyhFcnJvclN0cmluZyosIFJlZlB0cjxUeXBlQnVpbGRlcjo6QXJyYXk8 VHlwZUJ1aWxkZXI6OkhlYXBQcm9maWxlcjo6UHJvZmlsZUhlYWRlcj4gPiYgaGVhZGVycykKIHsK LSAgICBtX2hlYWRlcnNSZXF1ZXN0ZWQgPSB0cnVlOworICAgIG1fc3RhdGUtPnNldEJvb2xlYW4o SGVhcFByb2ZpbGVyQWdlbnRTdGF0ZTo6cHJvZmlsZUhlYWRlcnNSZXF1ZXN0ZWQsIHRydWUpOwog ICAgIGhlYWRlcnMgPSBUeXBlQnVpbGRlcjo6QXJyYXk8VHlwZUJ1aWxkZXI6OkhlYXBQcm9maWxl cjo6UHJvZmlsZUhlYWRlcj46OmNyZWF0ZSgpOwogCiAgICAgSWRUb0hlYXBTbmFwc2hvdE1hcDo6 aXRlcmF0b3Igc25hcHNob3RzRW5kID0gbV9zbmFwc2hvdHMuZW5kKCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySGVhcFByb2ZpbGVyQWdlbnQuaCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JIZWFwUHJvZmlsZXJBZ2VudC5oCmluZGV4 IDZkNzgyOTQ5NGRiMDExMjllMWVkM2FiYmU4ZmU1N2E1Zjk4MGU1MDQuLjE4YzZjOGQ5NGEyM2I3 YzMyYTU4MTYyNzVmYWZmZmI1ZTEwMTM0NzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JIZWFwUHJvZmlsZXJBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JIZWFwUHJvZmlsZXJBZ2VudC5oCkBAIC04Nyw3ICs4Nyw2IEBA IHByaXZhdGU6CiAKICAgICBJbmplY3RlZFNjcmlwdE1hbmFnZXIqIG1faW5qZWN0ZWRTY3JpcHRN YW5hZ2VyOwogICAgIEluc3BlY3RvckZyb250ZW5kOjpIZWFwUHJvZmlsZXIqIG1fZnJvbnRlbmQ7 Ci0gICAgYm9vbCBtX2hlYWRlcnNSZXF1ZXN0ZWQ7CiAgICAgdW5zaWduZWQgbV9uZXh0VXNlcklu aXRpYXRlZEhlYXBTbmFwc2hvdE51bWJlcjsKICAgICBJZFRvSGVhcFNuYXBzaG90TWFwIG1fc25h cHNob3RzOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JQcm9maWxlckFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQ cm9maWxlckFnZW50LmNwcAppbmRleCAyZDdiMDgzZWY0ZTBkMTQ2Nzk2YjBmMjQ2MTkyMTBhYmNi ZDIyNzBkLi43NjBmZWNmNDM3ZWRjODc3MzVkM2VhNDE2NTcxNmE2ZjYwNzkxNTg5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUHJvZmlsZXJBZ2VudC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclByb2ZpbGVyQWdlbnQuY3Bw CkBAIC02Miw2ICs2Miw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBQcm9maWxl ckFnZW50U3RhdGUgewogc3RhdGljIGNvbnN0IGNoYXIgdXNlckluaXRpYXRlZFByb2ZpbGluZ1td ID0gInVzZXJJbml0aWF0ZWRQcm9maWxpbmciOwogc3RhdGljIGNvbnN0IGNoYXIgcHJvZmlsZXJF bmFibGVkW10gPSAicHJvZmlsZXJFbmFibGVkIjsKK3N0YXRpYyBjb25zdCBjaGFyIHByb2ZpbGVI ZWFkZXJzUmVxdWVzdGVkW10gPSAicHJvZmlsZUhlYWRlcnNSZXF1ZXN0ZWQiOwogfQogCiBzdGF0 aWMgY29uc3QgY2hhciogY29uc3QgVXNlckluaXRpYXRlZFByb2ZpbGVOYW1lID0gIm9yZy53ZWJr aXQucHJvZmlsZXMudXNlci1pbml0aWF0ZWQiOwpAQCAtMTM1LDcgKzEzNiw2IEBAIEluc3BlY3Rv clByb2ZpbGVyQWdlbnQ6Okluc3BlY3RvclByb2ZpbGVyQWdlbnQoSW5zdHJ1bWVudGluZ0FnZW50 cyogaW5zdHJ1bWVudGluCiAgICAgLCBtX2Zyb250ZW5kKDApCiAgICAgLCBtX2VuYWJsZWQoZmFs c2UpCiAgICAgLCBtX3JlY29yZGluZ0NQVVByb2ZpbGUoZmFsc2UpCi0gICAgLCBtX2hlYWRlcnNS ZXF1ZXN0ZWQoZmFsc2UpCiAgICAgLCBtX2N1cnJlbnRVc2VySW5pdGlhdGVkUHJvZmlsZU51bWJl cigtMSkKICAgICAsIG1fbmV4dFVzZXJJbml0aWF0ZWRQcm9maWxlTnVtYmVyKDEpCiAgICAgLCBt X25leHRVc2VySW5pdGlhdGVkSGVhcFNuYXBzaG90TnVtYmVyKDEpCkBAIC0xNTQsNyArMTU0LDcg QEAgdm9pZCBJbnNwZWN0b3JQcm9maWxlckFnZW50OjphZGRQcm9maWxlKFBhc3NSZWZQdHI8U2Ny aXB0UHJvZmlsZT4gcHJwUHJvZmlsZSwgdW4KIHsKICAgICBSZWZQdHI8U2NyaXB0UHJvZmlsZT4g cHJvZmlsZSA9IHBycFByb2ZpbGU7CiAgICAgbV9wcm9maWxlcy5hZGQocHJvZmlsZS0+dWlkKCks IHByb2ZpbGUpOwotICAgIGlmIChtX2Zyb250ZW5kICYmIG1faGVhZGVyc1JlcXVlc3RlZCkKKyAg ICBpZiAobV9mcm9udGVuZCAmJiBtX3N0YXRlLT5nZXRCb29sZWFuKFByb2ZpbGVyQWdlbnRTdGF0 ZTo6cHJvZmlsZUhlYWRlcnNSZXF1ZXN0ZWQpKQogICAgICAgICBtX2Zyb250ZW5kLT5hZGRQcm9m aWxlSGVhZGVyKGNyZWF0ZVByb2ZpbGVIZWFkZXIoKnByb2ZpbGUpKTsKICAgICBhZGRQcm9maWxl RmluaXNoZWRNZXNzYWdlVG9Db25zb2xlKHByb2ZpbGUsIGxpbmVOdW1iZXIsIHNvdXJjZVVSTCk7 CiB9CkBAIC0yMzUsNyArMjM1LDcgQEAgdm9pZCBJbnNwZWN0b3JQcm9maWxlckFnZW50OjpkaXNh YmxlKCkKICAgICBpZiAoIW1fZW5hYmxlZCkKICAgICAgICAgcmV0dXJuOwogICAgIG1fZW5hYmxl ZCA9IGZhbHNlOwotICAgIG1faGVhZGVyc1JlcXVlc3RlZCA9IGZhbHNlOworICAgIG1fc3RhdGUt PnNldEJvb2xlYW4oUHJvZmlsZXJBZ2VudFN0YXRlOjpwcm9maWxlSGVhZGVyc1JlcXVlc3RlZCwg ZmFsc2UpOwogICAgIHJlY29tcGlsZVNjcmlwdCgpOwogfQogCkBAIC0yNTgsNyArMjU4LDcgQEAg U3RyaW5nIEluc3BlY3RvclByb2ZpbGVyQWdlbnQ6OmdldEN1cnJlbnRVc2VySW5pdGlhdGVkUHJv ZmlsZU5hbWUoYm9vbCBpbmNyZW1lbnQKIAogdm9pZCBJbnNwZWN0b3JQcm9maWxlckFnZW50Ojpn ZXRQcm9maWxlSGVhZGVycyhFcnJvclN0cmluZyosIFJlZlB0cjxUeXBlQnVpbGRlcjo6QXJyYXk8 VHlwZUJ1aWxkZXI6OlByb2ZpbGVyOjpQcm9maWxlSGVhZGVyPiA+JiBoZWFkZXJzKQogewotICAg IG1faGVhZGVyc1JlcXVlc3RlZCA9IHRydWU7CisgICAgbV9zdGF0ZS0+c2V0Qm9vbGVhbihQcm9m aWxlckFnZW50U3RhdGU6OnByb2ZpbGVIZWFkZXJzUmVxdWVzdGVkLCB0cnVlKTsKICAgICBoZWFk ZXJzID0gVHlwZUJ1aWxkZXI6OkFycmF5PFR5cGVCdWlsZGVyOjpQcm9maWxlcjo6UHJvZmlsZUhl YWRlcj46OmNyZWF0ZSgpOwogCiAgICAgUHJvZmlsZXNNYXA6Oml0ZXJhdG9yIHByb2ZpbGVzRW5k ID0gbV9wcm9maWxlcy5lbmQoKTsKQEAgLTM0MCw5ICszNDAsMTEgQEAgdm9pZCBJbnNwZWN0b3JQ cm9maWxlckFnZW50OjpyZXNldFN0YXRlKCkKIAogdm9pZCBJbnNwZWN0b3JQcm9maWxlckFnZW50 OjpyZXNldEZyb250ZW5kUHJvZmlsZXMoKQogewotICAgIGlmIChtX2hlYWRlcnNSZXF1ZXN0ZWQg JiYgbV9mcm9udGVuZAotICAgICAgICAmJiBtX3Byb2ZpbGVzLmJlZ2luKCkgPT0gbV9wcm9maWxl cy5lbmQoKQotICAgICAgICAmJiBtX3NuYXBzaG90cy5iZWdpbigpID09IG1fc25hcHNob3RzLmVu ZCgpKQorICAgIGlmICghbV9mcm9udGVuZCkKKyAgICAgICAgcmV0dXJuOworICAgIGlmICghbV9z dGF0ZS0+Z2V0Qm9vbGVhbihQcm9maWxlckFnZW50U3RhdGU6OnByb2ZpbGVIZWFkZXJzUmVxdWVz dGVkKSkKKyAgICAgICAgcmV0dXJuOworICAgIGlmIChtX3Byb2ZpbGVzLmlzRW1wdHkoKSAmJiBt X3NuYXBzaG90cy5pc0VtcHR5KCkpCiAgICAgICAgIG1fZnJvbnRlbmQtPnJlc2V0UHJvZmlsZXMo KTsKIH0KIApAQCAtMzYzLDkgKzM2NSw2IEBAIHZvaWQgSW5zcGVjdG9yUHJvZmlsZXJBZ2VudDo6 cmVzdG9yZSgpCiB7CiAgICAgLy8gTmVlZCB0byByZXN0b3JlIGVuYWJsZW1lbnQgc3RhdGUgaGVy ZSBhcyBpbiBzZXRGcm9udGVuZCBtX3N0YXRlIHdhc24ndCBsb2FkZWQgeWV0LgogICAgIHJlc3Rv cmVFbmFibGVtZW50KCk7Ci0KLSAgICAvLyBSZXZpc2l0IHRoaXMuCi0gICAgbV9oZWFkZXJzUmVx dWVzdGVkID0gdHJ1ZTsKICAgICByZXNldEZyb250ZW5kUHJvZmlsZXMoKTsKICAgICBpZiAobV9z dGF0ZS0+Z2V0Qm9vbGVhbihQcm9maWxlckFnZW50U3RhdGU6OnVzZXJJbml0aWF0ZWRQcm9maWxp bmcpKQogICAgICAgICBzdGFydCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvclByb2ZpbGVyQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JQcm9maWxlckFnZW50LmgKaW5kZXggZmEwM2MyMTAyNTY0MTMzNjY0Yjk3ZmIwNGVm MDE4ZDAxN2EzNTE1Zi4uMjQ0NTk4MTVkMDkwNjgzODgwMWI4MzZkMGVhOGE4OGZmZmE0MmQxYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclByb2ZpbGVyQWdl bnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUHJvZmlsZXJBZ2Vu dC5oCkBAIC0xMjYsNyArMTI2LDYgQEAgcHJpdmF0ZToKICAgICBJbnNwZWN0b3JGcm9udGVuZDo6 UHJvZmlsZXIqIG1fZnJvbnRlbmQ7CiAgICAgYm9vbCBtX2VuYWJsZWQ7CiAgICAgYm9vbCBtX3Jl Y29yZGluZ0NQVVByb2ZpbGU7Ci0gICAgYm9vbCBtX2hlYWRlcnNSZXF1ZXN0ZWQ7CiAgICAgaW50 IG1fY3VycmVudFVzZXJJbml0aWF0ZWRQcm9maWxlTnVtYmVyOwogICAgIHVuc2lnbmVkIG1fbmV4 dFVzZXJJbml0aWF0ZWRQcm9maWxlTnVtYmVyOwogICAgIHVuc2lnbmVkIG1fbmV4dFVzZXJJbml0 aWF0ZWRIZWFwU25hcHNob3ROdW1iZXI7Cg== 189281 2013-02-20 03:52:31 -0800 2013-02-20 04:17:34 -0800 Patch bug-110315-20130220154853.patch text/plain 8974 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNDMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjA0OGM0Y2EyMDgwZDM4 NGQ0MzAyNjQ1MDYzZjk1ZTQzNmI2OTcwYy4uNjQzMjIwMDJiMDE0NDJiYTFkZDRmZmExOTZhMjM4 YzI1ZDIxOWMzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEzLTAyLTIwICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGZpeCBtZXNzYWdlIGZvciBub24tZXhpc3RlbnQgZG9tYWluIHdhcm5pbmcKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDMxNQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE9ubHkgc2VuZCAoSGVhcClQ cm9maWxlci5yZXNldFByb2ZpbGVzIGV2ZW50IGlmIHRoZSBjbGllbnQgaGFzCisgICAgICAgIHJl cXVlc3RlZCBwcm9maWxlIGhlYWRlcnMgYmVmb3JlLgorCisgICAgICAgICogaW5zcGVjdG9yL0lu c3BlY3RvckhlYXBQcm9maWxlckFnZW50LmNwcDoKKyAgICAgICAgKEhlYXBQcm9maWxlckFnZW50 U3RhdGUpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JI ZWFwUHJvZmlsZXJBZ2VudDo6SW5zcGVjdG9ySGVhcFByb2ZpbGVyQWdlbnQpOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9ySGVhcFByb2ZpbGVyQWdlbnQ6OnJlc2V0RnJvbnRlbmRQcm9maWxl cyk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JIZWFwUHJvZmlsZXJBZ2VudDo6Y2xlYXJG cm9udGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JIZWFwUHJvZmlsZXJBZ2VudDo6 cmVzdG9yZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JIZWFwUHJvZmlsZXJBZ2VudDo6 Z2V0UHJvZmlsZUhlYWRlcnMpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JIZWFwUHJv ZmlsZXJBZ2VudC5oOgorICAgICAgICAoSW5zcGVjdG9ySGVhcFByb2ZpbGVyQWdlbnQpOgorICAg ICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JQcm9maWxlckFnZW50LmNwcDoKKyAgICAgICAgKFBy b2ZpbGVyQWdlbnRTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JQcm9maWxlckFn ZW50OjpJbnNwZWN0b3JQcm9maWxlckFnZW50KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv clByb2ZpbGVyQWdlbnQ6OmFkZFByb2ZpbGUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y UHJvZmlsZXJBZ2VudDo6ZGlzYWJsZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JQcm9m aWxlckFnZW50OjpnZXRQcm9maWxlSGVhZGVycyk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAg ICAgKFdlYkNvcmU6Okluc3BlY3RvclByb2ZpbGVyQWdlbnQ6OnJlc2V0RnJvbnRlbmRQcm9maWxl cyk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JQcm9maWxlckFnZW50OjpyZXN0b3JlKToK KyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUHJvZmlsZXJBZ2VudC5oOgorICAgICAgICAo SW5zcGVjdG9yUHJvZmlsZXJBZ2VudCk6CisKIDIwMTMtMDItMTkgIFRpbSBIb3J0b24gIDx0aW1v dGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgQ2xhcmlmeSBpc0luV2luZG93IHZzLiBp c1Zpc2libGUgcGF0aCB0aHJvdWdoIHRvIFJlbmRlckxheWVyQ29tcG9zaXRvcgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckhlYXBQcm9maWxlckFnZW50LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JIZWFwUHJvZmlsZXJBZ2VudC5j cHAKaW5kZXggMjMzY2JkNWFiOTI1YTU5MTEwYTE5Y2M2MDUzZjEwYzkxM2MzNjczMC4uODY0NjZl Njg4OTQ3MzMxMGM3ZWViY2MzYjBlZGI5MjlhOGYzYTZmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckhlYXBQcm9maWxlckFnZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySGVhcFByb2ZpbGVyQWdlbnQuY3BwCkBAIC0z NiwxMiArMzYsMTcgQEAKIAogI2luY2x1ZGUgIkluamVjdGVkU2NyaXB0LmgiCiAjaW5jbHVkZSAi SW5qZWN0ZWRTY3JpcHRIb3N0LmgiCisjaW5jbHVkZSAiSW5zcGVjdG9yU3RhdGUuaCIKICNpbmNs dWRlICJJbnN0cnVtZW50aW5nQWdlbnRzLmgiCiAjaW5jbHVkZSAiU2NyaXB0UHJvZmlsZXIuaCIK ICNpbmNsdWRlICJXZWJDb3JlTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmgiCiAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAorbmFtZXNwYWNlIEhlYXBQcm9maWxlckFnZW50U3RhdGUgeworc3RhdGljIGNv bnN0IGNoYXIgcHJvZmlsZUhlYWRlcnNSZXF1ZXN0ZWRbXSA9ICJwcm9maWxlSGVhZGVyc1JlcXVl c3RlZCI7Cit9CisKIHN0YXRpYyBjb25zdCBjaGFyKiBjb25zdCBVc2VySW5pdGlhdGVkUHJvZmls ZU5hbWVIZWFwID0gIm9yZy53ZWJraXQucHJvZmlsZXMudXNlci1pbml0aWF0ZWQiOwogCiBQYXNz T3duUHRyPEluc3BlY3RvckhlYXBQcm9maWxlckFnZW50PiBJbnNwZWN0b3JIZWFwUHJvZmlsZXJB Z2VudDo6Y3JlYXRlKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMsIElu c3BlY3RvckNvbXBvc2l0ZVN0YXRlKiBpbnNwZWN0b3JTdGF0ZSwgSW5qZWN0ZWRTY3JpcHRNYW5h Z2VyKiBpbmplY3RlZFNjcmlwdE1hbmFnZXIpCkBAIC01Myw3ICs1OCw2IEBAIEluc3BlY3Rvckhl YXBQcm9maWxlckFnZW50OjpJbnNwZWN0b3JIZWFwUHJvZmlsZXJBZ2VudChJbnN0cnVtZW50aW5n QWdlbnRzKiBpbnN0CiAgICAgOiBJbnNwZWN0b3JCYXNlQWdlbnQ8SW5zcGVjdG9ySGVhcFByb2Zp bGVyQWdlbnQ+KCJIZWFwUHJvZmlsZXIiLCBpbnN0cnVtZW50aW5nQWdlbnRzLCBpbnNwZWN0b3JT dGF0ZSkKICAgICAsIG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKGluamVjdGVkU2NyaXB0TWFuYWdl cikKICAgICAsIG1fZnJvbnRlbmQoMCkKLSAgICAsIG1faGVhZGVyc1JlcXVlc3RlZChmYWxzZSkK ICAgICAsIG1fbmV4dFVzZXJJbml0aWF0ZWRIZWFwU25hcHNob3ROdW1iZXIoMSkKIHsKICAgICBt X2luc3RydW1lbnRpbmdBZ2VudHMtPnNldEluc3BlY3RvckhlYXBQcm9maWxlckFnZW50KHRoaXMp OwpAQCAtNzQsNyArNzgsMTEgQEAgdm9pZCBJbnNwZWN0b3JIZWFwUHJvZmlsZXJBZ2VudDo6cmVz ZXRTdGF0ZSgpCiAKIHZvaWQgSW5zcGVjdG9ySGVhcFByb2ZpbGVyQWdlbnQ6OnJlc2V0RnJvbnRl bmRQcm9maWxlcygpCiB7Ci0gICAgaWYgKG1faGVhZGVyc1JlcXVlc3RlZCAmJiBtX2Zyb250ZW5k ICYmIG1fc25hcHNob3RzLmlzRW1wdHkoKSkKKyAgICBpZiAoIW1fZnJvbnRlbmQpCisgICAgICAg IHJldHVybjsKKyAgICBpZiAoIW1fc3RhdGUtPmdldEJvb2xlYW4oSGVhcFByb2ZpbGVyQWdlbnRT dGF0ZTo6cHJvZmlsZUhlYWRlcnNSZXF1ZXN0ZWQpKQorICAgICAgICByZXR1cm47CisgICAgaWYg KG1fc25hcHNob3RzLmlzRW1wdHkoKSkKICAgICAgICAgbV9mcm9udGVuZC0+cmVzZXRQcm9maWxl cygpOwogfQogCkBAIC04NSwxNCArOTMsMTIgQEAgdm9pZCBJbnNwZWN0b3JIZWFwUHJvZmlsZXJB Z2VudDo6c2V0RnJvbnRlbmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kKQogCiB2b2lkIElu c3BlY3RvckhlYXBQcm9maWxlckFnZW50OjpjbGVhckZyb250ZW5kKCkKIHsKLSAgICBtX2hlYWRl cnNSZXF1ZXN0ZWQgPSBmYWxzZTsKKyAgICBtX3N0YXRlLT5zZXRCb29sZWFuKEhlYXBQcm9maWxl ckFnZW50U3RhdGU6OnByb2ZpbGVIZWFkZXJzUmVxdWVzdGVkLCBmYWxzZSk7CiAgICAgbV9mcm9u dGVuZCA9IDA7CiB9CiAKIHZvaWQgSW5zcGVjdG9ySGVhcFByb2ZpbGVyQWdlbnQ6OnJlc3RvcmUo KQogewotICAgIC8vIFJldmlzaXQgdGhpcy4KLSAgICBtX2hlYWRlcnNSZXF1ZXN0ZWQgPSB0cnVl OwogICAgIHJlc2V0RnJvbnRlbmRQcm9maWxlcygpOwogfQogCkBAIC0xMTcsNyArMTIzLDcgQEAg dm9pZCBJbnNwZWN0b3JIZWFwUHJvZmlsZXJBZ2VudDo6aGFzSGVhcFByb2ZpbGVyKEVycm9yU3Ry aW5nKiwgYm9vbCogcmVzdWx0KQogCiB2b2lkIEluc3BlY3RvckhlYXBQcm9maWxlckFnZW50Ojpn ZXRQcm9maWxlSGVhZGVycyhFcnJvclN0cmluZyosIFJlZlB0cjxUeXBlQnVpbGRlcjo6QXJyYXk8 VHlwZUJ1aWxkZXI6OkhlYXBQcm9maWxlcjo6UHJvZmlsZUhlYWRlcj4gPiYgaGVhZGVycykKIHsK LSAgICBtX2hlYWRlcnNSZXF1ZXN0ZWQgPSB0cnVlOworICAgIG1fc3RhdGUtPnNldEJvb2xlYW4o SGVhcFByb2ZpbGVyQWdlbnRTdGF0ZTo6cHJvZmlsZUhlYWRlcnNSZXF1ZXN0ZWQsIHRydWUpOwog ICAgIGhlYWRlcnMgPSBUeXBlQnVpbGRlcjo6QXJyYXk8VHlwZUJ1aWxkZXI6OkhlYXBQcm9maWxl cjo6UHJvZmlsZUhlYWRlcj46OmNyZWF0ZSgpOwogCiAgICAgSWRUb0hlYXBTbmFwc2hvdE1hcDo6 aXRlcmF0b3Igc25hcHNob3RzRW5kID0gbV9zbmFwc2hvdHMuZW5kKCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySGVhcFByb2ZpbGVyQWdlbnQuaCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JIZWFwUHJvZmlsZXJBZ2VudC5oCmluZGV4 IDZkNzgyOTQ5NGRiMDExMjllMWVkM2FiYmU4ZmU1N2E1Zjk4MGU1MDQuLjE4YzZjOGQ5NGEyM2I3 YzMyYTU4MTYyNzVmYWZmZmI1ZTEwMTM0NzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JIZWFwUHJvZmlsZXJBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JIZWFwUHJvZmlsZXJBZ2VudC5oCkBAIC04Nyw3ICs4Nyw2IEBA IHByaXZhdGU6CiAKICAgICBJbmplY3RlZFNjcmlwdE1hbmFnZXIqIG1faW5qZWN0ZWRTY3JpcHRN YW5hZ2VyOwogICAgIEluc3BlY3RvckZyb250ZW5kOjpIZWFwUHJvZmlsZXIqIG1fZnJvbnRlbmQ7 Ci0gICAgYm9vbCBtX2hlYWRlcnNSZXF1ZXN0ZWQ7CiAgICAgdW5zaWduZWQgbV9uZXh0VXNlcklu aXRpYXRlZEhlYXBTbmFwc2hvdE51bWJlcjsKICAgICBJZFRvSGVhcFNuYXBzaG90TWFwIG1fc25h cHNob3RzOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JQcm9maWxlckFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQ cm9maWxlckFnZW50LmNwcAppbmRleCAyZDdiMDgzZWY0ZTBkMTQ2Nzk2YjBmMjQ2MTkyMTBhYmNi ZDIyNzBkLi43NjBmZWNmNDM3ZWRjODc3MzVkM2VhNDE2NTcxNmE2ZjYwNzkxNTg5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUHJvZmlsZXJBZ2VudC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclByb2ZpbGVyQWdlbnQuY3Bw CkBAIC02Miw2ICs2Miw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBQcm9maWxl ckFnZW50U3RhdGUgewogc3RhdGljIGNvbnN0IGNoYXIgdXNlckluaXRpYXRlZFByb2ZpbGluZ1td ID0gInVzZXJJbml0aWF0ZWRQcm9maWxpbmciOwogc3RhdGljIGNvbnN0IGNoYXIgcHJvZmlsZXJF bmFibGVkW10gPSAicHJvZmlsZXJFbmFibGVkIjsKK3N0YXRpYyBjb25zdCBjaGFyIHByb2ZpbGVI ZWFkZXJzUmVxdWVzdGVkW10gPSAicHJvZmlsZUhlYWRlcnNSZXF1ZXN0ZWQiOwogfQogCiBzdGF0 aWMgY29uc3QgY2hhciogY29uc3QgVXNlckluaXRpYXRlZFByb2ZpbGVOYW1lID0gIm9yZy53ZWJr aXQucHJvZmlsZXMudXNlci1pbml0aWF0ZWQiOwpAQCAtMTM1LDcgKzEzNiw2IEBAIEluc3BlY3Rv clByb2ZpbGVyQWdlbnQ6Okluc3BlY3RvclByb2ZpbGVyQWdlbnQoSW5zdHJ1bWVudGluZ0FnZW50 cyogaW5zdHJ1bWVudGluCiAgICAgLCBtX2Zyb250ZW5kKDApCiAgICAgLCBtX2VuYWJsZWQoZmFs c2UpCiAgICAgLCBtX3JlY29yZGluZ0NQVVByb2ZpbGUoZmFsc2UpCi0gICAgLCBtX2hlYWRlcnNS ZXF1ZXN0ZWQoZmFsc2UpCiAgICAgLCBtX2N1cnJlbnRVc2VySW5pdGlhdGVkUHJvZmlsZU51bWJl cigtMSkKICAgICAsIG1fbmV4dFVzZXJJbml0aWF0ZWRQcm9maWxlTnVtYmVyKDEpCiAgICAgLCBt X25leHRVc2VySW5pdGlhdGVkSGVhcFNuYXBzaG90TnVtYmVyKDEpCkBAIC0xNTQsNyArMTU0LDcg QEAgdm9pZCBJbnNwZWN0b3JQcm9maWxlckFnZW50OjphZGRQcm9maWxlKFBhc3NSZWZQdHI8U2Ny aXB0UHJvZmlsZT4gcHJwUHJvZmlsZSwgdW4KIHsKICAgICBSZWZQdHI8U2NyaXB0UHJvZmlsZT4g cHJvZmlsZSA9IHBycFByb2ZpbGU7CiAgICAgbV9wcm9maWxlcy5hZGQocHJvZmlsZS0+dWlkKCks IHByb2ZpbGUpOwotICAgIGlmIChtX2Zyb250ZW5kICYmIG1faGVhZGVyc1JlcXVlc3RlZCkKKyAg ICBpZiAobV9mcm9udGVuZCAmJiBtX3N0YXRlLT5nZXRCb29sZWFuKFByb2ZpbGVyQWdlbnRTdGF0 ZTo6cHJvZmlsZUhlYWRlcnNSZXF1ZXN0ZWQpKQogICAgICAgICBtX2Zyb250ZW5kLT5hZGRQcm9m aWxlSGVhZGVyKGNyZWF0ZVByb2ZpbGVIZWFkZXIoKnByb2ZpbGUpKTsKICAgICBhZGRQcm9maWxl RmluaXNoZWRNZXNzYWdlVG9Db25zb2xlKHByb2ZpbGUsIGxpbmVOdW1iZXIsIHNvdXJjZVVSTCk7 CiB9CkBAIC0yMzUsNyArMjM1LDcgQEAgdm9pZCBJbnNwZWN0b3JQcm9maWxlckFnZW50OjpkaXNh YmxlKCkKICAgICBpZiAoIW1fZW5hYmxlZCkKICAgICAgICAgcmV0dXJuOwogICAgIG1fZW5hYmxl ZCA9IGZhbHNlOwotICAgIG1faGVhZGVyc1JlcXVlc3RlZCA9IGZhbHNlOworICAgIG1fc3RhdGUt PnNldEJvb2xlYW4oUHJvZmlsZXJBZ2VudFN0YXRlOjpwcm9maWxlSGVhZGVyc1JlcXVlc3RlZCwg ZmFsc2UpOwogICAgIHJlY29tcGlsZVNjcmlwdCgpOwogfQogCkBAIC0yNTgsNyArMjU4LDcgQEAg U3RyaW5nIEluc3BlY3RvclByb2ZpbGVyQWdlbnQ6OmdldEN1cnJlbnRVc2VySW5pdGlhdGVkUHJv ZmlsZU5hbWUoYm9vbCBpbmNyZW1lbnQKIAogdm9pZCBJbnNwZWN0b3JQcm9maWxlckFnZW50Ojpn ZXRQcm9maWxlSGVhZGVycyhFcnJvclN0cmluZyosIFJlZlB0cjxUeXBlQnVpbGRlcjo6QXJyYXk8 VHlwZUJ1aWxkZXI6OlByb2ZpbGVyOjpQcm9maWxlSGVhZGVyPiA+JiBoZWFkZXJzKQogewotICAg IG1faGVhZGVyc1JlcXVlc3RlZCA9IHRydWU7CisgICAgbV9zdGF0ZS0+c2V0Qm9vbGVhbihQcm9m aWxlckFnZW50U3RhdGU6OnByb2ZpbGVIZWFkZXJzUmVxdWVzdGVkLCB0cnVlKTsKICAgICBoZWFk ZXJzID0gVHlwZUJ1aWxkZXI6OkFycmF5PFR5cGVCdWlsZGVyOjpQcm9maWxlcjo6UHJvZmlsZUhl YWRlcj46OmNyZWF0ZSgpOwogCiAgICAgUHJvZmlsZXNNYXA6Oml0ZXJhdG9yIHByb2ZpbGVzRW5k ID0gbV9wcm9maWxlcy5lbmQoKTsKQEAgLTM0MCw5ICszNDAsMTEgQEAgdm9pZCBJbnNwZWN0b3JQ cm9maWxlckFnZW50OjpyZXNldFN0YXRlKCkKIAogdm9pZCBJbnNwZWN0b3JQcm9maWxlckFnZW50 OjpyZXNldEZyb250ZW5kUHJvZmlsZXMoKQogewotICAgIGlmIChtX2hlYWRlcnNSZXF1ZXN0ZWQg JiYgbV9mcm9udGVuZAotICAgICAgICAmJiBtX3Byb2ZpbGVzLmJlZ2luKCkgPT0gbV9wcm9maWxl cy5lbmQoKQotICAgICAgICAmJiBtX3NuYXBzaG90cy5iZWdpbigpID09IG1fc25hcHNob3RzLmVu ZCgpKQorICAgIGlmICghbV9mcm9udGVuZCkKKyAgICAgICAgcmV0dXJuOworICAgIGlmICghbV9z dGF0ZS0+Z2V0Qm9vbGVhbihQcm9maWxlckFnZW50U3RhdGU6OnByb2ZpbGVIZWFkZXJzUmVxdWVz dGVkKSkKKyAgICAgICAgcmV0dXJuOworICAgIGlmIChtX3Byb2ZpbGVzLmlzRW1wdHkoKSAmJiBt X3NuYXBzaG90cy5pc0VtcHR5KCkpCiAgICAgICAgIG1fZnJvbnRlbmQtPnJlc2V0UHJvZmlsZXMo KTsKIH0KIApAQCAtMzYzLDkgKzM2NSw2IEBAIHZvaWQgSW5zcGVjdG9yUHJvZmlsZXJBZ2VudDo6 cmVzdG9yZSgpCiB7CiAgICAgLy8gTmVlZCB0byByZXN0b3JlIGVuYWJsZW1lbnQgc3RhdGUgaGVy ZSBhcyBpbiBzZXRGcm9udGVuZCBtX3N0YXRlIHdhc24ndCBsb2FkZWQgeWV0LgogICAgIHJlc3Rv cmVFbmFibGVtZW50KCk7Ci0KLSAgICAvLyBSZXZpc2l0IHRoaXMuCi0gICAgbV9oZWFkZXJzUmVx dWVzdGVkID0gdHJ1ZTsKICAgICByZXNldEZyb250ZW5kUHJvZmlsZXMoKTsKICAgICBpZiAobV9z dGF0ZS0+Z2V0Qm9vbGVhbihQcm9maWxlckFnZW50U3RhdGU6OnVzZXJJbml0aWF0ZWRQcm9maWxp bmcpKQogICAgICAgICBzdGFydCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvclByb2ZpbGVyQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JQcm9maWxlckFnZW50LmgKaW5kZXggZmEwM2MyMTAyNTY0MTMzNjY0Yjk3ZmIwNGVm MDE4ZDAxN2EzNTE1Zi4uMjQ0NTk4MTVkMDkwNjgzODgwMWI4MzZkMGVhOGE4OGZmZmE0MmQxYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclByb2ZpbGVyQWdl bnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUHJvZmlsZXJBZ2Vu dC5oCkBAIC0xMjYsNyArMTI2LDYgQEAgcHJpdmF0ZToKICAgICBJbnNwZWN0b3JGcm9udGVuZDo6 UHJvZmlsZXIqIG1fZnJvbnRlbmQ7CiAgICAgYm9vbCBtX2VuYWJsZWQ7CiAgICAgYm9vbCBtX3Jl Y29yZGluZ0NQVVByb2ZpbGU7Ci0gICAgYm9vbCBtX2hlYWRlcnNSZXF1ZXN0ZWQ7CiAgICAgaW50 IG1fY3VycmVudFVzZXJJbml0aWF0ZWRQcm9maWxlTnVtYmVyOwogICAgIHVuc2lnbmVkIG1fbmV4 dFVzZXJJbml0aWF0ZWRQcm9maWxlTnVtYmVyOwogICAgIHVuc2lnbmVkIG1fbmV4dFVzZXJJbml0 aWF0ZWRIZWFwU25hcHNob3ROdW1iZXI7Cg==