112787 2013-03-20 04:29:54 -0700 Web Inspector: do not use inspector cookie in InspectorInstrumentation::{will,did}Paint 2013-03-21 08:52:04 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 112371 1 caseq caseq apavlov eric esprehn+autocc keishi loislo ojan.autocc pfeldman pmuellr simon.fraser vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 859243 0 caseq 2013-03-20 04:29:54 -0700 We don't need cookie there, as we don't expect frame to navigate within paint. We do need frame in didPaint, though (see bug 112371) 859245 1 194019 caseq 2013-03-20 04:32:56 -0700 Created attachment 194019 Patch 860390 2 caseq 2013-03-21 08:52:04 -0700 Committed r146475: <http://trac.webkit.org/changeset/146475> 194019 2013-03-20 04:32:56 -0700 2013-03-20 23:05:16 -0700 Patch bug-112787-20130320152846.patch text/plain 9148 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MzIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTA1ZWMzMTg4ZTRhZGIz ZWE0Yzk0MjYxYzdjOGRkODc4NmY2ODBhNC4uYmRkMjUzYWY0ZGFiNDkyZGFmNGI1MzBiYjg0NGEx MWM1OTdiOGQwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTAzLTIwICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogZG8gbm90IHVzZSBpbnNwZWN0b3IgY29va2llIGluIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6e3dpbGwsZGlkfVBhaW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMTI3ODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAtIHBhc3MgZnJhbWUsIG5vdCBpbnNwZWN0b3IgY29va2llIHRvIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbjo6ZGlkUGFpbnQ7CisgICAgICAgIC0gdXNlIGZyYW1lIHRvIGRldGVy bWluZSB0aW1lbGluZSBhZ2VudCBpbiBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFBhaW50 LgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHA6Cisg ICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRh dGlvbjo6d2lsbFBhaW50SW1wbCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVt ZW50YXRpb246OmRpZFBhaW50SW1wbCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvcklu c3RydW1lbnRhdGlvbi5oOgorICAgICAgICAoSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uKToKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbFBhaW50KToKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkUGFpbnQpOgorICAg ICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6 cGFpbnRDb250ZW50cyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnBhaW50Q29udGVudHMp OgorCiAyMDEzLTAzLTIwICBBbGV4ZWkgRmlsaXBwb3YgIDxhbHBoQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBXZWIgSW5zcGVjdG9yOiBBbGxvdyB0b29sYmFyIGN1c3RvbWl6YXRpb24KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24u Y3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5j cHAKaW5kZXggZmYwZjBiODYzYzZmOWNlZjllZDBhZTE4ZDk4NjFmN2VjODM4OWJkOS4uMWIzOTJj MzY4MmQyMjgyNzU5MzQwODUzMmUxM2U3MzZmZDEwZTM3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAKQEAgLTUyNSwy NSArNTI1LDIxIEBAIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWREaXNwYXRjaFhI UkxvYWRFdmVudEltcGwoY29uc3QgSW5zcGVjdG9ySW5zdHJ1CiAgICAgICAgIHRpbWVsaW5lQWdl bnQtPmRpZERpc3BhdGNoWEhSTG9hZEV2ZW50KCk7CiB9CiAKLUluc3BlY3Rvckluc3RydW1lbnRh dGlvbkNvb2tpZSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxQYWludEltcGwoSW5zdHJ1 bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cywgRnJhbWUqIGZyYW1lKQordm9pZCBJ bnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxQYWludEltcGwoSW5zdHJ1bWVudGluZ0FnZW50 cyogaW5zdHJ1bWVudGluZ0FnZW50cywgRnJhbWUqIGZyYW1lKQogewogI2lmIFBMQVRGT1JNKENI Uk9NSVVNKQogICAgIFRSQUNFX0VWRU5UX0lOU1RBTlQxKCJpbnN0cnVtZW50YXRpb24iLCBJbnN0 cnVtZW50YXRpb25FdmVudHM6OlBhaW50LCBJbnN0cnVtZW50YXRpb25FdmVudEFyZ3VtZW50czo6 UGFnZUlkLCBmcmFtZSA/IHJlaW50ZXJwcmV0X2Nhc3Q8dW5zaWduZWQgbG9uZyBsb25nPihmcmFt ZS0+cGFnZSgpKSA6IDApOwogI2VuZGlmCiAKLSAgICBpbnQgdGltZWxpbmVBZ2VudElkID0gMDsK LSAgICBpZiAoSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IGluc3RydW1l bnRpbmdBZ2VudHMtPmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKSkgeworICAgIGlmIChJbnNwZWN0 b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gaW5zdHJ1bWVudGluZ0FnZW50cy0+aW5z cGVjdG9yVGltZWxpbmVBZ2VudCgpKQogICAgICAgICB0aW1lbGluZUFnZW50LT53aWxsUGFpbnQo ZnJhbWUpOwotICAgICAgICB0aW1lbGluZUFnZW50SWQgPSB0aW1lbGluZUFnZW50LT5pZCgpOwot ICAgIH0KLSAgICByZXR1cm4gSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llKGluc3RydW1l bnRpbmdBZ2VudHMsIHRpbWVsaW5lQWdlbnRJZCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uOjpkaWRQYWludEltcGwoY29uc3QgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29v a2llJiBjb29raWUsIEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgTGF5b3V0UmVjdCYg cmVjdCkKK3ZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRQYWludEltcGwoSW5zdHJ1 bWVudGluZ0FnZW50cyogIGluc3RydW1lbnRpbmdBZ2VudHMsIEdyYXBoaWNzQ29udGV4dCogY29u dGV4dCwgY29uc3QgTGF5b3V0UmVjdCYgcmVjdCkKIHsKLSAgICBpZiAoSW5zcGVjdG9yVGltZWxp bmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IHJldHJpZXZlVGltZWxpbmVBZ2VudChjb29raWUpKQor ICAgIGlmIChJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gaW5zdHJ1bWVu dGluZ0FnZW50cy0+aW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpKQogICAgICAgICB0aW1lbGluZUFn ZW50LT5kaWRQYWludChyZWN0KTsKLSAgICBpZiAoSW5zcGVjdG9yUGFnZUFnZW50KiBwYWdlQWdl bnQgPSBjb29raWUuaW5zdHJ1bWVudGluZ0FnZW50cygpLT5pbnNwZWN0b3JQYWdlQWdlbnQoKSkK KyAgICBpZiAoSW5zcGVjdG9yUGFnZUFnZW50KiBwYWdlQWdlbnQgPSBpbnN0cnVtZW50aW5nQWdl bnRzLT5pbnNwZWN0b3JQYWdlQWdlbnQoKSkKICAgICAgICAgcGFnZUFnZW50LT5kaWRQYWludChj b250ZXh0LCByZWN0KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3Rvckluc3RydW1lbnRhdGlvbi5oCmluZGV4IGI0YTgzMjJkMTNmNzdjMWJjNWY0YjhiNTNh YjQ1NTYzMzk4NGQ2NGQuLjhkNTgyYWEyZTA4ZmNlYTE4NmFiMmE1YzNmNDFhYTljMGRiZmNmMTgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50 YXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uLmgKQEAgLTE2OSw4ICsxNjksOCBAQCBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgZGlk RGlzcGF0Y2hYSFJMb2FkRXZlbnQoY29uc3QgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2ll Jik7CiAgICAgc3RhdGljIHZvaWQgd2lsbFNjcm9sbExheWVyKEZyYW1lKik7CiAgICAgc3RhdGlj IHZvaWQgZGlkU2Nyb2xsTGF5ZXIoRnJhbWUqKTsKLSAgICBzdGF0aWMgSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uQ29va2llIHdpbGxQYWludChGcmFtZSopOwotICAgIHN0YXRpYyB2b2lkIGRpZFBh aW50KGNvbnN0IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSYsIEdyYXBoaWNzQ29udGV4 dCosIGNvbnN0IExheW91dFJlY3QmKTsKKyAgICBzdGF0aWMgdm9pZCB3aWxsUGFpbnQoRnJhbWUq KTsKKyAgICBzdGF0aWMgdm9pZCBkaWRQYWludChGcmFtZSosIEdyYXBoaWNzQ29udGV4dCosIGNv bnN0IExheW91dFJlY3QmKTsKICAgICBzdGF0aWMgdm9pZCB3aWxsQ29tcG9zaXRlKFBhZ2UqKTsK ICAgICBzdGF0aWMgdm9pZCBkaWRDb21wb3NpdGUoUGFnZSopOwogICAgIHN0YXRpYyBJbnNwZWN0 b3JJbnN0cnVtZW50YXRpb25Db29raWUgd2lsbFJlY2FsY3VsYXRlU3R5bGUoRG9jdW1lbnQqKTsK QEAgLTM3Myw4ICszNzMsOCBAQCBwcml2YXRlOgogICAgIHN0YXRpYyB2b2lkIGRpZERpc3BhdGNo WEhSTG9hZEV2ZW50SW1wbChjb25zdCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUmKTsK ICAgICBzdGF0aWMgdm9pZCB3aWxsU2Nyb2xsTGF5ZXJJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMq LCBGcmFtZSopOwogICAgIHN0YXRpYyB2b2lkIGRpZFNjcm9sbExheWVySW1wbChJbnN0cnVtZW50 aW5nQWdlbnRzKik7Ci0gICAgc3RhdGljIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSB3 aWxsUGFpbnRJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqLCBGcmFtZSopOwotICAgIHN0YXRpYyB2 b2lkIGRpZFBhaW50SW1wbChjb25zdCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUmLCBH cmFwaGljc0NvbnRleHQqLCBjb25zdCBMYXlvdXRSZWN0Jik7CisgICAgc3RhdGljIHZvaWQgd2ls bFBhaW50SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiwgRnJhbWUqKTsKKyAgICBzdGF0aWMgdm9p ZCBkaWRQYWludEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyosIEdyYXBoaWNzQ29udGV4dCosIGNv bnN0IExheW91dFJlY3QmKTsKICAgICBzdGF0aWMgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29v a2llIHdpbGxSZWNhbGN1bGF0ZVN0eWxlSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiwgRnJhbWUq KTsKICAgICBzdGF0aWMgdm9pZCBkaWRSZWNhbGN1bGF0ZVN0eWxlSW1wbChjb25zdCBJbnNwZWN0 b3JJbnN0cnVtZW50YXRpb25Db29raWUmKTsKICAgICBzdGF0aWMgdm9pZCBkaWRTY2hlZHVsZVN0 eWxlUmVjYWxjdWxhdGlvbkltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyosIERvY3VtZW50Kik7CkBA IC0xMTAxLDI2ICsxMTAxLDI1IEBAIGlubGluZSB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6ZGlkRGlzcGF0Y2hYSFJMb2FkRXZlbnQoY29uc3QgSW5zcGVjdG9ySW5zCiAjZW5kaWYKIH0K IAotaW5saW5lIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSBJbnNwZWN0b3JJbnN0cnVt ZW50YXRpb246OndpbGxQYWludChGcmFtZSogZnJhbWUpCitpbmxpbmUgdm9pZCBJbnNwZWN0b3JJ bnN0cnVtZW50YXRpb246OndpbGxQYWludChGcmFtZSogZnJhbWUpCiB7CiAjaWYgRU5BQkxFKElO U1BFQ1RPUikKLSAgICBGQVNUX1JFVFVSTl9JRl9OT19GUk9OVEVORFMoSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uQ29va2llKCkpOworICAgIEZBU1RfUkVUVVJOX0lGX05PX0ZST05URU5EUyh2b2lk KCkpOwogICAgIGlmIChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzID0g aW5zdHJ1bWVudGluZ0FnZW50c0ZvckZyYW1lKGZyYW1lKSkKICAgICAgICAgcmV0dXJuIHdpbGxQ YWludEltcGwoaW5zdHJ1bWVudGluZ0FnZW50cywgZnJhbWUpOwogI2Vsc2UKICAgICBVTlVTRURf UEFSQU0oZnJhbWUpOwogI2VuZGlmCi0gICAgcmV0dXJuIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bkNvb2tpZSgpOwogfQogCi1pbmxpbmUgdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRp ZFBhaW50KGNvbnN0IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSYgY29va2llLCBHcmFw aGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IExheW91dFJlY3QmIHJlY3QpCitpbmxpbmUgdm9p ZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFBhaW50KEZyYW1lKiBmcmFtZSwgR3JhcGhp Y3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBMYXlvdXRSZWN0JiByZWN0KQogewogI2lmIEVOQUJM RShJTlNQRUNUT1IpCiAgICAgRkFTVF9SRVRVUk5fSUZfTk9fRlJPTlRFTkRTKHZvaWQoKSk7Ci0g ICAgaWYgKGNvb2tpZS5pc1ZhbGlkKCkpCi0gICAgICAgIGRpZFBhaW50SW1wbChjb29raWUsIGNv bnRleHQsIHJlY3QpOworICAgIGlmIChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5n QWdlbnRzID0gaW5zdHJ1bWVudGluZ0FnZW50c0ZvckZyYW1lKGZyYW1lKSkKKyAgICAgICAgZGlk UGFpbnRJbXBsKGluc3RydW1lbnRpbmdBZ2VudHMsIGNvbnRleHQsIHJlY3QpOwogI2Vsc2UKLSAg ICBVTlVTRURfUEFSQU0oY29va2llKTsKKyAgICBVTlVTRURfUEFSQU0oZnJhbWUpOwogICAgIFVO VVNFRF9QQVJBTShjb250ZXh0KTsKICAgICBVTlVTRURfUEFSQU0ocmVjdCk7CiAjZW5kaWYKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCAwNDFlNGUzYTc1MDRlODc0ZDg4YmM4YTc0MjY5 Yzg3ODNmNTE5MjBlLi4wNzA3NWM5OTdkOTQ5ZGE3Nzc0ODk0NzU1YTNhOWNiNTBjMTAzN2ZjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC0zMzU1LDcgKzMzNTUsNyBAQCB2b2lkIEZy YW1lVmlldzo6cGFpbnRDb250ZW50cyhHcmFwaGljc0NvbnRleHQqIHAsIGNvbnN0IEludFJlY3Qm IHJlY3QpCiAgICAgaWYgKCFmcmFtZSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBJbnNwZWN0 b3JJbnN0cnVtZW50YXRpb25Db29raWUgY29va2llID0gSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u Ojp3aWxsUGFpbnQobV9mcmFtZS5nZXQoKSk7CisgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u Ojp3aWxsUGFpbnQobV9mcmFtZS5nZXQoKSk7CiAKICAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBt X2ZyYW1lLT5kb2N1bWVudCgpOwogCkBAIC0zNDUwLDcgKzM0NTAsNyBAQCB2b2lkIEZyYW1lVmll dzo6cGFpbnRDb250ZW50cyhHcmFwaGljc0NvbnRleHQqIHAsIGNvbnN0IEludFJlY3QmIHJlY3Qp CiAgICAgaWYgKGlzVG9wTGV2ZWxQYWludGVyKQogICAgICAgICBzQ3VycmVudFBhaW50VGltZVN0 YW1wID0gMDsKIAotICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkUGFpbnQoY29va2ll LCBwLCByZWN0KTsKKyAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFBhaW50KG1fZnJh bWUuZ2V0KCksIHAsIHJlY3QpOwogfQogCiB2b2lkIEZyYW1lVmlldzo6c2V0UGFpbnRCZWhhdmlv cihQYWludEJlaGF2aW9yIGJlaGF2aW9yKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXJCYWNraW5nLmNwcAppbmRleCBjZWU1YTBmYWNkMTA5YTZkYjlkZTI2ZTE5MDA1 Y2MzOGI1ZjI4N2EwLi43MzdlNzhmMTIyZTllY2E2MDgzYmE0NTllNjI3Y2M1MGQ0OTE5NGI3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcApA QCAtMTg5NSw3ICsxODk1LDggQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnBhaW50Q29udGVu dHMoY29uc3QgR3JhcGhpY3NMYXllciogZ3JhcGhpY3NMYXllciwgR3JhcGgKICAgICAgICAgfHwg Z3JhcGhpY3NMYXllciA9PSBtX2JhY2tncm91bmRMYXllci5nZXQoKQogICAgICAgICB8fCBncmFw aGljc0xheWVyID09IG1fbWFza0xheWVyLmdldCgpCiAgICAgICAgIHx8IGdyYXBoaWNzTGF5ZXIg PT0gbV9zY3JvbGxpbmdDb250ZW50c0xheWVyLmdldCgpKSB7Ci0gICAgICAgIEluc3BlY3Rvcklu c3RydW1lbnRhdGlvbkNvb2tpZSBjb29raWUgPSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246Ondp bGxQYWludChtX293bmluZ0xheWVyLT5yZW5kZXJlcigpLT5mcmFtZSgpKTsKKyAgICAgICAgRnJh bWUqIGZyYW1lID0gbV9vd25pbmdMYXllci0+cmVuZGVyZXIoKS0+ZnJhbWUoKTsKKyAgICAgICAg SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsUGFpbnQoZnJhbWUpOwogCiAgICAgICAgIC8v IFRoZSBkaXJ0eVJlY3QgaXMgaW4gdGhlIGNvb3JkcyBvZiB0aGUgcGFpbnRpbmcgcm9vdC4KICAg ICAgICAgSW50UmVjdCBkaXJ0eVJlY3QgPSBjbGlwOwpAQCAtMTkwNiw5ICsxOTA3LDkgQEAgdm9p ZCBSZW5kZXJMYXllckJhY2tpbmc6OnBhaW50Q29udGVudHMoY29uc3QgR3JhcGhpY3NMYXllciog Z3JhcGhpY3NMYXllciwgR3JhcGgKICAgICAgICAgcGFpbnRJbnRvTGF5ZXIoZ3JhcGhpY3NMYXll ciwgJmNvbnRleHQsIGRpcnR5UmVjdCwgUGFpbnRCZWhhdmlvck5vcm1hbCwgcGFpbnRpbmdQaGFz ZSk7CiAKICAgICAgICAgaWYgKG1fdXNpbmdUaWxlZENhY2hlTGF5ZXIpCi0gICAgICAgICAgICBt X293bmluZ0xheWVyLT5yZW5kZXJlcigpLT5mcmFtZSgpLT52aWV3KCktPnNldExhc3RQYWludFRp bWUoY3VycmVudFRpbWUoKSk7CisgICAgICAgICAgICBmcmFtZS0+dmlldygpLT5zZXRMYXN0UGFp bnRUaW1lKGN1cnJlbnRUaW1lKCkpOwogCi0gICAgICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6ZGlkUGFpbnQoY29va2llLCAmY29udGV4dCwgY2xpcCk7CisgICAgICAgIEluc3BlY3Rvcklu c3RydW1lbnRhdGlvbjo6ZGlkUGFpbnQoZnJhbWUsICZjb250ZXh0LCBjbGlwKTsKICAgICB9IGVs c2UgaWYgKGdyYXBoaWNzTGF5ZXIgPT0gbGF5ZXJGb3JIb3Jpem9udGFsU2Nyb2xsYmFyKCkpIHsK ICAgICAgICAgcGFpbnRTY3JvbGxiYXIobV9vd25pbmdMYXllci0+aG9yaXpvbnRhbFNjcm9sbGJh cigpLCBjb250ZXh0LCBjbGlwKTsKICAgICB9IGVsc2UgaWYgKGdyYXBoaWNzTGF5ZXIgPT0gbGF5 ZXJGb3JWZXJ0aWNhbFNjcm9sbGJhcigpKSB7Cg==