58041 2011-04-07 06:57:36 -0700 Web Inspector: get rid of source frame delegates for resources panel. 2011-04-11 06:41:14 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 381302 0 podivilov 2011-04-07 06:57:36 -0700 Web Inspector: get rid of source frame delegates for resources panel. SourceFrameDelegateForResourcesPanel and CSSSourceFrameDelegateForResourcesPanel are strange classes, we should get rid of them. Resources panel should use TextViewer configured with a domain-specific delegate to show/edit resource contents. See bug 57941. 381303 1 88625 podivilov 2011-04-07 06:58:09 -0700 Created attachment 88625 Patch. 383145 2 podivilov 2011-04-11 06:41:14 -0700 Committed r83438: <http://trac.webkit.org/changeset/83438> 88625 2011-04-07 06:58:09 -0700 2011-04-07 08:50:04 -0700 Patch. patch text/plain 9726 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmZDU3MTI2Li4zOTRkMTY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMzMg QEAKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBXZWIg SW5zcGVjdG9yOiBnZXQgcmlkIG9mIHNvdXJjZSBmcmFtZSBkZWxlZ2F0ZXMgZm9yIHJlc291cmNl cyBwYW5lbC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTU4MDQxCisKKyAgICAgICAgVXNlIFRleHRWaWV3ZXIgY29uZmlndXJlZCB3aXRoIGEgZG9tYWlu LXNwZWNpZmljIGRlbGVnYXRlIHRvIHNob3cvZWRpdCByZXNvdXJjZSBjb250ZW50cyBpbiByZXNv dXJjZXMgcGFuZWwuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVmll dy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVZpZXcuY3JlYXRlUmVzb3VyY2VW aWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVZpZXcucmVzb3VyY2VWaWV3VHlw ZU1hdGNoZXNSZXNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VTb3VyY2VG cmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VTb3VyY2VGcmFtZS5wcm90b3R5 cGUuZ2V0IHJlc291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVNvdXJjZUZy YW1lLnByb3RvdHlwZS5jb250ZW50RWRpdGFibGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJl c291cmNlU291cmNlRnJhbWUucHJvdG90eXBlLl9yZXF1ZXN0Q29udGVudCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuQ1NTU291cmNlRnJhbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1Nv dXJjZUZyYW1lLnByb3RvdHlwZS5jb250ZW50RWRpdGFibGUpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkNTU1NvdXJjZUZyYW1lLnByb3RvdHlwZS5fZWRpdENvbnRlbnQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkNTU1NvdXJjZUZyYW1lLnByb3RvdHlwZS5fZWRpdENvbnRlbnQuaGFuZGxlSW5m b3MpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1NvdXJjZUZyYW1lLnByb3RvdHlwZS5fc2F2 ZVN0eWxlU2hlZXQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLl9lbnN1cmVD b250ZW50TG9hZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5 cGUuX3JlcXVlc3RDb250ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5w cm90b3R5cGUuX2hhbmRsZVNhdmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1l LnByb3RvdHlwZS5fZWRpdENvbnRlbnQpOgorCisyMDExLTA0LTA3ICBQYXZlbCBQb2Rpdmlsb3Yg IDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1ha2UgU291cmNlRnJhbWUgVGV4dFZp ZXdlcidzIGRlbGVnYXRlIGZvciBlZGl0aW5nIG9wZXJhdGlvbnMuCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODAyNgogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVmlldy5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VWaWV3LmpzCmluZGV4IGI3ZmQ3YTEu LjY4MTVmMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv UmVzb3VyY2VWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv UmVzb3VyY2VWaWV3LmpzCkBAIC00NSwyMCArNDUsMTMgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNl Vmlldy5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlZpZXcucHJvdG90eXBlOwog CiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3LmNyZWF0ZVJlc291cmNlVmlldyA9IGZ1bmN0aW9u KHJlc291cmNlKQogewotICAgIGZ1bmN0aW9uIHNvdXJjZUZyYW1lRm9yRGVsZWdhdGVBbmRVUkwo ZGVsZWdhdGUsIHVybCkKLSAgICB7Ci0gICAgICAgIHZhciB2aWV3ID0gbmV3IFdlYkluc3BlY3Rv ci5Tb3VyY2VGcmFtZShkZWxlZ2F0ZSwgdXJsKTsKLSAgICAgICAgdmlldy5yZXNvdXJjZSA9IHJl c291cmNlOwotICAgICAgICByZXR1cm4gdmlldzsKLSAgICB9Ci0KICAgICBzd2l0Y2ggKHJlc291 cmNlLmNhdGVnb3J5KSB7CiAgICAgY2FzZSBXZWJJbnNwZWN0b3IucmVzb3VyY2VDYXRlZ29yaWVz LmRvY3VtZW50czoKICAgICBjYXNlIFdlYkluc3BlY3Rvci5yZXNvdXJjZUNhdGVnb3JpZXMuc2Ny aXB0czoKICAgICBjYXNlIFdlYkluc3BlY3Rvci5yZXNvdXJjZUNhdGVnb3JpZXMueGhyOgotICAg ICAgICByZXR1cm4gc291cmNlRnJhbWVGb3JEZWxlZ2F0ZUFuZFVSTChuZXcgV2ViSW5zcGVjdG9y LlNvdXJjZUZyYW1lRGVsZWdhdGVGb3JSZXNvdXJjZXNQYW5lbChyZXNvdXJjZSksIHJlc291cmNl LnVybCk7CisgICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlU291cmNlRnJh bWUocmVzb3VyY2UpOwogICAgIGNhc2UgV2ViSW5zcGVjdG9yLnJlc291cmNlQ2F0ZWdvcmllcy5z dHlsZXNoZWV0czoKLSAgICAgICAgcmV0dXJuIHNvdXJjZUZyYW1lRm9yRGVsZWdhdGVBbmRVUkwo bmV3IFdlYkluc3BlY3Rvci5DU1NTb3VyY2VGcmFtZURlbGVnYXRlRm9yUmVzb3VyY2VzUGFuZWwo cmVzb3VyY2UpLCByZXNvdXJjZS51cmwpOworICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rv ci5DU1NTb3VyY2VGcmFtZShyZXNvdXJjZSk7CiAgICAgY2FzZSBXZWJJbnNwZWN0b3IucmVzb3Vy Y2VDYXRlZ29yaWVzLmltYWdlczoKICAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuSW1h Z2VWaWV3KHJlc291cmNlKTsKICAgICBjYXNlIFdlYkluc3BlY3Rvci5yZXNvdXJjZUNhdGVnb3Jp ZXMuZm9udHM6CkBAIC03MywxMCArNjYsMTEgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldy5y ZXNvdXJjZVZpZXdUeXBlTWF0Y2hlc1Jlc291cmNlID0gZnVuY3Rpb24ocmVzb3VyY2UpCiAgICAg dmFyIHJlc291cmNlVmlldyA9IHJlc291cmNlLl9yZXNvdXJjZXNWaWV3OwogICAgIHN3aXRjaCAo cmVzb3VyY2UuY2F0ZWdvcnkpIHsKICAgICBjYXNlIFdlYkluc3BlY3Rvci5yZXNvdXJjZUNhdGVn b3JpZXMuZG9jdW1lbnRzOgotICAgIGNhc2UgV2ViSW5zcGVjdG9yLnJlc291cmNlQ2F0ZWdvcmll cy5zdHlsZXNoZWV0czoKICAgICBjYXNlIFdlYkluc3BlY3Rvci5yZXNvdXJjZUNhdGVnb3JpZXMu c2NyaXB0czoKICAgICBjYXNlIFdlYkluc3BlY3Rvci5yZXNvdXJjZUNhdGVnb3JpZXMueGhyOgot ICAgICAgICByZXR1cm4gcmVzb3VyY2VWaWV3Ll9fcHJvdG9fXyA9PT0gV2ViSW5zcGVjdG9yLlNv dXJjZUZyYW1lLnByb3RvdHlwZTsKKyAgICAgICAgcmV0dXJuIHJlc291cmNlVmlldy5fX3Byb3Rv X18gPT09IFdlYkluc3BlY3Rvci5SZXNvdXJjZVNvdXJjZUZyYW1lLnByb3RvdHlwZTsKKyAgICBj YXNlIFdlYkluc3BlY3Rvci5yZXNvdXJjZUNhdGVnb3JpZXMuc3R5bGVzaGVldHM6CisgICAgICAg IHJldHVybiByZXNvdXJjZVZpZXcuX19wcm90b19fID09PSBXZWJJbnNwZWN0b3IuQ1NTU291cmNl RnJhbWUucHJvdG90eXBlOwogICAgIGNhc2UgV2ViSW5zcGVjdG9yLnJlc291cmNlQ2F0ZWdvcmll cy5pbWFnZXM6CiAgICAgICAgIHJldHVybiByZXNvdXJjZVZpZXcuX19wcm90b19fID09PSBXZWJJ bnNwZWN0b3IuSW1hZ2VWaWV3LnByb3RvdHlwZTsKICAgICBjYXNlIFdlYkluc3BlY3Rvci5yZXNv dXJjZUNhdGVnb3JpZXMuZm9udHM6CkBAIC0xMjQsNTggKzExOCw3MSBAQCBXZWJJbnNwZWN0b3Iu UmVzb3VyY2VWaWV3LmV4aXN0aW5nUmVzb3VyY2VWaWV3Rm9yUmVzb3VyY2UgPSBmdW5jdGlvbihy ZXNvdXJjZSkKIH0KIAogCi1XZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclJlc291 cmNlc1BhbmVsID0gZnVuY3Rpb24ocmVzb3VyY2UpCitXZWJJbnNwZWN0b3IuUmVzb3VyY2VTb3Vy Y2VGcmFtZSA9IGZ1bmN0aW9uKHJlc291cmNlKQogewotICAgIFdlYkluc3BlY3Rvci5Tb3VyY2VG cmFtZURlbGVnYXRlLmNhbGwodGhpcyk7CisgICAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLmNh bGwodGhpcywgbmV3IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlKCksIHJlc291cmNl LnVybCk7CiAgICAgdGhpcy5fcmVzb3VyY2UgPSByZXNvdXJjZTsKIH0KIAogLy9UaGlzIGlzIGEg bWFwIGZyb20gcmVzb3VyY2UudHlwZSB0byBtaW1lIHR5cGVzCiAvL2ZvdW5kIGluIFdlYkluc3Bl Y3Rvci5Tb3VyY2VUb2tlbml6ZXIuUmVnaXN0cnkuCi1XZWJJbnNwZWN0b3IuU291cmNlRnJhbWVE ZWxlZ2F0ZUZvclJlc291cmNlc1BhbmVsLkRlZmF1bHRNSU1FVHlwZUZvclJlc291cmNlVHlwZSA9 IHsKK1dlYkluc3BlY3Rvci5SZXNvdXJjZVNvdXJjZUZyYW1lLkRlZmF1bHRNSU1FVHlwZUZvclJl c291cmNlVHlwZSA9IHsKICAgICAwOiAidGV4dC9odG1sIiwKICAgICAxOiAidGV4dC9jc3MiLAog ICAgIDQ6ICJ0ZXh0L2phdmFzY3JpcHQiCiB9CiAKLVdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURl bGVnYXRlRm9yUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewotICAgIHJlcXVlc3RDb250ZW50 OiBmdW5jdGlvbihjYWxsYmFjaykKK1dlYkluc3BlY3Rvci5SZXNvdXJjZVNvdXJjZUZyYW1lLnBy b3RvdHlwZSA9IHsKKyAgICBnZXQgcmVzb3VyY2UoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRo aXMuX3Jlc291cmNlOworICAgIH0sCisKKyAgICBjb250ZW50RWRpdGFibGU6IGZ1bmN0aW9uKCkK KyAgICB7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9LAorCisgICAgX3JlcXVlc3RDb250 ZW50OiBmdW5jdGlvbihjYWxsYmFjaykKICAgICB7CiAgICAgICAgIGZ1bmN0aW9uIGNvbnRlbnRM b2FkZWQodGV4dCkKICAgICAgICAgewotICAgICAgICAgICAgdmFyIG1pbWVUeXBlID0gV2ViSW5z cGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGVGb3JSZXNvdXJjZXNQYW5lbC5EZWZhdWx0TUlNRVR5 cGVGb3JSZXNvdXJjZVR5cGVbdGhpcy5fcmVzb3VyY2UudHlwZV0gfHwgdGhpcy5fcmVzb3VyY2Uu bWltZVR5cGU7CisgICAgICAgICAgICB2YXIgbWltZVR5cGUgPSBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VTb3VyY2VGcmFtZS5EZWZhdWx0TUlNRVR5cGVGb3JSZXNvdXJjZVR5cGVbdGhpcy5fcmVzb3Vy Y2UudHlwZV0gfHwgdGhpcy5fcmVzb3VyY2UubWltZVR5cGU7CiAgICAgICAgICAgICBjYWxsYmFj ayhtaW1lVHlwZSwgdGV4dCk7CiAgICAgICAgIH0KICAgICAgICAgdGhpcy5fcmVzb3VyY2UucmVx dWVzdENvbnRlbnQoY29udGVudExvYWRlZC5iaW5kKHRoaXMpKTsKICAgICB9CiB9CiAKLVdlYklu c3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLl9f cHJvdG9fXyA9IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlLnByb3RvdHlwZTsKK1dl Ykluc3BlY3Rvci5SZXNvdXJjZVNvdXJjZUZyYW1lLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJ bnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlOwogCiAKLVdlYkluc3BlY3Rvci5DU1NTb3Vy Y2VGcmFtZURlbGVnYXRlRm9yUmVzb3VyY2VzUGFuZWwgPSBmdW5jdGlvbihyZXNvdXJjZSkKK1dl Ykluc3BlY3Rvci5DU1NTb3VyY2VGcmFtZSA9IGZ1bmN0aW9uKHJlc291cmNlKQogewotICAgIFdl Ykluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yUmVzb3VyY2VzUGFuZWwuY2FsbCh0aGlz LCByZXNvdXJjZSk7CisgICAgV2ViSW5zcGVjdG9yLlJlc291cmNlU291cmNlRnJhbWUuY2FsbCh0 aGlzLCByZXNvdXJjZSk7CiB9CiAKLVdlYkluc3BlY3Rvci5DU1NTb3VyY2VGcmFtZURlbGVnYXRl Rm9yUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewotICAgIGNhbkVkaXRTY3JpcHRTb3VyY2U6 IGZ1bmN0aW9uKCkKK1dlYkluc3BlY3Rvci5DU1NTb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7Cisg ICAgY29udGVudEVkaXRhYmxlOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICByZXR1cm4gdHJ1 ZTsKICAgICB9LAogCi0gICAgZWRpdFNjcmlwdFNvdXJjZTogZnVuY3Rpb24obmV3VGV4dCkKKyAg ICBfZWRpdENvbnRlbnQ6IGZ1bmN0aW9uKG5ld1RleHQsIGNhbGxiYWNrKQogICAgIHsKICAgICAg ICAgZnVuY3Rpb24gaGFuZGxlU3R5bGVTaGVldChuZXdUZXh0LCBzdHlsZVNoZWV0KQogICAgICAg ICB7CiAgICAgICAgICAgICB0aGlzLl9zdHlsZVNoZWV0ID0gc3R5bGVTaGVldDsKLSAgICAgICAg ICAgIHRoaXMuX3NhdmVTdHlsZVNoZWV0KG5ld1RleHQpOworICAgICAgICAgICAgdGhpcy5fc2F2 ZVN0eWxlU2hlZXQobmV3VGV4dCwgY2FsbGJhY2spOwogICAgICAgICB9CiAKICAgICAgICAgZnVu Y3Rpb24gaGFuZGxlSW5mb3MobmV3VGV4dCwgZXJyb3IsIGluZm9zKQogICAgICAgICB7Ci0gICAg ICAgICAgICBpZiAoZXJyb3IpCisgICAgICAgICAgICBpZiAoZXJyb3IpIHsKKyAgICAgICAgICAg ICAgICBjYWxsYmFjayhlcnJvcik7CiAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAg ICAgfQorCiAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGluZm9zLmxlbmd0aDsgKytp KSB7CiAgICAgICAgICAgICAgICAgdmFyIGluZm8gPSBpbmZvc1tpXTsKICAgICAgICAgICAgICAg ICBpZiAoaW5mby5zb3VyY2VVUkwgPT09IHRoaXMuX3Jlc291cmNlLnVybCkgewpAQCAtMTg2LDIx ICsxOTMsMjMgQEAgV2ViSW5zcGVjdG9yLkNTU1NvdXJjZUZyYW1lRGVsZWdhdGVGb3JSZXNvdXJj ZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAodGhpcy5fc3R5 bGVTaGVldCkKLSAgICAgICAgICAgIHRoaXMuX3NhdmVTdHlsZVNoZWV0KG5ld1RleHQpOworICAg ICAgICAgICAgdGhpcy5fc2F2ZVN0eWxlU2hlZXQobmV3VGV4dCwgY2FsbGJhY2spOwogICAgICAg ICBlbHNlCiAgICAgICAgICAgICBDU1NBZ2VudC5nZXRBbGxTdHlsZVNoZWV0cyhoYW5kbGVJbmZv cy5iaW5kKHRoaXMsIG5ld1RleHQpKTsKICAgICB9LAogCi0gICAgX3NhdmVTdHlsZVNoZWV0OiBm dW5jdGlvbihuZXdUZXh0KQorICAgIF9zYXZlU3R5bGVTaGVldDogZnVuY3Rpb24obmV3VGV4dCwg Y2FsbGJhY2spCiAgICAgewotICAgICAgICBmdW5jdGlvbiBjYWxsYmFjayhzdWNjZXNzKQorICAg ICAgICBmdW5jdGlvbiBkaWRTZXRUZXh0KHN1Y2Nlc3MpCiAgICAgICAgIHsKKyAgICAgICAgICAg IHZhciBlcnJvcjsKICAgICAgICAgICAgIGlmICghc3VjY2VzcykKLSAgICAgICAgICAgICAgICBj b25zb2xlLmVycm9yKCJGYWlsZWQgdG8gc2F2ZSBtb2RpZmllZCBzdHlsZXNoZWV0ICVzIiwgdGhp cy5fcmVzb3VyY2UudXJsKTsKKyAgICAgICAgICAgICAgICBlcnJvciA9ICJGYWlsZWQgdG8gc2F2 ZSBtb2RpZmllZCBzdHlsZXNoZWV0ICIgKyB0aGlzLl9yZXNvdXJjZS51cmw7CisgICAgICAgICAg ICBjYWxsYmFjayhlcnJvcik7CiAgICAgICAgIH0KIAotICAgICAgICB0aGlzLl9zdHlsZVNoZWV0 LnNldFRleHQobmV3VGV4dCwgY2FsbGJhY2suYmluZCh0aGlzKSk7CisgICAgICAgIHRoaXMuX3N0 eWxlU2hlZXQuc2V0VGV4dChuZXdUZXh0LCBkaWRTZXRUZXh0LmJpbmQodGhpcykpOwogICAgIH0K IH0KIAotV2ViSW5zcGVjdG9yLkNTU1NvdXJjZUZyYW1lRGVsZWdhdGVGb3JSZXNvdXJjZXNQYW5l bC5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGVG b3JSZXNvdXJjZXNQYW5lbC5wcm90b3R5cGU7CitXZWJJbnNwZWN0b3IuQ1NTU291cmNlRnJhbWUu cHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5SZXNvdXJjZVNvdXJjZUZyYW1lLnBy b3RvdHlwZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U291cmNlRnJhbWUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJj ZUZyYW1lLmpzCmluZGV4IDVkZDUyODguLmZlNTg5NTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcwpAQCAtMTE0LDEwICsxMTQsMTUg QEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAg IGlmICghdGhpcy5fY29udGVudFJlcXVlc3RlZCkgewogICAgICAgICAgICAgdGhpcy5fY29udGVu dFJlcXVlc3RlZCA9IHRydWU7Ci0gICAgICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5yZXF1ZXN0Q29u dGVudCh0aGlzLl9jcmVhdGVUZXh0Vmlld2VyLmJpbmQodGhpcykpOworICAgICAgICAgICAgdGhp cy5fcmVxdWVzdENvbnRlbnQodGhpcy5fY3JlYXRlVGV4dFZpZXdlci5iaW5kKHRoaXMpKTsKICAg ICAgICAgfQogICAgIH0sCiAKKyAgICBfcmVxdWVzdENvbnRlbnQ6IGZ1bmN0aW9uKGNhbGxiYWNr KQorICAgIHsKKyAgICAgICAgdGhpcy5fZGVsZWdhdGUucmVxdWVzdENvbnRlbnQoY2FsbGJhY2sp OworICAgIH0sCisKICAgICBtYXJrRGlmZjogZnVuY3Rpb24oZGlmZkRhdGEpCiAgICAgewogICAg ICAgICBpZiAodGhpcy5fZGlmZkxpbmVzICYmIHRoaXMuX3RleHRWaWV3ZXIpCkBAIC04ODMsNyAr ODg4LDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKIAogICAgIF9o YW5kbGVTYXZlOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICBpZiAodGhpcy5fdGV4dFZpZXdl ci5yZWFkT25seSB8fCAhdGhpcy5fZGVsZWdhdGUuY2FuRWRpdFNjcmlwdFNvdXJjZSgpKQorICAg ICAgICBpZiAodGhpcy5fdGV4dFZpZXdlci5yZWFkT25seSB8fCAhdGhpcy5jb250ZW50RWRpdGFi bGUoKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICBpZiAoIXRoaXMuX3Zp ZXdlclN0YXRlKSB7CkBAIC05MTAsMTAgKzkxNSwxNSBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJh bWUucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zaG93Q29uc29s ZSgpOwogICAgICAgICAgICAgfQogICAgICAgICB9Ci0gICAgICAgIHRoaXMuX2RlbGVnYXRlLmVk aXRTY3JpcHRTb3VyY2UobmV3U291cmNlLCBkaWRFZGl0U2NyaXB0U291cmNlLmJpbmQodGhpcykp OworICAgICAgICB0aGlzLl9lZGl0Q29udGVudChuZXdTb3VyY2UsIGRpZEVkaXRTY3JpcHRTb3Vy Y2UuYmluZCh0aGlzKSk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0sCiAKKyAgICBfZWRp dENvbnRlbnQ6IGZ1bmN0aW9uKG5ld0NvbnRlbnQsIGNhbGxiYWNrKQorICAgIHsKKyAgICAgICAg dGhpcy5fZGVsZWdhdGUuZWRpdFNjcmlwdFNvdXJjZShuZXdDb250ZW50LCBjYWxsYmFjayk7Cisg ICAgfSwKKwogICAgIF9oYW5kbGVSZXZlcnRFZGl0aW5nOiBmdW5jdGlvbigpCiAgICAgewogICAg ICAgICBpZiAodGhpcy5fdGV4dFZpZXdlci5yZWFkT25seSkK