36183 2010-03-16 12:48:55 -0700 Web Inspector: [REGRESSION in r56051] Resources panel is empty after front-end reopening. 2010-03-17 04:00:31 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman yurys timothy yurys oldest_to_newest 200379 0 pfeldman 2010-03-16 12:48:55 -0700 Make sure resource tracking is 'on' 1. Go to any site 2. Open inspector, make sure there are resources in in the resources panel 3. Close and reopen inspector Actual: resources panel is empty Expected: it should contain all resources. 200632 1 50885 yurys 2010-03-17 02:55:26 -0700 Created attachment 50885 patch 200636 2 50885 pfeldman 2010-03-17 03:02:38 -0700 Comment on attachment 50885 patch Could you replace all windowVisible with m_frontend checks everywhere? 200659 3 yurys 2010-03-17 04:00:31 -0700 (In reply to comment #2) > (From update of attachment 50885 [details]) > Could you replace all windowVisible with m_frontend checks everywhere? Done. M WebCore/ChangeLog M WebCore/WebCore.xcodeproj/project.pbxproj M WebCore/inspector/InspectorController.cpp M WebCore/inspector/InspectorController.h M WebCore/inspector/InspectorResource.cpp Committed r56104 50885 2010-03-17 02:55:26 -0700 2010-03-17 03:02:38 -0700 patch reset-scripts.patch text/plain 9699 yurys ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDc5Y2MzNC4uODg1MTc0MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0wMy0xNyAgWXVyeSBTZW1pa2hh dHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBNYXJrIGluc3BlY3RvciByZXNvdXJjZXMgYXMgY2hhbmdlZCBz byB0aGF0IHRoZXkgYXJlIHJlbG9hZGVkIG9uIHRoZSBuZXh0IGZyb250ZW5kIGNvbm5lY3Rpb24u CisgICAgICAgIAorICAgICAgICBTcGxpdCByZXNldFNjcmlwdE9iamVjdHMgaW50byBjb2RlIHNw ZWNpZmljIGZvciBwYWdlIG5hdmlnYXRpb24gYW5kIGluc2VwY3RvciBmcm9udGVuZCBkaXNjb25u ZWN0aW9uLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zNjE4MworCisKKyAgICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6 IEFkZGVkIEluc3BlY3RvcldvcmtlclJlc291cmNlLmggdG8gdGhlIHByb2plY3QgZmlsZS4KKyAg ICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpkaXNjb25uZWN0RnJvbnRlbmQpOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6dW5iaW5kQWxsUmVzb3VyY2VzKToKKyAgICAg ICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmRpZENvbW1pdExvYWQpOgorICAgICAg ICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmg6CisgICAgICAgICogaW5zcGVjdG9y L0luc3BlY3RvclJlc291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclJlc291 cmNlOjpyZWxlYXNlU2NyaXB0T2JqZWN0KToKKwogMjAxMC0wMy0xNiAgSm9obiBBYmQtRWwtTWFs ZWsgIDxqYW1AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEZpc2hl ci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9q IGIvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggYWE4MDRi MS4uMTc3OWMzNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0 LnBieHByb2oKKysrIGIvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oK QEAgLTQ4NjgsNiArNDg2OCw3IEBACiAJCUYzNDRDNzU4MTEyOTRGRjYwMEYyNkVFRSAvKiBJbnNw ZWN0b3JGcm9udGVuZENsaWVudExvY2FsLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IEYzNDRDNzU3MTEyOTRGRjYwMEYyNkVFRSAvKiBJbnNwZWN0b3JG cm9udGVuZENsaWVudExvY2FsLmNwcCAqLzsgfTsKIAkJRjM2NDRBRkYxMTE5ODA1OTAwRTBENTM3 IC8qIEluamVjdGVkU2NyaXB0LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IEYzNjQ0QUZEMTExOTgwNTkwMEUwRDUzNyAvKiBJbmplY3RlZFNjcmlwdC5j cHAgKi87IH07CiAJCUYzNjQ0QjAwMTExOTgwNTkwMEUwRDUzNyAvKiBJbmplY3RlZFNjcmlwdC5o IGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRjM2NDRBRkUx MTE5ODA1OTAwRTBENTM3IC8qIEluamVjdGVkU2NyaXB0LmggKi87IH07CisJCUYzNzVDQzA3MTE1 MEQzMDAwMDhEREI4MSAvKiBJbnNwZWN0b3JXb3JrZXJSZXNvdXJjZS5oIGluIEhlYWRlcnMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRjM3NUNDMDYxMTUwRDMwMDAwOEREQjgx IC8qIEluc3BlY3RvcldvcmtlclJlc291cmNlLmggKi87IH07CiAJCUY0RUFGNEFFMTBDNzQyQjEw MDkxMDBEMyAvKiBPcGVuVHlwZVNhbml0aXplci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGNEVBRjRBQzEwQzc0MkIxMDA5MTAwRDMgLyogT3BlblR5 cGVTYW5pdGl6ZXIuY3BwICovOyB9OwogCQlGNEVBRjRBRjEwQzc0MkIxMDA5MTAwRDMgLyogT3Bl blR5cGVTYW5pdGl6ZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IEY0RUFGNEFEMTBDNzQyQjEwMDkxMDBEMyAvKiBPcGVuVHlwZVNhbml0aXplci5oICov OyB9OwogCQlGNUMwNDFEQTBGRkNBN0NFMDA4MzlENEEgLyogSFRNTERhdGFMaXN0RWxlbWVudC5j cHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGNUMwNDFE NzBGRkNBN0NFMDA4MzlENEEgLyogSFRNTERhdGFMaXN0RWxlbWVudC5jcHAgKi87IH07CkBAIC0x MDIxMSw2ICsxMDIxMiw3IEBACiAJCUYzNDRDNzU3MTEyOTRGRjYwMEYyNkVFRSAvKiBJbnNwZWN0 b3JGcm9udGVuZENsaWVudExvY2FsLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsg cGF0aCA9IEluc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWwuY3BwOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwogCQlGMzY0NEFGRDExMTk4MDU5MDBFMEQ1MzcgLyogSW5qZWN0ZWRTY3JpcHQu Y3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSW5qZWN0ZWRTY3JpcHQu Y3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlGMzY0NEFGRTExMTk4MDU5MDBFMEQ1 MzcgLyogSW5qZWN0ZWRTY3JpcHQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0g SW5qZWN0ZWRTY3JpcHQuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJRjM3NUNDMDYx MTUwRDMwMDAwOEREQjgxIC8qIEluc3BlY3RvcldvcmtlclJlc291cmNlLmggKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEluc3BlY3RvcldvcmtlclJlc291cmNlLmg7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CiAJCUY0RUFGNEFDMTBDNzQyQjEwMDkxMDBEMyAvKiBPcGVuVHlw ZVNhbml0aXplci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IG5hbWUgPSBPcGVu VHlwZVNhbml0aXplci5jcHA7IHBhdGggPSBvcGVudHlwZS9PcGVuVHlwZVNhbml0aXplci5jcHA7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUY0RUFGNEFEMTBDNzQyQjEwMDkxMDBEMyAv KiBPcGVuVHlwZVNhbml0aXplci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVF bmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IG5hbWUgPSBP cGVuVHlwZVNhbml0aXplci5oOyBwYXRoID0gb3BlbnR5cGUvT3BlblR5cGVTYW5pdGl6ZXIuaDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJRjUyM0QyM0IwMkRFNDM5NjAxODYzNUNBIC8q IEhUTUxEb2N1bWVudC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gMzA7IGluZGVudFdpZHRoID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmNwcC5jcHA7IHBhdGggPSBIVE1MRG9jdW1lbnQuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB0YWJXaWR0aCA9IDg7IHVzZXNUYWJzID0gMDsgfTsKQEAgLTEwNzU0LDYgKzEwNzU2LDcgQEAK IAkJCQk0MUYwNjFGRjBGNUYwQjY2MDBBMDdFQUMgLyogSW5zcGVjdG9yUmVzb3VyY2UuaCAqLywK IAkJCQk3NTQxMzNBOTEwMkUwMEY0MDAwNzVEMDAgLyogSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5j cHAgKi8sCiAJCQkJNzU0MTMzQTcxMDJFMDBFODAwMDc1RDAwIC8qIEluc3BlY3RvclRpbWVsaW5l QWdlbnQuaCAqLywKKwkJCQlGMzc1Q0MwNjExNTBEMzAwMDA4RERCODEgLyogSW5zcGVjdG9yV29y a2VyUmVzb3VyY2UuaCAqLywKIAkJCQkxQzgxQkEwMzBFOTczNDgzMDAyNjZFMDcgLyogSmF2YVNj cmlwdENhbGxGcmFtZS5jcHAgKi8sCiAJCQkJMUM4MUJBMDQwRTk3MzQ4MzAwMjY2RTA3IC8qIEph dmFTY3JpcHRDYWxsRnJhbWUuaCAqLywKIAkJCQkxQzgxQkEwNTBFOTczNDgzMDAyNjZFMDcgLyog SmF2YVNjcmlwdENhbGxGcmFtZS5pZGwgKi8sCkBAIC0xODY5Myw2ICsxODY5Niw3IEBACiAJCQkJ Q0UxNzJFMDExMTM2RThDRTAwNjJBNTMzIC8qIFpvb21Nb2RlLmggaW4gSGVhZGVycyAqLywKIAkJ CQlBNDNCRjU5OTExNDkyOTBBMDBDNjQzQ0EgLyogSFRNTFByb2dyZXNzRWxlbWVudC5oIGluIEhl YWRlcnMgKi8sCiAJCQkJQTQzQkY1OUQxMTQ5MjkyODAwQzY0M0NBIC8qIFJlbmRlclByb2dyZXNz LmggaW4gSGVhZGVycyAqLywKKwkJCQlGMzc1Q0MwNzExNTBEMzAwMDA4RERCODEgLyogSW5zcGVj dG9yV29ya2VyUmVzb3VyY2UuaCBpbiBIZWFkZXJzICovLAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JE ZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQl9OwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JDb250cm9sbGVyLmNwcAppbmRleCBlNWYyMjJmLi4zNWM5OTA4IDEwMDY0NAotLS0gYS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAorKysgYi9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcApAQCAtNTI0LDcgKzUyNCw3IEBAIHZvaWQg SW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlzY29ubmVjdEZyb250ZW5kKCkKICAgICAgICAgbV9hdHRh Y2hEZWJ1Z2dlcldoZW5TaG93biA9IHRydWU7CiAjZW5kaWYKICAgICBzZXRTZWFyY2hpbmdGb3JO b2RlKGZhbHNlKTsKLSAgICByZXNldFNjcmlwdE9iamVjdHMoKTsKKyAgICB1bmJpbmRBbGxSZXNv dXJjZXMoKTsKICAgICBzdG9wVGltZWxpbmVQcm9maWxlcigpOwogCiAgICAgbV9zaG93QWZ0ZXJW aXNpYmxlID0gQ3VycmVudFBhbmVsOwpAQCAtNjA5LDExICs2MDksMTIgQEAgdm9pZCBJbnNwZWN0 b3JDb250cm9sbGVyOjpwb3B1bGF0ZVNjcmlwdE9iamVjdHMoKQogICAgIG1fcGVuZGluZ0V2YWx1 YXRlVGVzdENvbW1hbmRzLmNsZWFyKCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6 cmVzZXRTY3JpcHRPYmplY3RzKCkKK3ZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6dW5iaW5kQWxs UmVzb3VyY2VzKCkKIHsKLSAgICBpZiAoIW1fZnJvbnRlbmQpCi0gICAgICAgIHJldHVybjsKLQor ICAgIFJlc291cmNlc01hcDo6aXRlcmF0b3IgcmVzb3VyY2VzRW5kID0gbV9yZXNvdXJjZXMuZW5k KCk7IAorICAgIGZvciAoUmVzb3VyY2VzTWFwOjppdGVyYXRvciBpdCA9IG1fcmVzb3VyY2VzLmJl Z2luKCk7IGl0ICE9IHJlc291cmNlc0VuZDsgKytpdCkgCisgICAgICAgIGl0LT5zZWNvbmQtPnJl bGVhc2VTY3JpcHRPYmplY3QoMCk7IAorICAgIAogI2lmIEVOQUJMRShEQVRBQkFTRSkKICAgICBE YXRhYmFzZVJlc291cmNlc01hcDo6aXRlcmF0b3IgZGF0YWJhc2VzRW5kID0gbV9kYXRhYmFzZVJl c291cmNlcy5lbmQoKTsKICAgICBmb3IgKERhdGFiYXNlUmVzb3VyY2VzTWFwOjppdGVyYXRvciBp dCA9IG1fZGF0YWJhc2VSZXNvdXJjZXMuYmVnaW4oKTsgaXQgIT0gZGF0YWJhc2VzRW5kOyArK2l0 KQpAQCAtNjI0LDE0ICs2MjUsOCBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OnJlc2V0U2Ny aXB0T2JqZWN0cygpCiAgICAgZm9yIChET01TdG9yYWdlUmVzb3VyY2VzTWFwOjppdGVyYXRvciBp dCA9IG1fZG9tU3RvcmFnZVJlc291cmNlcy5iZWdpbigpOyBpdCAhPSBkb21TdG9yYWdlRW5kOyAr K2l0KQogICAgICAgICBpdC0+c2Vjb25kLT51bmJpbmQoKTsKICNlbmRpZgotI2lmIEVOQUJMRShX T1JLRVJTKQotICAgIG1fd29ya2Vycy5jbGVhcigpOwotI2VuZGlmCiAgICAgaWYgKG1fdGltZWxp bmVBZ2VudCkKICAgICAgICAgbV90aW1lbGluZUFnZW50LT5yZXNldCgpOwotCi0gICAgbV9mcm9u dGVuZC0+cmVzZXQoKTsKLSAgICBtX2RvbUFnZW50LT5yZXNldCgpOwogfQogCiB2b2lkIEluc3Bl Y3RvckNvbnRyb2xsZXI6OnBydW5lUmVzb3VyY2VzKFJlc291cmNlc01hcCogcmVzb3VyY2VNYXAs IERvY3VtZW50TG9hZGVyKiBsb2FkZXJUb0tlZXApCkBAIC02NzksOCArNjc0LDE2IEBAIHZvaWQg SW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkQ29tbWl0TG9hZChEb2N1bWVudExvYWRlciogbG9hZGVy KQogI2VuZGlmCiAgICAgICAgIC8vIHJlc2V0U2NyaXB0T2JqZWN0cyBzaG91bGQgYmUgY2FsbGVk IGJlZm9yZSBkYXRhYmFzZSBhbmQgRE9NIHN0b3JhZ2UKICAgICAgICAgLy8gcmVzb3VyY2VzIGFy ZSBjbGVhcmVkIHNvIHRoYXQgaXQgaGFzIGEgY2hhbmNlIHRvIHVuYmluZCB0aGVtLgotICAgICAg ICByZXNldFNjcmlwdE9iamVjdHMoKTsKKyAgICAgICAgaWYgKG1fZnJvbnRlbmQpIHsKKyAgICAg ICAgICAgIGlmIChtX3RpbWVsaW5lQWdlbnQpCisgICAgICAgICAgICAgICAgbV90aW1lbGluZUFn ZW50LT5yZXNldCgpOwogCisgICAgICAgICAgICBtX2Zyb250ZW5kLT5yZXNldCgpOworICAgICAg ICAgICAgbV9kb21BZ2VudC0+cmVzZXQoKTsKKyAgICAgICAgfQorI2lmIEVOQUJMRShXT1JLRVJT KQorICAgICAgICBtX3dvcmtlcnMuY2xlYXIoKTsKKyNlbmRpZgogI2lmIEVOQUJMRShEQVRBQkFT RSkKICAgICAgICAgbV9kYXRhYmFzZVJlc291cmNlcy5jbGVhcigpOwogI2VuZGlmCkBAIC02OTQs OCArNjk3LDcgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRDb21taXRMb2FkKERvY3Vt ZW50TG9hZGVyKiBsb2FkZXIpCiAgICAgICAgICAgICAgICAgLy8gV2UgZG9uJ3QgYWRkIHRoZSBt YWluIHJlc291cmNlIHVudGlsIGl0cyBsb2FkIGlzIGNvbW1pdHRlZC4gVGhpcyBpcwogICAgICAg ICAgICAgICAgIC8vIG5lZWRlZCB0byBrZWVwIHRoZSBsb2FkIGZvciBhIHVzZXItZW50ZXJlZCBV UkwgZnJvbSBzaG93aW5nIHVwIGluIHRoZQogICAgICAgICAgICAgICAgIC8vIGxpc3Qgb2YgcmVz b3VyY2VzIGZvciB0aGUgcGFnZSB0aGV5IGFyZSBuYXZpZ2F0aW5nIGF3YXkgZnJvbS4KLSAgICAg ICAgICAgICAgICBpZiAod2luZG93VmlzaWJsZSgpKQotICAgICAgICAgICAgICAgICAgICBtX21h aW5SZXNvdXJjZS0+dXBkYXRlU2NyaXB0T2JqZWN0KG1fZnJvbnRlbmQuZ2V0KCkpOworICAgICAg ICAgICAgICAgIG1fbWFpblJlc291cmNlLT51cGRhdGVTY3JpcHRPYmplY3QobV9mcm9udGVuZC5n ZXQoKSk7CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIC8vIFBhZ2VzIGxv YWRlZCBmcm9tIHRoZSBwYWdlIGNhY2hlIGFyZSBjb21taXR0ZWQgYmVmb3JlCiAgICAgICAgICAg ICAgICAgLy8gbV9tYWluUmVzb3VyY2UgaXMgdGhlIHJpZ2h0IHJlc291cmNlIGZvciB0aGlzIGxv YWQsIHNvIHdlCkBAIC03MDMsMTAgKzcwNSw4IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6 ZGlkQ29tbWl0TG9hZChEb2N1bWVudExvYWRlciogbG9hZGVyKQogICAgICAgICAgICAgICAgIC8v IGlkZW50aWZpZXJGb3JJbml0aWFsUmVxdWVzdC4KICAgICAgICAgICAgICAgICBtX21haW5SZXNv dXJjZSA9IDA7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBpZiAod2luZG93VmlzaWJsZSgp KSB7Ci0gICAgICAgICAgICAgICAgbV9mcm9udGVuZC0+ZGlkQ29tbWl0TG9hZCgpOwotICAgICAg ICAgICAgICAgIG1fZG9tQWdlbnQtPnNldERvY3VtZW50KG1faW5zcGVjdGVkUGFnZS0+bWFpbkZy YW1lKCktPmRvY3VtZW50KCkpOwotICAgICAgICAgICAgfQorICAgICAgICAgICAgbV9mcm9udGVu ZC0+ZGlkQ29tbWl0TG9hZCgpOworICAgICAgICAgICAgbV9kb21BZ2VudC0+c2V0RG9jdW1lbnQo bV9pbnNwZWN0ZWRQYWdlLT5tYWluRnJhbWUoKS0+ZG9jdW1lbnQoKSk7CiAgICAgICAgIH0KICAg ICB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIu aCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaAppbmRleCAwY2E5ZDE3 Li5mNDc0NTQ5IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9s bGVyLmgKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oCkBAIC0x NTMsOSArMTUzLDYgQEAgcHVibGljOgogICAgIGJvb2wgd2luZG93VmlzaWJsZSgpOwogICAgIHZv aWQgc2V0RnJvbnRlbmQoUGFzc093blB0cjxJbnNwZWN0b3JGcm9udGVuZD4pOwogCi0gICAgdm9p ZCBwb3B1bGF0ZVNjcmlwdE9iamVjdHMoKTsKLSAgICB2b2lkIHJlc2V0U2NyaXB0T2JqZWN0cygp OwotCiAgICAgdm9pZCBkaWRDb21taXRMb2FkKERvY3VtZW50TG9hZGVyKik7CiAgICAgdm9pZCBm cmFtZURldGFjaGVkRnJvbVBhcmVudChGcmFtZSopOwogCkBAIC0yNTgsNyArMjU1LDEwIEBAIHBy aXZhdGU6CiAKICAgICBmcmllbmQgY2xhc3MgSW5zcGVjdG9yQmFja2VuZDsKICAgICBmcmllbmQg Y2xhc3MgSW5qZWN0ZWRTY3JpcHRIb3N0OwotCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIAorICAgIHZvaWQgcG9wdWxhdGVTY3JpcHRPYmpl Y3RzKCk7CisgICAgdm9pZCB1bmJpbmRBbGxSZXNvdXJjZXMoKTsKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgLy8gRm9sbG93aW5n IGFyZSB1c2VkIGZyb20gSW5zcGVjdG9yQmFja2VuZCBhbmQgaW50ZXJuYWxseS4KICAgICB2b2lk IHNldFNlYXJjaGluZ0Zvck5vZGUoYm9vbCBlbmFibGVkKTsKIApkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2UuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yUmVzb3VyY2UuY3BwCmluZGV4IDdhMGI0NmUuLjg1ODM5ZWEgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlLmNwcAorKysgYi9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JSZXNvdXJjZS5jcHAKQEAgLTIyMCw3ICsyMjAsOCBAQCB2b2lkIEluc3Bl Y3RvclJlc291cmNlOjpyZWxlYXNlU2NyaXB0T2JqZWN0KEluc3BlY3RvckZyb250ZW5kKiBmcm9u dGVuZCkKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1fcmVkaXJlY3RzLnNpemUoKTsgKytp KQogICAgICAgICBtX3JlZGlyZWN0c1tpXS0+cmVsZWFzZVNjcmlwdE9iamVjdChmcm9udGVuZCk7 CiAKLSAgICBmcm9udGVuZC0+cmVtb3ZlUmVzb3VyY2UobV9pZGVudGlmaWVyKTsKKyAgICBpZiAo ZnJvbnRlbmQpCisgICAgICAgIGZyb250ZW5kLT5yZW1vdmVSZXNvdXJjZShtX2lkZW50aWZpZXIp OwogfQogCiBDYWNoZWRSZXNvdXJjZSogSW5zcGVjdG9yUmVzb3VyY2U6OmNhY2hlZFJlc291cmNl KCkgY29uc3QK