28390 2009-08-17 08:07:23 -0700 WebInspector: Reset InjectedScript styles cache on document change. 2009-08-17 10:44:12 -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 140713 0 pfeldman 2009-08-17 08:07:23 -0700 Reset InjectedScript styles cache on document change. 140715 1 34968 pfeldman 2009-08-17 08:08:41 -0700 Created attachment 34968 patch 140730 2 34968 timothy 2009-08-17 09:33:13 -0700 Comment on attachment 34968 patch _reset should be reset since it isn't private. 140734 3 pfeldman 2009-08-17 09:49:16 -0700 (In reply to comment #2) > (From update of attachment 34968 [details]) > _reset should be reset since it isn't private. The reason I made is private was that I wanted to show that it is called _not_ from the frontend, but from the InspectorController host itself (as with _createProxyObject). But I can highlight that in comments if you'd like. 140735 4 timothy 2009-08-17 09:52:24 -0700 I think a comment and dropping the underscore would be best (in the case of _createProxyObject too). Anything called from another file should not have a underscore. 140752 5 34976 pfeldman 2009-08-17 10:31:26 -0700 Created attachment 34976 patch Thanks for review. Fixed the underscores! 140756 6 pfeldman 2009-08-17 10:44:12 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/InspectorController.cpp M WebCore/inspector/InspectorController.h M WebCore/inspector/InspectorDOMAgent.cpp M WebCore/inspector/InspectorDOMAgent.h M WebCore/inspector/front-end/InjectedScript.js Committed r47369 34968 2009-08-17 08:08:41 -0700 2009-08-17 10:31:26 -0700 patch reset_styles text/plain 5588 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg M2NlZGY5Yi4uMDEzZTE5MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwyNiBAQAogCiAgICAgICAgIFJldmlld2VkIGJ5IFRp bW90aHkgSGF0Y2hlci4KIAorICAgICAgICBXZWJJbnNwZWN0b3I6IFJlc2V0IEluamVjdGVkU2Ny aXB0IHN0eWxlcyBjYWNoZSBvbiBkb2N1bWVudCBjaGFuZ2UuCisKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI4MzkwCisKKyAgICAgICAgKiBpbnNwZWN0 b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JD b250cm9sbGVyOjpjbG9zZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVy Ojpwb3B1bGF0ZVNjcmlwdE9iamVjdHMpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29u dHJvbGxlcjo6ZGlkQ29tbWl0TG9hZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250 cm9sbGVyOjpyZXNldEluamVjdGVkU2NyaXB0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVj dG9yQ29udHJvbGxlci5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6c2V0RG9jdW1lbnQpOgor ICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvSW5qZWN0ZWRTY3JpcHQuanM6CisgICAgICAgIChJbmplY3RlZFNjcmlw dC5fcmVzZXQpOgorCisyMDA5LTA4LTE3ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4KKwogICAgICAg ICBXZWJJbnNwZWN0b3I6IERpc2NhcmQgRE9NIE5vZGUgYmluZGluZ3Mgb24gYW55IGRvY3VtZW50 IGNoYW5nZS4KIAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjgzODkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xs ZXIuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXgg ZGM1N2RhYi4uN2Q0NTkzMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y Q29udHJvbGxlci5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxl ci5jcHAKQEAgLTU5OSwxMCArNTk5LDcgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpjbG9z ZSgpCiAKICAgICBtX2Zyb250ZW5kLnNldCgwKTsKICAgICBtX2luamVjdGVkU2NyaXB0T2JqID0g U2NyaXB0T2JqZWN0KCk7Ci0gICAgaWYgKG1fZG9tQWdlbnQpIHsKLSAgICAgICAgbV9kb21BZ2Vu dC0+c2V0RG9jdW1lbnQoMCk7Ci0gICAgICAgIG1fZG9tQWdlbnQgPSAwOwotICAgIH0KKyAgICBt X2RvbUFnZW50ID0gMDsKICAgICBtX3NjcmlwdFN0YXRlID0gMDsKIH0KIApAQCAtNjUzLDggKzY1 MCw4IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6cG9wdWxhdGVTY3JpcHRPYmplY3RzKCkK ICAgICAgICAgKCppdCktPmJpbmQobV9mcm9udGVuZC5nZXQoKSk7CiAjZW5kaWYKIAotICAgIGlm IChtX2RvbUFnZW50KQotICAgICAgICBtX2RvbUFnZW50LT5zZXREb2N1bWVudChtX2luc3BlY3Rl ZFBhZ2UtPm1haW5GcmFtZSgpLT5kb2N1bWVudCgpKTsKKyAgICBpZiAobV9kb21BZ2VudC0+c2V0 RG9jdW1lbnQobV9pbnNwZWN0ZWRQYWdlLT5tYWluRnJhbWUoKS0+ZG9jdW1lbnQoKSkpCisgICAg ICAgIHJlc2V0SW5qZWN0ZWRTY3JpcHQoKTsKICAgICBtX2Zyb250ZW5kLT5wb3B1bGF0ZUludGVy ZmFjZSgpOwogfQogCkBAIC03NDQsOCArNzQxLDggQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVy OjpkaWRDb21taXRMb2FkKERvY3VtZW50TG9hZGVyKiBsb2FkZXIpCiAgICAgICAgICAgICB9CiAg ICAgICAgIH0KIAotICAgICAgICBpZiAobV9kb21BZ2VudCkKLSAgICAgICAgICAgIG1fZG9tQWdl bnQtPnNldERvY3VtZW50KG1faW5zcGVjdGVkUGFnZS0+bWFpbkZyYW1lKCktPmRvY3VtZW50KCkp OworICAgICAgICBpZiAobV9kb21BZ2VudCAmJiBtX2RvbUFnZW50LT5zZXREb2N1bWVudChtX2lu c3BlY3RlZFBhZ2UtPm1haW5GcmFtZSgpLT5kb2N1bWVudCgpKSkKKyAgICAgICAgICAgIHJlc2V0 SW5qZWN0ZWRTY3JpcHQoKTsKICAgICB9CiAKICAgICBmb3IgKEZyYW1lKiBmcmFtZSA9IGxvYWRl ci0+ZnJhbWUoKTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS0+dHJhdmVyc2VOZXh0KGxv YWRlci0+ZnJhbWUoKSkpCkBAIC0xNTA2LDQgKzE1MDMsMTAgQEAgU2NyaXB0VmFsdWUgSW5zcGVj dG9yQ29udHJvbGxlcjo6dW53cmFwT2JqZWN0KGNvbnN0IFN0cmluZyYgb2JqZWN0SWQpCiAgICAg cmV0dXJuIFNjcmlwdFZhbHVlKCk7CiB9CiAKK3ZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6cmVz ZXRJbmplY3RlZFNjcmlwdCgpCit7CisgICAgU2NyaXB0RnVuY3Rpb25DYWxsIGZ1bmN0aW9uKG1f c2NyaXB0U3RhdGUsIG1faW5qZWN0ZWRTY3JpcHRPYmosICJfcmVzZXQiKTsKKyAgICBmdW5jdGlv bi5jYWxsKCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckNvbnRyb2xsZXIuaAppbmRleCBiMGI1YjljLi5lYzhmNjg3IDEwMDY0NAotLS0gYS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKKysrIGIvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oCkBAIC0yODUsNiArMjg1LDggQEAgcHJpdmF0ZToK ICAgICAvLyBUT0RPOiBleHRyYWN0IHRoZXNlIGludG8gYSBzZXBhcmF0ZSBpbnRlcmZhY2UuCiAg ICAgU2NyaXB0VmFsdWUgd3JhcE9iamVjdChjb25zdCBTY3JpcHRWYWx1ZSYgb2JqZWN0KTsKICAg ICBTY3JpcHRWYWx1ZSB1bndyYXBPYmplY3QoY29uc3QgU3RyaW5nJiBvYmplY3RJZCk7CisgICAg CisgICAgdm9pZCByZXNldEluamVjdGVkU2NyaXB0KCk7CiAKICNpZiBFTkFCTEUoSkFWQVNDUklQ VF9ERUJVR0dFUikKICAgICB2b2lkIHN0YXJ0VXNlckluaXRpYXRlZFByb2ZpbGluZ1Nvb24oKTsK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcCBiL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAppbmRleCAyNjA1ZDNmLi44YTA4 MWY3IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAK KysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCkBAIC02NCwxMCAr NjQsMTAgQEAgSW5zcGVjdG9yRE9NQWdlbnQ6On5JbnNwZWN0b3JET01BZ2VudCgpCiAgICAgc2V0 RG9jdW1lbnQoMCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OnNldERvY3VtZW50KERv Y3VtZW50KiBkb2MpCitib29sIEluc3BlY3RvckRPTUFnZW50OjpzZXREb2N1bWVudChEb2N1bWVu dCogZG9jKQogewogICAgIGlmIChkb2MgPT0gbWFpbkZyYW1lRG9jdW1lbnQoKSkKLSAgICAgICAg cmV0dXJuOworICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgZGlzY2FyZEJpbmRpbmdzKCk7CiAK ICAgICBMaXN0SGFzaFNldDxSZWZQdHI8RG9jdW1lbnQ+ID4gY29weSA9IG1fZG9jdW1lbnRzOwpA QCAtODIsNiArODIsNyBAQCB2b2lkIEluc3BlY3RvckRPTUFnZW50OjpzZXREb2N1bWVudChEb2N1 bWVudCogZG9jKQogICAgICAgICAgICAgcHVzaERvY3VtZW50VG9Gcm9udGVuZCgpOwogICAgICAg ICB9CiAgICAgfQorICAgIHJldHVybiB0cnVlOwogfQogCiB2b2lkIEluc3BlY3RvckRPTUFnZW50 OjpzdGFydExpc3RlbmluZyhEb2N1bWVudCogZG9jKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRP TUFnZW50LmgKaW5kZXggZjQ0YWVmNS4uNjdiMmJlOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JET01BZ2VudC5oCkBAIC02Myw3ICs2Myw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAg ICAgdm9pZCBzZXRUZXh0Tm9kZVZhbHVlKGxvbmcgY2FsbElkLCBsb25nIG5vZGVJZCwgY29uc3Qg U3RyaW5nJiB2YWx1ZSk7CiAKICAgICAgICAgLy8gTWV0aG9kcyBjYWxsZWQgZnJvbSB0aGUgSW5z cGVjdG9yQ29udHJvbGxlci4KLSAgICAgICAgdm9pZCBzZXREb2N1bWVudChEb2N1bWVudCogZG9j dW1lbnQpOworICAgICAgICBib29sIHNldERvY3VtZW50KERvY3VtZW50KiBkb2N1bWVudCk7CiAK ICAgICAgICAgTm9kZSogbm9kZUZvcklkKGxvbmcgbm9kZUlkKTsKICAgICAgICAgbG9uZyBpZEZv ck5vZGUoTm9kZSogbm9kZSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvSW5qZWN0ZWRTY3JpcHQuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5qZWN0 ZWRTY3JpcHQuanMKaW5kZXggMWFjYmE5Ny4uOTAxMDA4YSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkU2NyaXB0LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9JbmplY3RlZFNjcmlwdC5qcwpAQCAtMjcsMTQgKzI3LDE5IEBACiAgKiBU SElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLgogICovCiAKLXZhciBJbmplY3RlZFNjcmlwdCA9IHsKLSAgICBfc3R5bGVzOiB7fSwK LSAgICBfc3R5bGVSdWxlczoge30sCi0gICAgX2xhc3RTdHlsZUlkOiAwLAotICAgIF9sYXN0U3R5 bGVSdWxlSWQ6IDAsCi0gICAgX3NlYXJjaFJlc3VsdHM6IFtdLAotICAgIF9pbmNsdWRlZEluU2Vh cmNoUmVzdWx0c1Byb3BlcnR5TmFtZTogIl9faW5jbHVkZWRJbkluc3BlY3RvclNlYXJjaFJlc3Vs dHMiCi19OwordmFyIEluamVjdGVkU2NyaXB0ID0ge307CisKK0luamVjdGVkU2NyaXB0Ll9yZXNl dCA9IGZ1bmN0aW9uKCkKK3sKKyAgICBJbmplY3RlZFNjcmlwdC5fc3R5bGVzID0ge307CisgICAg SW5qZWN0ZWRTY3JpcHQuX3N0eWxlUnVsZXMgPSB7fTsKKyAgICBJbmplY3RlZFNjcmlwdC5fbGFz dFN0eWxlSWQgPSAwOworICAgIEluamVjdGVkU2NyaXB0Ll9sYXN0U3R5bGVSdWxlSWQgPSAwOwor ICAgIEluamVjdGVkU2NyaXB0Ll9zZWFyY2hSZXN1bHRzID0gW107CisgICAgSW5qZWN0ZWRTY3Jp cHQuX2luY2x1ZGVkSW5TZWFyY2hSZXN1bHRzUHJvcGVydHlOYW1lID0gIl9faW5jbHVkZWRJbklu c3BlY3RvclNlYXJjaFJlc3VsdHMiOworfQorCitJbmplY3RlZFNjcmlwdC5fcmVzZXQoKTsKIAog SW5qZWN0ZWRTY3JpcHQuZ2V0U3R5bGVzID0gZnVuY3Rpb24obm9kZUlkLCBhdXRob3JPbmx5KQog ewo= 34976 2009-08-17 10:31:26 -0700 2009-08-17 10:31:50 -0700 patch reset_styles text/plain 6577 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg M2Y3MDIxMy4uMjZlZjFjOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwyNiBAQAogCiAgICAgICAgIFJldmlld2VkIGJ5IFRp bW90aHkgSGF0Y2hlci4KIAorICAgICAgICBXZWJJbnNwZWN0b3I6IFJlc2V0IEluamVjdGVkU2Ny aXB0IHN0eWxlcyBjYWNoZSBvbiBkb2N1bWVudCBjaGFuZ2UuCisKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI4MzkwCisKKyAgICAgICAgKiBpbnNwZWN0 b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JD b250cm9sbGVyOjpjbG9zZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVy Ojpwb3B1bGF0ZVNjcmlwdE9iamVjdHMpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29u dHJvbGxlcjo6ZGlkQ29tbWl0TG9hZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250 cm9sbGVyOjpyZXNldEluamVjdGVkU2NyaXB0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVj dG9yQ29udHJvbGxlci5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6c2V0RG9jdW1lbnQpOgor ICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvSW5qZWN0ZWRTY3JpcHQuanM6CisgICAgICAgIChJbmplY3RlZFNjcmlw dC5fcmVzZXQpOgorCisyMDA5LTA4LTE3ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4KKwogICAgICAg ICBXZWJJbnNwZWN0b3I6IERpc2NhcmQgRE9NIE5vZGUgYmluZGluZ3Mgb24gYW55IGRvY3VtZW50 IGNoYW5nZS4KIAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjgzODkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xs ZXIuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXgg ZGM1N2RhYi4uNjQ1NjliMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y Q29udHJvbGxlci5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxl ci5jcHAKQEAgLTU5OSwxMCArNTk5LDcgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpjbG9z ZSgpCiAKICAgICBtX2Zyb250ZW5kLnNldCgwKTsKICAgICBtX2luamVjdGVkU2NyaXB0T2JqID0g U2NyaXB0T2JqZWN0KCk7Ci0gICAgaWYgKG1fZG9tQWdlbnQpIHsKLSAgICAgICAgbV9kb21BZ2Vu dC0+c2V0RG9jdW1lbnQoMCk7Ci0gICAgICAgIG1fZG9tQWdlbnQgPSAwOwotICAgIH0KKyAgICBt X2RvbUFnZW50ID0gMDsKICAgICBtX3NjcmlwdFN0YXRlID0gMDsKIH0KIApAQCAtNjUzLDggKzY1 MCw4IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6cG9wdWxhdGVTY3JpcHRPYmplY3RzKCkK ICAgICAgICAgKCppdCktPmJpbmQobV9mcm9udGVuZC5nZXQoKSk7CiAjZW5kaWYKIAotICAgIGlm IChtX2RvbUFnZW50KQotICAgICAgICBtX2RvbUFnZW50LT5zZXREb2N1bWVudChtX2luc3BlY3Rl ZFBhZ2UtPm1haW5GcmFtZSgpLT5kb2N1bWVudCgpKTsKKyAgICBpZiAobV9kb21BZ2VudC0+c2V0 RG9jdW1lbnQobV9pbnNwZWN0ZWRQYWdlLT5tYWluRnJhbWUoKS0+ZG9jdW1lbnQoKSkpCisgICAg ICAgIHJlc2V0SW5qZWN0ZWRTY3JpcHQoKTsKICAgICBtX2Zyb250ZW5kLT5wb3B1bGF0ZUludGVy ZmFjZSgpOwogfQogCkBAIC03NDQsOCArNzQxLDggQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVy OjpkaWRDb21taXRMb2FkKERvY3VtZW50TG9hZGVyKiBsb2FkZXIpCiAgICAgICAgICAgICB9CiAg ICAgICAgIH0KIAotICAgICAgICBpZiAobV9kb21BZ2VudCkKLSAgICAgICAgICAgIG1fZG9tQWdl bnQtPnNldERvY3VtZW50KG1faW5zcGVjdGVkUGFnZS0+bWFpbkZyYW1lKCktPmRvY3VtZW50KCkp OworICAgICAgICBpZiAobV9kb21BZ2VudCAmJiBtX2RvbUFnZW50LT5zZXREb2N1bWVudChtX2lu c3BlY3RlZFBhZ2UtPm1haW5GcmFtZSgpLT5kb2N1bWVudCgpKSkKKyAgICAgICAgICAgIHJlc2V0 SW5qZWN0ZWRTY3JpcHQoKTsKICAgICB9CiAKICAgICBmb3IgKEZyYW1lKiBmcmFtZSA9IGxvYWRl ci0+ZnJhbWUoKTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS0+dHJhdmVyc2VOZXh0KGxv YWRlci0+ZnJhbWUoKSkpCkBAIC0xNDg5LDcgKzE0ODYsNyBAQCBTY3JpcHRWYWx1ZSBJbnNwZWN0 b3JDb250cm9sbGVyOjp3cmFwT2JqZWN0KGNvbnN0IFNjcmlwdFZhbHVlJiBxdWFyYW50aW5lZE9i amVjdAogICAgICAgICBTdHJpbmcgb2JqZWN0SWQgPSBTdHJpbmc6OmZvcm1hdCgib2JqZWN0IyVs ZCIsIGlkKTsKICAgICAgICAgbV9pZFRvQ29uc29sZU9iamVjdC5zZXQob2JqZWN0SWQsIHF1YXJh bnRpbmVkT2JqZWN0KTsKIAotICAgICAgICBTY3JpcHRGdW5jdGlvbkNhbGwgZnVuY3Rpb24obV9z Y3JpcHRTdGF0ZSwgbV9pbmplY3RlZFNjcmlwdE9iaiwgIl9jcmVhdGVQcm94eU9iamVjdCIpOwor ICAgICAgICBTY3JpcHRGdW5jdGlvbkNhbGwgZnVuY3Rpb24obV9zY3JpcHRTdGF0ZSwgbV9pbmpl Y3RlZFNjcmlwdE9iaiwgImNyZWF0ZVByb3h5T2JqZWN0Iik7CiAgICAgICAgIGZ1bmN0aW9uLmFw cGVuZEFyZ3VtZW50KHF1YXJhbnRpbmVkT2JqZWN0KTsKICAgICAgICAgZnVuY3Rpb24uYXBwZW5k QXJndW1lbnQob2JqZWN0SWQpOwogICAgICAgICBTY3JpcHRWYWx1ZSB3cmFwcGVyID0gZnVuY3Rp b24uY2FsbCgpOwpAQCAtMTUwNiw0ICsxNTAzLDEwIEBAIFNjcmlwdFZhbHVlIEluc3BlY3RvckNv bnRyb2xsZXI6OnVud3JhcE9iamVjdChjb25zdCBTdHJpbmcmIG9iamVjdElkKQogICAgIHJldHVy biBTY3JpcHRWYWx1ZSgpOwogfQogCit2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OnJlc2V0SW5q ZWN0ZWRTY3JpcHQoKQoreworICAgIFNjcmlwdEZ1bmN0aW9uQ2FsbCBmdW5jdGlvbihtX3Njcmlw dFN0YXRlLCBtX2luamVjdGVkU2NyaXB0T2JqLCAicmVzZXQiKTsKKyAgICBmdW5jdGlvbi5jYWxs KCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckNvbnRyb2xsZXIuaAppbmRleCBiMGI1YjljLi5lYzhmNjg3IDEwMDY0NAotLS0gYS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yQ29udHJvbGxlci5oCkBAIC0yODUsNiArMjg1LDggQEAgcHJpdmF0ZToKICAgICAv LyBUT0RPOiBleHRyYWN0IHRoZXNlIGludG8gYSBzZXBhcmF0ZSBpbnRlcmZhY2UuCiAgICAgU2Ny aXB0VmFsdWUgd3JhcE9iamVjdChjb25zdCBTY3JpcHRWYWx1ZSYgb2JqZWN0KTsKICAgICBTY3Jp cHRWYWx1ZSB1bndyYXBPYmplY3QoY29uc3QgU3RyaW5nJiBvYmplY3RJZCk7CisgICAgCisgICAg dm9pZCByZXNldEluamVjdGVkU2NyaXB0KCk7CiAKICNpZiBFTkFCTEUoSkFWQVNDUklQVF9ERUJV R0dFUikKICAgICB2b2lkIHN0YXJ0VXNlckluaXRpYXRlZFByb2ZpbGluZ1Nvb24oKTsKZGlmZiAt LWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcCBiL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAppbmRleCAyNjA1ZDNmLi44YTA4MWY3IDEw MDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKKysrIGIv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCkBAIC02NCwxMCArNjQsMTAg QEAgSW5zcGVjdG9yRE9NQWdlbnQ6On5JbnNwZWN0b3JET01BZ2VudCgpCiAgICAgc2V0RG9jdW1l bnQoMCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OnNldERvY3VtZW50KERvY3VtZW50 KiBkb2MpCitib29sIEluc3BlY3RvckRPTUFnZW50OjpzZXREb2N1bWVudChEb2N1bWVudCogZG9j KQogewogICAgIGlmIChkb2MgPT0gbWFpbkZyYW1lRG9jdW1lbnQoKSkKLSAgICAgICAgcmV0dXJu OworICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgZGlzY2FyZEJpbmRpbmdzKCk7CiAKICAgICBM aXN0SGFzaFNldDxSZWZQdHI8RG9jdW1lbnQ+ID4gY29weSA9IG1fZG9jdW1lbnRzOwpAQCAtODIs NiArODIsNyBAQCB2b2lkIEluc3BlY3RvckRPTUFnZW50OjpzZXREb2N1bWVudChEb2N1bWVudCog ZG9jKQogICAgICAgICAgICAgcHVzaERvY3VtZW50VG9Gcm9udGVuZCgpOwogICAgICAgICB9CiAg ICAgfQorICAgIHJldHVybiB0cnVlOwogfQogCiB2b2lkIEluc3BlY3RvckRPTUFnZW50OjpzdGFy dExpc3RlbmluZyhEb2N1bWVudCogZG9jKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRE9NQWdlbnQuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50 LmgKaW5kZXggZjQ0YWVmNS4uNjdiMmJlOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRE9NQWdlbnQuaAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01B Z2VudC5oCkBAIC02Myw3ICs2Myw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9p ZCBzZXRUZXh0Tm9kZVZhbHVlKGxvbmcgY2FsbElkLCBsb25nIG5vZGVJZCwgY29uc3QgU3RyaW5n JiB2YWx1ZSk7CiAKICAgICAgICAgLy8gTWV0aG9kcyBjYWxsZWQgZnJvbSB0aGUgSW5zcGVjdG9y Q29udHJvbGxlci4KLSAgICAgICAgdm9pZCBzZXREb2N1bWVudChEb2N1bWVudCogZG9jdW1lbnQp OworICAgICAgICBib29sIHNldERvY3VtZW50KERvY3VtZW50KiBkb2N1bWVudCk7CiAKICAgICAg ICAgTm9kZSogbm9kZUZvcklkKGxvbmcgbm9kZUlkKTsKICAgICAgICAgbG9uZyBpZEZvck5vZGUo Tm9kZSogbm9kZSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5q ZWN0ZWRTY3JpcHQuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5qZWN0ZWRTY3Jp cHQuanMKaW5kZXggY2ViNWQ1Yy4uNDE0NDgyNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0luamVjdGVkU2NyaXB0LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9JbmplY3RlZFNjcmlwdC5qcwpAQCAtMjcsMTQgKzI3LDIwIEBACiAgKiBUSElTIFNP RlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdF LgogICovCiAKLXZhciBJbmplY3RlZFNjcmlwdCA9IHsKLSAgICBfc3R5bGVzOiB7fSwKLSAgICBf c3R5bGVSdWxlczoge30sCi0gICAgX2xhc3RTdHlsZUlkOiAwLAotICAgIF9sYXN0U3R5bGVSdWxl SWQ6IDAsCi0gICAgX3NlYXJjaFJlc3VsdHM6IFtdLAotICAgIF9pbmNsdWRlZEluU2VhcmNoUmVz dWx0c1Byb3BlcnR5TmFtZTogIl9faW5jbHVkZWRJbkluc3BlY3RvclNlYXJjaFJlc3VsdHMiCi19 OwordmFyIEluamVjdGVkU2NyaXB0ID0ge307CisKKy8vIENhbGxlZCBmcm9tIHdpdGhpbiBJbnNw ZWN0b3JDb250cm9sbGVyIG9uIHRoZSAnaW5zcGVjdGVkIHBhZ2UnIHNpZGUuCitJbmplY3RlZFNj cmlwdC5yZXNldCA9IGZ1bmN0aW9uKCkKK3sKKyAgICBJbmplY3RlZFNjcmlwdC5fc3R5bGVzID0g e307CisgICAgSW5qZWN0ZWRTY3JpcHQuX3N0eWxlUnVsZXMgPSB7fTsKKyAgICBJbmplY3RlZFNj cmlwdC5fbGFzdFN0eWxlSWQgPSAwOworICAgIEluamVjdGVkU2NyaXB0Ll9sYXN0U3R5bGVSdWxl SWQgPSAwOworICAgIEluamVjdGVkU2NyaXB0Ll9zZWFyY2hSZXN1bHRzID0gW107CisgICAgSW5q ZWN0ZWRTY3JpcHQuX2luY2x1ZGVkSW5TZWFyY2hSZXN1bHRzUHJvcGVydHlOYW1lID0gIl9faW5j bHVkZWRJbkluc3BlY3RvclNlYXJjaFJlc3VsdHMiOworfQorCitJbmplY3RlZFNjcmlwdC5yZXNl dCgpOwogCiBJbmplY3RlZFNjcmlwdC5nZXRTdHlsZXMgPSBmdW5jdGlvbihub2RlSWQsIGF1dGhv ck9ubHkpCiB7CkBAIC04NzMsNyArODc5LDggQEAgSW5qZWN0ZWRTY3JpcHQuX29iamVjdEZvcklk ID0gZnVuY3Rpb24ob2JqZWN0SWQpCiAgICAgcmV0dXJuIG9iamVjdElkOwogfQogCi1JbmplY3Rl ZFNjcmlwdC5fY3JlYXRlUHJveHlPYmplY3QgPSBmdW5jdGlvbihvYmplY3QsIG9iamVjdElkKQor Ly8gQ2FsbGVkIGZyb20gd2l0aGluIEluc3BlY3RvckNvbnRyb2xsZXIgb24gdGhlICdpbnNwZWN0 ZWQgcGFnZScgc2lkZS4KK0luamVjdGVkU2NyaXB0LmNyZWF0ZVByb3h5T2JqZWN0ID0gZnVuY3Rp b24ob2JqZWN0LCBvYmplY3RJZCkKIHsKICAgICB2YXIgcmVzdWx0ID0ge307CiAgICAgcmVzdWx0 Lm9iamVjdElkID0gb2JqZWN0SWQ7Cg==