53584 2011-02-02 03:38:55 -0800 Web Inspector: do not share source frames between resources panel and scripts panel 2011-02-03 09:15:40 -0800 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 webkit.review.bot yurys oldest_to_newest 343937 0 podivilov 2011-02-02 03:38:55 -0800 Web Inspector: do not share source frames between resources panel and scripts panel Currently, we show error messages only for resources. This change will allow showing error messages in source frame even when resource is not available (eval scripts, inlined scripts). 343939 1 80909 podivilov 2011-02-02 03:40:10 -0800 Created attachment 80909 Patch. 343940 2 webkit.review.bot 2011-02-02 03:41:42 -0800 Attachment 80909 did not pass style-queue: Failed to run "['Tools/Scripts/update-webkit']" exit_code: 2 perl: warning: Setting locale failed. perl: warning: Please check that your locale settings: LANGUAGE = (unset), LC_ALL = (unset), LANG = "en_US.US-ASCII" are supported and installed on your system. perl: warning: Falling back to the standard locale ("C"). Updating OpenSource perl: warning: Setting locale failed. perl: warning: Please check that your locale settings: LANGUAGE = (unset), LC_ALL = (unset), LANG = "en_US.US-ASCII" are supported and installed on your system. perl: warning: Falling back to the standard locale ("C"). RA layer request failed: OPTIONS of 'http://svn.webkit.org/repository/webkit': Could not read status line: Connection reset by peer (http://svn.webkit.org) at /usr/lib/git-core/git-svn line 2295 Died at Tools/Scripts/update-webkit line 132. If any of these errors are false positives, please file a bug against check-webkit-style. 344762 3 podivilov 2011-02-03 09:15:40 -0800 Committed r77498: <http://trac.webkit.org/changeset/77498> 80909 2011-02-02 03:40:10 -0800 2011-02-02 05:39:53 -0800 Patch. patch text/plain 9033 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiY2QyMmM0Li40OWYyNTQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkg QEAKKzIwMTEtMDItMDIgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogZG8gbm90IHNoYXJlIHNvdXJjZSBmcmFtZXMgYmV0d2VlbiByZXNvdXJjZXMgcGFu ZWwgYW5kIHNjcmlwdHMgcGFuZWwuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD01MzU4NAorCisgICAgICAgIEN1cnJlbnRseSwgd2Ugc2hvdyBlcnJvciBt ZXNzYWdlcyBvbmx5IGZvciByZXNvdXJjZXMuIFRoaXMgY2hhbmdlIHdpbGwgYWxsb3cgc2hvd2lu ZyBlcnJvcgorICAgICAgICBtZXNzYWdlcyBpbiBzb3VyY2UgZnJhbWUgZXZlbiB3aGVuIHJlc291 cmNlIGlzIG5vdCBhdmFpbGFibGUgKGV2YWwgc2NyaXB0cywgaW5saW5lZCBzY3JpcHRzKS4KKwor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlLmFkZE1lc3NhZ2UpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS5jbGVhck1lc3NhZ2VzKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVmlldy5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5SZXNvdXJjZVZpZXcucmVjcmVhdGVSZXNvdXJjZVZpZXcpOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuRnJhbWVSZXNvdXJjZVRyZWVFbGVtZW50LnByb3RvdHlwZS5fc2V0QnViYmxlVGV4dCk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fc2NyaXB0U291cmNlQ2hhbmdlZCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5hZGRDb25zb2xl TWVzc2FnZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5j bGVhckNvbnNvbGVNZXNzYWdlcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVs LnByb3RvdHlwZS5yZXNldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnBy b3RvdHlwZS5fc291cmNlRnJhbWVGb3JTY3JpcHRPclJlc291cmNlKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9zb3VyY2VGcmFtZUZvclJlc291cmNlKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9zb3VyY2VGcmFt ZUZvclNjcmlwdCk6CisKIDIwMTEtMDItMDEgIEphbWVzIFNpbW9uc2VuICA8c2ltb25qYW1AY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFRvbnkgR2VudGlsY29yZS4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCmluZGV4 IDNhYTVlZjAuLmUwYjdkMWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQ29uc29sZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Db25zb2xlVmlldy5qcwpAQCAtMjczLDYgKzI3Myw3IEBAIFdlYkluc3BlY3Rvci5D b25zb2xlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmIChtc2cgaW5zdGFuY2VvZiBXZWJJ bnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UgJiYgIShtc2cgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3Iu Q29uc29sZUNvbW1hbmRSZXN1bHQpKSB7CiAgICAgICAgICAgICB0aGlzLl9pbmNyZW1lbnRFcnJv cldhcm5pbmdDb3VudChtc2cpOwogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnJlc291cmNlVHJl ZU1vZGVsLmFkZENvbnNvbGVNZXNzYWdlKG1zZyk7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3Iu cGFuZWxzLnNjcmlwdHMuYWRkQ29uc29sZU1lc3NhZ2UobXNnKTsKICAgICAgICAgICAgIHRoaXMu Y29tbWFuZFNpbmNlUHJldmlvdXNNZXNzYWdlID0gZmFsc2U7CiAgICAgICAgICAgICB0aGlzLnBy ZXZpb3VzTWVzc2FnZSA9IG1zZzsKICAgICAgICAgfSBlbHNlIGlmIChtc2cgaW5zdGFuY2VvZiBX ZWJJbnNwZWN0b3IuQ29uc29sZUNvbW1hbmQpIHsKQEAgLTMyMSw2ICszMjIsNyBAQCBXZWJJbnNw ZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAgIGNsZWFyTWVzc2FnZXM6IGZ1bmN0 aW9uKCkKICAgICB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5jbGVh ckNvbnNvbGVNZXNzYWdlcygpOworICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMu Y2xlYXJDb25zb2xlTWVzc2FnZXMoKTsKIAogICAgICAgICB0aGlzLm1lc3NhZ2VzID0gW107CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VW aWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVZpZXcu anMKaW5kZXggNWI0YjcwMS4uZTM4Y2QwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanMKQEAgLTEwOSw3ICsxMDksNiBAQCBXZWJJ bnNwZWN0b3IuUmVzb3VyY2VWaWV3LnJlY3JlYXRlUmVzb3VyY2VWaWV3ID0gZnVuY3Rpb24ocmVz b3VyY2UpCiAgICAgaWYgKHNjcm9sbFRvcCkKICAgICAgICAgbmV3Vmlldy5zY3JvbGxUb3AgPSBz Y3JvbGxUb3A7CiAKLSAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMudmlld1JlY3JlYXRl ZChvbGRWaWV3LCBuZXdWaWV3KTsKICAgICByZXR1cm4gbmV3VmlldzsKIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKaW5k ZXggMTc0M2VjZS4uNzNmMDA3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCkBAIC0xMDQyLDcgKzEwNDIsOCBAQCBXZWJJ bnNwZWN0b3IuRnJhbWVSZXNvdXJjZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAg aWYgKCF0aGlzLl9idWJibGVFbGVtZW50KSB7CiAgICAgICAgICAgICB0aGlzLl9idWJibGVFbGVt ZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAgICAgICAgICB0aGlzLl9i dWJibGVFbGVtZW50LmNsYXNzTmFtZSA9ICJidWJibGUiOwotICAgICAgICAgICAgdGhpcy5fc3Rh dHVzRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9idWJibGVFbGVtZW50KTsKKyAgICAgICAgICAg IGlmICh0aGlzLl9zdGF0dXNFbGVtZW50KQorICAgICAgICAgICAgICAgIHRoaXMuX3N0YXR1c0Vs ZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fYnViYmxlRWxlbWVudCk7CiAgICAgICAgIH0KIAogICAg ICAgICB0aGlzLl9idWJibGVFbGVtZW50LnRleHRDb250ZW50ID0geDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggZGRjOTA2 YS4uY2Y3MDM2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzUGFuZWwuanMKQEAgLTI1NSwxOSArMjU1LDIzIEBAIFdlYkluc3BlY3Rvci5TY3Jp cHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB2YXIgc291cmNlSUQgPSBldmVudC5kYXRh LnNvdXJjZUlEOwogICAgICAgICB2YXIgb2xkU291cmNlID0gZXZlbnQuZGF0YS5vbGRTb3VyY2U7 CiAKKyAgICAgICAgdmFyIG9sZFZpZXcsIG5ld1ZpZXc7CiAgICAgICAgIHZhciBzY3JpcHQgPSBX ZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5zY3JpcHRGb3JTb3VyY2VJRChzb3VyY2VJRCk7CiAg ICAgICAgIGlmIChzY3JpcHQucmVzb3VyY2UpIHsKLSAgICAgICAgICAgIGRlbGV0ZSBzY3JpcHQu X3NvdXJjZUZyYW1lOwotICAgICAgICAgICAgZGVsZXRlIHNjcmlwdC5yZXNvdXJjZS5fc291cmNl RnJhbWU7CisgICAgICAgICAgICBvbGRWaWV3ID0gdGhpcy5fdXJsVG9Tb3VyY2VGcmFtZVtzY3Jp cHQucmVzb3VyY2UudXJsXTsKKyAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl91cmxUb1NvdXJjZUZy YW1lW3NjcmlwdC5yZXNvdXJjZS51cmxdOworICAgICAgICAgICAgbmV3VmlldyA9IHRoaXMuX3Nv dXJjZUZyYW1lRm9yUmVzb3VyY2Uoc2NyaXB0LnJlc291cmNlKTsKICAgICAgICAgICAgIHZhciBy ZXZlcnRIYW5kbGUgPSBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5lZGl0U2NyaXB0U291cmNl LmJpbmQoV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwsIHNvdXJjZUlELCBvbGRTb3VyY2UpOwog ICAgICAgICAgICAgc2NyaXB0LnJlc291cmNlLnNldENvbnRlbnQoc2NyaXB0LnNvdXJjZSwgcmV2 ZXJ0SGFuZGxlKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIHZhciBvbGRWaWV3ID0g c2NyaXB0Ll9zb3VyY2VGcmFtZTsKICAgICAgICAgICAgIGRlbGV0ZSBzY3JpcHQuX3NvdXJjZUZy YW1lOwotICAgICAgICAgICAgaWYgKG9sZFZpZXcpCi0gICAgICAgICAgICAgICAgdGhpcy52aWV3 UmVjcmVhdGVkKG9sZFZpZXcsIHRoaXMuX3NvdXJjZUZyYW1lRm9yU2NyaXB0T3JSZXNvdXJjZShz Y3JpcHQpKTsKKyAgICAgICAgICAgIG5ld1ZpZXcgPSB0aGlzLl9zb3VyY2VGcmFtZUZvclNjcmlw dChzY3JpcHQpOwogICAgICAgICB9CiAKKyAgICAgICAgaWYgKHRoaXMudmlzaWJsZVZpZXcgPT09 IG9sZFZpZXcpCisgICAgICAgICAgICB0aGlzLnZpc2libGVWaWV3ID0gbmV3VmlldzsKKwogICAg ICAgICB2YXIgY2FsbEZyYW1lcyA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmNhbGxGcmFt ZXM7CiAgICAgICAgIGlmIChjYWxsRnJhbWVzLmxlbmd0aCkKICAgICAgICAgICAgIHRoaXMuX2Rl YnVnZ2VyUGF1c2VkKHsgZGF0YTogeyBjYWxsRnJhbWVzOiBjYWxsRnJhbWVzIH0gfSk7CkBAIC0z MDgsNiArMzEyLDIxIEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewog ICAgICAgICBkZWxldGUgcmVzb3VyY2UuX3NjcmlwdHNQZW5kaW5nUmVzb3VyY2VMb2FkOwogICAg IH0sCiAKKyAgICBhZGRDb25zb2xlTWVzc2FnZTogZnVuY3Rpb24obWVzc2FnZSkKKyAgICB7Cisg ICAgICAgIHRoaXMuX21lc3NhZ2VzLnB1c2gobWVzc2FnZSk7CisgICAgICAgIHZhciBzb3VyY2VG cmFtZSA9IHRoaXMuX3VybFRvU291cmNlRnJhbWVbbWVzc2FnZS51cmxdOworICAgICAgICBpZiAo c291cmNlRnJhbWUpCisgICAgICAgICAgICBzb3VyY2VGcmFtZS5hZGRNZXNzYWdlKG1lc3NhZ2Up OworICAgIH0sCisKKyAgICBjbGVhckNvbnNvbGVNZXNzYWdlczogZnVuY3Rpb24oKQorICAgIHsK KyAgICAgICAgdGhpcy5fbWVzc2FnZXMgPSBbXTsKKyAgICAgICAgZm9yICh2YXIgdXJsIGluIHRo aXMuX3VybFRvU291cmNlRnJhbWUpCisgICAgICAgICAgICB0aGlzLl91cmxUb1NvdXJjZUZyYW1l W3VybF0uY2xlYXJNZXNzYWdlcygpOworICAgIH0sCisKICAgICBzZWxlY3RlZENhbGxGcmFtZUlk OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB2YXIgc2VsZWN0ZWRDYWxsRnJhbWUgPSB0aGlz LnNpZGViYXJQYW5lcy5jYWxsc3RhY2suc2VsZWN0ZWRDYWxsRnJhbWU7CkBAIC0zOTYsNiArNDE1 LDggQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRo aXMuX2N1cnJlbnRCYWNrRm9yd2FyZEluZGV4ID0gLTE7CiAgICAgICAgIHRoaXMuX3VwZGF0ZUJh Y2tBbmRGb3J3YXJkQnV0dG9ucygpOwogCisgICAgICAgIHRoaXMuX3VybFRvU291cmNlRnJhbWUg PSB7fTsKKyAgICAgICAgdGhpcy5fbWVzc2FnZXMgPSBbXTsKICAgICAgICAgdGhpcy5fcmVzb3Vy Y2VGb3JVUkxJbkZpbGVzU2VsZWN0ID0ge307CiAgICAgICAgIHRoaXMuZmlsZXNTZWxlY3RFbGVt ZW50LnJlbW92ZUNoaWxkcmVuKCk7CiAgICAgICAgIHRoaXMuZnVuY3Rpb25zU2VsZWN0RWxlbWVu dC5yZW1vdmVDaGlsZHJlbigpOwpAQCAtNDI1LDEyICs0NDYsNiBAQCBXZWJJbnNwZWN0b3IuU2Ny aXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHguc2hvdyh0aGlzLnZpZXdzQ29u dGFpbmVyRWxlbWVudCk7CiAgICAgfSwKIAotICAgIHZpZXdSZWNyZWF0ZWQ6IGZ1bmN0aW9uKG9s ZFZpZXcsIG5ld1ZpZXcpCi0gICAgewotICAgICAgICBpZiAodGhpcy52aXNpYmxlVmlldyA9PT0g b2xkVmlldykKLSAgICAgICAgICAgIHRoaXMudmlzaWJsZVZpZXcgPSBuZXdWaWV3OwotICAgIH0s Ci0KICAgICBjYW5TaG93U291cmNlTGluZTogZnVuY3Rpb24odXJsLCBsaW5lKQogICAgIHsKICAg ICAgICAgaWYgKCF0aGlzLl9kZWJ1Z2dlckVuYWJsZWQpCkBAIC00NzcsMTUgKzQ5MiwzNSBAQCBX ZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgIF9zb3VyY2VGcmFt ZUZvclNjcmlwdE9yUmVzb3VyY2U6IGZ1bmN0aW9uKHNjcmlwdE9yUmVzb3VyY2UpCiAgICAgewot ICAgICAgICBpZiAoc2NyaXB0T3JSZXNvdXJjZS5fc291cmNlRnJhbWUpCi0gICAgICAgICAgICBy ZXR1cm4gc2NyaXB0T3JSZXNvdXJjZS5fc291cmNlRnJhbWU7CiAgICAgICAgIGlmIChzY3JpcHRP clJlc291cmNlIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlJlc291cmNlKQotICAgICAgICAgICAg c2NyaXB0T3JSZXNvdXJjZS5fc291cmNlRnJhbWUgPSBXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3 LnJlc291cmNlVmlld0ZvclJlc291cmNlKHNjcmlwdE9yUmVzb3VyY2UpOwotICAgICAgICBlbHNl IGlmIChzY3JpcHRPclJlc291cmNlIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlNjcmlwdCkgewot ICAgICAgICAgICAgdmFyIGNvbnRlbnRQcm92aWRlciA9IG5ldyBXZWJJbnNwZWN0b3IuU291cmNl RnJhbWVDb250ZW50UHJvdmlkZXJGb3JTY3JpcHQoc2NyaXB0T3JSZXNvdXJjZSk7Ci0gICAgICAg ICAgICBzY3JpcHRPclJlc291cmNlLl9zb3VyY2VGcmFtZSA9IG5ldyBXZWJJbnNwZWN0b3IuU291 cmNlRnJhbWUoY29udGVudFByb3ZpZGVyLCBzY3JpcHRPclJlc291cmNlLnNvdXJjZVVSTCwgdHJ1 ZSk7CisgICAgICAgICAgICByZXR1cm4gdGhpcy5fc291cmNlRnJhbWVGb3JSZXNvdXJjZShzY3Jp cHRPclJlc291cmNlKTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3NvdXJjZUZyYW1lRm9yU2NyaXB0 KHNjcmlwdE9yUmVzb3VyY2UpOworICAgIH0sCisKKyAgICBfc291cmNlRnJhbWVGb3JSZXNvdXJj ZTogZnVuY3Rpb24ocmVzb3VyY2UpCisgICAgeworICAgICAgICB2YXIgc291cmNlRnJhbWUgPSB0 aGlzLl91cmxUb1NvdXJjZUZyYW1lW3Jlc291cmNlLnVybF07CisgICAgICAgIGlmIChzb3VyY2VG cmFtZSkKKyAgICAgICAgICAgIHJldHVybiBzb3VyY2VGcmFtZTsKKyAgICAgICAgdmFyIGNvbnRl bnRQcm92aWRlciA9IG5ldyBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVDb250ZW50UHJvdmlkZXJG b3JSZXNvdXJjZShyZXNvdXJjZSk7CisgICAgICAgIHZhciBpc1NjcmlwdCA9IHJlc291cmNlLnR5 cGUgPT09IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLlNjcmlwdDsKKyAgICAgICAgc291cmNl RnJhbWUgPSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lKGNvbnRlbnRQcm92aWRlciwgcmVz b3VyY2UudXJsLCBpc1NjcmlwdCk7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5f bWVzc2FnZXMubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIHZhciBtZXNzYWdlID0gdGhpcy5f bWVzc2FnZXNbaV07CisgICAgICAgICAgICBpZiAodGhpcy5fbWVzc2FnZXNbaV0udXJsID09PSBy ZXNvdXJjZS51cmwpCisgICAgICAgICAgICAgICAgc291cmNlRnJhbWUuYWRkTWVzc2FnZShtZXNz YWdlKTsKICAgICAgICAgfQotICAgICAgICByZXR1cm4gc2NyaXB0T3JSZXNvdXJjZS5fc291cmNl RnJhbWU7CisgICAgICAgIHRoaXMuX3VybFRvU291cmNlRnJhbWVbcmVzb3VyY2UudXJsXSA9IHNv dXJjZUZyYW1lOworICAgICAgICByZXR1cm4gc291cmNlRnJhbWU7CisgICAgfSwKKworICAgIF9z b3VyY2VGcmFtZUZvclNjcmlwdDogZnVuY3Rpb24oc2NyaXB0KQorICAgIHsKKyAgICAgICAgaWYg KHNjcmlwdC5fc291cmNlRnJhbWUpCisgICAgICAgICAgICByZXR1cm4gc2NyaXB0Ll9zb3VyY2VG cmFtZTsKKyAgICAgICAgdmFyIGNvbnRlbnRQcm92aWRlciA9IG5ldyBXZWJJbnNwZWN0b3IuU291 cmNlRnJhbWVDb250ZW50UHJvdmlkZXJGb3JTY3JpcHQoc2NyaXB0KTsKKyAgICAgICAgc2NyaXB0 Ll9zb3VyY2VGcmFtZSA9IG5ldyBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUoY29udGVudFByb3Zp ZGVyLCBzY3JpcHQuc291cmNlVVJMLCB0cnVlKTsKKyAgICAgICAgcmV0dXJuIHNjcmlwdC5fc291 cmNlRnJhbWU7CiAgICAgfSwKIAogICAgIF9zaG93U2NyaXB0T3JSZXNvdXJjZTogZnVuY3Rpb24o c2NyaXB0T3JSZXNvdXJjZSwgb3B0aW9ucykK