30376 2009-10-14 22:28:00 -0700 Web Inspector: Create and update frontend script objects only when web inspector is visible. 2009-10-15 02:16:11 -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 154711 0 pfeldman 2009-10-14 22:28:00 -0700 All script objects should exist between populateScriptObjects and releaseScriptObjects (i.e. when web inspector window is visible). Replace a number of checks for m_frontend being defined with windowVisible. That actually fixes the following crash: 1. Open a page that has console output 2. Open and close web inspector for it 3. Refresh the page Console objects were pushed into the web inspector behind the m_frontend check (that was not enough). I actually think we should simplify the code and dispose the view (along with the m_frontend) when inspector window is closed. I don't like the state of InspectorController when m_frontend (along with the frontend scripts) exists while window is not visible. We are anyway not talking to frontend when it is not viisble. The downside of disposing frontend is that inspector would loose its state when re-opened. We already maintain active tab state though, so it won't be too bad. What do you think? 154712 1 41207 pfeldman 2009-10-14 22:30:08 -0700 Created attachment 41207 patch 154745 2 pfeldman 2009-10-15 02:16:11 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/InspectorController.cpp Committed r49614 41207 2009-10-14 22:30:08 -0700 2009-10-14 22:31:17 -0700 patch window_visible text/plain 8486 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YmIwNWRmYy4uZGIxNzE2YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMiBAQAorMjAwOS0xMC0xNCAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBDcmVhdGUgYW5kIHVwZGF0ZSBmcm9u dGVuZCBzY3JpcHQgb2JqZWN0cyBvbmx5IHdoZW4KKyAgICAgICAgd2ViIGluc3BlY3RvciBpcyB2 aXNpYmxlLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zMDM3NgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6YWRkQ29uc29sZU1lc3NhZ2Up OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6cG9wdWxhdGVTY3JpcHRP YmplY3RzKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OnBydW5lUmVz b3VyY2VzKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmRpZENvbW1p dExvYWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkTG9hZFJl c291cmNlRnJvbU1lbW9yeUNhY2hlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRy b2xsZXI6OmlkZW50aWZpZXJGb3JJbml0aWFsUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JDb250cm9sbGVyOjptYWluUmVzb3VyY2VGaXJlZERPTUNvbnRlbnRFdmVudCk6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjptYWluUmVzb3VyY2VGaXJlZExv YWRFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjp3aWxsU2Vu ZFJlcXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkUmVj ZWl2ZVJlc3BvbnNlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmRp ZFJlY2VpdmVDb250ZW50TGVuZ3RoKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRy b2xsZXI6OmRpZEZpbmlzaExvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29u dHJvbGxlcjo6ZGlkRmFpbExvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29u dHJvbGxlcjo6cmVzb3VyY2VSZXRyaWV2ZWRCeVhNTEh0dHBSZXF1ZXN0KToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OnNjcmlwdEltcG9ydGVkKToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmRpZE9wZW5EYXRhYmFzZSk6CisgICAgICAgIChX ZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRVc2VET01TdG9yYWdlKToKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmV2YWx1YXRlRm9yVGVzdEluRnJvbnRlbmQp OgorCiAyMDA5LTEwLTE0ICBDaHJpcyBNYXJyaW4gIDxjbWFycmluQGFwcGxlLmNvbT4KIAogICAg ICAgICBNb3JlIGNoYW5nZXMgdG8gZmlndXJlIG91dCB3aHkgdGhlIHdlYmdsIHRlc3RzIGFyZSBj cmFzaGluZyBvbiB0aGUgYnVpbGQgYm90LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yQ29udHJvbGxlci5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250 cm9sbGVyLmNwcAppbmRleCBhNjNkMmZiLi45YWYzMTI1IDEwMDY0NAotLS0gYS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JDb250cm9sbGVyLmNwcApAQCAtMzc3LDcgKzM3Nyw3IEBAIHZvaWQgSW5zcGVjdG9y Q29udHJvbGxlcjo6YWRkQ29uc29sZU1lc3NhZ2UoU2NyaXB0U3RhdGUqIHNjcmlwdFN0YXRlLCBD b25zb2xlTWVzCiAgICAgICAgIG1fY29uc29sZU1lc3NhZ2VzLmFwcGVuZChjb25zb2xlTWVzc2Fn ZSk7CiAgICAgfQogCi0gICAgaWYgKG1fZnJvbnRlbmQpCisgICAgaWYgKHdpbmRvd1Zpc2libGUo KSkKICAgICAgICAgbV9wcmV2aW91c01lc3NhZ2UtPmFkZFRvQ29uc29sZShtX2Zyb250ZW5kLmdl dCgpKTsKIH0KIApAQCAtNjU1LDcgKzY1NSw3IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6 cG9wdWxhdGVTY3JpcHRPYmplY3RzKCkKICAgICAgICAgaXQtPnNlY29uZC0+Y3JlYXRlU2NyaXB0 T2JqZWN0KG1fZnJvbnRlbmQuZ2V0KCkpOwogICAgICAgICBtX2Zyb250ZW5kLT5hZGRDb29raWVE b21haW4oaXQtPnNlY29uZC0+ZnJhbWUoKS0+ZG9jdW1lbnQoKS0+dXJsKCkuaG9zdCgpKTsKICAg ICB9Ci0gICAgICAgIAorCiAgICAgdW5zaWduZWQgbWVzc2FnZUNvdW50ID0gbV9jb25zb2xlTWVz c2FnZXMuc2l6ZSgpOwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBtZXNzYWdlQ291bnQ7 ICsraSkKICAgICAgICAgbV9jb25zb2xlTWVzc2FnZXNbaV0tPmFkZFRvQ29uc29sZShtX2Zyb250 ZW5kLmdldCgpKTsKQEAgLTcyMSw3ICs3MjEsNyBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6 OnBydW5lUmVzb3VyY2VzKFJlc291cmNlc01hcCogcmVzb3VyY2VNYXAsIERvY3VtZW50TG9hZAog CiAgICAgICAgIGlmICghbG9hZGVyVG9LZWVwIHx8ICFyZXNvdXJjZS0+aXNTYW1lTG9hZGVyKGxv YWRlclRvS2VlcCkpIHsKICAgICAgICAgICAgIHJlbW92ZVJlc291cmNlKHJlc291cmNlKTsKLSAg ICAgICAgICAgIGlmIChtX2Zyb250ZW5kKQorICAgICAgICAgICAgaWYgKHdpbmRvd1Zpc2libGUo KSkKICAgICAgICAgICAgICAgICByZXNvdXJjZS0+cmVsZWFzZVNjcmlwdE9iamVjdChtX2Zyb250 ZW5kLmdldCgpLCB0cnVlKTsKICAgICAgICAgfQogICAgIH0KQEAgLTc2Miw3ICs3NjIsOCBAQCB2 b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZENvbW1pdExvYWQoRG9jdW1lbnRMb2FkZXIqIGxv YWRlcikKICAgICAgICAgICAgICAgICAvLyBXZSBkb24ndCBhZGQgdGhlIG1haW4gcmVzb3VyY2Ug dW50aWwgaXRzIGxvYWQgaXMgY29tbWl0dGVkLiBUaGlzIGlzCiAgICAgICAgICAgICAgICAgLy8g bmVlZGVkIHRvIGtlZXAgdGhlIGxvYWQgZm9yIGEgdXNlci1lbnRlcmVkIFVSTCBmcm9tIHNob3dp bmcgdXAgaW4gdGhlCiAgICAgICAgICAgICAgICAgLy8gbGlzdCBvZiByZXNvdXJjZXMgZm9yIHRo ZSBwYWdlIHRoZXkgYXJlIG5hdmlnYXRpbmcgYXdheSBmcm9tLgotICAgICAgICAgICAgICAgIG1f bWFpblJlc291cmNlLT5jcmVhdGVTY3JpcHRPYmplY3QobV9mcm9udGVuZC5nZXQoKSk7CisgICAg ICAgICAgICAgICAgaWYgKHdpbmRvd1Zpc2libGUoKSkKKyAgICAgICAgICAgICAgICAgICAgbV9t YWluUmVzb3VyY2UtPmNyZWF0ZVNjcmlwdE9iamVjdChtX2Zyb250ZW5kLmdldCgpKTsKICAgICAg ICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgLy8gUGFnZXMgbG9hZGVkIGZyb20gdGhl IHBhZ2UgY2FjaGUgYXJlIGNvbW1pdHRlZCBiZWZvcmUKICAgICAgICAgICAgICAgICAvLyBtX21h aW5SZXNvdXJjZSBpcyB0aGUgcmlnaHQgcmVzb3VyY2UgZm9yIHRoaXMgbG9hZCwgc28gd2UKQEAg LTg1Niw3ICs4NTcsNyBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZExvYWRSZXNvdXJj ZUZyb21NZW1vcnlDYWNoZShEb2N1bWVudExvYWRlciogbG9hZGVyLAogICAgIGVuc3VyZVJlc291 cmNlVHJhY2tpbmdTZXR0aW5nc0xvYWRlZCgpOwogICAgIGlmICghaXNNYWluUmVzb3VyY2UgJiYg IW1fcmVzb3VyY2VUcmFja2luZ0VuYWJsZWQpCiAgICAgICAgIHJldHVybjsKLSAgICAKKwogICAg IFJlZlB0cjxJbnNwZWN0b3JSZXNvdXJjZT4gcmVzb3VyY2UgPSBJbnNwZWN0b3JSZXNvdXJjZTo6 Y3JlYXRlQ2FjaGVkKG1fbmV4dElkZW50aWZpZXItLSwgbG9hZGVyLCBjYWNoZWRSZXNvdXJjZSk7 CiAKICAgICBpZiAoaXNNYWluUmVzb3VyY2UpIHsKQEAgLTg2Niw3ICs4NjcsNyBAQCB2b2lkIElu c3BlY3RvckNvbnRyb2xsZXI6OmRpZExvYWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZShEb2N1bWVu dExvYWRlciogbG9hZGVyLAogCiAgICAgYWRkUmVzb3VyY2UocmVzb3VyY2UuZ2V0KCkpOwogCi0g ICAgaWYgKG1fZnJvbnRlbmQpCisgICAgaWYgKHdpbmRvd1Zpc2libGUoKSkKICAgICAgICAgcmVz b3VyY2UtPmNyZWF0ZVNjcmlwdE9iamVjdChtX2Zyb250ZW5kLmdldCgpKTsKIH0KIApAQCAtODky LDcgKzg5Myw3IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6aWRlbnRpZmllckZvckluaXRp YWxSZXF1ZXN0KHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwKIAogICAgIGFkZFJlc291cmNlKHJl c291cmNlLmdldCgpKTsKIAotICAgIGlmIChtX2Zyb250ZW5kICYmIGxvYWRlci0+ZnJhbWVMb2Fk ZXIoKS0+aXNMb2FkaW5nRnJvbUNhY2hlZFBhZ2UoKSAmJiByZXNvdXJjZSA9PSBtX21haW5SZXNv dXJjZSkKKyAgICBpZiAod2luZG93VmlzaWJsZSgpICYmIGxvYWRlci0+ZnJhbWVMb2FkZXIoKS0+ aXNMb2FkaW5nRnJvbUNhY2hlZFBhZ2UoKSAmJiByZXNvdXJjZSA9PSBtX21haW5SZXNvdXJjZSkK ICAgICAgICAgcmVzb3VyY2UtPmNyZWF0ZVNjcmlwdE9iamVjdChtX2Zyb250ZW5kLmdldCgpKTsK IH0KIApAQCAtOTAzLDcgKzkwNCw3IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6bWFpblJl c291cmNlRmlyZWRET01Db250ZW50RXZlbnQoRG9jdW1lbnRMb2FkZXIqIGxvYWRlCiAKICAgICBp ZiAobV9tYWluUmVzb3VyY2UpIHsKICAgICAgICAgbV9tYWluUmVzb3VyY2UtPm1hcmtET01Db250 ZW50RXZlbnRUaW1lKCk7Ci0gICAgICAgIGlmIChtX2Zyb250ZW5kKQorICAgICAgICBpZiAod2lu ZG93VmlzaWJsZSgpKQogICAgICAgICAgICAgbV9tYWluUmVzb3VyY2UtPnVwZGF0ZVNjcmlwdE9i amVjdChtX2Zyb250ZW5kLmdldCgpKTsKICAgICB9CiB9CkBAIC05MTUsNyArOTE2LDcgQEAgdm9p ZCBJbnNwZWN0b3JDb250cm9sbGVyOjptYWluUmVzb3VyY2VGaXJlZExvYWRFdmVudChEb2N1bWVu dExvYWRlciogbG9hZGVyLCBjb24KIAogICAgIGlmIChtX21haW5SZXNvdXJjZSkgewogICAgICAg ICBtX21haW5SZXNvdXJjZS0+bWFya0xvYWRFdmVudFRpbWUoKTsKLSAgICAgICAgaWYgKG1fZnJv bnRlbmQpCisgICAgICAgIGlmICh3aW5kb3dWaXNpYmxlKCkpCiAgICAgICAgICAgICBtX21haW5S ZXNvdXJjZS0+dXBkYXRlU2NyaXB0T2JqZWN0KG1fZnJvbnRlbmQuZ2V0KCkpOwogICAgIH0KIH0K QEAgLTkzOCw3ICs5MzksNyBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OndpbGxTZW5kUmVx dWVzdChEb2N1bWVudExvYWRlciosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZgogICAgICAgICByZXNv dXJjZS0+dXBkYXRlUmVzcG9uc2UocmVkaXJlY3RSZXNwb25zZSk7CiAgICAgfQogCi0gICAgaWYg KHJlc291cmNlICE9IG1fbWFpblJlc291cmNlICYmIG1fZnJvbnRlbmQpCisgICAgaWYgKHJlc291 cmNlICE9IG1fbWFpblJlc291cmNlICYmIHdpbmRvd1Zpc2libGUoKSkKICAgICAgICAgcmVzb3Vy Y2UtPmNyZWF0ZVNjcmlwdE9iamVjdChtX2Zyb250ZW5kLmdldCgpKTsKIH0KIApAQCAtOTUxLDcg Kzk1Miw3IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKERv Y3VtZW50TG9hZGVyKiwgdW5zaWduZWQgbG9uZyBpZGVuCiAgICAgcmVzb3VyY2UtPnVwZGF0ZVJl c3BvbnNlKHJlc3BvbnNlKTsKICAgICByZXNvdXJjZS0+bWFya1Jlc3BvbnNlUmVjZWl2ZWRUaW1l KCk7CiAKLSAgICBpZiAobV9mcm9udGVuZCkKKyAgICBpZiAod2luZG93VmlzaWJsZSgpKQogICAg ICAgICByZXNvdXJjZS0+dXBkYXRlU2NyaXB0T2JqZWN0KG1fZnJvbnRlbmQuZ2V0KCkpOwogfQog CkBAIC05NjMsNyArOTY0LDcgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRSZWNlaXZl Q29udGVudExlbmd0aChEb2N1bWVudExvYWRlciosIHVuc2lnbmVkIGxvbmcKIAogICAgIHJlc291 cmNlLT5hZGRMZW5ndGgobGVuZ3RoUmVjZWl2ZWQpOwogCi0gICAgaWYgKG1fZnJvbnRlbmQpCisg ICAgaWYgKHdpbmRvd1Zpc2libGUoKSkKICAgICAgICAgcmVzb3VyY2UtPnVwZGF0ZVNjcmlwdE9i amVjdChtX2Zyb250ZW5kLmdldCgpKTsKIH0KIApAQCAtOTc5LDcgKzk4MCw3IEBAIHZvaWQgSW5z cGVjdG9yQ29udHJvbGxlcjo6ZGlkRmluaXNoTG9hZGluZyhEb2N1bWVudExvYWRlciosIHVuc2ln bmVkIGxvbmcgaWRlbnRpCiAKICAgICBhZGRSZXNvdXJjZShyZXNvdXJjZS5nZXQoKSk7CiAKLSAg ICBpZiAobV9mcm9udGVuZCkgeworICAgIGlmICh3aW5kb3dWaXNpYmxlKCkpIHsKICAgICAgICAg cmVzb3VyY2UtPnVwZGF0ZVNjcmlwdE9iamVjdChtX2Zyb250ZW5kLmdldCgpKTsKICAgICAgICAg bV9mcm9udGVuZC0+YWRkQ29va2llRG9tYWluKHJlc291cmNlLT5mcmFtZSgpLT5kb2N1bWVudCgp LT51cmwoKS5ob3N0KCkpOwogICAgIH0KQEAgLTk5OCw3ICs5OTksNyBAQCB2b2lkIEluc3BlY3Rv ckNvbnRyb2xsZXI6OmRpZEZhaWxMb2FkaW5nKERvY3VtZW50TG9hZGVyKiwgdW5zaWduZWQgbG9u ZyBpZGVudGlmaQogCiAgICAgYWRkUmVzb3VyY2UocmVzb3VyY2UuZ2V0KCkpOwogCi0gICAgaWYg KG1fZnJvbnRlbmQpCisgICAgaWYgKHdpbmRvd1Zpc2libGUoKSkKICAgICAgICAgcmVzb3VyY2Ut PnVwZGF0ZVNjcmlwdE9iamVjdChtX2Zyb250ZW5kLmdldCgpKTsKIH0KIApAQCAtMTAxMyw3ICsx MDE0LDcgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpyZXNvdXJjZVJldHJpZXZlZEJ5WE1M SHR0cFJlcXVlc3QodW5zaWduZWQgbG9uZyBpZGVudGkKIAogICAgIHJlc291cmNlLT5zZXRYTUxI dHRwUmVzcG9uc2VUZXh0KHNvdXJjZVN0cmluZyk7CiAKLSAgICBpZiAobV9mcm9udGVuZCkKKyAg ICBpZiAod2luZG93VmlzaWJsZSgpKQogICAgICAgICByZXNvdXJjZS0+dXBkYXRlU2NyaXB0T2Jq ZWN0KG1fZnJvbnRlbmQuZ2V0KCkpOwogfQogCkBAIC0xMDMwLDcgKzEwMzEsNyBAQCB2b2lkIElu c3BlY3RvckNvbnRyb2xsZXI6OnNjcmlwdEltcG9ydGVkKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmll ciwgY29uc3QgU3RyaW5nJgogICAgIC8vIHRoaW5nIGJ5IHRoZSBJbnNwZWN0b3IuIFRoZXkgc2hv dWxkIGJlIG1hZGUgaW50byBkaXN0aW5jdCB0eXBlcy4KICAgICByZXNvdXJjZS0+c2V0WE1MSHR0 cFJlc3BvbnNlVGV4dChTY3JpcHRTdHJpbmcoc291cmNlU3RyaW5nKSk7CiAgICAgCi0gICAgaWYg KG1fZnJvbnRlbmQpCisgICAgaWYgKHdpbmRvd1Zpc2libGUoKSkKICAgICAgICAgcmVzb3VyY2Ut PnVwZGF0ZVNjcmlwdE9iamVjdChtX2Zyb250ZW5kLmdldCgpKTsKIH0KIApAQCAtMTE0NCw3ICsx MTQ1LDcgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRPcGVuRGF0YWJhc2UoRGF0YWJh c2UqIGRhdGFiYXNlLCBjb25zdCBTdHJpbmcmIGRvbWEKICAgICBtX2RhdGFiYXNlUmVzb3VyY2Vz LnNldChyZXNvdXJjZS0+aWQoKSwgcmVzb3VyY2UpOwogCiAgICAgLy8gUmVzb3VyY2VzIGFyZSBv bmx5IGJvdW5kIHdoaWxlIHZpc2libGUuCi0gICAgaWYgKG1fZnJvbnRlbmQgJiYgd2luZG93Vmlz aWJsZSgpKQorICAgIGlmICh3aW5kb3dWaXNpYmxlKCkpCiAgICAgICAgIHJlc291cmNlLT5iaW5k KG1fZnJvbnRlbmQuZ2V0KCkpOwogfQogI2VuZGlmCkBAIC0xMjM1LDcgKzEyMzYsNyBAQCB2b2lk IEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZFVzZURPTVN0b3JhZ2UoU3RvcmFnZUFyZWEqIHN0b3Jh Z2VBcmVhLCBib29sIGlzTG9jYQogICAgIG1fZG9tU3RvcmFnZVJlc291cmNlcy5zZXQocmVzb3Vy Y2UtPmlkKCksIHJlc291cmNlKTsKIAogICAgIC8vIFJlc291cmNlcyBhcmUgb25seSBib3VuZCB3 aGlsZSB2aXNpYmxlLgotICAgIGlmIChtX2Zyb250ZW5kICYmIHdpbmRvd1Zpc2libGUoKSkKKyAg ICBpZiAod2luZG93VmlzaWJsZSgpKQogICAgICAgICByZXNvdXJjZS0+YmluZChtX2Zyb250ZW5k LmdldCgpKTsKIH0KIApAQCAtMTU1MCw3ICsxNTUxLDcgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9s bGVyOjpkaWRDb250aW51ZSgpCiAKIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZXZhbHVhdGVG b3JUZXN0SW5Gcm9udGVuZChsb25nIGNhbGxJZCwgY29uc3QgU3RyaW5nJiBzY3JpcHQpCiB7Ci0g ICAgaWYgKG1fZnJvbnRlbmQgJiYgd2luZG93VmlzaWJsZSgpKQorICAgIGlmICh3aW5kb3dWaXNp YmxlKCkpCiAgICAgICAgIG1fZnJvbnRlbmQtPmV2YWx1YXRlRm9yVGVzdEluRnJvbnRlbmQoY2Fs bElkLCBzY3JpcHQpOwogICAgIGVsc2UKICAgICAgICAgbV9wZW5kaW5nRXZhbHVhdGVUZXN0Q29t bWFuZHMuYXBwZW5kKHBhaXI8bG9uZywgU3RyaW5nPihjYWxsSWQsIHNjcmlwdCkpOwo=