47675 2010-10-14 09:58:04 -0700 Web Inspector: encapsulate ScriptState into ConsoleMessage instead of passing it as additional parameter 2010-10-14 12:53:16 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 yurys yurys apavlov bweinstein commit-queue joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 294163 0 yurys 2010-10-14 09:58:04 -0700 Web Inspector: encapsulate ScriptState into ConsoleMessage instead of passing it as additional parameter in InspectorController::addConsoleMessage. 294176 1 70748 yurys 2010-10-14 10:22:46 -0700 Created attachment 70748 Patch 294297 2 70748 commit-queue 2010-10-14 12:53:10 -0700 Comment on attachment 70748 Patch Clearing flags on attachment: 70748 Committed r69799: <http://trac.webkit.org/changeset/69799> 294298 3 commit-queue 2010-10-14 12:53:16 -0700 All reviewed patches have been landed. Closing bug. 70748 2010-10-14 10:22:46 -0700 2010-10-14 12:53:10 -0700 Patch bug-47675-20101014212244.patch text/plain 10551 yurys ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NjY4OGQ0M2FiMzBkNTAzZGRmYzMzNjE4Mjc2NTg0YTdhZmU2MzkzNy4uZTg4N2M5YjY2NTJiOTIz ZDM4ZGE2YWU3NWYyYTY5NGQ3NzYwZmVkYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMC0xMC0xNCAgWXVy eSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBlbmNhcHN1bGF0ZSBT Y3JpcHRTdGF0ZSBpbnRvIENvbnNvbGVNZXNzYWdlIGluc3RlYWQgb2YgcGFzc2luZyBpdCBhcyBh ZGRpdGlvbmFsIHBhcmFtZXRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NDc2NzUKKworICAgICAgICBObyBuZXcgdGVzdHMuIFRoaXMgcmVmYWN0b3Jp bmcgaXMgY292ZXJlZCBieSBleGlzdGluZyBpbnNwZWN0b3IgdGVzdHMuCisKKyAgICAgICAgKiBi aW5kaW5ncy9qcy9KU0NvbnNvbGVDdXN0b20uY3BwOgorICAgICAgICAqIGJpbmRpbmdzL2pzL1Nj cmlwdENhbGxGcmFtZS5jcHA6CisgICAgICAgICogYmluZGluZ3MvanMvU2NyaXB0Q2FsbEZyYW1l Lmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRDYWxsRnJhbWU6OmZ1bmN0aW9uTmFtZSk6Cisg ICAgICAgIChXZWJDb3JlOjpTY3JpcHRDYWxsRnJhbWU6OnNvdXJjZVVSTCk6CisgICAgICAgIChX ZWJDb3JlOjpTY3JpcHRDYWxsRnJhbWU6OmxpbmVOdW1iZXIpOgorICAgICAgICAoV2ViQ29yZTo6 U2NyaXB0Q2FsbEZyYW1lOjphcmd1bWVudENvdW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvQ29u c29sZU1lc3NhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29uc29sZU1lc3NhZ2U6OmlzRXF1 YWwpOgorICAgICAgICAqIGluc3BlY3Rvci9Db25zb2xlTWVzc2FnZS5oOgorICAgICAgICAqIGlu c3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3RvckNvbnRyb2xsZXI6OmFkZE1lc3NhZ2VUb0NvbnNvbGUpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yQ29udHJvbGxlcjo6YWRkQ29uc29sZU1lc3NhZ2UpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6c3RhcnRHcm91cCk6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JDb250cm9sbGVyOjplbmRHcm91cCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3Bl Y3RvckNvbnRyb2xsZXIuaDoKKwogMjAxMC0xMC0xNCAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFu QGNocm9taXVtLm9yZz4KIAogICAgICAgICBOb3QgcmV2aWV3ZWQuIFJlLWxhbmRpbmcgcjY5NzU3 LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0NvbnNvbGVDdXN0b20uY3BwIGIv V2ViQ29yZS9iaW5kaW5ncy9qcy9KU0NvbnNvbGVDdXN0b20uY3BwCmluZGV4IDNhZDM0YTMwMGQ0 YzJjZDQzZGZiZjljNmNmMDk4ZDZkOGIxZjljMGMuLmYwNDE5YzdhZDdjMjAwYjgyYWYxYmEyNzIw MTRmMGE5NmY3OGRhNDQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDb25zb2xl Q3VzdG9tLmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ29uc29sZUN1c3RvbS5jcHAK QEAgLTI5LDcgKzI5LDYgQEAKIAogI2luY2x1ZGUgIkNvbnNvbGUuaCIKICNpbmNsdWRlICJKU1Nj cmlwdFByb2ZpbGUuaCIKLSNpbmNsdWRlICJTY3JpcHRDYWxsU3RhY2suaCIKICNpbmNsdWRlICJT Y3JpcHRQcm9maWxlLmgiCiAjaW5jbHVkZSA8cnVudGltZS9KU0FycmF5Lmg+CiAKZGlmZiAtLWdp dCBhL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0Q2FsbEZyYW1lLmNwcCBiL1dlYkNvcmUvYmlu ZGluZ3MvanMvU2NyaXB0Q2FsbEZyYW1lLmNwcAppbmRleCBhM2Q5OGFjNDUzYTU3MjE2Zjg5YmY2 OWIxMTg5ODk5ZTU3ZWU0ZmQzLi4yZjc0Yjk2ZTQxZDIwNjBkOWFiYWQwOWQ3OWU5MzkzMWY0Mjkw ZjFjIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENhbGxGcmFtZS5jcHAK KysrIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDYWxsRnJhbWUuY3BwCkBAIC0zMSw3ICsz MSw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiU2NyaXB0Q2FsbEZyYW1lLmgi CiAKLSNpbmNsdWRlIDxpbnRlcnByZXRlci9DYWxsRnJhbWUuaD4KKyNpbmNsdWRlIDxydW50aW1l L0FyZ0xpc3QuaD4KICNpbmNsdWRlIDxydW50aW1lL1VTdHJpbmcuaD4KIAogdXNpbmcgbmFtZXNw YWNlIEpTQzsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0Q2FsbEZyYW1l LmggYi9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENhbGxGcmFtZS5oCmluZGV4IDg5ZmUyYmVm YWFlNjgzYWI3NjJjMDhlMTZkNmYxYWQ4Zjc4YjU4ZTguLjMxYWVjN2U2ZDYyZDZkZWZkMDA5Yjcw ZTNkNDg4NzVmYmY4NjBhZTEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0 Q2FsbEZyYW1lLmgKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDYWxsRnJhbWUuaApA QCAtMzEsNDEgKzMxLDM3IEBACiAjaWZuZGVmIFNjcmlwdENhbGxGcmFtZV9oCiAjZGVmaW5lIFNj cmlwdENhbGxGcmFtZV9oCiAKLSNpbmNsdWRlIDxydW50aW1lL0FyZ0xpc3QuaD4KKyNpbmNsdWRl ICJQbGF0Zm9ybVN0cmluZy5oIgogI2luY2x1ZGUgIlNjcmlwdFZhbHVlLmgiCiAjaW5jbHVkZSA8 d3RmL1ZlY3Rvci5oPgogCiBuYW1lc3BhY2UgSlNDIHsKLSAgICBjbGFzcyBFeGVjU3RhdGU7Ci0g ICAgY2xhc3MgSW50ZXJuYWxGdW5jdGlvbjsKK2NsYXNzIEV4ZWNTdGF0ZTsKK2NsYXNzIFVTdHJp bmc7CiB9CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQg cmV0cmlldmluZyBsaW5lIG51bWJlciBhbmQgc291cmNlIFVSTCBhbmQgc3RvcmluZyBoZXJlCi0g ICAgLy8gZm9yIGFsbCBjYWxsIGZyYW1lcywgbm90IGp1c3QgdGhlIGZpcnN0IG9uZS4KLSAgICAv LyBTZWUgPGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU1Nj4gYW5k Ci0gICAgLy8gPGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTE4MD4K LSAgICBjbGFzcyBTY3JpcHRDYWxsRnJhbWUgIHsKLSAgICBwdWJsaWM6Ci0gICAgICAgIFNjcmlw dENhbGxGcmFtZShjb25zdCBKU0M6OlVTdHJpbmcmIGZ1bmN0aW9uTmFtZSwgY29uc3QgSlNDOjpV U3RyaW5nJiB1cmxTdHJpbmcsIGludCBsaW5lTnVtYmVyLCBKU0M6OkV4ZWNTdGF0ZSosIHVuc2ln bmVkIHNraXBBcmd1bWVudENvdW50KTsKLSAgICAgICAgflNjcmlwdENhbGxGcmFtZSgpOworY2xh c3MgU2NyaXB0Q2FsbEZyYW1lICB7CitwdWJsaWM6CisgICAgU2NyaXB0Q2FsbEZyYW1lKGNvbnN0 IEpTQzo6VVN0cmluZyYgZnVuY3Rpb25OYW1lLCBjb25zdCBKU0M6OlVTdHJpbmcmIHVybFN0cmlu ZywgaW50IGxpbmVOdW1iZXIsIEpTQzo6RXhlY1N0YXRlKiwgdW5zaWduZWQgc2tpcEFyZ3VtZW50 Q291bnQpOworICAgIH5TY3JpcHRDYWxsRnJhbWUoKTsKIAotICAgICAgICBjb25zdCBTdHJpbmcm IGZ1bmN0aW9uTmFtZSgpIGNvbnN0IHsgcmV0dXJuIG1fZnVuY3Rpb25OYW1lOyB9Ci0gICAgICAg IGNvbnN0IFN0cmluZyYgc291cmNlVVJMKCkgY29uc3QgeyByZXR1cm4gbV9zb3VyY2VVUkw7IH0K LSAgICAgICAgdW5zaWduZWQgbGluZU51bWJlcigpIGNvbnN0IHsgcmV0dXJuIG1fbGluZU51bWJl cjsgfQorICAgIGNvbnN0IFN0cmluZyYgZnVuY3Rpb25OYW1lKCkgY29uc3QgeyByZXR1cm4gbV9m dW5jdGlvbk5hbWU7IH0KKyAgICBjb25zdCBTdHJpbmcmIHNvdXJjZVVSTCgpIGNvbnN0IHsgcmV0 dXJuIG1fc291cmNlVVJMOyB9CisgICAgdW5zaWduZWQgbGluZU51bWJlcigpIGNvbnN0IHsgcmV0 dXJuIG1fbGluZU51bWJlcjsgfQogCi0gICAgICAgIC8vIGFyZ3VtZW50IHJldHJpZXZhbCBtZXRo b2RzCi0gICAgICAgIGNvbnN0IFNjcmlwdFZhbHVlJiBhcmd1bWVudEF0KHVuc2lnbmVkKSBjb25z dDsKLSAgICAgICAgdW5zaWduZWQgYXJndW1lbnRDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fYXJn dW1lbnRzLnNpemUoKTsgfQorICAgIC8vIGFyZ3VtZW50IHJldHJpZXZhbCBtZXRob2RzCisgICAg Y29uc3QgU2NyaXB0VmFsdWUmIGFyZ3VtZW50QXQodW5zaWduZWQpIGNvbnN0OworICAgIHVuc2ln bmVkIGFyZ3VtZW50Q291bnQoKSBjb25zdCB7IHJldHVybiBtX2FyZ3VtZW50cy5zaXplKCk7IH0K IAotICAgIHByaXZhdGU6Ci0gICAgICAgIFN0cmluZyBtX2Z1bmN0aW9uTmFtZTsKLSAgICAgICAg U3RyaW5nIG1fc291cmNlVVJMOwotICAgICAgICB1bnNpZ25lZCBtX2xpbmVOdW1iZXI7Citwcml2 YXRlOgorICAgIFN0cmluZyBtX2Z1bmN0aW9uTmFtZTsKKyAgICBTdHJpbmcgbV9zb3VyY2VVUkw7 CisgICAgdW5zaWduZWQgbV9saW5lTnVtYmVyOwogCi0gICAgICAgIFZlY3RvcjxTY3JpcHRWYWx1 ZT4gbV9hcmd1bWVudHM7Ci0gICAgfTsKKyAgICBWZWN0b3I8U2NyaXB0VmFsdWU+IG1fYXJndW1l bnRzOworfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCmRpZmYgLS1naXQgYS9XZWJDb3Jl L2luc3BlY3Rvci9Db25zb2xlTWVzc2FnZS5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9Db25zb2xl TWVzc2FnZS5jcHAKaW5kZXggNThjYThkMzkzNTcwOTU2MmVmMjlmNjQ2OWY2YjM5ZjM0OGY4NzU2 ZS4uNjc5MzBjZDZlZWM5MDI2Y2JkNTI4Mjg5ZGY0Yzg3ZDljMWQ0NzY2MSAxMDA2NDQKLS0tIGEv V2ViQ29yZS9pbnNwZWN0b3IvQ29uc29sZU1lc3NhZ2UuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVj dG9yL0NvbnNvbGVNZXNzYWdlLmNwcApAQCAtMTU1LDIyICsxNTUsMjAgQEAgdm9pZCBDb25zb2xl TWVzc2FnZTo6dXBkYXRlUmVwZWF0Q291bnRJbkNvbnNvbGUoSW5zcGVjdG9yRnJvbnRlbmQqIGZy b250ZW5kKQogfQogI2VuZGlmIC8vIEVOQUJMRShJTlNQRUNUT1IpCiAKLWJvb2wgQ29uc29sZU1l c3NhZ2U6OmlzRXF1YWwoU2NyaXB0U3RhdGUqIHN0YXRlLCBDb25zb2xlTWVzc2FnZSogbXNnKSBj b25zdAorYm9vbCBDb25zb2xlTWVzc2FnZTo6aXNFcXVhbChDb25zb2xlTWVzc2FnZSogbXNnKSBj b25zdAogewogI2lmIEVOQUJMRShJTlNQRUNUT1IpCiAgICAgaWYgKG1zZy0+bV9hcmd1bWVudHMu c2l6ZSgpICE9IG1fYXJndW1lbnRzLnNpemUoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAg IGlmICghc3RhdGUgJiYgbXNnLT5tX2FyZ3VtZW50cy5zaXplKCkpCisgICAgaWYgKCFtc2ctPm1f c2NyaXB0U3RhdGUuZ2V0KCkgJiYgbXNnLT5tX2FyZ3VtZW50cy5zaXplKCkpIHsKKyAgICAgICAg QVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAKLSAg ICBBU1NFUlRfQVJHKHN0YXRlLCBzdGF0ZSB8fCBtc2ctPm1fYXJndW1lbnRzLmlzRW1wdHkoKSk7 Ci0KLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1zZy0+bV9hcmd1bWVudHMuc2l6ZSgpOyAr K2kpIHsKLSAgICAgICAgaWYgKCFtX2FyZ3VtZW50c1tpXS5pc0VxdWFsKHN0YXRlLCBtc2ctPm1f YXJndW1lbnRzW2ldKSkKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1fYXJndW1lbnRzLnNp emUoKTsgKytpKSB7CisgICAgICAgIGlmICghbV9hcmd1bWVudHNbaV0uaXNFcXVhbChtc2ctPm1f c2NyaXB0U3RhdGUuZ2V0KCksIG1zZy0+bV9hcmd1bWVudHNbaV0pKQogICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgIH0KLSNlbHNlCi0gICAgVU5VU0VEX1BBUkFNKHN0YXRlKTsKICNlbmRp ZiAvLyBFTkFCTEUoSU5TUEVDVE9SKQogCiAgICAgc2l6ZV90IGZyYW1lQ291bnQgPSBtc2ctPm1f ZnJhbWVzLnNpemUoKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0NvbnNvbGVNZXNz YWdlLmggYi9XZWJDb3JlL2luc3BlY3Rvci9Db25zb2xlTWVzc2FnZS5oCmluZGV4IDRkOGYwYTJj NjkzMzMzMTM5ZWQ0Y2E3YWVlMzY1MzIzN2YzYTM3MmQuLjZjM2YyYzcyNjg0MjBkY2RmZjFjMmMx YTY5MTA0MjI2NTU2ZTgwOTQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0NvbnNvbGVN ZXNzYWdlLmgKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvQ29uc29sZU1lc3NhZ2UuaApAQCAtNTUs NyArNTUsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCB1cGRhdGVSZXBlYXRDb3VudEluQ29uc29sZShJ bnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQpOwogI2VuZGlmCiAgICAgdm9pZCBpbmNyZW1lbnRD b3VudCgpIHsgKyttX3JlcGVhdENvdW50OyB9Ci0gICAgYm9vbCBpc0VxdWFsKFNjcmlwdFN0YXRl KiwgQ29uc29sZU1lc3NhZ2UqIG1zZykgY29uc3Q7CisgICAgYm9vbCBpc0VxdWFsKENvbnNvbGVN ZXNzYWdlKiBtc2cpIGNvbnN0OwogCiAgICAgTWVzc2FnZVNvdXJjZSBzb3VyY2UoKSBjb25zdCB7 IHJldHVybiBtX3NvdXJjZTsgfQogICAgIGNvbnN0IFN0cmluZyYgbWVzc2FnZSgpIGNvbnN0IHsg cmV0dXJuIG1fbWVzc2FnZTsgfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yQ29udHJvbGxlci5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVy LmNwcAppbmRleCBhZjBiMzgzZmI5OTJlNDAwNzNhZGZkYThmODJmNTExMTA4M2VkNDY4Li42ZWI1 YTg1NDc0ZWM5NzNlNmMzYTgwOWU1OTIzMDg3NDBjYmUxY2U5IDEwMDY0NAotLS0gYS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcApAQCAtODYsNiArODYsNyBAQAogI2luY2x1ZGUgIlNj cmlwdFByb2ZpbGUuaCIKICNpbmNsdWRlICJTY3JpcHRQcm9maWxlci5oIgogI2luY2x1ZGUgIlNj cmlwdFNvdXJjZUNvZGUuaCIKKyNpbmNsdWRlICJTY3JpcHRTdGF0ZS5oIgogI2luY2x1ZGUgIlNl Y3VyaXR5T3JpZ2luLmgiCiAjaW5jbHVkZSAiU2V0dGluZ3MuaCIKICNpbmNsdWRlICJTaGFyZWRC dWZmZXIuaCIKQEAgLTM1OCw3ICszNTksNyBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmFk ZE1lc3NhZ2VUb0NvbnNvbGUoTWVzc2FnZVNvdXJjZSBzb3VyY2UsIE1lc3NhZ2VUeXBlCiAgICAg ICAgIHJldHVybjsKIAogICAgIGJvb2wgc3RvcmVTdGFja1RyYWNlID0gdHlwZSA9PSBUcmFjZU1l c3NhZ2VUeXBlIHx8IHR5cGUgPT0gVW5jYXVnaHRFeGNlcHRpb25NZXNzYWdlVHlwZSB8fCB0eXBl ID09IEFzc2VydE1lc3NhZ2VUeXBlOwotICAgIGFkZENvbnNvbGVNZXNzYWdlKGNhbGxTdGFjay0+ c3RhdGUoKSwgbmV3IENvbnNvbGVNZXNzYWdlKHNvdXJjZSwgdHlwZSwgbGV2ZWwsIG1lc3NhZ2Us IGNhbGxTdGFjaywgbV9ncm91cExldmVsLCBzdG9yZVN0YWNrVHJhY2UpKTsKKyAgICBhZGRDb25z b2xlTWVzc2FnZShuZXcgQ29uc29sZU1lc3NhZ2Uoc291cmNlLCB0eXBlLCBsZXZlbCwgbWVzc2Fn ZSwgY2FsbFN0YWNrLCBtX2dyb3VwTGV2ZWwsIHN0b3JlU3RhY2tUcmFjZSkpOwogfQogCiB2b2lk IEluc3BlY3RvckNvbnRyb2xsZXI6OmFkZE1lc3NhZ2VUb0NvbnNvbGUoTWVzc2FnZVNvdXJjZSBz b3VyY2UsIE1lc3NhZ2VUeXBlIHR5cGUsIE1lc3NhZ2VMZXZlbCBsZXZlbCwgY29uc3QgU3RyaW5n JiBtZXNzYWdlLCB1bnNpZ25lZCBsaW5lTnVtYmVyLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlEKQpA QCAtMzY2LDE1ICszNjcsMTUgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjphZGRNZXNzYWdl VG9Db25zb2xlKE1lc3NhZ2VTb3VyY2Ugc291cmNlLCBNZXNzYWdlVHlwZQogICAgIGlmICghZW5h YmxlZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBhZGRDb25zb2xlTWVzc2FnZSgwLCBuZXcg Q29uc29sZU1lc3NhZ2Uoc291cmNlLCB0eXBlLCBsZXZlbCwgbWVzc2FnZSwgbGluZU51bWJlciwg c291cmNlSUQsIG1fZ3JvdXBMZXZlbCkpOworICAgIGFkZENvbnNvbGVNZXNzYWdlKG5ldyBDb25z b2xlTWVzc2FnZShzb3VyY2UsIHR5cGUsIGxldmVsLCBtZXNzYWdlLCBsaW5lTnVtYmVyLCBzb3Vy Y2VJRCwgbV9ncm91cExldmVsKSk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6YWRk Q29uc29sZU1lc3NhZ2UoU2NyaXB0U3RhdGUqIHNjcmlwdFN0YXRlLCBQYXNzT3duUHRyPENvbnNv bGVNZXNzYWdlPiBjb25zb2xlTWVzc2FnZSkKK3ZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6YWRk Q29uc29sZU1lc3NhZ2UoUGFzc093blB0cjxDb25zb2xlTWVzc2FnZT4gY29uc29sZU1lc3NhZ2Up CiB7CiAgICAgQVNTRVJUKGVuYWJsZWQoKSk7CiAgICAgQVNTRVJUX0FSRyhjb25zb2xlTWVzc2Fn ZSwgY29uc29sZU1lc3NhZ2UpOwogCi0gICAgaWYgKG1fcHJldmlvdXNNZXNzYWdlICYmIG1fcHJl dmlvdXNNZXNzYWdlLT5pc0VxdWFsKHNjcmlwdFN0YXRlLCBjb25zb2xlTWVzc2FnZS5nZXQoKSkp IHsKKyAgICBpZiAobV9wcmV2aW91c01lc3NhZ2UgJiYgbV9wcmV2aW91c01lc3NhZ2UtPmlzRXF1 YWwoY29uc29sZU1lc3NhZ2UuZ2V0KCkpKSB7CiAgICAgICAgIG1fcHJldmlvdXNNZXNzYWdlLT5p bmNyZW1lbnRDb3VudCgpOwogICAgICAgICBpZiAobV9mcm9udGVuZCkKICAgICAgICAgICAgIG1f cHJldmlvdXNNZXNzYWdlLT51cGRhdGVSZXBlYXRDb3VudEluQ29uc29sZShtX2Zyb250ZW5kLmdl dCgpKTsKQEAgLTQwOCw3ICs0MDksNyBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OnN0YXJ0 R3JvdXAoTWVzc2FnZVNvdXJjZSBzb3VyY2UsIFNjcmlwdENhbGxTdGFjayogY2FsbAogewogICAg ICsrbV9ncm91cExldmVsOwogCi0gICAgYWRkQ29uc29sZU1lc3NhZ2UoY2FsbFN0YWNrLT5zdGF0 ZSgpLCBuZXcgQ29uc29sZU1lc3NhZ2Uoc291cmNlLCBjb2xsYXBzZWQgPyBTdGFydEdyb3VwQ29s bGFwc2VkTWVzc2FnZVR5cGUgOiBTdGFydEdyb3VwTWVzc2FnZVR5cGUsIExvZ01lc3NhZ2VMZXZl bCwgU3RyaW5nKCksIGNhbGxTdGFjaywgbV9ncm91cExldmVsKSk7CisgICAgYWRkQ29uc29sZU1l c3NhZ2UobmV3IENvbnNvbGVNZXNzYWdlKHNvdXJjZSwgY29sbGFwc2VkID8gU3RhcnRHcm91cENv bGxhcHNlZE1lc3NhZ2VUeXBlIDogU3RhcnRHcm91cE1lc3NhZ2VUeXBlLCBMb2dNZXNzYWdlTGV2 ZWwsIFN0cmluZygpLCBjYWxsU3RhY2ssIG1fZ3JvdXBMZXZlbCkpOwogfQogCiB2b2lkIEluc3Bl Y3RvckNvbnRyb2xsZXI6OmVuZEdyb3VwKE1lc3NhZ2VTb3VyY2Ugc291cmNlLCB1bnNpZ25lZCBs aW5lTnVtYmVyLCBjb25zdCBTdHJpbmcmIHNvdXJjZVVSTCkKQEAgLTQxOCw3ICs0MTksNyBAQCB2 b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmVuZEdyb3VwKE1lc3NhZ2VTb3VyY2Ugc291cmNlLCB1 bnNpZ25lZCBsaW5lTnVtYmVyLCBjbwogCiAgICAgLS1tX2dyb3VwTGV2ZWw7CiAKLSAgICBhZGRD b25zb2xlTWVzc2FnZSgwLCBuZXcgQ29uc29sZU1lc3NhZ2Uoc291cmNlLCBFbmRHcm91cE1lc3Nh Z2VUeXBlLCBMb2dNZXNzYWdlTGV2ZWwsIFN0cmluZygpLCBsaW5lTnVtYmVyLCBzb3VyY2VVUkws IG1fZ3JvdXBMZXZlbCkpOworICAgIGFkZENvbnNvbGVNZXNzYWdlKG5ldyBDb25zb2xlTWVzc2Fn ZShzb3VyY2UsIEVuZEdyb3VwTWVzc2FnZVR5cGUsIExvZ01lc3NhZ2VMZXZlbCwgU3RyaW5nKCks IGxpbmVOdW1iZXIsIHNvdXJjZVVSTCwgbV9ncm91cExldmVsKSk7CiB9CiAKIHZvaWQgSW5zcGVj dG9yQ29udHJvbGxlcjo6bWFya1RpbWVsaW5lKGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKZGlmZiAt LWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaCBiL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaAppbmRleCBiMjA4N2JhYmVmODBjMjU2OTBj ODg2MWQwMGE3NDdlMWVkZmZjZTEyLi4xYzA1MTQ3MzlhYTBhNjZiYTJhODJlYjg1ZDRhODYzMjY4 YWEyZDA2IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVy LmgKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oCkBAIC0zNCw3 ICszNCw2IEBACiAjaW5jbHVkZSAiQ29va2llLmgiCiAjaW5jbHVkZSAiUGFnZS5oIgogI2luY2x1 ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCi0jaW5jbHVkZSAiU2NyaXB0U3RhdGUuaCIKICNpbmNsdWRl IDx3dGYvSGFzaE1hcC5oPgogI2luY2x1ZGUgPHd0Zi9IYXNoU2V0Lmg+CiAjaW5jbHVkZSA8d3Rm L0xpc3RIYXNoU2V0Lmg+CkBAIC0zMTUsNyArMzE0LDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQg Zm9jdXNOb2RlKCk7CiAKLSAgICB2b2lkIGFkZENvbnNvbGVNZXNzYWdlKFNjcmlwdFN0YXRlKiwg UGFzc093blB0cjxDb25zb2xlTWVzc2FnZT4pOworICAgIHZvaWQgYWRkQ29uc29sZU1lc3NhZ2Uo UGFzc093blB0cjxDb25zb2xlTWVzc2FnZT4pOwogCiAgICAgdm9pZCBhZGRSZXNvdXJjZShJbnNw ZWN0b3JSZXNvdXJjZSopOwogICAgIHZvaWQgcmVtb3ZlUmVzb3VyY2UoSW5zcGVjdG9yUmVzb3Vy Y2UqKTsK