47892 2010-10-19 02:15:26 -0700 Web Inspector: do not access ResourcePanel from resources directly. 2010-10-19 03:36:00 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman apavlov bweinstein commit-queue joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 296068 0 pfeldman 2010-10-19 02:15:26 -0700 We should either update panel externally or make it listen to resources. 296079 1 71147 pfeldman 2010-10-19 02:46:55 -0700 Created attachment 71147 [PATCH] Proposed change. 296083 2 71147 yurys 2010-10-19 03:01:56 -0700 Comment on attachment 71147 [PATCH] Proposed change. View in context: https://bugs.webkit.org/attachment.cgi?id=71147&action=review Nice change. > WebCore/inspector/front-end/ResourcesPanel.js:1078 > + return resourceView.__proto__ === WebInspector.SourceView.prototype; Why not check for (resourceView instanceof WebInspector.SourceView) instead? > WebCore/inspector/front-end/ResourcesPanel.js:1080 > + return resourceView.__proto__ === WebInspector.ImageView.prototype; ditto > WebCore/inspector/front-end/ResourcesPanel.js:1082 > + return resourceView.__proto__ === WebInspector.FontView.prototype; ditto > WebCore/inspector/front-end/ResourcesPanel.js:1084 > + return resourceView.__proto__ === WebInspector.ResourceView.prototype; ditto 296084 3 pfeldman 2010-10-19 03:07:43 -0700 (In reply to comment #2) > (From update of attachment 71147 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=71147&action=review > > Nice change. > > > WebCore/inspector/front-end/ResourcesPanel.js:1078 > > + return resourceView.__proto__ === WebInspector.SourceView.prototype; > > Why not check for (resourceView instanceof WebInspector.SourceView) instead? > instanceof ResourceView would be true for all of them and I don't want that... 296092 4 71147 commit-queue 2010-10-19 03:35:55 -0700 Comment on attachment 71147 [PATCH] Proposed change. Clearing flags on attachment: 71147 Committed r70045: <http://trac.webkit.org/changeset/70045> 296093 5 commit-queue 2010-10-19 03:36:00 -0700 All reviewed patches have been landed. Closing bug. 71147 2010-10-19 02:46:55 -0700 2010-10-19 03:35:54 -0700 [PATCH] Proposed change. resource_listeners text/plain 9751 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTk1M2U5Mi4uMTJjNDYzNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNCBAQAorMjAxMC0xMC0xOSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBkbyBub3QgYWNjZXNzIFJlc291cmNl UGFuZWwgZnJvbSByZXNvdXJjZXMgZGlyZWN0bHkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Nzg5MgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5 cGUuc2V0IGRvY3VtZW50VVJMKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90 b3R5cGUuc2V0IHN0YXJ0VGltZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJv dG90eXBlLnNldCByZXNwb25zZVJlY2VpdmVkVGltZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu UmVzb3VyY2UucHJvdG90eXBlLnNldCBlbmRUaW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5S ZXNvdXJjZS5wcm90b3R5cGUuc2V0IHJlc291cmNlU2l6ZSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuUmVzb3VyY2UucHJvdG90eXBlLnNldCBleHBlY3RlZENvbnRlbnRMZW5ndGgpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZS5zZXQgY2F0ZWdvcnkpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZS5zZXQgY2FjaGVkKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuc2V0IG1pbWVUeXBlKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuZ2V0IHJlcXVlc3RIZWFkZXJzKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuc2V0IHJlcXVlc3RIZWFkZXJz KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuZ2V0IHJlc3BvbnNl SGVhZGVycyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLnNldCBy ZXNwb25zZUhlYWRlcnMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2Vz UGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBl LmFkZFJlc291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90 b3R5cGUucmVmcmVzaFJlc291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQ YW5lbC5wcm90b3R5cGUuX3JlY3JlYXRlVmlld0ZvclJlc291cmNlSWZOZWVkZWQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5fcmVzb3VyY2VWaWV3SXND b25zaXN0ZW50V2l0aENhdGVnb3J5KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZUdy YXBoKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZUdyYXBoLnByb3RvdHlwZS5yZWZy ZXNoKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci51cGRhdGVSZXNvdXJjZSk6CisKIDIwMTAtMTAtMTkgIFNoZXJpZmYg Qm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IHJvbGxpbmcgb3V0IHI3MDAzNC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5q cwppbmRleCBiNDMzOGFiLi4xODQ4YTNhIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvUmVzb3VyY2UuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlLmpzCkBAIC0xMTksOCArMTE5LDYgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3Rv dHlwZSA9IHsKIAogICAgIHNldCBkb2N1bWVudFVSTCh4KQogICAgIHsKLSAgICAgICAgaWYgKHRo aXMuX2RvY3VtZW50VVJMID09PSB4KQotICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB0aGlz Ll9kb2N1bWVudFVSTCA9IHg7CiAgICAgfSwKIApAQCAtMTUzLDEzICsxNTEsNyBAQCBXZWJJbnNw ZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlID0gewogCiAgICAgc2V0IHN0YXJ0VGltZSh4KQogICAg IHsKLSAgICAgICAgaWYgKHRoaXMuX3N0YXJ0VGltZSA9PT0geCkKLSAgICAgICAgICAgIHJldHVy bjsKLQogICAgICAgICB0aGlzLl9zdGFydFRpbWUgPSB4OwotCi0gICAgICAgIGlmIChXZWJJbnNw ZWN0b3IucGFuZWxzLnJlc291cmNlcykKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMu cmVzb3VyY2VzLnJlZnJlc2hSZXNvdXJjZSh0aGlzKTsKICAgICB9LAogCiAgICAgZ2V0IHJlc3Bv bnNlUmVjZWl2ZWRUaW1lKCkKQEAgLTE3NCwxMyArMTY2LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291 cmNlLnByb3RvdHlwZSA9IHsKIAogICAgIHNldCByZXNwb25zZVJlY2VpdmVkVGltZSh4KQogICAg IHsKLSAgICAgICAgaWYgKHRoaXMuX3Jlc3BvbnNlUmVjZWl2ZWRUaW1lID09PSB4KQotICAgICAg ICAgICAgcmV0dXJuOwotCiAgICAgICAgIHRoaXMuX3Jlc3BvbnNlUmVjZWl2ZWRUaW1lID0geDsK LQotICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMpCi0gICAgICAgICAg ICBXZWJJbnNwZWN0b3IucGFuZWxzLnJlc291cmNlcy5yZWZyZXNoUmVzb3VyY2UodGhpcyk7CiAg ICAgfSwKIAogICAgIGdldCBlbmRUaW1lKCkKQEAgLTE5NiwxMyArMTgyLDcgQEAgV2ViSW5zcGVj dG9yLlJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHggPCB0aGlzLnJlc3BvbnNl UmVjZWl2ZWRUaW1lKQogICAgICAgICAgICAgdGhpcy5yZXNwb25zZVJlY2VpdmVkVGltZSA9IHg7 CiAKLSAgICAgICAgaWYgKHRoaXMuX2VuZFRpbWUgPT09IHgpCi0gICAgICAgICAgICByZXR1cm47 Ci0KICAgICAgICAgdGhpcy5fZW5kVGltZSA9IHg7Ci0KLSAgICAgICAgaWYgKFdlYkluc3BlY3Rv ci5wYW5lbHMucmVzb3VyY2VzKQotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNv dXJjZXMucmVmcmVzaFJlc291cmNlKHRoaXMpOwogICAgIH0sCiAKICAgICBnZXQgZHVyYXRpb24o KQpAQCAtMjMzLDEzICsyMTMsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlID0g ewogCiAgICAgc2V0IHJlc291cmNlU2l6ZSh4KQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX3Jl c291cmNlU2l6ZSA9PT0geCkKLSAgICAgICAgICAgIHJldHVybjsKLQogICAgICAgICB0aGlzLl9y ZXNvdXJjZVNpemUgPSB4OwotCi0gICAgICAgIGlmIChXZWJJbnNwZWN0b3IucGFuZWxzLnJlc291 cmNlcykKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2VzLnJlZnJlc2hS ZXNvdXJjZSh0aGlzKTsKICAgICB9LAogCiAgICAgZ2V0IHRyYW5zZmVyU2l6ZSgpCkBAIC0yNTUs OCArMjI5LDYgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZSA9IHsKIAogICAgIHNl dCBleHBlY3RlZENvbnRlbnRMZW5ndGgoeCkKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9leHBl Y3RlZENvbnRlbnRMZW5ndGggPT09IHgpCi0gICAgICAgICAgICByZXR1cm47CiAgICAgICAgIHRo aXMuX2V4cGVjdGVkQ29udGVudExlbmd0aCA9IHg7CiAgICAgfSwKIApAQCAtMzA2LDExICsyNzgs NiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlID0gewogCiAgICAgICAgIGlmICh0 aGlzLl9jYXRlZ29yeSkKICAgICAgICAgICAgIHRoaXMuX2NhdGVnb3J5LmFkZFJlc291cmNlKHRo aXMpOwotCi0gICAgICAgIGlmIChXZWJJbnNwZWN0b3IucGFuZWxzLnJlc291cmNlcykgewotICAg ICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMucmVmcmVzaFJlc291cmNlKHRo aXMpOwotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMucmVjcmVhdGVW aWV3Rm9yUmVzb3VyY2VJZk5lZWRlZCh0aGlzKTsKLSAgICAgICAgfQogICAgIH0sCiAKICAgICBn ZXQgY2FjaGVkKCkKQEAgLTMyMSw3ICsyODgsNiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJv dG90eXBlID0gewogICAgIHNldCBjYWNoZWQoeCkKICAgICB7CiAgICAgICAgIHRoaXMuX2NhY2hl ZCA9IHg7Ci0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKCJjYWNoZWQgY2hh bmdlZCIpOwogICAgIH0sCiAKICAgICBnZXQgbWltZVR5cGUoKQpAQCAtMzMxLDkgKzI5Nyw2IEBA IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAKICAgICBzZXQgbWltZVR5cGUo eCkKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9taW1lVHlwZSA9PT0geCkKLSAgICAgICAgICAg IHJldHVybjsKLQogICAgICAgICB0aGlzLl9taW1lVHlwZSA9IHg7CiAgICAgfSwKIApAQCAtMzgw LDE2ICszNDMsMTEgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZSA9IHsKIAogICAg IGdldCByZXF1ZXN0SGVhZGVycygpCiAgICAgewotICAgICAgICBpZiAodGhpcy5fcmVxdWVzdEhl YWRlcnMgPT09IHVuZGVmaW5lZCkKLSAgICAgICAgICAgIHRoaXMuX3JlcXVlc3RIZWFkZXJzID0g e307Ci0gICAgICAgIHJldHVybiB0aGlzLl9yZXF1ZXN0SGVhZGVyczsKKyAgICAgICAgcmV0dXJu IHRoaXMuX3JlcXVlc3RIZWFkZXJzIHx8IHt9OwogICAgIH0sCiAKICAgICBzZXQgcmVxdWVzdEhl YWRlcnMoeCkKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9yZXF1ZXN0SGVhZGVycyA9PT0geCkK LSAgICAgICAgICAgIHJldHVybjsKLQogICAgICAgICB0aGlzLl9yZXF1ZXN0SGVhZGVycyA9IHg7 CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9zb3J0ZWRSZXF1ZXN0SGVhZGVyczsKIApAQCAtNDI3LDE2 ICszODUsMTEgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZSA9IHsKIAogICAgIGdl dCByZXNwb25zZUhlYWRlcnMoKQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX3Jlc3BvbnNlSGVh ZGVycyA9PT0gdW5kZWZpbmVkKQotICAgICAgICAgICAgdGhpcy5fcmVzcG9uc2VIZWFkZXJzID0g e307Ci0gICAgICAgIHJldHVybiB0aGlzLl9yZXNwb25zZUhlYWRlcnM7CisgICAgICAgIHJldHVy biB0aGlzLl9yZXNwb25zZUhlYWRlcnMgfHwge307CiAgICAgfSwKIAogICAgIHNldCByZXNwb25z ZUhlYWRlcnMoeCkKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9yZXNwb25zZUhlYWRlcnMgPT09 IHgpCi0gICAgICAgICAgICByZXR1cm47Ci0KICAgICAgICAgdGhpcy5fcmVzcG9uc2VIZWFkZXJz ID0geDsKICAgICAgICAgZGVsZXRlIHRoaXMuX3NvcnRlZFJlc3BvbnNlSGVhZGVyczsKIApkaWZm IC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzIGIv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4IGZkMTY4 NDcuLjRjZWJmMDYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNv dXJjZXNQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2Vz UGFuZWwuanMKQEAgLTc1Nyw3ICs3NTcsNiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwu cHJvdG90eXBlID0gewogICAgIGFkZFJlc291cmNlOiBmdW5jdGlvbihyZXNvdXJjZSkKICAgICB7 CiAgICAgICAgIHRoaXMuX3Jlc291cmNlcy5wdXNoKHJlc291cmNlKTsKLSAgICAgICAgdGhpcy5y ZWZyZXNoUmVzb3VyY2UocmVzb3VyY2UpOwogICAgIH0sCiAKICAgICByZW1vdmVSZXNvdXJjZTog ZnVuY3Rpb24ocmVzb3VyY2UpCkBAIC04MTUsMTggKzgxNCwxOSBAQCBXZWJJbnNwZWN0b3IuUmVz b3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgcmVmcmVzaFJlc291cmNlOiBmdW5jdGlv bihyZXNvdXJjZSkKICAgICB7CisgICAgICAgIHRoaXMuX3JlY3JlYXRlVmlld0ZvclJlc291cmNl SWZOZWVkZWQocmVzb3VyY2UpOwogICAgICAgICB0aGlzLnJlZnJlc2hJdGVtKHJlc291cmNlKTsK ICAgICB9LAogCi0gICAgcmVjcmVhdGVWaWV3Rm9yUmVzb3VyY2VJZk5lZWRlZDogZnVuY3Rpb24o cmVzb3VyY2UpCisgICAgX3JlY3JlYXRlVmlld0ZvclJlc291cmNlSWZOZWVkZWQ6IGZ1bmN0aW9u KHJlc291cmNlKQogICAgIHsKICAgICAgICAgaWYgKCFyZXNvdXJjZSB8fCAhcmVzb3VyY2UuX3Jl c291cmNlc1ZpZXcpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgdmFyIG5ld1ZpZXcg PSB0aGlzLl9jcmVhdGVSZXNvdXJjZVZpZXcocmVzb3VyY2UpOwotICAgICAgICBpZiAobmV3Vmll dy5fX3Byb3RvX18gPT09IHJlc291cmNlLl9yZXNvdXJjZXNWaWV3Ll9fcHJvdG9fXykKKyAgICAg ICAgaWYgKHRoaXMuX3Jlc291cmNlVmlld0lzQ29uc2lzdGVudFdpdGhDYXRlZ29yeShyZXNvdXJj ZSwgcmVzb3VyY2UuX3Jlc291cmNlc1ZpZXcpKQogICAgICAgICAgICAgcmV0dXJuOwogCisgICAg ICAgIHZhciBuZXdWaWV3ID0gdGhpcy5fY3JlYXRlUmVzb3VyY2VWaWV3KHJlc291cmNlKTsKICAg ICAgICAgaWYgKCF0aGlzLmN1cnJlbnRRdWVyeSAmJiByZXNvdXJjZS5faXRlbXNUcmVlRWxlbWVu dCkKICAgICAgICAgICAgIHJlc291cmNlLl9pdGVtc1RyZWVFbGVtZW50LnVwZGF0ZUVycm9yc0Fu ZFdhcm5pbmdzKCk7CiAKQEAgLTEwNjgsNiArMTA2OCwyMyBAQCBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLmNhbGN1bGF0b3IgPSB0aGlzLnN1 bW1hcnlCYXIuY2FsY3VsYXRvciA9IHNlbGVjdGVkT3B0aW9uLmNhbGN1bGF0b3I7CiAgICAgfSwK IAorICAgIF9yZXNvdXJjZVZpZXdJc0NvbnNpc3RlbnRXaXRoQ2F0ZWdvcnk6IGZ1bmN0aW9uKHJl c291cmNlLCByZXNvdXJjZVZpZXcpCisgICAgeworICAgICAgICBzd2l0Y2ggKHJlc291cmNlLmNh dGVnb3J5KSB7CisgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5yZXNvdXJjZUNhdGVnb3Jp ZXMuZG9jdW1lbnRzOgorICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IucmVzb3VyY2VDYXRl Z29yaWVzLnN0eWxlc2hlZXRzOgorICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IucmVzb3Vy Y2VDYXRlZ29yaWVzLnNjcmlwdHM6CisgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5yZXNv dXJjZUNhdGVnb3JpZXMueGhyOgorICAgICAgICAgICAgICAgIHJldHVybiByZXNvdXJjZVZpZXcu X19wcm90b19fID09PSBXZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGU7CisgICAgICAg ICAgICBjYXNlIFdlYkluc3BlY3Rvci5yZXNvdXJjZUNhdGVnb3JpZXMuaW1hZ2VzOgorICAgICAg ICAgICAgICAgIHJldHVybiByZXNvdXJjZVZpZXcuX19wcm90b19fID09PSBXZWJJbnNwZWN0b3Iu SW1hZ2VWaWV3LnByb3RvdHlwZTsKKyAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLnJlc291 cmNlQ2F0ZWdvcmllcy5mb250czoKKyAgICAgICAgICAgICAgICByZXR1cm4gcmVzb3VyY2VWaWV3 Ll9fcHJvdG9fXyA9PT0gV2ViSW5zcGVjdG9yLkZvbnRWaWV3LnByb3RvdHlwZTsKKyAgICAgICAg ICAgIGRlZmF1bHQ6CisgICAgICAgICAgICAgICAgcmV0dXJuIHJlc291cmNlVmlldy5fX3Byb3Rv X18gPT09IFdlYkluc3BlY3Rvci5SZXNvdXJjZVZpZXcucHJvdG90eXBlOworICAgICAgICB9Cisg ICAgfSwKKwogICAgIF9jcmVhdGVSZXNvdXJjZVZpZXc6IGZ1bmN0aW9uKHJlc291cmNlKQogICAg IHsKICAgICAgICAgc3dpdGNoIChyZXNvdXJjZS5jYXRlZ29yeSkgewpAQCAtMTgxOSw3ICsxODM2 LDggQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlR3JhcGggPSBmdW5jdGlvbihyZXNvdXJjZSkKICAg ICB0aGlzLl9ncmFwaEVsZW1lbnQuY2xhc3NOYW1lID0gInJlc291cmNlcy1ncmFwaC1zaWRlIjsK ICAgICB0aGlzLl9ncmFwaEVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2VvdmVyIiwgdGhp cy5yZWZyZXNoTGFiZWxQb3NpdGlvbnMuYmluZCh0aGlzKSwgZmFsc2UpOwogCi0gICAgdGhpcy5f Y2FjaGVkQ2hhbmdlZCgpOworICAgIGlmICh0aGlzLnJlc291cmNlLmNhY2hlZCkKKyAgICAgICAg dGhpcy5fZ3JhcGhFbGVtZW50LmFkZFN0eWxlQ2xhc3MoInJlc291cmNlLWNhY2hlZCIpOwogCiAg ICAgdGhpcy5fYmFyQXJlYUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsK ICAgICB0aGlzLl9iYXJBcmVhRWxlbWVudC5jbGFzc05hbWUgPSAicmVzb3VyY2VzLWdyYXBoLWJh ci1hcmVhIGhpZGRlbiI7CkBAIC0xODQzLDggKzE4NjEsNiBAQCBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VHcmFwaCA9IGZ1bmN0aW9uKHJlc291cmNlKQogICAgIHRoaXMuX2JhckFyZWFFbGVtZW50LmFw cGVuZENoaWxkKHRoaXMuX2xhYmVsUmlnaHRFbGVtZW50KTsKIAogICAgIHRoaXMuX2dyYXBoRWxl bWVudC5hZGRTdHlsZUNsYXNzKCJyZXNvdXJjZXMtY2F0ZWdvcnktIiArIHJlc291cmNlLmNhdGVn b3J5Lm5hbWUpOwotCi0gICAgcmVzb3VyY2UuYWRkRXZlbnRMaXN0ZW5lcigiY2FjaGVkIGNoYW5n ZWQiLCB0aGlzLl9jYWNoZWRDaGFuZ2VkLCB0aGlzKTsKIH0KIAogV2ViSW5zcGVjdG9yLlJlc291 cmNlR3JhcGgucHJvdG90eXBlID0gewpAQCAtMTk2OCwxMSArMTk4NCw4IEBAIFdlYkluc3BlY3Rv ci5SZXNvdXJjZUdyYXBoLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fbGFiZWxMZWZ0RWxl bWVudC50aXRsZSA9IHRvb2x0aXA7CiAgICAgICAgIHRoaXMuX2xhYmVsUmlnaHRFbGVtZW50LnRp dGxlID0gdG9vbHRpcDsKICAgICAgICAgdGhpcy5fYmFyUmlnaHRFbGVtZW50LnRpdGxlID0gdG9v bHRpcDsKLSAgICB9LAogCi0gICAgX2NhY2hlZENoYW5nZWQ6IGZ1bmN0aW9uKCkKLSAgICB7Ci0g ICAgICAgIGlmICh0aGlzLnJlc291cmNlLmNhY2hlZCkKKyAgICAgICAgaWYgKHRoaXMucmVzb3Vy Y2UuY2FjaGVkICYmICF0aGlzLl9ncmFwaEVsZW1lbnQuaGFzU3R5bGVDbGFzcygicmVzb3VyY2Ut Y2FjaGVkIikpCiAgICAgICAgICAgICB0aGlzLl9ncmFwaEVsZW1lbnQuYWRkU3R5bGVDbGFzcygi cmVzb3VyY2UtY2FjaGVkIik7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuanMKaW5kZXggNjYyOWU2Yy4uOWJkODhkNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvaW5zcGVjdG9yLmpzCkBAIC0xMjgxLDYgKzEyODEsNyBAQCBXZWJJbnNwZWN0b3Iu dXBkYXRlUmVzb3VyY2UgPSBmdW5jdGlvbihwYXlsb2FkKQogICAgICAgICBpZiAocGF5bG9hZC5l bmRUaW1lKQogICAgICAgICAgICAgcmVzb3VyY2UuZW5kVGltZSA9IHBheWxvYWQuZW5kVGltZTsK ICAgICB9CisgICAgdGhpcy5wYW5lbHMucmVzb3VyY2VzLnJlZnJlc2hSZXNvdXJjZShyZXNvdXJj ZSk7CiB9CiAKIFdlYkluc3BlY3Rvci5kb21Db250ZW50RXZlbnRGaXJlZCA9IGZ1bmN0aW9uKHRp bWUpCg==