90668 2012-07-06 01:51:20 -0700 Web Inspector: add memory reporting routine to Document 2012-07-06 04:25:51 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 87262 0 yurys yurys alph apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 663953 0 yurys 2012-07-06 01:51:20 -0700 Before instrumenting potentially big objects referenced from Document we should report size of the Document itself including numerous collections in it. 663961 1 151041 yurys 2012-07-06 02:11:05 -0700 Created attachment 151041 Patch 663999 2 151041 webkit.review.bot 2012-07-06 04:25:46 -0700 Comment on attachment 151041 Patch Clearing flags on attachment: 151041 Committed r121952: <http://trac.webkit.org/changeset/121952> 664000 3 webkit.review.bot 2012-07-06 04:25:51 -0700 All reviewed patches have been landed. Closing bug. 151041 2012-07-06 02:11:05 -0700 2012-07-06 04:25:46 -0700 Patch bug-90668-20120706131104.patch text/plain 9478 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxOTQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTUzZWFiODQzNGIwMTg2 MTlhZTA0YzUzNWFlNTgyNjJkNTA5NzNjNS4uZmI0N2FlMTVjYTFjOGViODJmM2M4YzE4M2Q3OWEx YzU0NjRlZTAwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEyLTA3LTA2ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGFkZCBtZW1vcnkgcmVwb3J0aW5nIHJvdXRpbmUgdG8gRG9jdW1lbnQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkwNjY4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgbWV0aG9kcyBmb3IgcmVw b3J0aW5nIEhhc2hTZXQsIExpc3RIYXNoU2V0IGFuZCBWZWN0b3IgbWVtb3J5CisgICAgICAgIGZv b3RwcmludC4gTWFkZSBEb2N1bWVudCByZXBvcnQgaXRzIHNpemUgYWxvbmcgd2l0aCBpdHMgaW50 ZXJuYWwKKyAgICAgICAgY29sbGVjdGlvbnMgc2l6ZXMuCisKKyAgICAgICAgKiBkb20vRG9jdW1l bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnJlcG9ydE1lbW9yeVVzYWdlKToK KyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIGRvbS9Eb2N1bWVudC5oOgorICAgICAgICAo RG9jdW1lbnQpOgorICAgICAgICAqIGRvbS9NZW1vcnlJbnN0cnVtZW50YXRpb24uaDoKKyAgICAg ICAgKE1lbW9yeUluc3RydW1lbnRhdGlvbik6CisgICAgICAgIChNZW1vcnlPYmplY3RJbmZvKToK KyAgICAgICAgKFdlYkNvcmU6Ok1lbW9yeU9iamVjdEluZm86OnJlcG9ydEhhc2hNYXApOgorICAg ICAgICAoV2ViQ29yZTo6TWVtb3J5T2JqZWN0SW5mbzo6cmVwb3J0SGFzaFNldCk6CisgICAgICAg IChXZWJDb3JlOjpNZW1vcnlPYmplY3RJbmZvOjpyZXBvcnRMaXN0SGFzaFNldCk6CisgICAgICAg IChXZWJDb3JlOjpNZW1vcnlPYmplY3RJbmZvOjpyZXBvcnRWZWN0b3IpOgorICAgICAgICAoV2Vi Q29yZTo6TWVtb3J5T2JqZWN0SW5mbzo6bWVtb3J5SW5zdHJ1bWVudGF0aW9uKToKKyAgICAgICAg KFdlYkNvcmU6Ok1lbW9yeUluc3RydW1lbnRhdGlvbjo6cmVwb3J0SGFzaE1hcCk6CisgICAgICAg IChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lbW9yeUluc3RydW1lbnRhdGlvbjo6cmVw b3J0SGFzaFNldCk6CisgICAgICAgIChXZWJDb3JlOjpNZW1vcnlJbnN0cnVtZW50YXRpb246OnJl cG9ydExpc3RIYXNoU2V0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lbW9yeUluc3RydW1lbnRhdGlv bjo6cmVwb3J0VmVjdG9yKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yTWVtb3J5QWdl bnQuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisKIDIwMTItMDctMDUgIEFybmF1ZCBSZW5ldmll ciAgPGFybm9AcmVuZXZpZXIubmV0PgogCiAgICAgICAgIFtHVEtdIFNob3dpbmcgdGhlIGNvbnRl eHQgbWVudSBpbiB0aGUgV2ViIEluc3BlY3RvciBjYW4gY3Jhc2ggdGhlIGJyb3dzZXIKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnQuY3BwCmluZGV4IDJiMGNmMDg1NWQ3OTVkMDY5OTQ2ZDcwYTVlNzE4MzMyNDJh YTQwN2YuLmFkZGUzMTI3YWFlYzU5NTFhOTczNzRjYzc0ZTI4NWNkMmNiZmNmYjAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv ZG9tL0RvY3VtZW50LmNwcApAQCAtMTA5LDYgKzEwOSw3IEBACiAjaW5jbHVkZSAiTG9nZ2luZy5o IgogI2luY2x1ZGUgIk1lZGlhUXVlcnlMaXN0LmgiCiAjaW5jbHVkZSAiTWVkaWFRdWVyeU1hdGNo ZXIuaCIKKyNpbmNsdWRlICJNZW1vcnlJbnN0cnVtZW50YXRpb24uaCIKICNpbmNsdWRlICJNb3Vz ZUV2ZW50V2l0aEhpdFRlc3RSZXN1bHRzLmgiCiAjaW5jbHVkZSAiTmFtZU5vZGVMaXN0LmgiCiAj aW5jbHVkZSAiTmVzdGluZ0xldmVsSW5jcmVtZW50ZXIuaCIKQEAgLTU5OTQsNiArNTk5NSw0MiBA QCB2b2lkIERvY3VtZW50OjpzZXRDb250ZXh0RmVhdHVyZXMoUGFzc1JlZlB0cjxDb250ZXh0RmVh dHVyZXM+IGZlYXR1cmVzKQogICAgIG1fY29udGV4dEZlYXR1cmVzID0gZmVhdHVyZXM7CiB9CiAK K3ZvaWQgRG9jdW1lbnQ6OnJlcG9ydE1lbW9yeVVzYWdlKE1lbW9yeU9iamVjdEluZm8qIG1lbW9y eU9iamVjdEluZm8pIGNvbnN0Cit7CisgICAgbWVtb3J5T2JqZWN0SW5mby0+cmVwb3J0T2JqZWN0 SW5mbyh0aGlzLCBNZW1vcnlJbnN0cnVtZW50YXRpb246OkRPTSk7CisgICAgQ29udGFpbmVyTm9k ZTo6cmVwb3J0TWVtb3J5VXNhZ2UobWVtb3J5T2JqZWN0SW5mbyk7CisgICAgbWVtb3J5T2JqZWN0 SW5mby0+cmVwb3J0VmVjdG9yKG1fY3VzdG9tRm9udHMpOworICAgIG1lbW9yeU9iamVjdEluZm8t PnJlcG9ydFN0cmluZyhtX2RvY3VtZW50VVJJKTsKKyAgICBtZW1vcnlPYmplY3RJbmZvLT5yZXBv cnRTdHJpbmcobV9iYXNlVGFyZ2V0KTsKKyAgICBpZiAobV9wYWdlR3JvdXBVc2VyU2hlZXRzKQor ICAgICAgICBtZW1vcnlPYmplY3RJbmZvLT5yZXBvcnRWZWN0b3IoKm1fcGFnZUdyb3VwVXNlclNo ZWV0cy5nZXQoKSk7CisgICAgaWYgKG1fdXNlclNoZWV0cykKKyAgICAgICAgbWVtb3J5T2JqZWN0 SW5mby0+cmVwb3J0VmVjdG9yKCptX3VzZXJTaGVldHMuZ2V0KCkpOworICAgIG1lbW9yeU9iamVj dEluZm8tPnJlcG9ydEhhc2hTZXQobV9ub2RlSXRlcmF0b3JzKTsKKyAgICBtZW1vcnlPYmplY3RJ bmZvLT5yZXBvcnRIYXNoU2V0KG1fcmFuZ2VzKTsKKyAgICBtZW1vcnlPYmplY3RJbmZvLT5yZXBv cnRMaXN0SGFzaFNldChtX3N0eWxlU2hlZXRDYW5kaWRhdGVOb2Rlcyk7CisgICAgbWVtb3J5T2Jq ZWN0SW5mby0+cmVwb3J0U3RyaW5nKG1fcHJlZmVycmVkU3R5bGVzaGVldFNldCk7CisgICAgbWVt b3J5T2JqZWN0SW5mby0+cmVwb3J0U3RyaW5nKG1fc2VsZWN0ZWRTdHlsZXNoZWV0U2V0KTsKKyAg ICBtZW1vcnlPYmplY3RJbmZvLT5yZXBvcnRTdHJpbmcobV90aXRsZS5zdHJpbmcoKSk7CisgICAg bWVtb3J5T2JqZWN0SW5mby0+cmVwb3J0U3RyaW5nKG1fcmF3VGl0bGUuc3RyaW5nKCkpOworICAg IG1lbW9yeU9iamVjdEluZm8tPnJlcG9ydFN0cmluZyhtX3htbEVuY29kaW5nKTsKKyAgICBtZW1v cnlPYmplY3RJbmZvLT5yZXBvcnRTdHJpbmcobV94bWxWZXJzaW9uKTsKKyAgICBtZW1vcnlPYmpl Y3RJbmZvLT5yZXBvcnRTdHJpbmcobV9jb250ZW50TGFuZ3VhZ2UpOworICAgIG1lbW9yeU9iamVj dEluZm8tPnJlcG9ydEhhc2hNYXAobV9kb2N1bWVudE5hbWVkSXRlbUNvbGxlY3Rpb25zKTsKKyAg ICBtZW1vcnlPYmplY3RJbmZvLT5yZXBvcnRIYXNoTWFwKG1fd2luZG93TmFtZWRJdGVtQ29sbGVj dGlvbnMpOworI2lmIEVOQUJMRShEQVNIQk9BUkRfU1VQUE9SVCkKKyAgICBtZW1vcnlPYmplY3RJ bmZvLT5yZXBvcnRWZWN0b3IobV9kYXNoYm9hcmRSZWdpb25zKTsKKyNlbmRpZgorICAgIG1lbW9y eU9iamVjdEluZm8tPnJlcG9ydEhhc2hNYXAobV9jc3NDYW52YXNFbGVtZW50cyk7CisgICAgbWVt b3J5T2JqZWN0SW5mby0+cmVwb3J0VmVjdG9yKG1faWNvblVSTHMpOworICAgIG1lbW9yeU9iamVj dEluZm8tPnJlcG9ydEhhc2hTZXQobV9kb2N1bWVudFN1c3BlbnNpb25DYWxsYmFja0VsZW1lbnRz KTsKKyAgICBtZW1vcnlPYmplY3RJbmZvLT5yZXBvcnRIYXNoU2V0KG1fbWVkaWFWb2x1bWVDYWxs YmFja0VsZW1lbnRzKTsKKyAgICBtZW1vcnlPYmplY3RJbmZvLT5yZXBvcnRIYXNoU2V0KG1fcHJp dmF0ZUJyb3dzaW5nU3RhdGVDaGFuZ2VkRWxlbWVudHMpOworICAgIG1lbW9yeU9iamVjdEluZm8t PnJlcG9ydEhhc2hNYXAobV9lbGVtZW50c0J5QWNjZXNzS2V5KTsKKyAgICBtZW1vcnlPYmplY3RJ bmZvLT5yZXBvcnRIYXNoU2V0KG1fbWVkaWFDYW5TdGFydExpc3RlbmVycyk7CisgICAgbWVtb3J5 T2JqZWN0SW5mby0+cmVwb3J0VmVjdG9yKG1fcGVuZGluZ1Rhc2tzKTsKK30KKwogI2lmIEVOQUJM RShVTkRPX01BTkFHRVIpCiBQYXNzUmVmUHRyPFVuZG9NYW5hZ2VyPiBEb2N1bWVudDo6dW5kb01h bmFnZXIoKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmggYi9T b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAppbmRleCA2OTRiMTdiOWEyNGJmMDQ3NjMzOWY0 MWM5NjYzMzczZWFmMzFmNzg4Li45ODA1OWFhZWYwNTQ5Zjg0YjVjYTUxNDZiYzg1NjMzMzQwNDEx ZGUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaApAQCAtMTE0Myw2ICsxMTQzLDggQEAgcHVibGljOgog ICAgIHZvaWQgc2V0Q29udGV4dEZlYXR1cmVzKFBhc3NSZWZQdHI8Q29udGV4dEZlYXR1cmVzPik7 CiAgICAgQ29udGV4dEZlYXR1cmVzKiBjb250ZXh0RmVhdHVyZXMoKSB7IHJldHVybiBtX2NvbnRl eHRGZWF0dXJlcy5nZXQoKTsgfQogCisgICAgdmlydHVhbCB2b2lkIHJlcG9ydE1lbW9yeVVzYWdl KE1lbW9yeU9iamVjdEluZm8qKSBjb25zdCBPVkVSUklERTsKKwogcHJvdGVjdGVkOgogICAgIERv Y3VtZW50KEZyYW1lKiwgY29uc3QgS1VSTCYsIGJvb2wgaXNYSFRNTCwgYm9vbCBpc0hUTUwpOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmgg Yi9Tb3VyY2UvV2ViQ29yZS9kb20vTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmgKaW5kZXggNTBhOGE2 ZDhmYzllOWEzMzg3OWUxMjFkNWQ1ZDc2MmI5OWJiYmJkMy4uMWQ5OWExMjNjMGJlMDQxYTc1ZTJh MGEyNjYzNzczYWU5YWRjOWU3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL01lbW9y eUluc3RydW1lbnRhdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9NZW1vcnlJbnN0cnVt ZW50YXRpb24uaApAQCAtNjEsNyArNjEsMTAgQEAgcHVibGljOgogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICBjb3VudE9iamVjdFNpemUob2JqZWN0VHlwZSwgc2l6ZW9mKFQpKTsKICAgICB9 Ci0gICAgdGVtcGxhdGUgPHR5cGVuYW1lIEhhc2hNYXBUeXBlPiB2b2lkIHJlcG9ydEhhc2hNYXAo Y29uc3QgSGFzaE1hcFR5cGUmLCBPYmplY3RUeXBlKTsKKyAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUg SGFzaE1hcFR5cGU+IHZvaWQgcmVwb3J0SGFzaE1hcChjb25zdCBIYXNoTWFwVHlwZSYsIE9iamVj dFR5cGUsIGJvb2wgY29udGVudE9ubHkgPSBmYWxzZSk7CisgICAgdGVtcGxhdGUgPHR5cGVuYW1l IEhhc2hTZXRUeXBlPiB2b2lkIHJlcG9ydEhhc2hTZXQoY29uc3QgSGFzaFNldFR5cGUmLCBPYmpl Y3RUeXBlLCBib29sIGNvbnRlbnRPbmx5ID0gZmFsc2UpOworICAgIHRlbXBsYXRlIDx0eXBlbmFt ZSBMaXN0SGFzaFNldFR5cGU+IHZvaWQgcmVwb3J0TGlzdEhhc2hTZXQoY29uc3QgTGlzdEhhc2hT ZXRUeXBlJiwgT2JqZWN0VHlwZSwgYm9vbCBjb250ZW50T25seSA9IGZhbHNlKTsKKyAgICB0ZW1w bGF0ZSA8dHlwZW5hbWUgVmVjdG9yVHlwZT4gdm9pZCByZXBvcnRWZWN0b3IoY29uc3QgVmVjdG9y VHlwZSYsIE9iamVjdFR5cGUsIGJvb2wgY29udGVudE9ubHkgPSBmYWxzZSk7CiAKIHByb3RlY3Rl ZDoKICAgICBjbGFzcyBJbnN0cnVtZW50ZWRQb2ludGVyQmFzZSB7CkBAIC0xMjksNiArMTMyLDMw IEBAIHB1YmxpYzoKICAgICAgICAgbV9vYmplY3RTaXplID0gc2l6ZW9mKFQpOwogICAgIH0KIAor ICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBIYXNoTWFwVHlwZT4KKyAgICB2b2lkIHJlcG9ydEhhc2hN YXAoY29uc3QgSGFzaE1hcFR5cGUmIG1hcCkKKyAgICB7CisgICAgICAgIG1fbWVtb3J5SW5zdHJ1 bWVudGF0aW9uLT5yZXBvcnRIYXNoTWFwKG1hcCwgb2JqZWN0VHlwZSgpLCB0cnVlKTsKKyAgICB9 CisKKyAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgSGFzaFNldFR5cGU+CisgICAgdm9pZCByZXBvcnRI YXNoU2V0KGNvbnN0IEhhc2hTZXRUeXBlJiBzZXQpCisgICAgeworICAgICAgICBtX21lbW9yeUlu c3RydW1lbnRhdGlvbi0+cmVwb3J0SGFzaFNldChzZXQsIG9iamVjdFR5cGUoKSwgdHJ1ZSk7Cisg ICAgfQorCisgICAgdGVtcGxhdGUgPHR5cGVuYW1lIExpc3RIYXNoU2V0VHlwZT4KKyAgICB2b2lk IHJlcG9ydExpc3RIYXNoU2V0KGNvbnN0IExpc3RIYXNoU2V0VHlwZSYgc2V0KQorICAgIHsKKyAg ICAgICAgbV9tZW1vcnlJbnN0cnVtZW50YXRpb24tPnJlcG9ydExpc3RIYXNoU2V0KHNldCwgb2Jq ZWN0VHlwZSgpLCB0cnVlKTsKKyAgICB9CisKKyAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVmVjdG9y VHlwZT4KKyAgICB2b2lkIHJlcG9ydFZlY3Rvcihjb25zdCBWZWN0b3JUeXBlJiB2ZWN0b3IpCisg ICAgeworICAgICAgICBtX21lbW9yeUluc3RydW1lbnRhdGlvbi0+cmVwb3J0VmVjdG9yKHZlY3Rv ciwgb2JqZWN0VHlwZSgpLCB0cnVlKTsKKyAgICB9CisKICAgICB2b2lkIHJlcG9ydFN0cmluZyhj b25zdCBTdHJpbmcmIHN0cmluZykKICAgICB7CiAgICAgICAgIG1fbWVtb3J5SW5zdHJ1bWVudGF0 aW9uLT5yZXBvcnRTdHJpbmcob2JqZWN0VHlwZSgpLCBzdHJpbmcpOwpAQCAtMTM3LDYgKzE2NCw4 IEBAIHB1YmxpYzoKICAgICBNZW1vcnlJbnN0cnVtZW50YXRpb246Ok9iamVjdFR5cGUgb2JqZWN0 VHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fb2JqZWN0VHlwZTsgfQogICAgIHNpemVfdCBvYmplY3RT aXplKCkgY29uc3QgeyByZXR1cm4gbV9vYmplY3RTaXplOyB9CiAKKyAgICBNZW1vcnlJbnN0cnVt ZW50YXRpb24qIG1lbW9yeUluc3RydW1lbnRhdGlvbigpIHsgcmV0dXJuIG1fbWVtb3J5SW5zdHJ1 bWVudGF0aW9uOyB9CisKICBwcml2YXRlOgogICAgIE1lbW9yeUluc3RydW1lbnRhdGlvbiogbV9t ZW1vcnlJbnN0cnVtZW50YXRpb247CiAgICAgTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjpPYmplY3RU eXBlIG1fb2JqZWN0VHlwZTsKQEAgLTE2MSw5ICsxOTAsMzYgQEAgdm9pZCBNZW1vcnlJbnN0cnVt ZW50YXRpb246OnJlcG9ydEluc3RydW1lbnRlZE9iamVjdChjb25zdCBUJiBvYmplY3QpCiB9CiAK IHRlbXBsYXRlPHR5cGVuYW1lIEhhc2hNYXBUeXBlPgotdm9pZCBNZW1vcnlJbnN0cnVtZW50YXRp b246OnJlcG9ydEhhc2hNYXAoY29uc3QgSGFzaE1hcFR5cGUmIGhhc2hNYXAsIE9iamVjdFR5cGUg b2JqZWN0VHlwZSkKK3ZvaWQgTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjpyZXBvcnRIYXNoTWFwKGNv bnN0IEhhc2hNYXBUeXBlJiBoYXNoTWFwLCBPYmplY3RUeXBlIG9iamVjdFR5cGUsIGJvb2wgY29u dGVudE9ubHkpCit7CisgICAgc2l6ZV90IHNpemUgPSAoY29udGVudE9ubHkgPyAwIDogc2l6ZW9m KEhhc2hNYXBUeXBlKSkgKyBoYXNoTWFwLmNhcGFjaXR5KCkgKiBzaXplb2YodHlwZW5hbWUgSGFz aE1hcFR5cGU6OlZhbHVlVHlwZSk7CisgICAgY291bnRPYmplY3RTaXplKG9iamVjdFR5cGUsIHNp emUpOworfQorCit0ZW1wbGF0ZTx0eXBlbmFtZSBIYXNoU2V0VHlwZT4KK3ZvaWQgTWVtb3J5SW5z dHJ1bWVudGF0aW9uOjpyZXBvcnRIYXNoU2V0KGNvbnN0IEhhc2hTZXRUeXBlJiBoYXNoU2V0LCBP YmplY3RUeXBlIG9iamVjdFR5cGUsIGJvb2wgY29udGVudE9ubHkpCit7CisgICAgaWYgKHZpc2l0 ZWQoJmhhc2hTZXQpKQorICAgICAgICByZXR1cm47CisgICAgc2l6ZV90IHNpemUgPSAoY29udGVu dE9ubHkgPyAwIDogc2l6ZW9mKEhhc2hTZXRUeXBlKSkgKyBoYXNoU2V0LmNhcGFjaXR5KCkgKiBz aXplb2YodHlwZW5hbWUgSGFzaFNldFR5cGU6OlZhbHVlVHlwZSk7CisgICAgY291bnRPYmplY3RT aXplKG9iamVjdFR5cGUsIHNpemUpOworfQorCit0ZW1wbGF0ZTx0eXBlbmFtZSBMaXN0SGFzaFNl dFR5cGU+Cit2b2lkIE1lbW9yeUluc3RydW1lbnRhdGlvbjo6cmVwb3J0TGlzdEhhc2hTZXQoY29u c3QgTGlzdEhhc2hTZXRUeXBlJiBoYXNoU2V0LCBPYmplY3RUeXBlIG9iamVjdFR5cGUsIGJvb2wg Y29udGVudE9ubHkpCiB7Ci0gICAgc2l6ZV90IHNpemUgPSBzaXplb2YoSGFzaE1hcFR5cGUpICsg aGFzaE1hcC5jYXBhY2l0eSgpICogc2l6ZW9mKHR5cGVuYW1lIEhhc2hNYXBUeXBlOjpWYWx1ZVR5 cGUpOworICAgIGlmICh2aXNpdGVkKCZoYXNoU2V0KSkKKyAgICAgICAgcmV0dXJuOworICAgIHNp emVfdCBzaXplID0gKGNvbnRlbnRPbmx5ID8gMCA6IHNpemVvZihMaXN0SGFzaFNldFR5cGUpKSAr IGhhc2hTZXQuY2FwYWNpdHkoKSAqIHNpemVvZih2b2lkKikgKyBoYXNoU2V0LnNpemUoKSAqIChz aXplb2YodHlwZW5hbWUgTGlzdEhhc2hTZXRUeXBlOjpWYWx1ZVR5cGUpICsgMiAqIHNpemVvZih2 b2lkKikpOworICAgIGNvdW50T2JqZWN0U2l6ZShvYmplY3RUeXBlLCBzaXplKTsKK30KKwordGVt cGxhdGUgPHR5cGVuYW1lIFZlY3RvclR5cGU+Cit2b2lkIE1lbW9yeUluc3RydW1lbnRhdGlvbjo6 cmVwb3J0VmVjdG9yKGNvbnN0IFZlY3RvclR5cGUmIHZlY3RvciwgT2JqZWN0VHlwZSBvYmplY3RU eXBlLCBib29sIGNvbnRlbnRPbmx5KQoreworICAgIGlmICh2aXNpdGVkKHZlY3Rvci5kYXRhKCkp KQorICAgICAgICByZXR1cm47CisgICAgc2l6ZV90IHNpemUgPSAoY29udGVudE9ubHkgPyAwIDog c2l6ZW9mKFZlY3RvclR5cGUpKSArIHZlY3Rvci5jYXBhY2l0eSgpICogc2l6ZW9mKHR5cGVuYW1l IFZlY3RvclR5cGU6OlZhbHVlVHlwZSk7CiAgICAgY291bnRPYmplY3RTaXplKG9iamVjdFR5cGUs IHNpemUpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yTWVtb3J5QWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck1l bW9yeUFnZW50LmNwcAppbmRleCBjZTQ2Njg1ZTczNTQ5MjIxYWIyZGJhNzI2ODc0MjczYWJlNTQ0 M2JmLi5lOTA3MjU3YzlhZTZmOWM0NTE3Y2M2NDQ2NTJhYTQyNjQ1MjFlNDQxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yTWVtb3J5QWdlbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JNZW1vcnlBZ2VudC5jcHAKQEAgLTQ3 MSw3ICs0NzEsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCByZXBvcnRT dHJpbmcoT2JqZWN0VHlwZSBvYmplY3RUeXBlLCBjb25zdCBTdHJpbmcmIHN0cmluZykKICAgICB7 Ci0gICAgICAgIGlmICh2aXNpdGVkKHN0cmluZy5pbXBsKCkpKQorICAgICAgICBpZiAoc3RyaW5n LmlzTnVsbCgpIHx8IHZpc2l0ZWQoc3RyaW5nLmltcGwoKSkpCiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIGNvdW50T2JqZWN0U2l6ZShvYmplY3RUeXBlLCBzdHJpbmdTaXplKHN0cmluZy5p bXBsKCkpKTsKICAgICB9Cg==