28297 2009-08-14 02:32:52 -0700 WebInspector: Wrap console objects late (in the frontend) so that injected script was already in place. 2009-08-14 04:39:56 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman timothy oldest_to_newest 140189 0 pfeldman 2009-08-14 02:32:52 -0700 Otherwise, console.log being executed before frontend has started causes operation on uninitialized ScriptObject. 140191 1 34823 pfeldman 2009-08-14 03:11:09 -0700 Created attachment 34823 patch This patch moves stack processing back to the ConsoleMessage and introduces dependency from InspectorFrontend to the InspectorController for object wrapping. It actually reverts ConsoleMessage.* to where they were before the DOMAgent-related change. 140200 2 pfeldman 2009-08-14 04:39:56 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/ConsoleMessage.cpp M WebCore/inspector/ConsoleMessage.h M WebCore/inspector/InspectorController.cpp M WebCore/inspector/InspectorController.h M WebCore/inspector/InspectorFrontend.cpp M WebCore/inspector/InspectorFrontend.h Committed r47277 34823 2009-08-14 03:11:09 -0700 2009-08-14 03:27:10 -0700 patch wrap_late text/plain 9932 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NWJkMzRlYi4uMzI1YjRmZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAwOS0wOC0xNCAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5 IEhhdGNoZXIuCisKKyAgICAgICAgV2ViSW5zcGVjdG9yOiBXcmFwIGNvbnNvbGUgb2JqZWN0cyBs YXRlIChpbiB0aGUgZnJvbnRlbmQpIHNvIHRoYXQgaW5qZWN0ZWQKKyAgICAgICAgc2NyaXB0IHdh cyBhbHJlYWR5IGluIHBsYWNlLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yODI5NworCisgICAgICAgICogaW5zcGVjdG9yL0NvbnNvbGVNZXNzYWdl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnNvbGVNZXNzYWdlOjpDb25zb2xlTWVzc2FnZSk6 CisgICAgICAgICogaW5zcGVjdG9yL0NvbnNvbGVNZXNzYWdlLmg6CisgICAgICAgICogaW5zcGVj dG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y Q29udHJvbGxlcjo6YWRkTWVzc2FnZVRvQ29uc29sZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JDb250cm9sbGVyOjpzdGFydEdyb3VwKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv ckNvbnRyb2xsZXI6OnNldEZyb250ZW5kUHJveHlPYmplY3QpOgorICAgICAgICAqIGluc3BlY3Rv ci9JbnNwZWN0b3JDb250cm9sbGVyLmg6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZy b250ZW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckZyb250ZW5kOjpJbnNwZWN0 b3JGcm9udGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVuZDo6YWRkTWVz c2FnZVRvQ29uc29sZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmg6 CisKIDIwMDktMDgtMTMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUv aW5zcGVjdG9yL0NvbnNvbGVNZXNzYWdlLmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9yL0NvbnNvbGVN ZXNzYWdlLmNwcAppbmRleCBmMmZlMTA4Li5mOWQ4NzA4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2lu c3BlY3Rvci9Db25zb2xlTWVzc2FnZS5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvQ29uc29s ZU1lc3NhZ2UuY3BwCkBAIC01MCwxOCArNTAsMjkgQEAgQ29uc29sZU1lc3NhZ2U6OkNvbnNvbGVN ZXNzYWdlKE1lc3NhZ2VTb3VyY2UgcywgTWVzc2FnZVR5cGUgdCwgTWVzc2FnZUxldmVsIGwsIGMK IHsKIH0KIAotQ29uc29sZU1lc3NhZ2U6OkNvbnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3VyY2Ugcywg TWVzc2FnZVR5cGUgdCwgTWVzc2FnZUxldmVsIGwsIGNvbnN0IFZlY3RvcjxTY3JpcHRTdHJpbmc+ JiBmcmFtZXMsIGNvbnN0IFZlY3RvcjxTY3JpcHRWYWx1ZT4mIHdyYXBwZWRBcmd1bWVudHMsIHVu c2lnbmVkIGxpLCBjb25zdCBTdHJpbmcmIHUsIHVuc2lnbmVkIGcpCitDb25zb2xlTWVzc2FnZTo6 Q29uc29sZU1lc3NhZ2UoTWVzc2FnZVNvdXJjZSBzLCBNZXNzYWdlVHlwZSB0LCBNZXNzYWdlTGV2 ZWwgbCwgU2NyaXB0Q2FsbFN0YWNrKiBjYWxsU3RhY2ssIHVuc2lnbmVkIGcsIGJvb2wgc3RvcmVU cmFjZSkKICAgICA6IG1fc291cmNlKHMpCiAgICAgLCBtX3R5cGUodCkKICAgICAsIG1fbGV2ZWwo bCkKLSAgICAsIG1fZnJhbWVzKGZyYW1lcykKLSAgICAsIG1fd3JhcHBlZEFyZ3VtZW50cyh3cmFw cGVkQXJndW1lbnRzKQotICAgICwgbV9saW5lKGxpKQotICAgICwgbV91cmwodSkKKyAgICAsIG1f d3JhcHBlZEFyZ3VtZW50cyhjYWxsU3RhY2stPmF0KDApLmFyZ3VtZW50Q291bnQoKSkKKyAgICAs IG1fZnJhbWVzKHN0b3JlVHJhY2UgPyBjYWxsU3RhY2stPnNpemUoKSA6IDApCiAgICAgLCBtX2dy b3VwTGV2ZWwoZykKICAgICAsIG1fcmVwZWF0Q291bnQoMSkKIHsKKyAgICBjb25zdCBTY3JpcHRD YWxsRnJhbWUmIGxhc3RDYWxsZXIgPSBjYWxsU3RhY2stPmF0KDApOworICAgIG1fbGluZSA9IGxh c3RDYWxsZXIubGluZU51bWJlcigpOworICAgIG1fdXJsID0gbGFzdENhbGxlci5zb3VyY2VVUkwo KS5zdHJpbmcoKTsKKworICAgIC8vIEZJWE1FOiBGb3Igbm93LCBqdXN0IHN0b3JlIGZ1bmN0aW9u IG5hbWVzIGFzIHN0cmluZ3MuCisgICAgLy8gQXMgU2NyaXB0Q2FsbFN0YWNrIHN0YXJ0IHN0b3Jp bmcgbGluZSBudW1iZXIgYW5kIHNvdXJjZSBVUkwgZm9yIGFsbAorICAgIC8vIGZyYW1lcywgcmVm YWN0b3IgdG8gdXNlIHRoYXQsIGFzIHdlbGwuCisgICAgaWYgKHN0b3JlVHJhY2UpIHsKKyAgICAg ICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGNhbGxTdGFjay0+c2l6ZSgpOyArK2kpCisgICAg ICAgICAgICBtX2ZyYW1lc1tpXSA9IGNhbGxTdGFjay0+YXQoaSkuZnVuY3Rpb25OYW1lKCk7Cisg ICAgfQogCisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxhc3RDYWxsZXIuYXJndW1lbnRD b3VudCgpOyArK2kpCisgICAgICAgIG1fd3JhcHBlZEFyZ3VtZW50c1tpXSA9IHF1YXJhbnRpbmVW YWx1ZShjYWxsU3RhY2stPnN0YXRlKCksIGxhc3RDYWxsZXIuYXJndW1lbnRBdChpKSk7CiB9CiAK IHZvaWQgQ29uc29sZU1lc3NhZ2U6OmFkZFRvQ29uc29sZShJbnNwZWN0b3JGcm9udGVuZCogZnJv bnRlbmQpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9Db25zb2xlTWVzc2FnZS5oIGIv V2ViQ29yZS9pbnNwZWN0b3IvQ29uc29sZU1lc3NhZ2UuaAppbmRleCA1YjE1NjBkLi45MTBhMDA3 IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9Db25zb2xlTWVzc2FnZS5oCisrKyBiL1dl YkNvcmUvaW5zcGVjdG9yL0NvbnNvbGVNZXNzYWdlLmgKQEAgLTQ1LDcgKzQ1LDcgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogICAgIGNsYXNzIENvbnNvbGVNZXNzYWdlIHsKICAgICBwdWJsaWM6CiAg ICAgICAgIENvbnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3VyY2UsIE1lc3NhZ2VUeXBlLCBNZXNzYWdl TGV2ZWwsIGNvbnN0IFN0cmluZyYgbSwgdW5zaWduZWQgbGksIGNvbnN0IFN0cmluZyYgdSwgdW5z aWduZWQgZyk7ICAgICAgICAKLSAgICAgICAgQ29uc29sZU1lc3NhZ2UoTWVzc2FnZVNvdXJjZSwg TWVzc2FnZVR5cGUsIE1lc3NhZ2VMZXZlbCwgY29uc3QgVmVjdG9yPFNjcmlwdFN0cmluZz4mIGZy YW1lcywgY29uc3QgVmVjdG9yPFNjcmlwdFZhbHVlPiYgd3JhcHBlZEFyZ3VtZW50cywgdW5zaWdu ZWQgbGksIGNvbnN0IFN0cmluZyYgdSwgdW5zaWduZWQgZyk7CisgICAgICAgIENvbnNvbGVNZXNz YWdlKE1lc3NhZ2VTb3VyY2UsIE1lc3NhZ2VUeXBlLCBNZXNzYWdlTGV2ZWwsIFNjcmlwdENhbGxT dGFjayosIHVuc2lnbmVkIGcsIGJvb2wgc3RvcmVUcmFjZSA9IGZhbHNlKTsKIAogICAgICAgICB2 b2lkIGFkZFRvQ29uc29sZShJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQpOwogICAgICAgICB2 b2lkIGluY3JlbWVudENvdW50KCkgeyArK21fcmVwZWF0Q291bnQ7IH07CkBAIC01OSw4ICs1OSw4 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgTWVzc2FnZVR5cGUgbV90eXBlOwogICAg ICAgICBNZXNzYWdlTGV2ZWwgbV9sZXZlbDsKICAgICAgICAgU3RyaW5nIG1fbWVzc2FnZTsKLSAg ICAgICAgVmVjdG9yPFNjcmlwdFN0cmluZz4gbV9mcmFtZXM7CiAgICAgICAgIFZlY3RvcjxTY3Jp cHRWYWx1ZT4gbV93cmFwcGVkQXJndW1lbnRzOworICAgICAgICBWZWN0b3I8U2NyaXB0U3RyaW5n PiBtX2ZyYW1lczsKICAgICAgICAgdW5zaWduZWQgbV9saW5lOwogICAgICAgICBTdHJpbmcgbV91 cmw7CiAgICAgICAgIHVuc2lnbmVkIG1fZ3JvdXBMZXZlbDsKZGlmZiAtLWdpdCBhL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXggNDUxMjMxMS4uMTE1MGFkYiAxMDA2NDQKLS0tIGEv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKKysrIGIvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKQEAgLTM1NCwyNCArMzU0LDcgQEAgdm9p ZCBJbnNwZWN0b3JDb250cm9sbGVyOjphZGRNZXNzYWdlVG9Db25zb2xlKE1lc3NhZ2VTb3VyY2Ug c291cmNlLCBNZXNzYWdlVHlwZQogICAgIGlmICghZW5hYmxlZCgpKQogICAgICAgICByZXR1cm47 CiAKLSAgICBWZWN0b3I8U2NyaXB0VmFsdWU+IHdyYXBwZWRBcmd1bWVudHMoY2FsbFN0YWNrLT5h dCgwKS5hcmd1bWVudENvdW50KCkpOwotICAgIGJvb2wgc3RvcmVUcmFjZSA9IHR5cGUgPT0gVHJh Y2VNZXNzYWdlVHlwZTsKLSAgICBWZWN0b3I8U2NyaXB0U3RyaW5nPiBmcmFtZXMoc3RvcmVUcmFj ZSA/IGNhbGxTdGFjay0+c2l6ZSgpIDogMCk7Ci0KLSAgICBjb25zdCBTY3JpcHRDYWxsRnJhbWUm IGxhc3RDYWxsZXIgPSBjYWxsU3RhY2stPmF0KDApOwotCi0gICAgLy8gRklYTUU6IEZvciBub3cs IGp1c3Qgc3RvcmUgZnVuY3Rpb24gbmFtZXMgYXMgc3RyaW5ncy4KLSAgICAvLyBBcyBTY3JpcHRD YWxsU3RhY2sgc3RhcnQgc3RvcmluZyBsaW5lIG51bWJlciBhbmQgc291cmNlIFVSTCBmb3IgYWxs Ci0gICAgLy8gZnJhbWVzLCByZWZhY3RvciB0byB1c2UgdGhhdCwgYXMgd2VsbC4KLSAgICBpZiAo c3RvcmVUcmFjZSkgewotICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgY2FsbFN0YWNr LT5zaXplKCk7ICsraSkKLSAgICAgICAgICAgIGZyYW1lc1tpXSA9IGNhbGxTdGFjay0+YXQoaSku ZnVuY3Rpb25OYW1lKCk7Ci0gICAgfQotCi0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxh c3RDYWxsZXIuYXJndW1lbnRDb3VudCgpOyArK2kpCi0gICAgICAgIHdyYXBwZWRBcmd1bWVudHNb aV0gPSB3cmFwT2JqZWN0KHF1YXJhbnRpbmVWYWx1ZShjYWxsU3RhY2stPnN0YXRlKCksIGxhc3RD YWxsZXIuYXJndW1lbnRBdChpKSkpOwotCi0gICAgYWRkQ29uc29sZU1lc3NhZ2UoY2FsbFN0YWNr LT5zdGF0ZSgpLCBuZXcgQ29uc29sZU1lc3NhZ2Uoc291cmNlLCB0eXBlLCBsZXZlbCwgZnJhbWVz LCB3cmFwcGVkQXJndW1lbnRzLCBsYXN0Q2FsbGVyLmxpbmVOdW1iZXIoKSwgbGFzdENhbGxlci5z b3VyY2VVUkwoKS5zdHJpbmcoKSwgbV9ncm91cExldmVsKSk7CisgICAgYWRkQ29uc29sZU1lc3Nh Z2UoY2FsbFN0YWNrLT5zdGF0ZSgpLCBuZXcgQ29uc29sZU1lc3NhZ2Uoc291cmNlLCB0eXBlLCBs ZXZlbCwgY2FsbFN0YWNrLCBtX2dyb3VwTGV2ZWwsIHR5cGUgPT0gVHJhY2VNZXNzYWdlVHlwZSkp OwogfQogCiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmFkZE1lc3NhZ2VUb0NvbnNvbGUoTWVz c2FnZVNvdXJjZSBzb3VyY2UsIE1lc3NhZ2VUeXBlIHR5cGUsIE1lc3NhZ2VMZXZlbCBsZXZlbCwg Y29uc3QgU3RyaW5nJiBtZXNzYWdlLCB1bnNpZ25lZCBsaW5lTnVtYmVyLCBjb25zdCBTdHJpbmcm IHNvdXJjZUlEKQpAQCAtNDE0LDcgKzM5Nyw3IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6 c3RhcnRHcm91cChNZXNzYWdlU291cmNlIHNvdXJjZSwgU2NyaXB0Q2FsbFN0YWNrKiBjYWxsCiB7 CiAgICAgKyttX2dyb3VwTGV2ZWw7CiAKLSAgICBhZGRNZXNzYWdlVG9Db25zb2xlKHNvdXJjZSwg U3RhcnRHcm91cE1lc3NhZ2VUeXBlLCBMb2dNZXNzYWdlTGV2ZWwsIGNhbGxTdGFjayk7CisgICAg YWRkQ29uc29sZU1lc3NhZ2UoY2FsbFN0YWNrLT5zdGF0ZSgpLCBuZXcgQ29uc29sZU1lc3NhZ2Uo c291cmNlLCBTdGFydEdyb3VwTWVzc2FnZVR5cGUsIExvZ01lc3NhZ2VMZXZlbCwgY2FsbFN0YWNr LCBtX2dyb3VwTGV2ZWwpKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjplbmRHcm91 cChNZXNzYWdlU291cmNlIHNvdXJjZSwgdW5zaWduZWQgbGluZU51bWJlciwgY29uc3QgU3RyaW5n JiBzb3VyY2VVUkwpCkBAIC01NjgsNyArNTUxLDcgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVy OjpzZXRGcm9udGVuZFByb3h5T2JqZWN0KFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZSwgU2NyaXAK IHsKICAgICBtX3NjcmlwdFN0YXRlID0gc2NyaXB0U3RhdGU7CiAgICAgbV9pbmplY3RlZFNjcmlw dE9iaiA9IGluamVjdGVkU2NyaXB0T2JqOwotICAgIG1fZnJvbnRlbmQuc2V0KG5ldyBJbnNwZWN0 b3JGcm9udGVuZChzY3JpcHRTdGF0ZSwgd2ViSW5zcGVjdG9yT2JqKSk7CisgICAgbV9mcm9udGVu ZC5zZXQobmV3IEluc3BlY3RvckZyb250ZW5kKHRoaXMsIHNjcmlwdFN0YXRlLCB3ZWJJbnNwZWN0 b3JPYmopKTsKICAgICBtX2RvbUFnZW50ID0gbmV3IEluc3BlY3RvckRPTUFnZW50KG1fZnJvbnRl bmQuZ2V0KCkpOwogfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JD b250cm9sbGVyLmggYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKaW5k ZXggMGQ4YzQyYy4uNTlhOTU5ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yQ29udHJvbGxlci5oCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xs ZXIuaApAQCAtMjcxLDcgKzI3MSw2IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBmcmllbmQg Y2xhc3MgSW5zcGVjdG9yQmFja2VuZDsKLSAKICAgICAvLyBGb2xsb3dpbmcgYXJlIHVzZWQgZnJv bSBJbnNwZWN0b3JCYWNrZW5kIGFuZCBpbnRlcm5hbGx5LgogICAgIHZvaWQgc2NyaXB0T2JqZWN0 UmVhZHkoKTsKICAgICB2b2lkIG1vdmVXaW5kb3dCeShmbG9hdCB4LCBmbG9hdCB5KSBjb25zdDsK QEAgLTI4MCw2ICsyNzksMTEgQEAgcHJpdmF0ZToKICAgICB2b2lkIHN0b3JlTGFzdEFjdGl2ZVBh bmVsKGNvbnN0IFN0cmluZyYgcGFuZWxOYW1lKTsKICAgICB2b2lkIGNsb3NlV2luZG93KCk7CiAg ICAgSW5zcGVjdG9yRE9NQWdlbnQqIGRvbUFnZW50KCkgeyByZXR1cm4gbV9kb21BZ2VudC5nZXQo KTsgfQorCisgICAgZnJpZW5kIGNsYXNzIEluc3BlY3RvckZyb250ZW5kOworICAgIC8vIEZvbGxv d2luZyBhcmUgdXNlZCBmcm9tIEluc3BlY3RvckZyb250ZW5kIG9ubHkuIFdlIGRvbid0IHdhbnQg dG8gZXhwb3NlIHRoZW0gdG8gdGhlCisgICAgLy8gcmVzdCBvZiB0aGUgSW5zcGVjdG9yQ29udHJv bGxlciBjbGllbnRzLgorICAgIC8vIFRPRE86IGV4dHJhY3QgdGhlc2UgaW50byBhIHNlcGFyYXRl IGludGVyZmFjZS4KICAgICBTY3JpcHRWYWx1ZSB3cmFwT2JqZWN0KGNvbnN0IFNjcmlwdFZhbHVl JiBvYmplY3QpOwogICAgIFNjcmlwdFZhbHVlIHVud3JhcE9iamVjdChjb25zdCBTdHJpbmcmIG9i amVjdElkKTsKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRl bmQuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuY3BwCmluZGV4IDQ0 ZTAxYWYuLmRhMTFjZjcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZy b250ZW5kLmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZC5jcHAK QEAgLTMyLDcgKzMyLDcgQEAKIAogI2luY2x1ZGUgIkNvbnNvbGVNZXNzYWdlLmgiCiAjaW5jbHVk ZSAiRnJhbWUuaCIKLSNpbmNsdWRlICJJbnNwZWN0b3JDb250cm9sbGVyLmgiICAvLyBUT0RPKHBm ZWxkbWFuKTogRXh0cmFjdCBTcGVjaWFsUGFuZWxzIHRvIHJlbW92ZSBpbmNsdWRlLgorI2luY2x1 ZGUgIkluc3BlY3RvckNvbnRyb2xsZXIuaCIKICNpbmNsdWRlICJOb2RlLmgiCiAjaW5jbHVkZSAi U2NyaXB0RnVuY3Rpb25DYWxsLmgiCiAjaW5jbHVkZSAiU2NyaXB0T2JqZWN0LmgiCkBAIC00OSw4 ICs0OSw5IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotSW5zcGVjdG9yRnJvbnRlbmQ6Oklu c3BlY3RvckZyb250ZW5kKFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZSwgU2NyaXB0T2JqZWN0IHdl Ykluc3BlY3RvcikKLSAgICA6IG1fc2NyaXB0U3RhdGUoc2NyaXB0U3RhdGUpCitJbnNwZWN0b3JG cm9udGVuZDo6SW5zcGVjdG9yRnJvbnRlbmQoSW5zcGVjdG9yQ29udHJvbGxlciogaW5zcGVjdG9y Q29udHJvbGxlciwgU2NyaXB0U3RhdGUqIHNjcmlwdFN0YXRlLCBTY3JpcHRPYmplY3Qgd2ViSW5z cGVjdG9yKQorICAgIDogbV9pbnNwZWN0b3JDb250cm9sbGVyKGluc3BlY3RvckNvbnRyb2xsZXIp CisgICAgLCBtX3NjcmlwdFN0YXRlKHNjcmlwdFN0YXRlKQogICAgICwgbV93ZWJJbnNwZWN0b3Io d2ViSW5zcGVjdG9yKQogewogfQpAQCAtNzksNyArODAsNyBAQCB2b2lkIEluc3BlY3RvckZyb250 ZW5kOjphZGRNZXNzYWdlVG9Db25zb2xlKGNvbnN0IFNjcmlwdE9iamVjdCYgbWVzc2FnZU9iaiwg Y29ucwogICAgICAgICAgICAgZnVuY3Rpb24tPmFwcGVuZEFyZ3VtZW50KGZyYW1lc1tpXSk7CiAg ICAgfSBlbHNlIGlmICghd3JhcHBlZEFyZ3VtZW50cy5pc0VtcHR5KCkpIHsKICAgICAgICAgZm9y ICh1bnNpZ25lZCBpID0gMDsgaSA8IHdyYXBwZWRBcmd1bWVudHMuc2l6ZSgpOyArK2kpCi0gICAg ICAgICAgICBmdW5jdGlvbi0+YXBwZW5kQXJndW1lbnQod3JhcHBlZEFyZ3VtZW50c1tpXSk7Cisg ICAgICAgICAgICBmdW5jdGlvbi0+YXBwZW5kQXJndW1lbnQobV9pbnNwZWN0b3JDb250cm9sbGVy LT53cmFwT2JqZWN0KHdyYXBwZWRBcmd1bWVudHNbaV0pKTsKICAgICB9IGVsc2UKICAgICAgICAg ZnVuY3Rpb24tPmFwcGVuZEFyZ3VtZW50KG1lc3NhZ2UpOwogICAgIGZ1bmN0aW9uLT5jYWxsKCk7 CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZC5oIGIvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuaAppbmRleCBkZjFhMTJlLi5iYTkyNDE4 IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZC5oCisrKyBi L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmgKQEAgLTQ3LDYgKzQ3LDcgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogICAgIGNsYXNzIENvbnNvbGVNZXNzYWdlOwogICAgIGNsYXNz IERhdGFiYXNlOwogICAgIGNsYXNzIEZyYW1lOworICAgIGNsYXNzIEluc3BlY3RvckNvbnRyb2xs ZXI7CiAgICAgY2xhc3MgSW5zcGVjdG9yUmVzb3VyY2U7CiAgICAgY2xhc3MgTm9kZTsKICAgICBj bGFzcyBTY3JpcHRGdW5jdGlvbkNhbGw7CkBAIC01NSw3ICs1Niw3IEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAogICAgIGNsYXNzIEluc3BlY3RvckZyb250ZW5kIHsKICAgICBwdWJsaWM6Ci0gICAg ICAgIEluc3BlY3RvckZyb250ZW5kKFNjcmlwdFN0YXRlKiwgU2NyaXB0T2JqZWN0IHdlYkluc3Bl Y3Rvcik7CisgICAgICAgIEluc3BlY3RvckZyb250ZW5kKEluc3BlY3RvckNvbnRyb2xsZXIqIGlu c3BlY3RvckNvbnRyb2xsZXIsIFNjcmlwdFN0YXRlKiwgU2NyaXB0T2JqZWN0IHdlYkluc3BlY3Rv cik7CiAgICAgICAgIH5JbnNwZWN0b3JGcm9udGVuZCgpOwogCiAgICAgICAgIFNjcmlwdEFycmF5 IG5ld1NjcmlwdEFycmF5KCk7CkBAIC0xMTYsNiArMTE3LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogICAgIHByaXZhdGU6CiAgICAgICAgIFBhc3NPd25QdHI8U2NyaXB0RnVuY3Rpb25DYWxsPiBu ZXdGdW5jdGlvbkNhbGwoY29uc3QgU3RyaW5nJiBmdW5jdGlvbk5hbWUpOwogICAgICAgICB2b2lk IGNhbGxTaW1wbGVGdW5jdGlvbihjb25zdCBTdHJpbmcmIGZ1bmN0aW9uTmFtZSk7CisgICAgICAg IEluc3BlY3RvckNvbnRyb2xsZXIqIG1faW5zcGVjdG9yQ29udHJvbGxlcjsKICAgICAgICAgU2Ny aXB0U3RhdGUqIG1fc2NyaXB0U3RhdGU7CiAgICAgICAgIFNjcmlwdE9iamVjdCBtX3dlYkluc3Bl Y3RvcjsKICAgICB9Owo=