58026 2011-04-07 03:26:57 -0700 Web Inspector: make SourceFrame TextViewer's delegate for editing operations. 2011-04-08 05:32:24 -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 381219 0 podivilov 2011-04-07 03:26:57 -0700 Web Inspector: make SourceFrame TextViewer's delegate for editing operations. This is the first step of decoupling TextViewer from SourceFrame (see https://bugs.webkit.org/show_bug.cgi?id=57941). 381220 1 88603 podivilov 2011-04-07 03:27:46 -0700 Created attachment 88603 Patch. 381375 2 88603 pfeldman 2011-04-07 08:49:13 -0700 Comment on attachment 88603 Patch. View in context: https://bugs.webkit.org/attachment.cgi?id=88603&action=review > Source/WebCore/inspector/front-end/TextViewer.js:229 > + if (!this._delegate.contentEditable()) isContentEditable. 382165 3 podivilov 2011-04-08 05:32:24 -0700 Committed r83288: <http://trac.webkit.org/changeset/83288> 88603 2011-04-07 03:27:46 -0700 2011-04-07 08:49:12 -0700 Patch. patch text/plain 12812 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2YmFlZDQ1Li5mZDU3MTI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYg QEAKKzIwMTEtMDQtMDcgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogbWFrZSBTb3VyY2VGcmFtZSBUZXh0Vmlld2VyJ3MgZGVsZWdhdGUgZm9yIGVkaXRp bmcgb3BlcmF0aW9ucy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTU4MDI2CisKKyAgICAgICAgVGhpcyBpcyB0aGUgZmlyc3Qgc3RlcCBvZiBkZWNvdXBs aW5nIFRleHRWaWV3ZXIgZnJvbSBTb3VyY2VGcmFtZS4KKworICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvU291cmNlRnJhbWUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJh bWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5zaG93KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuaGlkZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLl9lbnN1cmVDb250ZW50TG9h ZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuY29udGVu dEVkaXRhYmxlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUu c3RhcnRFZGl0aW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5 cGUuZW5kRWRpdGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90 eXBlLl9jcmVhdGVUZXh0Vmlld2VyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFt ZS5wcm90b3R5cGUuX2hhbmRsZVNhdmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZy YW1lLnByb3RvdHlwZS5faGFuZGxlUmV2ZXJ0RWRpdGluZyk6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRWaWV3 ZXIucHJvdG90eXBlLl9lbnRlckludGVybmFsVGV4dENoYW5nZU1vZGUpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlRleHRWaWV3ZXIucHJvdG90eXBlLl9leGl0SW50ZXJuYWxUZXh0Q2hhbmdlTW9k ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dFZpZXdlci5wcm90b3R5cGUuX3N5bmNEZWNv cmF0aW9uc0ZvckxpbmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRWaWV3ZXIucHJvdG90 eXBlLl9kb3VibGVDbGljayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dFZpZXdlckRlbGVn YXRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0Vmlld2VyRGVsZWdhdGUucHJvdG90eXBl LmNvbnRlbnRFZGl0YWJsZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dFZpZXdlckRlbGVn YXRlLnByb3RvdHlwZS5zdGFydEVkaXRpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRW aWV3ZXJEZWxlZ2F0ZS5wcm90b3R5cGUuZW5kRWRpdGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUuX3BhaW50U2NoZWR1bGVkTGluZXMpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlLl9oYW5k bGVET01VcGRhdGVzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5o dG1sOgorCiAyMDExLTA0LTA2ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKaW5kZXggN2YwN2ExNy4uZTYxYmEzMSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFt ZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1l LmpzCkBAIC0zMCw5ICszMCw3IEBACiAKIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZSA9IGZ1bmN0 aW9uKGRlbGVnYXRlLCB1cmwpCiB7Ci0gICAgV2ViSW5zcGVjdG9yLlZpZXcuY2FsbCh0aGlzKTsK LQotICAgIHRoaXMuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzY3JpcHQtdmlldyIpOworICAgIFdl Ykluc3BlY3Rvci5UZXh0Vmlld2VyRGVsZWdhdGUuY2FsbCh0aGlzKTsKIAogICAgIHRoaXMuX2Rl bGVnYXRlID0gZGVsZWdhdGU7CiAgICAgdGhpcy5fdXJsID0gdXJsOwpAQCAtNTAsNyArNDgsNiBA QCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUgPSBmdW5jdGlvbihkZWxlZ2F0ZSwgdXJsKQogICAg IHRoaXMuX2JyZWFrcG9pbnRzID0ge307CiAKICAgICB0aGlzLl9yZWdpc3RlclNob3J0Y3V0cygp OwotICAgIHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJrZXlkb3duIiwgdGhpcy5faGFu ZGxlS2V5RG93bi5iaW5kKHRoaXMpLCBmYWxzZSk7CiB9CiAKIFdlYkluc3BlY3Rvci5Tb3VyY2VG cmFtZS5FdmVudHMgPSB7CkBAIC02MSw3ICs1OCw3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFt ZS5wcm90b3R5cGUgPSB7CiAKICAgICBzaG93OiBmdW5jdGlvbihwYXJlbnRFbGVtZW50KQogICAg IHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLlZpZXcucHJvdG90eXBlLnNob3cuY2FsbCh0aGlzLCBw YXJlbnRFbGVtZW50KTsKKyAgICAgICAgdGhpcy5fcGFyZW50RWxlbWVudCA9IHBhcmVudEVsZW1l bnQ7CiAKICAgICAgICAgdGhpcy5fZW5zdXJlQ29udGVudExvYWRlZCgpOwogCkBAIC03MCwyMCAr NjcsMjIgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLnNjcm9sbFRvcCA9IHRoaXMuX3Njcm9sbFRvcDsKICAg ICAgICAgICAgIGlmICh0aGlzLl9zY3JvbGxMZWZ0KQogICAgICAgICAgICAgICAgIHRoaXMuX3Rl eHRWaWV3ZXIuc2Nyb2xsTGVmdCA9IHRoaXMuX3Njcm9sbExlZnQ7CisgICAgICAgICAgICB0aGlz Ll90ZXh0Vmlld2VyLnNob3cocGFyZW50RWxlbWVudCk7CiAgICAgICAgICAgICB0aGlzLl90ZXh0 Vmlld2VyLnJlc2l6ZSgpOwogICAgICAgICB9CiAgICAgfSwKIAogICAgIGhpZGU6IGZ1bmN0aW9u KCkKICAgICB7CisgICAgICAgIGRlbGV0ZSB0aGlzLl9wYXJlbnRFbGVtZW50OworCiAgICAgICAg IGlmICh0aGlzLl90ZXh0Vmlld2VyKSB7CiAgICAgICAgICAgICB0aGlzLl9zY3JvbGxUb3AgPSB0 aGlzLl90ZXh0Vmlld2VyLnNjcm9sbFRvcDsKICAgICAgICAgICAgIHRoaXMuX3Njcm9sbExlZnQg PSB0aGlzLl90ZXh0Vmlld2VyLnNjcm9sbExlZnQ7CiAgICAgICAgICAgICB0aGlzLl90ZXh0Vmll d2VyLmZyZWVDYWNoZWRFbGVtZW50cygpOworICAgICAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5o aWRlKCk7CiAgICAgICAgIH0KIAotICAgICAgICBXZWJJbnNwZWN0b3IuVmlldy5wcm90b3R5cGUu aGlkZS5jYWxsKHRoaXMpOwotCiAgICAgICAgIHRoaXMuX2hpZGVQb3B1cCgpOwogICAgICAgICB0 aGlzLl9jbGVhckxpbmVIaWdobGlnaHQoKTsKICAgICB9LApAQCAtMjExLDcgKzIxMCwxMiBAQCBX ZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICBkZWxldGUgdGhp cy5fdmlld2VyU3RhdGU7CiAgICAgfSwKIAotICAgIF9zdGFydEVkaXRpbmc6IGZ1bmN0aW9uKCkK KyAgICBjb250ZW50RWRpdGFibGU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0 aGlzLl9kZWxlZ2F0ZS5jYW5FZGl0U2NyaXB0U291cmNlKCk7CisgICAgfSwKKworICAgIHN0YXJ0 RWRpdGluZzogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLl92aWV3ZXJTdGF0 ZSkgewogICAgICAgICAgICAgdGhpcy5fc2F2ZVZpZXdlclN0YXRlKCk7CkBAIC0yMjIsNyArMjI2 LDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhp cy5jbGVhck1lc3NhZ2VzKCk7CiAgICAgfSwKIAotICAgIF9lbmRFZGl0aW5nOiBmdW5jdGlvbihv bGRSYW5nZSwgbmV3UmFuZ2UpCisgICAgZW5kRWRpdGluZzogZnVuY3Rpb24ob2xkUmFuZ2UsIG5l d1JhbmdlKQogICAgIHsKICAgICAgICAgLy8gQWRqdXN0IGV4ZWN1dGlvbiBsaW5lIG51bWJlci4K ICAgICAgICAgaWYgKHR5cGVvZiB0aGlzLl9leGVjdXRpb25MaW5lTnVtYmVyID09PSAibnVtYmVy IikgewpAQCAtMjY2LDIyICsyNzAsMTcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3Rv dHlwZSA9IHsKICAgICAgICAgdGhpcy5fY29udGVudCA9IGNvbnRlbnQ7CiAgICAgICAgIHRoaXMu X3RleHRNb2RlbC5zZXRUZXh0KG51bGwsIGNvbnRlbnQpOwogCi0gICAgICAgIHRoaXMuX3RleHRW aWV3ZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlRleHRWaWV3ZXIodGhpcy5fdGV4dE1vZGVsLCBXZWJJ bnNwZWN0b3IucGxhdGZvcm0sIHRoaXMuX3VybCk7Ci0gICAgICAgIHRoaXMuX3RleHRWaWV3ZXIu c3RhcnRFZGl0aW5nTGlzdGVuZXIgPSB0aGlzLl9zdGFydEVkaXRpbmcuYmluZCh0aGlzKTsKLSAg ICAgICAgdGhpcy5fdGV4dFZpZXdlci5lbmRFZGl0aW5nTGlzdGVuZXIgPSB0aGlzLl9lbmRFZGl0 aW5nLmJpbmQodGhpcyk7CisgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIgPSBuZXcgV2ViSW5zcGVj dG9yLlRleHRWaWV3ZXIodGhpcy5fdGV4dE1vZGVsLCBXZWJJbnNwZWN0b3IucGxhdGZvcm0sIHRo aXMuX3VybCwgdGhpcyk7CiAKICAgICAgICAgdmFyIGVsZW1lbnQgPSB0aGlzLl90ZXh0Vmlld2Vy LmVsZW1lbnQ7CisgICAgICAgIGVsZW1lbnQuYWRkU3R5bGVDbGFzcygic2NyaXB0LXZpZXciKTsK ICAgICAgICAgaWYgKHRoaXMuX2RlbGVnYXRlLmRlYnVnZ2luZ1N1cHBvcnRlZCgpKSB7CiAgICAg ICAgICAgICBlbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNvbnRleHRtZW51IiwgdGhpcy5fY29u dGV4dE1lbnUuYmluZCh0aGlzKSwgdHJ1ZSk7CiAgICAgICAgICAgICBlbGVtZW50LmFkZEV2ZW50 TGlzdGVuZXIoIm1vdXNlZG93biIsIHRoaXMuX21vdXNlRG93bi5iaW5kKHRoaXMpLCB0cnVlKTsK ICAgICAgICAgICAgIGVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vtb3ZlIiwgdGhpcy5f bW91c2VNb3ZlLmJpbmQodGhpcyksIHRydWUpOwogICAgICAgICAgICAgZWxlbWVudC5hZGRFdmVu dExpc3RlbmVyKCJzY3JvbGwiLCB0aGlzLl9zY3JvbGwuYmluZCh0aGlzKSwgdHJ1ZSk7CiAgICAg ICAgIH0KLQotICAgICAgICBpZiAodGhpcy5fZGVsZWdhdGUuY2FuRWRpdFNjcmlwdFNvdXJjZSgp KQotICAgICAgICAgICAgZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJkYmxjbGljayIsIHRoaXMu X2RvdWJsZUNsaWNrLmJpbmQodGhpcyksIHRydWUpOwotCi0gICAgICAgIHRoaXMuZWxlbWVudC5h cHBlbmRDaGlsZChlbGVtZW50KTsKKyAgICAgICAgZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJr ZXlkb3duIiwgdGhpcy5faGFuZGxlS2V5RG93bi5iaW5kKHRoaXMpLCBmYWxzZSk7CiAKICAgICAg ICAgdGhpcy5fdGV4dFZpZXdlci5iZWdpblVwZGF0ZXMoKTsKIApAQCAtMzA0LDYgKzMwMyw5IEBA IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuZGlz cGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5FdmVudHMuTG9h ZGVkKTsKIAogICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLmVuZFVwZGF0ZXMoKTsKKworICAgICAg ICBpZiAodGhpcy5fcGFyZW50RWxlbWVudCkKKyAgICAgICAgICAgIHRoaXMuc2hvdyh0aGlzLl9w YXJlbnRFbGVtZW50KQogICAgIH0sCiAKICAgICBfc2V0VGV4dFZpZXdlckRlY29yYXRpb25zOiBm dW5jdGlvbigpCkBAIC05MDgsMjUgKzkxMCwxMCBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUu cHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLnJlYWRPbmx5ID0gdHJ1ZTsK ICAgICAgICAgdGhpcy5fZGVsZWdhdGUuc2V0U2NyaXB0U291cmNlSXNCZWluZ0VkaXRlZChmYWxz ZSk7CiAgICAgICAgIHJldHVybiB0cnVlOwotICAgIH0sCi0KLSAgICBfZG91YmxlQ2xpY2s6IGZ1 bmN0aW9uKGV2ZW50KQotICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLl9kZWxlZ2F0ZS5jYW5FZGl0 U2NyaXB0U291cmNlKCkpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgdmFyIGxpbmVS b3cgPSBldmVudC50YXJnZXQuZW5jbG9zaW5nTm9kZU9yU2VsZldpdGhDbGFzcygid2Via2l0LWxp bmUtY29udGVudCIpOwotICAgICAgICBpZiAoIWxpbmVSb3cpCi0gICAgICAgICAgICByZXR1cm47 ICAvLyBEbyBub3QgdHJpZ2dlciBlZGl0aW5nIGZyb20gbGluZSBudW1iZXJzLgotCi0gICAgICAg IGlmICh0aGlzLl90ZXh0Vmlld2VyLnJlYWRPbmx5KSB7Ci0gICAgICAgICAgICB0aGlzLl90ZXh0 Vmlld2VyLnJlYWRPbmx5ID0gZmFsc2U7Ci0gICAgICAgICAgICB3aW5kb3cuZ2V0U2VsZWN0aW9u KCkuY29sbGFwc2VUb1N0YXJ0KCk7Ci0gICAgICAgIH0KICAgICB9CiB9CiAKLVdlYkluc3BlY3Rv ci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlZpZXcucHJv dG90eXBlOworV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fX3Byb3RvX18gPSBX ZWJJbnNwZWN0b3IuVGV4dFZpZXdlckRlbGVnYXRlLnByb3RvdHlwZTsKIAogCiBXZWJJbnNwZWN0 b3IuU291cmNlRnJhbWVEZWxlZ2F0ZSA9IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdlci5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdlci5qcwppbmRleCBmZjAyMTE0Li4wODJhOTM4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3 ZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2Vy LmpzCkBAIC0yOSwxMiArMjksMTQgQEAKICAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURW SVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotV2ViSW5zcGVj dG9yLlRleHRWaWV3ZXIgPSBmdW5jdGlvbih0ZXh0TW9kZWwsIHBsYXRmb3JtLCB1cmwpCitXZWJJ bnNwZWN0b3IuVGV4dFZpZXdlciA9IGZ1bmN0aW9uKHRleHRNb2RlbCwgcGxhdGZvcm0sIHVybCwg ZGVsZWdhdGUpCiB7CisgICAgV2ViSW5zcGVjdG9yLlZpZXcuY2FsbCh0aGlzKTsKKwogICAgIHRo aXMuX3RleHRNb2RlbCA9IHRleHRNb2RlbDsKICAgICB0aGlzLl90ZXh0TW9kZWwuY2hhbmdlTGlz dGVuZXIgPSB0aGlzLl90ZXh0Q2hhbmdlZC5iaW5kKHRoaXMpOworICAgIHRoaXMuX2RlbGVnYXRl ID0gZGVsZWdhdGU7CiAKLSAgICB0aGlzLmVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJkaXYiKTsKICAgICB0aGlzLmVsZW1lbnQuY2xhc3NOYW1lID0gInRleHQtZWRpdG9yIG1vbm9z cGFjZSI7CiAKICAgICB2YXIgZW50ZXJUZXh0Q2hhbmdlTW9kZSA9IHRoaXMuX2VudGVySW50ZXJu YWxUZXh0Q2hhbmdlTW9kZS5iaW5kKHRoaXMpOwpAQCAtNDksNyArNTEsOSBAQCBXZWJJbnNwZWN0 b3IuVGV4dFZpZXdlciA9IGZ1bmN0aW9uKHRleHRNb2RlbCwgcGxhdGZvcm0sIHVybCkKICAgICAv LyBGb3J3YXJkIG1vdXNlIHdoZWVsIGV2ZW50cyBmcm9tIHRoZSB1bnNjcm9sbGFibGUgZ3V0dGVy IHRvIHRoZSBtYWluIHBhbmVsLgogICAgIHRoaXMuX2d1dHRlclBhbmVsLmVsZW1lbnQuYWRkRXZl bnRMaXN0ZW5lcigibW91c2V3aGVlbCIsIGZ1bmN0aW9uKGUpIHsKICAgICAgICAgdGhpcy5fbWFp blBhbmVsLmVsZW1lbnQuZGlzcGF0Y2hFdmVudChlKTsKLSAgICB9LmJpbmQodGhpcyksIGZhbHNl KQorICAgIH0uYmluZCh0aGlzKSwgZmFsc2UpOworCisgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50 TGlzdGVuZXIoImRibGNsaWNrIiwgdGhpcy5fZG91YmxlQ2xpY2suYmluZCh0aGlzKSwgdHJ1ZSk7 CiB9CiAKIFdlYkluc3BlY3Rvci5UZXh0Vmlld2VyLnByb3RvdHlwZSA9IHsKQEAgLTY4LDE2ICs3 Miw2IEBAIFdlYkluc3BlY3Rvci5UZXh0Vmlld2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0 dXJuIHRoaXMuX21haW5QYW5lbC5yZWFkT25seTsKICAgICB9LAogCi0gICAgc2V0IHN0YXJ0RWRp dGluZ0xpc3RlbmVyKHN0YXJ0RWRpdGluZ0xpc3RlbmVyKQotICAgIHsKLSAgICAgICAgdGhpcy5f c3RhcnRFZGl0aW5nTGlzdGVuZXIgPSBzdGFydEVkaXRpbmdMaXN0ZW5lcjsKLSAgICB9LAotCi0g ICAgc2V0IGVuZEVkaXRpbmdMaXN0ZW5lcihlbmRFZGl0aW5nTGlzdGVuZXIpCi0gICAgewotICAg ICAgICB0aGlzLl9lbmRFZGl0aW5nTGlzdGVuZXIgPSBlbmRFZGl0aW5nTGlzdGVuZXI7Ci0gICAg fSwKLQogICAgIGdldCB0ZXh0TW9kZWwoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3Rl eHRNb2RlbDsKQEAgLTE3NSw4ICsxNjksNyBAQCBXZWJJbnNwZWN0b3IuVGV4dFZpZXdlci5wcm90 b3R5cGUgPSB7CiAgICAgewogICAgICAgICB0aGlzLl9pbnRlcm5hbFRleHRDaGFuZ2VNb2RlID0g dHJ1ZTsKIAotICAgICAgICBpZiAodGhpcy5fc3RhcnRFZGl0aW5nTGlzdGVuZXIpCi0gICAgICAg ICAgICB0aGlzLl9zdGFydEVkaXRpbmdMaXN0ZW5lcigpOworICAgICAgICB0aGlzLl9kZWxlZ2F0 ZS5zdGFydEVkaXRpbmcoKTsKICAgICB9LAogCiAgICAgX2V4aXRJbnRlcm5hbFRleHRDaGFuZ2VN b2RlOiBmdW5jdGlvbihvbGRSYW5nZSwgbmV3UmFuZ2UpCkBAIC0xODcsOCArMTgwLDcgQEAgV2Vi SW5zcGVjdG9yLlRleHRWaWV3ZXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9ndXR0ZXJQ YW5lbC50ZXh0Q2hhbmdlZChvbGRSYW5nZSwgbmV3UmFuZ2UpOwogICAgICAgICB0aGlzLl91cGRh dGVQYW5lbE9mZnNldHMoKTsKIAotICAgICAgICBpZiAodGhpcy5fZW5kRWRpdGluZ0xpc3RlbmVy KQotICAgICAgICAgICAgdGhpcy5fZW5kRWRpdGluZ0xpc3RlbmVyKG9sZFJhbmdlLCBuZXdSYW5n ZSk7CisgICAgICAgIHRoaXMuX2RlbGVnYXRlLmVuZEVkaXRpbmcob2xkUmFuZ2UsIG5ld1Jhbmdl KTsKICAgICB9LAogCiAgICAgX3VwZGF0ZVBhbmVsT2Zmc2V0czogZnVuY3Rpb24oKQpAQCAtMjMw LDkgKzIyMiw0OSBAQCBXZWJJbnNwZWN0b3IuVGV4dFZpZXdlci5wcm90b3R5cGUgPSB7CiAgICAg ICAgICAgICBpZiAoZ3V0dGVyQ2h1bmsubGluZXNDb3VudCA9PT0gMSkKICAgICAgICAgICAgICAg ICBndXR0ZXJDaHVuay5lbGVtZW50LnN0eWxlLnJlbW92ZVByb3BlcnR5KCJoZWlnaHQiKTsKICAg ICAgICAgfQorICAgIH0sCisKKyAgICBfZG91YmxlQ2xpY2s6IGZ1bmN0aW9uKGV2ZW50KQorICAg IHsKKyAgICAgICAgaWYgKCF0aGlzLl9kZWxlZ2F0ZS5jb250ZW50RWRpdGFibGUoKSkKKyAgICAg ICAgICAgIHJldHVybjsKKworICAgICAgICB2YXIgbGluZVJvdyA9IGV2ZW50LnRhcmdldC5lbmNs b3NpbmdOb2RlT3JTZWxmV2l0aENsYXNzKCJ3ZWJraXQtbGluZS1jb250ZW50Iik7CisgICAgICAg IGlmICghbGluZVJvdykKKyAgICAgICAgICAgIHJldHVybjsgIC8vIERvIG5vdCB0cmlnZ2VyIGVk aXRpbmcgZnJvbSBsaW5lIG51bWJlcnMuCisKKyAgICAgICAgaWYgKHRoaXMucmVhZE9ubHkpIHsK KyAgICAgICAgICAgIHRoaXMucmVhZE9ubHkgPSBmYWxzZTsKKyAgICAgICAgICAgIHdpbmRvdy5n ZXRTZWxlY3Rpb24oKS5jb2xsYXBzZVRvU3RhcnQoKTsKKyAgICAgICAgfQogICAgIH0KIH0KIAor V2ViSW5zcGVjdG9yLlRleHRWaWV3ZXIucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rv ci5WaWV3LnByb3RvdHlwZTsKKworV2ViSW5zcGVjdG9yLlRleHRWaWV3ZXJEZWxlZ2F0ZSA9IGZ1 bmN0aW9uKCkKK3sKK30KKworV2ViSW5zcGVjdG9yLlRleHRWaWV3ZXJEZWxlZ2F0ZS5wcm90b3R5 cGUgPSB7CisgICAgY29udGVudEVkaXRhYmxlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICAv LyBTaG91bGQgYmUgaW1wbGVtZW50ZWQgYnkgc3ViY2xhc3Nlcy4KKyAgICB9LAorCisgICAgc3Rh cnRFZGl0aW5nOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICAvLyBTaG91bGQgYmUgaW1wbGVt ZW50ZWQgYnkgc3ViY2xhc3Nlcy4KKyAgICB9LAorCisgICAgZW5kRWRpdGluZzogZnVuY3Rpb24o b2xkUmFuZ2UsIG5ld1JhbmdlKQorICAgIHsKKyAgICAgICAgLy8gU2hvdWxkIGJlIGltcGxlbWVu dGVkIGJ5IHN1YmNsYXNzZXMuCisgICAgfQorfQorCitXZWJJbnNwZWN0b3IuVGV4dFZpZXdlckRl bGVnYXRlLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlw ZTsKKwogV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JDaHVua2VkUGFuZWwgPSBmdW5jdGlvbih0ZXh0 TW9kZWwpCiB7CiAgICAgdGhpcy5fdGV4dE1vZGVsID0gdGV4dE1vZGVsOwpAQCAtOTEwLDcgKzk0 Miw3IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKIAog ICAgICAgICB2YXIgc2NoZWR1bGVkUGFpbnRMaW5lcyA9IHRoaXMuX3NjaGVkdWxlZFBhaW50TGlu ZXM7CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9zY2hlZHVsZWRQYWludExpbmVzOwotICAgICAgICAK KwogICAgICAgICB0aGlzLl9yZXN0b3JlUGFpbnRMaW5lc09wZXJhdGlvbnNDcmVkaXQoKTsKICAg ICAgICAgdGhpcy5fcGFpbnRMaW5lQ2h1bmtzKHNjaGVkdWxlZFBhaW50TGluZXMsICFza2lwUmVz dG9yZVNlbGVjdGlvbik7CiAgICAgfSwKQEAgLTEyMzksNyArMTI3MSw3IEBAIFdlYkluc3BlY3Rv ci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIC8vIE5vdyB0 aGlzIHdpbGwgbm8gbG9uZ2VyIGJlIHZhbGlkLgogICAgICAgICAgICAgZGVsZXRlIGxpbmVSb3cu bGluZU51bWJlcjsKICAgICAgICAgfQotIAorCiAgICAgICAgIGlmICh0aGlzLl9kaXJ0eUxpbmVz KSB7CiAgICAgICAgICAgICB0aGlzLl9kaXJ0eUxpbmVzLnN0YXJ0ID0gTWF0aC5taW4odGhpcy5f ZGlydHlMaW5lcy5zdGFydCwgc3RhcnRMaW5lKTsKICAgICAgICAgICAgIHRoaXMuX2RpcnR5TGlu ZXMuZW5kID0gTWF0aC5tYXgodGhpcy5fZGlydHlMaW5lcy5lbmQsIGVuZExpbmUpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbCBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwKaW5kZXgg MzNhZDM4YS4uNzFkMDllMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9pbnNwZWN0b3IuaHRtbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL2luc3BlY3Rvci5odG1sCkBAIC0xMDEsNiArMTAxLDcgQEAgVEhJUyBTT0ZUV0FSRSwg RVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAgICA8 c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJFbGVtZW50c1BhbmVsLmpzIj48L3Nj cmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJOZXR3b3JrUGFu ZWwuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9 IkluamVjdGVkRmFrZVdvcmtlci5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0 L2phdmFzY3JpcHQiIHNyYz0iVGV4dFZpZXdlci5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0 eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iU291cmNlRnJhbWUuanMiPjwvc2NyaXB0PgogICAg IDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlJlc291cmNlVmlldy5qcyI+PC9z Y3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iU2NyaXB0c1Bh bmVsLmpzIj48L3NjcmlwdD4KQEAgLTEyNyw3ICsxMjgsNiBAQCBUSElTIFNPRlRXQVJFLCBFVkVO IElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICAgIDxzY3Jp cHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IkRPTVN5bnRheEhpZ2hsaWdodGVyLmpzIj48 L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJUZXh0RWRp dG9yTW9kZWwuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0 IiBzcmM9IlRleHRFZGl0b3JIaWdobGlnaHRlci5qcyI+PC9zY3JpcHQ+Ci0gICAgPHNjcmlwdCB0 eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iVGV4dFZpZXdlci5qcyI+PC9zY3JpcHQ+CiAgICAg PHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iU291cmNlVG9rZW5pemVyLmpzIj48 L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJTb3VyY2VD U1NUb2tlbml6ZXIuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2Ny aXB0IiBzcmM9IlNvdXJjZUhUTUxUb2tlbml6ZXIuanMiPjwvc2NyaXB0Pgo=