55461 2011-03-01 05:24:03 -0800 Web Inspector: Resource agent should have same lifetime as Inspector agent 2011-03-03 07:52:37 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 54112 1 yurys yurys apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 359828 0 yurys 2011-03-01 05:24:03 -0800 Web Inspector: Resource agent should have same live time as Inspector agent. 361598 1 84557 yurys 2011-03-03 07:19:35 -0800 Created attachment 84557 Patch 361619 2 84557 yurys 2011-03-03 07:52:26 -0800 Comment on attachment 84557 Patch Clearing flags on attachment: 84557 Committed r80239: <http://trac.webkit.org/changeset/80239> 361621 3 yurys 2011-03-03 07:52:37 -0800 All reviewed patches have been landed. Closing bug. 84557 2011-03-03 07:19:35 -0800 2011-03-03 07:52:26 -0800 Patch bug-55461-20110303181932.patch text/plain 23217 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogODAyMzAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2YTI1OTU2MDg2ODc3NjQz OGQ3NTkzZTgyOWRjOTFkYzMzMjBlODU3Li5lNTEzZjZkYTk4NzJjNjA0MjgzNDJhNzE4MmFjM2M0 YmI3MmRiMWFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTEgQEAKKzIwMTEtMDMtMDMgIFl1cnkg U2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVzb3VyY2UgYWdlbnQg c2hvdWxkIGhhdmUgc2FtZSBsaWZldGltZSBhcyBJbnNwZWN0b3IgYWdlbnQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU1NDYxCisKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9yLmlkbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQWdl bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQWdlbnQ6Okluc3BlY3RvckFnZW50 KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckFnZW50OjppbnNwZWN0ZWRQYWdlRGVzdHJv eWVkKTogZGlzY29ubmVjdEZyb250ZW5kIGlzIGNhbGxlZCBiZWZvcmUgdGhlIGFnZW50IGlzIGRl c3Ryb3llZAorICAgICAgICB0byBjbGVhciBmcm9udGVuZCByZWZlcmVuY2UgaW4gYWxsIGFnZW50 cy4KKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckFnZW50OjpyZXN0b3JlSW5zcGVjdG9yU3Rh dGVGcm9tQ29va2llKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckFnZW50OjpzZXRGcm9u dGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JBZ2VudDo6ZGlzY29ubmVjdEZyb250 ZW5kKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckFnZW50OjpyZWxlYXNlRnJvbnRlbmRM aWZldGltZUFnZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JBZ2VudDo6ZGlkQ29t bWl0TG9hZCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckFnZW50Lmg6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JBZ2VudDo6cmVzb3VyY2VBZ2VudCk6CisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFnZW50Ojp+SW5zcGVjdG9yQnJvd3NlckRlYnVn Z2VyQWdlbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6On5JbnNwZWN0b3JE ZWJ1Z2dlckFnZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlk Q3JlYXRlV2ViU29ja2V0SW1wbCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVt ZW50YXRpb246OndpbGxTZW5kV2ViU29ja2V0SGFuZHNoYWtlUmVxdWVzdEltcGwpOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRSZWNlaXZlV2ViU29ja2V0 SGFuZHNoYWtlUmVzcG9uc2VJbXBsKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbjo6ZGlkQ2xvc2VXZWJTb2NrZXRJbXBsKToKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6cmV0cmlldmVSZXNvdXJjZUFnZW50KToKKyAgICAgICAg KiBpbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpzZXRGcm9udGVuZCk6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpjbGVhckZyb250ZW5kKToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvclJlc291cmNlQWdlbnQ6OnJlc3RvcmUpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6fkluc3BlY3RvclJlc291cmNlQWdlbnQpOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6ZW5hYmxlKToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvclJlc291cmNlQWdlbnQ6OmRpc2FibGUpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6SW5zcGVjdG9yUmVzb3VyY2VBZ2VudCk6CisgICAg ICAgICogaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuaDoKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvclJlc291cmNlQWdlbnQ6OmNyZWF0ZSk6CisgICAgICAgICogaW5zcGVjdG9y L0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y VGltZWxpbmVBZ2VudDo6cmVzdG9yZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclRp bWVsaW5lQWdlbnQuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5h Z2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlci5wcm90b3R5cGUuZnJvbnRlbmRSZXVzZWQpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLmZyb250ZW5kUmV1c2VkKToKKwogMjAxMS0wMy0wMiAgWXVyeSBTZW1pa2hhdHNr eSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxk bWFuLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmlkbAppbmRleCAxOWZhOWI3Zjc1 MzNiNmFiZDc0YmEwYWVlY2U1NGZiNGUxMjIwN2JhLi4wM2YxYTgzNTZkNTk4N2IyYTFmNzRjNjIz MDkwMzExNWRjMzU0YjZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yLmlkbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmlkbApA QCAtOTIsNyArOTIsOCBAQCBtb2R1bGUgY29yZSB7CiAgICAgfTsKIAogICAgIGludGVyZmFjZSBb Q29uZGl0aW9uYWw9SU5TUEVDVE9SXSBOZXR3b3JrIHsKLSAgICAgICAgdm9pZCBjYWNoZWRSZXNv dXJjZXMob3V0IE9iamVjdCByZXNvdXJjZXMpOworICAgICAgICB2b2lkIGVuYWJsZShvdXQgT2Jq ZWN0IHJlc291cmNlcyk7CisgICAgICAgIHZvaWQgZGlzYWJsZSgpOwogICAgICAgICB2b2lkIHJl c291cmNlQ29udGVudChpbiB1bnNpZ25lZCBsb25nIGZyYW1lSWQsIGluIFN0cmluZyB1cmwsIGlu IGJvb2xlYW4gYmFzZTY0RW5jb2RlLCBvdXQgYm9vbGVhbiBzdWNjZXNzLCBvdXQgU3RyaW5nIGNv bnRlbnQpOwogICAgICAgICB2b2lkIHNldEV4dHJhSGVhZGVycyhpbiBPYmplY3QgaGVhZGVycyk7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuY3BwCmluZGV4IGNj MjMwMjRjN2ExOTk4MWRiM2M1Y2MwZmMwN2M1YjhhZTZjNWEzMTEuLjdiYzQyZDQwMGNkZDE5N2I4 NGIyYjAxNTdkMjdjOGM1MDEyMjlkZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckFnZW50LmNwcApAQCAtMTQ4LDYgKzE0OCw3IEBAIEluc3BlY3RvckFnZW50OjpJbnNw ZWN0b3JBZ2VudChQYWdlKiBwYWdlLCBJbnNwZWN0b3JDbGllbnQqIGNsaWVudCkKICNlbmRpZgog ICAgICwgbV9zdGF0ZShuZXcgSW5zcGVjdG9yU3RhdGUoY2xpZW50KSkKICAgICAsIG1fdGltZWxp bmVBZ2VudChJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpjcmVhdGUobV9pbnN0cnVtZW50aW5nQWdl bnRzLmdldCgpLCBtX3N0YXRlLmdldCgpKSkKKyAgICAsIG1fcmVzb3VyY2VBZ2VudChJbnNwZWN0 b3JSZXNvdXJjZUFnZW50OjpjcmVhdGUobV9pbnN0cnVtZW50aW5nQWdlbnRzLmdldCgpLCBwYWdl LCBtX3N0YXRlLmdldCgpKSkKICAgICAsIG1fY29uc29sZUFnZW50KG5ldyBJbnNwZWN0b3JDb25z b2xlQWdlbnQobV9pbnN0cnVtZW50aW5nQWdlbnRzLmdldCgpLCB0aGlzLCBtX3N0YXRlLmdldCgp LCBtX2luamVjdGVkU2NyaXB0SG9zdC5nZXQoKSwgbV9kb21BZ2VudC5nZXQoKSkpCiAjaWYgRU5B QkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCiAgICAgLCBtX2RlYnVnZ2VyQWdlbnQoSW5zcGVjdG9y RGVidWdnZXJBZ2VudDo6Y3JlYXRlKG1faW5zdHJ1bWVudGluZ0FnZW50cy5nZXQoKSwgbV9zdGF0 ZS5nZXQoKSwgcGFnZSwgbV9pbmplY3RlZFNjcmlwdEhvc3QuZ2V0KCkpKQpAQCAtMTcwLDggKzE3 MSwxMCBAQCBJbnNwZWN0b3JBZ2VudDo6fkluc3BlY3RvckFnZW50KCkKIAogdm9pZCBJbnNwZWN0 b3JBZ2VudDo6aW5zcGVjdGVkUGFnZURlc3Ryb3llZCgpCiB7Ci0gICAgaWYgKG1fZnJvbnRlbmQp CisgICAgaWYgKG1fZnJvbnRlbmQpIHsKICAgICAgICAgbV9mcm9udGVuZC0+aW5zcGVjdG9yKCkt PmRpc2Nvbm5lY3RGcm9tQmFja2VuZCgpOworICAgICAgICBkaXNjb25uZWN0RnJvbnRlbmQoKTsK KyAgICB9CiAKICAgICBFcnJvclN0cmluZyBlcnJvcjsKICAgICBoaWRlSGlnaGxpZ2h0KCZlcnJv cik7CkBAIC0yMDUsOCArMjA4LDggQEAgdm9pZCBJbnNwZWN0b3JBZ2VudDo6cmVzdG9yZUluc3Bl Y3RvclN0YXRlRnJvbUNvb2tpZShjb25zdCBTdHJpbmcmIGluc3BlY3RvclN0YXQKICAgICBtX2Zy b250ZW5kLT5pbnNwZWN0b3IoKS0+aW5zcGVjdGVkVVJMQ2hhbmdlZChpbnNwZWN0ZWRVUkwoKS5z dHJpbmcoKSk7CiAgICAgcHVzaERhdGFDb2xsZWN0ZWRPZmZsaW5lKCk7CiAKLSAgICBtX3Jlc291 cmNlQWdlbnQgPSBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpyZXN0b3JlKG1faW5zcGVjdGVkUGFn ZSwgbV9zdGF0ZS5nZXQoKSwgbV9mcm9udGVuZCk7Ci0gICAgbV90aW1lbGluZUFnZW50LT5yZXN0 b3JlKG1fc3RhdGUuZ2V0KCksIG1fZnJvbnRlbmQpOworICAgIG1fcmVzb3VyY2VBZ2VudC0+cmVz dG9yZSgpOworICAgIG1fdGltZWxpbmVBZ2VudC0+cmVzdG9yZSgpOwogCiAjaWYgRU5BQkxFKEpB VkFTQ1JJUFRfREVCVUdHRVIpCiAgICAgbV9kZWJ1Z2dlckFnZW50LT5yZXN0b3JlKCk7CkBAIC0z NjUsNiArMzY4LDcgQEAgdm9pZCBJbnNwZWN0b3JBZ2VudDo6c2V0RnJvbnRlbmQoSW5zcGVjdG9y RnJvbnRlbmQqIGluc3BlY3RvckZyb250ZW5kKQogICAgIG1fZG9tQWdlbnQtPnNldEZyb250ZW5k KG1fZnJvbnRlbmQpOwogICAgIG1fY29uc29sZUFnZW50LT5zZXRGcm9udGVuZChtX2Zyb250ZW5k KTsKICAgICBtX3RpbWVsaW5lQWdlbnQtPnNldEZyb250ZW5kKG1fZnJvbnRlbmQpOworICAgIG1f cmVzb3VyY2VBZ2VudC0+c2V0RnJvbnRlbmQobV9mcm9udGVuZCk7CiAjaWYgRU5BQkxFKEpBVkFT Q1JJUFRfREVCVUdHRVIpCiAgICAgbV9kZWJ1Z2dlckFnZW50LT5zZXRGcm9udGVuZChtX2Zyb250 ZW5kKTsKICAgICBtX2Jyb3dzZXJEZWJ1Z2dlckFnZW50LT5zZXRGcm9udGVuZChtX2Zyb250ZW5k KTsKQEAgLTQwNyw2ICs0MTEsNyBAQCB2b2lkIEluc3BlY3RvckFnZW50OjpkaXNjb25uZWN0RnJv bnRlbmQoKQogICAgIG1fY29uc29sZUFnZW50LT5jbGVhckZyb250ZW5kKCk7CiAgICAgbV9kb21B Z2VudC0+Y2xlYXJGcm9udGVuZCgpOwogICAgIG1fdGltZWxpbmVBZ2VudC0+Y2xlYXJGcm9udGVu ZCgpOworICAgIG1fcmVzb3VyY2VBZ2VudC0+Y2xlYXJGcm9udGVuZCgpOwogI2lmIEVOQUJMRShE QVRBQkFTRSkKICAgICBtX2RhdGFiYXNlQWdlbnQtPmNsZWFyRnJvbnRlbmQoKTsKICNlbmRpZgpA QCAtNDE4LDEzICs0MjMsNiBAQCB2b2lkIEluc3BlY3RvckFnZW50OjpkaXNjb25uZWN0RnJvbnRl bmQoKQogICAgIG1fdXNlckFnZW50T3ZlcnJpZGUgPSAiIjsKIH0KIAotSW5zcGVjdG9yUmVzb3Vy Y2VBZ2VudCogSW5zcGVjdG9yQWdlbnQ6OnJlc291cmNlQWdlbnQoKQotewotICAgIGlmICghbV9y ZXNvdXJjZUFnZW50ICYmIG1fZnJvbnRlbmQpCi0gICAgICAgIG1fcmVzb3VyY2VBZ2VudCA9IElu c3BlY3RvclJlc291cmNlQWdlbnQ6OmNyZWF0ZShtX2luc3BlY3RlZFBhZ2UsIG1fc3RhdGUuZ2V0 KCksIG1fZnJvbnRlbmQpOwotICAgIHJldHVybiBtX3Jlc291cmNlQWdlbnQuZ2V0KCk7Ci19Ci0K IHZvaWQgSW5zcGVjdG9yQWdlbnQ6OmNyZWF0ZUZyb250ZW5kTGlmZXRpbWVBZ2VudHMoKQogewog ICAgIG1fcnVudGltZUFnZW50ID0gSW5zcGVjdG9yUnVudGltZUFnZW50OjpjcmVhdGUobV9pbmpl Y3RlZFNjcmlwdEhvc3QuZ2V0KCkpOwpAQCAtNDM2LDcgKzQzNCw2IEBAIHZvaWQgSW5zcGVjdG9y QWdlbnQ6OmNyZWF0ZUZyb250ZW5kTGlmZXRpbWVBZ2VudHMoKQogCiB2b2lkIEluc3BlY3RvckFn ZW50OjpyZWxlYXNlRnJvbnRlbmRMaWZldGltZUFnZW50cygpCiB7Ci0gICAgbV9yZXNvdXJjZUFn ZW50LmNsZWFyKCk7CiAgICAgbV9ydW50aW1lQWdlbnQuY2xlYXIoKTsKICNpZiBFTkFCTEUoT0ZG TElORV9XRUJfQVBQTElDQVRJT05TKQogICAgIG1fYXBwbGljYXRpb25DYWNoZUFnZW50LmNsZWFy KCk7CkBAIC01MDcsOCArNTA0LDggQEAgdm9pZCBJbnNwZWN0b3JBZ2VudDo6ZGlkQ29tbWl0TG9h ZChEb2N1bWVudExvYWRlciogbG9hZGVyKQogICAgIGlmICghZW5hYmxlZCgpKQogICAgICAgICBy ZXR1cm47CiAKLSAgICBpZiAobV9yZXNvdXJjZUFnZW50KQotICAgICAgICBtX3Jlc291cmNlQWdl bnQtPmRpZENvbW1pdExvYWQobG9hZGVyKTsKKyAgICBpZiAoSW5zcGVjdG9yUmVzb3VyY2VBZ2Vu dCogcmVzb3VyY2VBZ2VudCA9IG1faW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVjdG9yUmVzb3Vy Y2VBZ2VudCgpKQorICAgICAgICByZXNvdXJjZUFnZW50LT5kaWRDb21taXRMb2FkKGxvYWRlcik7 CiAKICAgICBBU1NFUlQobV9pbnNwZWN0ZWRQYWdlKTsKIApAQCAtNzU5LDM3ICs3NTYsNiBAQCB2 b2lkIEluc3BlY3RvckFnZW50OjpkZWxldGVDb29raWUoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJp bmcmIGNvb2tpZU5hbWUsIGNvbnN0CiAgICAgfQogfQogCi0jaWYgRU5BQkxFKFdFQl9TT0NLRVRT KQotdm9pZCBJbnNwZWN0b3JBZ2VudDo6ZGlkQ3JlYXRlV2ViU29ja2V0KHVuc2lnbmVkIGxvbmcg aWRlbnRpZmllciwgY29uc3QgS1VSTCYgcmVxdWVzdFVSTCwgY29uc3QgS1VSTCYgZG9jdW1lbnRV UkwpCi17Ci0gICAgaWYgKCFlbmFibGVkKCkpCi0gICAgICAgIHJldHVybjsKLSAgICBBU1NFUlQo bV9pbnNwZWN0ZWRQYWdlKTsKLQotICAgIGlmIChtX3Jlc291cmNlQWdlbnQpCi0gICAgICAgIG1f cmVzb3VyY2VBZ2VudC0+ZGlkQ3JlYXRlV2ViU29ja2V0KGlkZW50aWZpZXIsIHJlcXVlc3RVUkwp OwotICAgIFVOVVNFRF9QQVJBTShkb2N1bWVudFVSTCk7Ci19Ci0KLXZvaWQgSW5zcGVjdG9yQWdl bnQ6OndpbGxTZW5kV2ViU29ja2V0SGFuZHNoYWtlUmVxdWVzdCh1bnNpZ25lZCBsb25nIGlkZW50 aWZpZXIsIGNvbnN0IFdlYlNvY2tldEhhbmRzaGFrZVJlcXVlc3QmIHJlcXVlc3QpCi17Ci0gICAg aWYgKG1fcmVzb3VyY2VBZ2VudCkKLSAgICAgICAgbV9yZXNvdXJjZUFnZW50LT53aWxsU2VuZFdl YlNvY2tldEhhbmRzaGFrZVJlcXVlc3QoaWRlbnRpZmllciwgcmVxdWVzdCk7Ci19Ci0KLXZvaWQg SW5zcGVjdG9yQWdlbnQ6OmRpZFJlY2VpdmVXZWJTb2NrZXRIYW5kc2hha2VSZXNwb25zZSh1bnNp Z25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFdlYlNvY2tldEhhbmRzaGFrZVJlc3BvbnNlJiBy ZXNwb25zZSkKLXsKLSAgICBpZiAobV9yZXNvdXJjZUFnZW50KQotICAgICAgICBtX3Jlc291cmNl QWdlbnQtPmRpZFJlY2VpdmVXZWJTb2NrZXRIYW5kc2hha2VSZXNwb25zZShpZGVudGlmaWVyLCBy ZXNwb25zZSk7Ci19Ci0KLXZvaWQgSW5zcGVjdG9yQWdlbnQ6OmRpZENsb3NlV2ViU29ja2V0KHVu c2lnbmVkIGxvbmcgaWRlbnRpZmllcikKLXsKLSAgICBpZiAobV9yZXNvdXJjZUFnZW50KQotICAg ICAgICBtX3Jlc291cmNlQWdlbnQtPmRpZENsb3NlV2ViU29ja2V0KGlkZW50aWZpZXIpOwotfQot I2VuZGlmIC8vIEVOQUJMRShXRUJfU09DS0VUUykKLQogI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RF QlVHR0VSKQogYm9vbCBJbnNwZWN0b3JBZ2VudDo6aXNSZWNvcmRpbmdVc2VySW5pdGlhdGVkUHJv ZmlsZSgpIGNvbnN0CiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5o CmluZGV4IDAzODMzNjE5ZmUzOGQ3MDU2NjdiMDgyYWM4ZmQyNzNiZWMzMGJjZGYuLjZkOTVkNDg4 ZmUyMDg4OWY2YzgxYzM2YjZiMGI1YjgyNDFkYWU5MzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JBZ2VudC5oCkBAIC05NCwxMSArOTQsNiBAQCBjbGFzcyBTdG9yYWdlQXJl YTsKIGNsYXNzIEluc3BlY3RvckFwcGxpY2F0aW9uQ2FjaGVBZ2VudDsKICNlbmRpZgogCi0jaWYg RU5BQkxFKFdFQl9TT0NLRVRTKQotY2xhc3MgV2ViU29ja2V0SGFuZHNoYWtlUmVxdWVzdDsKLWNs YXNzIFdlYlNvY2tldEhhbmRzaGFrZVJlc3BvbnNlOwotI2VuZGlmCi0KIHR5cGVkZWYgU3RyaW5n IEVycm9yU3RyaW5nOwogCiBjbGFzcyBJbnNwZWN0b3JBZ2VudCB7CkBAIC0xMzYsOCArMTMxLDYg QEAgcHVibGljOgogICAgIEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCgpIGNvbnN0IHsgcmV0 dXJuIG1fZnJvbnRlbmQ7IH0KICAgICB2b2lkIGRpc2Nvbm5lY3RGcm9udGVuZCgpOwogCi0gICAg SW5zcGVjdG9yUmVzb3VyY2VBZ2VudCogcmVzb3VyY2VBZ2VudCgpOwotCiAgICAgSW5zdHJ1bWVu dGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cygpIGNvbnN0IHsgcmV0dXJuIG1faW5zdHJ1 bWVudGluZ0FnZW50cy5nZXQoKTsgfQogCiAgICAgSW5zcGVjdG9yQWdlbnQqIGluc3BlY3RvckFn ZW50KCkgeyByZXR1cm4gdGhpczsgfQpAQCAtMTQ2LDYgKzEzOSw3IEBAIHB1YmxpYzoKICAgICBJ bnNwZWN0b3JET01BZ2VudCogZG9tQWdlbnQoKSB7IHJldHVybiBtX2RvbUFnZW50LmdldCgpOyB9 CiAgICAgSW5zcGVjdG9yUnVudGltZUFnZW50KiBydW50aW1lQWdlbnQoKSB7IHJldHVybiBtX3J1 bnRpbWVBZ2VudC5nZXQoKTsgfQogICAgIEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5l QWdlbnQoKSB7IHJldHVybiBtX3RpbWVsaW5lQWdlbnQuZ2V0KCk7IH0KKyAgICBJbnNwZWN0b3JS ZXNvdXJjZUFnZW50KiByZXNvdXJjZUFnZW50KCkgeyByZXR1cm4gbV9yZXNvdXJjZUFnZW50Lmdl dCgpOyB9CiAjaWYgRU5BQkxFKERBVEFCQVNFKQogICAgIEluc3BlY3RvckRhdGFiYXNlQWdlbnQq IGRhdGFiYXNlQWdlbnQoKSB7IHJldHVybiBtX2RhdGFiYXNlQWdlbnQuZ2V0KCk7IH0KICNlbmRp ZgpAQCAtMTgzLDEzICsxNzcsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBkaWREZXN0cm95V29ya2Vy KGludHB0cl90KTsKICNlbmRpZgogCi0jaWYgRU5BQkxFKFdFQl9TT0NLRVRTKQotICAgIHZvaWQg ZGlkQ3JlYXRlV2ViU29ja2V0KHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgS1VSTCYg cmVxdWVzdFVSTCwgY29uc3QgS1VSTCYgZG9jdW1lbnRVUkwpOwotICAgIHZvaWQgd2lsbFNlbmRX ZWJTb2NrZXRIYW5kc2hha2VSZXF1ZXN0KHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3Qg V2ViU29ja2V0SGFuZHNoYWtlUmVxdWVzdCYpOwotICAgIHZvaWQgZGlkUmVjZWl2ZVdlYlNvY2tl dEhhbmRzaGFrZVJlc3BvbnNlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgV2ViU29j a2V0SGFuZHNoYWtlUmVzcG9uc2UmKTsKLSAgICB2b2lkIGRpZENsb3NlV2ViU29ja2V0KHVuc2ln bmVkIGxvbmcgaWRlbnRpZmllcik7Ci0jZW5kaWYKLQogICAgIGJvb2wgaGFzRnJvbnRlbmQoKSBj b25zdCB7IHJldHVybiBtX2Zyb250ZW5kOyB9CiAKICAgICB2b2lkIGRyYXdOb2RlSGlnaGxpZ2h0 KEdyYXBoaWNzQ29udGV4dCYpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JCcm93c2VyRGVidWdnZXJBZ2VudC5jcHAKaW5kZXggZmIzNGY5 N2IzNDhiMzgxNmM1Y2Q1OTgzM2I3NjYxZjViOGYyMGZjNi4uMmQ1ZmQ0NmNiYzY2MDM5MTA1ZWY2 NGYzMmUzMGE0ZTZiMWY4NmI5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQuY3BwCkBAIC04NSw3ICs4NSw3 IEBAIEluc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFnZW50OjpJbnNwZWN0b3JCcm93c2VyRGVidWdn ZXJBZ2VudChJbnN0cnVtZW50aW5nQWdlbnRzCiBJbnNwZWN0b3JCcm93c2VyRGVidWdnZXJBZ2Vu dDo6fkluc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFnZW50KCkKIHsKICAgICBtX2RlYnVnZ2VyQWdl bnQtPnNldExpc3RlbmVyKDApOwotICAgIGNsZWFyRnJvbnRlbmQoKTsKKyAgICBBU1NFUlQoIW1f aW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQoKSk7CiB9 CiAKIC8vIEJyb3dzZXIgZGVidWdnZXIgYWdlbnQgZW5hYmxlZCBvbmx5IHdoZW4gSlMgZGVidWdn ZXIgaXMgZW5hYmxlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JEZWJ1Z2dlckFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JEZWJ1Z2dlckFnZW50LmNwcAppbmRleCA4MjM2ZTBkZjg1N2Y5MjE3MjQwM2Q4YzZjODA2YTdk ODQzNDY4ZTc5Li4yYzVjMGE3ZDE5ZDA4MzcxYTRlZjExOTNiM2MxN2Q5ZTcxMDYxMjZlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQu Y3BwCkBAIC02OCw4ICs2OCw3IEBAIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6Okluc3BlY3RvckRl YnVnZ2VyQWdlbnQoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGluCiAKIEluc3BlY3Rv ckRlYnVnZ2VyQWdlbnQ6On5JbnNwZWN0b3JEZWJ1Z2dlckFnZW50KCkKIHsKLSAgICBTY3JpcHRE ZWJ1Z1NlcnZlcjo6c2hhcmVkKCkucmVtb3ZlTGlzdGVuZXIodGhpcywgbV9pbnNwZWN0ZWRQYWdl KTsKLSAgICBtX3BhdXNlZFNjcmlwdFN0YXRlID0gMDsKKyAgICBBU1NFUlQoIW1faW5zdHJ1bWVu dGluZ0FnZW50cy0+aW5zcGVjdG9yRGVidWdnZXJBZ2VudCgpKTsKIH0KIAogdm9pZCBJbnNwZWN0 b3JEZWJ1Z2dlckFnZW50OjpzdGFydFVzZXJJbml0aWF0ZWREZWJ1Z2dpbmcoKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcApp bmRleCA5M2Q5ODk2Y2VhZjkyODYwZmQ1NjY5OWZhNGIxN2Q0MjJiMDQ0MTQwLi5hNzM4ZDliM2E0 ODM4ZWM5ZWFjYzU4YTY0YTM1YjhkOWZjMDY1ODllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcApAQCAtNjI0LDI0ICs2 MjQsMzAgQEAgdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZERlc3Ryb3lXb3JrZXJJ bXBsKEluc3BlY3RvckFnZW50KiBpbnNwZWN0b3JBZ2UKICNlbmRpZgogCiAjaWYgRU5BQkxFKFdF Ql9TT0NLRVRTKQotdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZENyZWF0ZVdlYlNv Y2tldEltcGwoSW5zcGVjdG9yQWdlbnQqIGluc3BlY3RvckFnZW50LCB1bnNpZ25lZCBsb25nIGlk ZW50aWZpZXIsIGNvbnN0IEtVUkwmIHJlcXVlc3RVUkwsIGNvbnN0IEtVUkwmIGRvY3VtZW50VVJM KQordm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZENyZWF0ZVdlYlNvY2tldEltcGwo SW5zcGVjdG9yQWdlbnQqIGluc3BlY3RvckFnZW50LCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIs IGNvbnN0IEtVUkwmIHJlcXVlc3RVUkwsIGNvbnN0IEtVUkwmKQogewotICAgIGluc3BlY3RvckFn ZW50LT5kaWRDcmVhdGVXZWJTb2NrZXQoaWRlbnRpZmllciwgcmVxdWVzdFVSTCwgZG9jdW1lbnRV UkwpOworICAgIGlmICghaW5zcGVjdG9yQWdlbnQtPmVuYWJsZWQoKSkKKyAgICAgICAgcmV0dXJu OworICAgIGlmIChJbnNwZWN0b3JSZXNvdXJjZUFnZW50KiByZXNvdXJjZUFnZW50ID0gcmV0cmll dmVSZXNvdXJjZUFnZW50KGluc3BlY3RvckFnZW50KSkKKyAgICAgICAgcmVzb3VyY2VBZ2VudC0+ ZGlkQ3JlYXRlV2ViU29ja2V0KGlkZW50aWZpZXIsIHJlcXVlc3RVUkwpOwogfQogCiB2b2lkIElu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbFNlbmRXZWJTb2NrZXRIYW5kc2hha2VSZXF1ZXN0 SW1wbChJbnNwZWN0b3JBZ2VudCogaW5zcGVjdG9yQWdlbnQsIHVuc2lnbmVkIGxvbmcgaWRlbnRp ZmllciwgY29uc3QgV2ViU29ja2V0SGFuZHNoYWtlUmVxdWVzdCYgcmVxdWVzdCkKIHsKLSAgICBp bnNwZWN0b3JBZ2VudC0+d2lsbFNlbmRXZWJTb2NrZXRIYW5kc2hha2VSZXF1ZXN0KGlkZW50aWZp ZXIsIHJlcXVlc3QpOworICAgIGlmIChJbnNwZWN0b3JSZXNvdXJjZUFnZW50KiByZXNvdXJjZUFn ZW50ID0gcmV0cmlldmVSZXNvdXJjZUFnZW50KGluc3BlY3RvckFnZW50KSkKKyAgICAgICAgcmVz b3VyY2VBZ2VudC0+d2lsbFNlbmRXZWJTb2NrZXRIYW5kc2hha2VSZXF1ZXN0KGlkZW50aWZpZXIs IHJlcXVlc3QpOwogfQogCiB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkUmVjZWl2 ZVdlYlNvY2tldEhhbmRzaGFrZVJlc3BvbnNlSW1wbChJbnNwZWN0b3JBZ2VudCogaW5zcGVjdG9y QWdlbnQsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgV2ViU29ja2V0SGFuZHNoYWtl UmVzcG9uc2UmIHJlc3BvbnNlKQogewotICAgIGluc3BlY3RvckFnZW50LT5kaWRSZWNlaXZlV2Vi U29ja2V0SGFuZHNoYWtlUmVzcG9uc2UoaWRlbnRpZmllciwgcmVzcG9uc2UpOworICAgIGlmIChJ bnNwZWN0b3JSZXNvdXJjZUFnZW50KiByZXNvdXJjZUFnZW50ID0gcmV0cmlldmVSZXNvdXJjZUFn ZW50KGluc3BlY3RvckFnZW50KSkKKyAgICAgICAgcmVzb3VyY2VBZ2VudC0+ZGlkUmVjZWl2ZVdl YlNvY2tldEhhbmRzaGFrZVJlc3BvbnNlKGlkZW50aWZpZXIsIHJlc3BvbnNlKTsKIH0KIAogdm9p ZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZENsb3NlV2ViU29ja2V0SW1wbChJbnNwZWN0 b3JBZ2VudCogaW5zcGVjdG9yQWdlbnQsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcikKIHsKLSAg ICBpbnNwZWN0b3JBZ2VudC0+ZGlkQ2xvc2VXZWJTb2NrZXQoaWRlbnRpZmllcik7CisgICAgaWYg KEluc3BlY3RvclJlc291cmNlQWdlbnQqIHJlc291cmNlQWdlbnQgPSByZXRyaWV2ZVJlc291cmNl QWdlbnQoaW5zcGVjdG9yQWdlbnQpKQorICAgICAgICByZXNvdXJjZUFnZW50LT5kaWRDbG9zZVdl YlNvY2tldChpZGVudGlmaWVyKTsKIH0KICNlbmRpZgogCkBAIC02OTUsNyArNzAxLDcgQEAgSW5z cGVjdG9yVGltZWxpbmVBZ2VudCogSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpyZXRyaWV2ZVRp bWVsaW5lQWdlbnQoY29uc3QgSW4KIAogSW5zcGVjdG9yUmVzb3VyY2VBZ2VudCogSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOjpyZXRyaWV2ZVJlc291cmNlQWdlbnQoSW5zcGVjdG9yQWdlbnQqIGlu c3BlY3RvckFnZW50KQogewotICAgIHJldHVybiBpbnNwZWN0b3JBZ2VudC0+cmVzb3VyY2VBZ2Vu dCgpOworICAgIHJldHVybiBpbnNwZWN0b3JBZ2VudC0+aW5zdHJ1bWVudGluZ0FnZW50cygpLT5p bnNwZWN0b3JSZXNvdXJjZUFnZW50KCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNw cAppbmRleCA4YjMzY2IwZjIzYzFiZWZiZGZjNjlkZDAzYTkwMWNlZDQzMzQzYTQ5Li5kYjQxNjQw ZjIyYmMyYTMzMjYzMWQ4MDk3YjliZTNiOTVjZDE3NDc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwCkBAIC00Nyw2ICs0Nyw3 IEBACiAjaW5jbHVkZSAiSW5zcGVjdG9yRnJvbnRlbmQuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JT dGF0ZS5oIgogI2luY2x1ZGUgIkluc3BlY3RvclZhbHVlcy5oIgorI2luY2x1ZGUgIkluc3RydW1l bnRpbmdBZ2VudHMuaCIKICNpbmNsdWRlICJLVVJMLmgiCiAjaW5jbHVkZSAiUGFnZS5oIgogI2lu Y2x1ZGUgIlByb2dyZXNzVHJhY2tlci5oIgpAQCAtNzIsMTEgKzczLDIxIEBAIHN0YXRpYyBjb25z dCBjaGFyIHJlc291cmNlQWdlbnRFbmFibGVkW10gPSAicmVzb3VyY2VBZ2VudEVuYWJsZWQiOwog c3RhdGljIGNvbnN0IGNoYXIgZXh0cmFSZXF1ZXN0SGVhZGVyc1tdID0gImV4dHJhUmVxdWVzdEhl YWRlcnMiOwogfQogCi1QYXNzUmVmUHRyPEluc3BlY3RvclJlc291cmNlQWdlbnQ+IEluc3BlY3Rv clJlc291cmNlQWdlbnQ6OnJlc3RvcmUoUGFnZSogcGFnZSwgSW5zcGVjdG9yU3RhdGUqIHN0YXRl LCBJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQpCit2b2lkIEluc3BlY3RvclJlc291cmNlQWdl bnQ6OnNldEZyb250ZW5kKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCkKIHsKLSAgICBpZiAo c3RhdGUtPmdldEJvb2xlYW4oUmVzb3VyY2VBZ2VudFN0YXRlOjpyZXNvdXJjZUFnZW50RW5hYmxl ZCkpCi0gICAgICAgIHJldHVybiBjcmVhdGUocGFnZSwgc3RhdGUsIGZyb250ZW5kKTsKLSAgICBy ZXR1cm4gMDsKKyAgICBtX2Zyb250ZW5kID0gZnJvbnRlbmQtPm5ldHdvcmsoKTsKK30KKwordm9p ZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpjbGVhckZyb250ZW5kKCkKK3sKKyAgICBtX2Zyb250 ZW5kID0gMDsKKyAgICBkaXNhYmxlKDApOworfQorCit2b2lkIEluc3BlY3RvclJlc291cmNlQWdl bnQ6OnJlc3RvcmUoKQoreworICAgIGlmIChtX3N0YXRlLT5nZXRCb29sZWFuKFJlc291cmNlQWdl bnRTdGF0ZTo6cmVzb3VyY2VBZ2VudEVuYWJsZWQpKQorICAgICAgICBlbmFibGUoKTsKIH0KIAog Ym9vbCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpyZXNvdXJjZUNvbnRlbnQoRnJhbWUqIGZyYW1l LCBjb25zdCBLVVJMJiB1cmwsIFN0cmluZyogcmVzdWx0KQpAQCAtMjk2LDcgKzMwNyw3IEBAIHN0 YXRpYyB2b2lkIHBvcHVsYXRlT2JqZWN0V2l0aEZyYW1lUmVzb3VyY2VzKEZyYW1lKiBmcmFtZSwg UGFzc1JlZlB0cjxJbnNwZWN0b3JPCiAKIEluc3BlY3RvclJlc291cmNlQWdlbnQ6On5JbnNwZWN0 b3JSZXNvdXJjZUFnZW50KCkKIHsKLSAgICBtX3N0YXRlLT5zZXRCb29sZWFuKFJlc291cmNlQWdl bnRTdGF0ZTo6cmVzb3VyY2VBZ2VudEVuYWJsZWQsIGZhbHNlKTsKKyAgICBBU1NFUlQoIW1faW5z dHJ1bWVudGluZ0FnZW50cy0+aW5zcGVjdG9yUmVzb3VyY2VBZ2VudCgpKTsKIH0KIAogdm9pZCBJ bnNwZWN0b3JSZXNvdXJjZUFnZW50OjppZGVudGlmaWVyRm9ySW5pdGlhbFJlcXVlc3QodW5zaWdu ZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBLVVJMJiB1cmwsIERvY3VtZW50TG9hZGVyKiBsb2Fk ZXIpCkBAIC00OTgsMTEgKzUwOSwyNiBAQCBGcmFtZSogSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6 ZnJhbWVGb3JJZCh1bnNpZ25lZCBsb25nIGZyYW1lSWQpCiAgICAgcmV0dXJuIDA7CiB9CiAKLXZv aWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6Y2FjaGVkUmVzb3VyY2VzKEVycm9yU3RyaW5nKiwg UmVmUHRyPEluc3BlY3Rvck9iamVjdD4qIG9iamVjdCkKK3ZvaWQgSW5zcGVjdG9yUmVzb3VyY2VB Z2VudDo6ZW5hYmxlKEVycm9yU3RyaW5nKiwgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4qIG9iamVj dCkKIHsKKyAgICBlbmFibGUoKTsKICAgICAqb2JqZWN0ID0gYnVpbGRPYmplY3RGb3JGcmFtZVRy ZWUobV9wYWdlLT5tYWluRnJhbWUoKSwgdHJ1ZSk7CiB9CiAKK3ZvaWQgSW5zcGVjdG9yUmVzb3Vy Y2VBZ2VudDo6ZW5hYmxlKCkKK3sKKyAgICBpZiAoIW1fZnJvbnRlbmQpCisgICAgICAgIHJldHVy bjsKKyAgICBtX3N0YXRlLT5zZXRCb29sZWFuKFJlc291cmNlQWdlbnRTdGF0ZTo6cmVzb3VyY2VB Z2VudEVuYWJsZWQsIHRydWUpOworICAgIG1faW5zdHJ1bWVudGluZ0FnZW50cy0+c2V0SW5zcGVj dG9yUmVzb3VyY2VBZ2VudCh0aGlzKTsKK30KKwordm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50 OjpkaXNhYmxlKEVycm9yU3RyaW5nKikKK3sKKyAgICBtX3N0YXRlLT5zZXRCb29sZWFuKFJlc291 cmNlQWdlbnRTdGF0ZTo6cmVzb3VyY2VBZ2VudEVuYWJsZWQsIGZhbHNlKTsKKyAgICBtX2luc3Ry dW1lbnRpbmdBZ2VudHMtPnNldEluc3BlY3RvclJlc291cmNlQWdlbnQoMCk7Cit9CisKIHZvaWQg SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6cmVzb3VyY2VDb250ZW50KEVycm9yU3RyaW5nKiwgdW5z aWduZWQgbG9uZyBmcmFtZUlkLCBjb25zdCBTdHJpbmcmIHVybCwgYm9vbCBiYXNlNjRFbmNvZGUs IGJvb2wqIHN1Y2Nlc3MsIFN0cmluZyogY29udGVudCkKIHsKICAgICBGcmFtZSogZnJhbWUgPSBm cmFtZUZvcklkKGZyYW1lSWQpOwpAQCAtNTE2LDEyICs1NDIsMTIgQEAgdm9pZCBJbnNwZWN0b3JS ZXNvdXJjZUFnZW50OjpyZXNvdXJjZUNvbnRlbnQoRXJyb3JTdHJpbmcqLCB1bnNpZ25lZCBsb25n IGZyYW1lSWQKICAgICAgICAgKnN1Y2Nlc3MgPSBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpyZXNv dXJjZUNvbnRlbnQoZnJhbWUsIEtVUkwoUGFyc2VkVVJMU3RyaW5nLCB1cmwpLCBjb250ZW50KTsK IH0KIAotSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6SW5zcGVjdG9yUmVzb3VyY2VBZ2VudChQYWdl KiBwYWdlLCBJbnNwZWN0b3JTdGF0ZSogc3RhdGUsIEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVu ZCkKLSAgICA6IG1fcGFnZShwYWdlKQorSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6SW5zcGVjdG9y UmVzb3VyY2VBZ2VudChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzLCBQ YWdlKiBwYWdlLCBJbnNwZWN0b3JTdGF0ZSogc3RhdGUpCisgICAgOiBtX2luc3RydW1lbnRpbmdB Z2VudHMoaW5zdHJ1bWVudGluZ0FnZW50cykKKyAgICAsIG1fcGFnZShwYWdlKQogICAgICwgbV9z dGF0ZShzdGF0ZSkKLSAgICAsIG1fZnJvbnRlbmQoZnJvbnRlbmQtPm5ldHdvcmsoKSkKKyAgICAs IG1fZnJvbnRlbmQoMCkKIHsKLSAgICBtX3N0YXRlLT5zZXRCb29sZWFuKFJlc291cmNlQWdlbnRT dGF0ZTo6cmVzb3VyY2VBZ2VudEVuYWJsZWQsIHRydWUpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVz b3VyY2VBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNl QWdlbnQuaAppbmRleCA2ZDAyMTQ0NDBlNTAzZDhiZjA1MDg3YjQ5YmQ3ZDE5Y2VkNDdjOWMyLi5m MWIzZDQ2OWM4YmE4NTgyZjUyMWM5Y2NkYjM4ODQ0YzRmOTMzOWIyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmgKQEAgLTUzLDYgKzUz LDcgQEAgY2xhc3MgSW5zcGVjdG9yQXJyYXk7CiBjbGFzcyBJbnNwZWN0b3JGcm9udGVuZDsKIGNs YXNzIEluc3BlY3Rvck9iamVjdDsKIGNsYXNzIEluc3BlY3RvclN0YXRlOworY2xhc3MgSW5zdHJ1 bWVudGluZ0FnZW50czsKIGNsYXNzIEtVUkw7CiBjbGFzcyBQYWdlOwogY2xhc3MgUmVzb3VyY2VF cnJvcjsKQEAgLTY5LDExICs3MCwxNSBAQCB0eXBlZGVmIFN0cmluZyBFcnJvclN0cmluZzsKIAog Y2xhc3MgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudCA6IHB1YmxpYyBSZWZDb3VudGVkPEluc3BlY3Rv clJlc291cmNlQWdlbnQ+IHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0 b3JSZXNvdXJjZUFnZW50PiBjcmVhdGUoUGFnZSogcGFnZSwgSW5zcGVjdG9yU3RhdGUqIHN0YXRl LCBJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQpCisgICAgc3RhdGljIFBhc3NSZWZQdHI8SW5z cGVjdG9yUmVzb3VyY2VBZ2VudD4gY3JlYXRlKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1l bnRpbmdBZ2VudHMsIFBhZ2UqIHBhZ2UsIEluc3BlY3RvclN0YXRlKiBzdGF0ZSkKICAgICB7Ci0g ICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudChwYWdlLCBz dGF0ZSwgZnJvbnRlbmQpKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBJbnNwZWN0b3JS ZXNvdXJjZUFnZW50KGluc3RydW1lbnRpbmdBZ2VudHMsIHBhZ2UsIHN0YXRlKSk7CiAgICAgfQog CisgICAgdm9pZCBzZXRGcm9udGVuZChJbnNwZWN0b3JGcm9udGVuZCopOworICAgIHZvaWQgY2xl YXJGcm9udGVuZCgpOworICAgIHZvaWQgcmVzdG9yZSgpOworCiAgICAgc3RhdGljIFBhc3NSZWZQ dHI8SW5zcGVjdG9yUmVzb3VyY2VBZ2VudD4gcmVzdG9yZShQYWdlKiwgSW5zcGVjdG9yU3RhdGUq LCBJbnNwZWN0b3JGcm9udGVuZCopOwogCiAgICAgc3RhdGljIGJvb2wgcmVzb3VyY2VDb250ZW50 KEZyYW1lKiwgY29uc3QgS1VSTCYsIFN0cmluZyogcmVzdWx0KTsKQEAgLTEwNSwxMyArMTEwLDE3 IEBAIHB1YmxpYzoKICAgICBGcmFtZSogZnJhbWVGb3JJZCh1bnNpZ25lZCBsb25nKTsKIAogICAg IC8vIENhbGxlZCBmcm9tIGZyb250ZW5kIAotICAgIHZvaWQgY2FjaGVkUmVzb3VyY2VzKEVycm9y U3RyaW5nKiwgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4qKTsKKyAgICB2b2lkIGVuYWJsZShFcnJv clN0cmluZyosIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+Kik7CisgICAgdm9pZCBkaXNhYmxlKEVy cm9yU3RyaW5nKik7CiAgICAgdm9pZCByZXNvdXJjZUNvbnRlbnQoRXJyb3JTdHJpbmcqLCB1bnNp Z25lZCBsb25nIGZyYW1lSWQsIGNvbnN0IFN0cmluZyYgdXJsLCBib29sIGJhc2U2NEVuY29kZSwg Ym9vbCogcmVzb3VyY2VGb3VuZCwgU3RyaW5nKiBjb250ZW50KTsKICAgICB2b2lkIHNldEV4dHJh SGVhZGVycyhFcnJvclN0cmluZyosIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0Pik7CiAKIHBy aXZhdGU6Ci0gICAgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudChQYWdlKiBwYWdlLCBJbnNwZWN0b3JT dGF0ZSosIEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCk7CisgICAgSW5zcGVjdG9yUmVzb3Vy Y2VBZ2VudChJbnN0cnVtZW50aW5nQWdlbnRzKiwgUGFnZSosIEluc3BlY3RvclN0YXRlKik7CisK KyAgICB2b2lkIGVuYWJsZSgpOwogCisgICAgSW5zdHJ1bWVudGluZ0FnZW50cyogbV9pbnN0cnVt ZW50aW5nQWdlbnRzOwogICAgIFBhZ2UqIG1fcGFnZTsKICAgICBJbnNwZWN0b3JTdGF0ZSogbV9z dGF0ZTsKICAgICBJbnNwZWN0b3JGcm9udGVuZDo6TmV0d29yayogbV9mcm9udGVuZDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcApp bmRleCA0ZjI4ZmNkODE0OTAwYmVkNjZjNDI2NzI4OWY4YzQ0NTdlMjI3YzQ4Li5kNDVhNTA3NTFj MzgyMWNkNTAyZjBmMjNmYTYyZDZlOGZlMTUxMmY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCkBAIC04NywxMCArODcsOSBA QCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmNsZWFyRnJvbnRlbmQoKQogICAgIG1fZnJv bnRlbmQgPSAwOwogfQogCi12b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnJlc3RvcmUoSW5z cGVjdG9yU3RhdGUqIHN0YXRlLCBJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQpCit2b2lkIElu c3BlY3RvclRpbWVsaW5lQWdlbnQ6OnJlc3RvcmUoKQogewotICAgIHNldEZyb250ZW5kKGZyb250 ZW5kKTsKLSAgICBpZiAoc3RhdGUtPmdldEJvb2xlYW4oVGltZWxpbmVBZ2VudFN0YXRlOjp0aW1l bGluZUFnZW50RW5hYmxlZCkpIHsKKyAgICBpZiAobV9zdGF0ZS0+Z2V0Qm9vbGVhbihUaW1lbGlu ZUFnZW50U3RhdGU6OnRpbWVsaW5lQWdlbnRFbmFibGVkKSkgewogICAgICAgICBFcnJvclN0cmlu ZyBlcnJvcjsKICAgICAgICAgc3RhcnQoJmVycm9yKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaAppbmRleCBkYzMwZjA0MjBj YjRmMDAwZDNmODMwM2Q3MzkyNTZiOWQ0NzM4N2Y2Li5jNGMwZjNiZjk4OGRmNzIzNGRmZTdlODcy MzMzZjM2YjU5OWI2N2Q5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yVGltZWxpbmVBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JUaW1lbGluZUFnZW50LmgKQEAgLTg4LDggKzg4LDcgQEAgcHVibGljOgogCiAgICAgdm9p ZCBzZXRGcm9udGVuZChJbnNwZWN0b3JGcm9udGVuZCopOwogICAgIHZvaWQgY2xlYXJGcm9udGVu ZCgpOwotCi0gICAgdm9pZCByZXN0b3JlKEluc3BlY3RvclN0YXRlKiwgSW5zcGVjdG9yRnJvbnRl bmQqKTsKKyAgICB2b2lkIHJlc3RvcmUoKTsKIAogICAgIHZvaWQgc3RhcnQoRXJyb3JTdHJpbmcq IGVycm9yKTsKICAgICB2b2lkIHN0b3AoRXJyb3JTdHJpbmcqIGVycm9yKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzCmluZGV4 IDRjMjhhMDM4ZGE4NWU5NDU3MDkxODYzYmQ2ZmEyZTI2YjAxYjNjNzMuLjI0NmI1M2NmMzc4Nzgz M2NkZmFjOWE1M2MzMTdjNGMzMTZkYmQzZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcwpAQCAtMzMsNyArMzMsNyBAQCBX ZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIgPSBmdW5jdGlvbihyZXNvdXJjZVRyZWVNb2RlbCkK ICAgICBXZWJJbnNwZWN0b3IuT2JqZWN0LmNhbGwodGhpcyk7CiAgICAgdGhpcy5fcmVzb3VyY2VU cmVlTW9kZWwgPSByZXNvdXJjZVRyZWVNb2RlbDsKICAgICB0aGlzLl9kaXNwYXRjaGVyID0gbmV3 IFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlcihyZXNvdXJjZVRyZWVNb2RlbCwgdGhpcyk7 Ci0gICAgTmV0d29ya0FnZW50LmNhY2hlZFJlc291cmNlcyh0aGlzLl9wcm9jZXNzQ2FjaGVkUmVz b3VyY2VzLmJpbmQodGhpcykpOworICAgIE5ldHdvcmtBZ2VudC5lbmFibGUodGhpcy5fcHJvY2Vz c0NhY2hlZFJlc291cmNlcy5iaW5kKHRoaXMpKTsKIH0KIAogV2ViSW5zcGVjdG9yLk5ldHdvcmtN YW5hZ2VyLkV2ZW50VHlwZXMgPSB7CkBAIC00NCwxMSArNDQsMTEgQEAgV2ViSW5zcGVjdG9yLk5l dHdvcmtNYW5hZ2VyLkV2ZW50VHlwZXMgPSB7CiB9CiAKIFdlYkluc3BlY3Rvci5OZXR3b3JrTWFu YWdlci5wcm90b3R5cGUgPSB7Ci0gICAgcmVzZXQ6IGZ1bmN0aW9uKCkKKyAgICBmcm9udGVuZFJl dXNlZDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5uZXR3 b3JrLmNsZWFyKCk7CiAgICAgICAgIHRoaXMuX3Jlc291cmNlVHJlZU1vZGVsLnJlc2V0KCk7Ci0g ICAgICAgIE5ldHdvcmtBZ2VudC5jYWNoZWRSZXNvdXJjZXModGhpcy5fcHJvY2Vzc0NhY2hlZFJl c291cmNlcy5iaW5kKHRoaXMpKTsKKyAgICAgICAgTmV0d29ya0FnZW50LmVuYWJsZSh0aGlzLl9w cm9jZXNzQ2FjaGVkUmVzb3VyY2VzLmJpbmQodGhpcykpOwogICAgIH0sCiAKICAgICByZXF1ZXN0 Q29udGVudDogZnVuY3Rpb24ocmVzb3VyY2UsIGJhc2U2NEVuY29kZSwgY2FsbGJhY2spCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IDY1 NjY0ZmY2MjlhNzdjMTBlNDAxYWZjNDI3NTY1MGJkMzFlMjk0ZjUuLmNmMjgwZTMxODM2MTg5Yzhj YTNjZTYyNDZiYjI3YTJkZjAyYzBmMmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCkBAIC0xNDA2LDcgKzE0MDYsNyBAQCBXZWJJbnNwZWN0 b3IuYWRkTWFpbkV2ZW50TGlzdGVuZXJzID0gZnVuY3Rpb24oZG9jKQogCiBXZWJJbnNwZWN0b3Iu ZnJvbnRlbmRSZXVzZWQgPSBmdW5jdGlvbigpCiB7Ci0gICAgdGhpcy5uZXR3b3JrTWFuYWdlci5y ZXNldCgpOworICAgIHRoaXMubmV0d29ya01hbmFnZXIuZnJvbnRlbmRSZXVzZWQoKTsKICAgICB0 aGlzLnJlc2V0KCk7CiB9CiAK