58238 2011-04-11 08:54:29 -0700 Web Inspector: move shortcut handlers from SourceFrame to TextViewer. 2011-04-12 06:52:57 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov aandrey apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 383189 0 podivilov 2011-04-11 08:54:29 -0700 Web Inspector: move shortcut handlers from SourceFrame to TextViewer. Commit/cancel editing functionality is common for all resource types, and it deals with TextViewer state. 383190 1 89013 podivilov 2011-04-11 08:55:34 -0700 Created attachment 89013 Patch. 383977 2 podivilov 2011-04-12 06:52:57 -0700 Committed r83585: <http://trac.webkit.org/changeset/83585> 89013 2011-04-11 08:55:34 -0700 2011-04-11 22:17:21 -0700 Patch. patch text/plain 11734 podivilov ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkMGM5NGVhLi4yNGZmZDRhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDQt MTEgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogbW92 ZSBzaG9ydGN1dCBoYW5kbGVycyBmcm9tIFNvdXJjZUZyYW1lIHRvIFRleHRWaWV3ZXIuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODIzOAorCisgICAg ICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL2xpdmUtZWRpdC5odG1sOgorCiAyMDExLTA0LTExICBB bmRyZWFzIEtsaW5nICA8YW5kcmVhcy5rbGluZ0Bub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgQmVuamFtaW4gUG91bGFpbi4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rv ci9kZWJ1Z2dlci9saXZlLWVkaXQuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dl ci9saXZlLWVkaXQuaHRtbAppbmRleCBiZjM0NmU0Li40ZDQzY2Y0IDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvbGl2ZS1lZGl0Lmh0bWwKKysrIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2xpdmUtZWRpdC5odG1sCkBAIC05MCw3ICs5MCw3IEBAIGZ1 bmN0aW9uIHRlc3QoKQogICAgIGZ1bmN0aW9uIHJlcGxhY2VJblNvdXJjZShzb3VyY2VGcmFtZSwg c3RyaW5nLCByZXBsYWNlbWVudCwgY2FsbGJhY2spCiAgICAgewogICAgICAgICBJbnNwZWN0b3JU ZXN0LmFkZFNuaWZmZXIoV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwsICJfZGlkRWRpdFNjcmlw dFNvdXJjZSIsIGNhbGxiYWNrKTsKLSAgICAgICAgc291cmNlRnJhbWUuX3RleHRWaWV3ZXIucmVh ZE9ubHkgPSBmYWxzZTsKKyAgICAgICAgc291cmNlRnJhbWUuX3RleHRWaWV3ZXIuX21haW5QYW5l bC5yZWFkT25seSA9IGZhbHNlOwogICAgICAgICBzb3VyY2VGcmFtZS5zdGFydEVkaXRpbmcoKTsK ICAgICAgICAgdmFyIG9sZFJhbmdlLCBuZXdSYW5nZTsKICAgICAgICAgdmFyIGxpbmVzID0gc291 cmNlRnJhbWUuX3RleHRNb2RlbC5fbGluZXM7CkBAIC0xMDYsNyArMTA2LDcgQEAgZnVuY3Rpb24g dGVzdCgpCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICBzb3VyY2VGcmFt ZS5lbmRFZGl0aW5nKG9sZFJhbmdlLCBuZXdSYW5nZSk7Ci0gICAgICAgIHNvdXJjZUZyYW1lLl9o YW5kbGVTYXZlKCk7CisgICAgICAgIHNvdXJjZUZyYW1lLl90ZXh0Vmlld2VyLl9jb21taXRFZGl0 aW5nKCk7CiAgICAgfQogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n IGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDkzNzU4MGQuLmJjMjQyOWUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAxMS0wNC0xMSAgUGF2ZWwgUG9kaXZpbG92ICA8cG9k aXZpbG92QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBtb3ZlIHNob3J0Y3V0IGhhbmRsZXJzIGZyb20g U291cmNlRnJhbWUgdG8gVGV4dFZpZXdlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTU4MjM4CisKKyAgICAgICAgQ29tbWl0L2NhbmNlbCBlZGl0aW5n IGZ1bmN0aW9uYWxpdHkgaXMgY29tbW9uIGZvciBhbGwgcmVzb3VyY2UgdHlwZXMsIGFuZCBpdCBk ZWFscyB3aXRoIFRleHRWaWV3ZXIgc3RhdGUuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL1NvdXJjZUZyYW1lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuaXNDb250ZW50RWRp dGFibGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fY3Jl YXRlVGV4dFZpZXdlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90 eXBlLmNvbW1pdEVkaXRpbmcuZGlkRWRpdENvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlNvdXJjZUZyYW1lLnByb3RvdHlwZS5jb21taXRFZGl0aW5nKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuY2FuY2VsRWRpdGluZyk6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRl eHRWaWV3ZXIucHJvdG90eXBlLl9kb3VibGVDbGljayk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VGV4dFZpZXdlci5wcm90b3R5cGUuX3JlZ2lzdGVyU2hvcnRjdXRzKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5UZXh0Vmlld2VyLnByb3RvdHlwZS5faGFuZGxlS2V5RG93bik6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuVGV4dFZpZXdlci5wcm90b3R5cGUuX2NvbW1pdEVkaXRpbmcuZGlkQ29tbWl0 RWRpdGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dFZpZXdlci5wcm90b3R5cGUuX2Nv bW1pdEVkaXRpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRWaWV3ZXIucHJvdG90eXBl Ll9jYW5jZWxFZGl0aW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0Vmlld2VyRGVsZWdh dGUucHJvdG90eXBlLmVuZEVkaXRpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRWaWV3 ZXJEZWxlZ2F0ZS5wcm90b3R5cGUuY29tbWl0RWRpdGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVGV4dFZpZXdlckRlbGVnYXRlLnByb3RvdHlwZS5jYW5jZWxFZGl0aW5nKToKKwogMjAxMS0w NC0wNyAgUGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKaW5kZXggYjAwMjY5NC4uNTI3Yzg5ZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpz CkBAIC00Niw4ICs0Niw2IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZSA9IGZ1bmN0aW9uKGRl bGVnYXRlLCB1cmwpCiAgICAgdGhpcy5fbWVzc2FnZUJ1YmJsZXMgPSB7fTsKIAogICAgIHRoaXMu X2JyZWFrcG9pbnRzID0ge307Ci0KLSAgICB0aGlzLl9yZWdpc3RlclNob3J0Y3V0cygpOwogfQog CiBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUuRXZlbnRzID0gewpAQCAtMjMwLDcgKzIyOCw3IEBA IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAKICAgICBpc0NvbnRlbnRF ZGl0YWJsZTogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2RlbGVnYXRl LmNhbkVkaXRTY3JpcHRTb3VyY2UoKSAmJiAhdGhpcy5fZWRpdFNjcmlwdFNvdXJjZUluUHJvZ3Jl c3M7CisgICAgICAgIHJldHVybiB0aGlzLl9kZWxlZ2F0ZS5jYW5FZGl0U2NyaXB0U291cmNlKCk7 CiAgICAgfSwKIAogICAgIHN0YXJ0RWRpdGluZzogZnVuY3Rpb24oKQpAQCAtMjk4LDcgKzI5Niw2 IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBl bGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlbW92ZSIsIHRoaXMuX21vdXNlTW92ZS5iaW5k KHRoaXMpLCB0cnVlKTsKICAgICAgICAgICAgIGVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigic2Ny b2xsIiwgdGhpcy5fc2Nyb2xsLmJpbmQodGhpcyksIHRydWUpOwogICAgICAgICB9Ci0gICAgICAg IGVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigia2V5ZG93biIsIHRoaXMuX2hhbmRsZUtleURvd24u YmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIuYmVnaW5VcGRh dGVzKCk7CiAKQEAgLTg2Nyw1NCArODY0LDIxIEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5w cm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLnJlc2l6ZSgpOwogICAg IH0sCiAKLSAgICBfcmVnaXN0ZXJTaG9ydGN1dHM6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAg IHRoaXMuX3Nob3J0Y3V0cyA9IHt9OwotICAgICAgICB2YXIgaGFuZGxlU2F2ZUNhbGxiYWNrID0g dGhpcy5faGFuZGxlU2F2ZS5iaW5kKHRoaXMpOwotICAgICAgICB0aGlzLl9zaG9ydGN1dHNbV2Vi SW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZUtleSgicyIsIFdlYkluc3BlY3Rvci5LZXli b2FyZFNob3J0Y3V0Lk1vZGlmaWVycy5DdHJsT3JNZXRhKV0gPSBoYW5kbGVTYXZlQ2FsbGJhY2s7 Ci0gICAgICAgIHRoaXMuX3Nob3J0Y3V0c1tXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5t YWtlS2V5KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleXMuRW50ZXIuY29kZSwgV2Vi SW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXJzLkN0cmxPck1ldGEpXSA9IGhhbmRs ZVNhdmVDYWxsYmFjazsKLSAgICAgICAgdGhpcy5fc2hvcnRjdXRzW1dlYkluc3BlY3Rvci5LZXli b2FyZFNob3J0Y3V0Lm1ha2VLZXkoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5cy5F c2MuY29kZSldID0gdGhpcy5faGFuZGxlUmV2ZXJ0RWRpdGluZy5iaW5kKHRoaXMpOwotICAgIH0s Ci0KLSAgICBfaGFuZGxlS2V5RG93bjogZnVuY3Rpb24oZSkKKyAgICBjb21taXRFZGl0aW5nOiBm dW5jdGlvbihjYWxsYmFjaykKICAgICB7Ci0gICAgICAgIHZhciBzaG9ydGN1dEtleSA9IFdlYklu c3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VLZXlGcm9tRXZlbnQoZSk7Ci0gICAgICAgIHZh ciBoYW5kbGVyID0gdGhpcy5fc2hvcnRjdXRzW3Nob3J0Y3V0S2V5XTsKLSAgICAgICAgaWYgKGhh bmRsZXIgJiYgaGFuZGxlci5jYWxsKHRoaXMpKSB7Ci0gICAgICAgICAgICBlLnByZXZlbnREZWZh dWx0KCk7Ci0gICAgICAgICAgICBlLnN0b3BQcm9wYWdhdGlvbigpOwotICAgICAgICB9Ci0gICAg fSwKLQotICAgIF9oYW5kbGVTYXZlOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICBpZiAodGhp cy5fdGV4dFZpZXdlci5yZWFkT25seSB8fCAhdGhpcy5pc0NvbnRlbnRFZGl0YWJsZSgpKQotICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOwotCiAgICAgICAgIGlmICghdGhpcy5fdmlld2VyU3RhdGUp IHsKICAgICAgICAgICAgIC8vIE5vIGVkaXRpbmcgd2FzIGFjdHVhbGx5IGRvbmUuCi0gICAgICAg ICAgICB0aGlzLl90ZXh0Vmlld2VyLnJlYWRPbmx5ID0gdHJ1ZTsKICAgICAgICAgICAgIHRoaXMu X2RlbGVnYXRlLnNldFNjcmlwdFNvdXJjZUlzQmVpbmdFZGl0ZWQoZmFsc2UpOwotICAgICAgICAg ICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICBjYWxsYmFjaygpOworICAgICAgICAgICAgcmV0 dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgdmFyIG9yaWdpbmFsVmlld2VyU3RhdGUgPSB0aGlz Ll92aWV3ZXJTdGF0ZTsKLSAgICAgICAgdmFyIG5ld1NvdXJjZSA9IHRoaXMuX3RleHRNb2RlbC50 ZXh0OwotCi0gICAgICAgIGRlbGV0ZSB0aGlzLl92aWV3ZXJTdGF0ZTsKLSAgICAgICAgdGhpcy5f dGV4dFZpZXdlci5yZWFkT25seSA9IHRydWU7Ci0gICAgICAgIHRoaXMuX2RlbGVnYXRlLnNldFNj cmlwdFNvdXJjZUlzQmVpbmdFZGl0ZWQoZmFsc2UpOwotCi0gICAgICAgIGZ1bmN0aW9uIGRpZEVk aXRTY3JpcHRTb3VyY2UoZXJyb3IpCisgICAgICAgIGZ1bmN0aW9uIGRpZEVkaXRDb250ZW50KGVy cm9yKQogICAgICAgICB7Ci0gICAgICAgICAgICB0aGlzLl9lZGl0U2NyaXB0U291cmNlSW5Qcm9n cmVzcyA9IGZhbHNlOwotCiAgICAgICAgICAgICBpZiAoZXJyb3IpIHsKLSAgICAgICAgICAgICAg ICB0aGlzLl92aWV3ZXJTdGF0ZSA9IG9yaWdpbmFsVmlld2VyU3RhdGU7Ci0gICAgICAgICAgICAg ICAgdGhpcy5fdGV4dFZpZXdlci5yZWFkT25seSA9IGZhbHNlOwotICAgICAgICAgICAgICAgIHRo aXMuX2RlbGVnYXRlLnNldFNjcmlwdFNvdXJjZUlzQmVpbmdFZGl0ZWQodHJ1ZSk7CiAgICAgICAg ICAgICAgICAgV2ViSW5zcGVjdG9yLmxvZyhlcnJvci5kYXRhWzBdLCBXZWJJbnNwZWN0b3IuQ29u c29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLkVycm9yKTsKICAgICAgICAgICAgICAgICBXZWJJbnNw ZWN0b3Iuc2hvd0NvbnNvbGUoKTsKKyAgICAgICAgICAgICAgICBjYWxsYmFjayhlcnJvcik7CiAg ICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogCkBAIC05MjQsMTcgKzg4OCwy MCBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICAgICAg ICAgIHRoaXMucmVtb3ZlQnJlYWtwb2ludChOdW1iZXIobGluZU51bWJlcikpOwogICAgICAgICAg ICAgfQogCi0gICAgICAgICAgICBmb3IgKHZhciBsaW5lTnVtYmVyIGluIG9yaWdpbmFsVmlld2Vy U3RhdGUuYnJlYWtwb2ludHMpCisgICAgICAgICAgICBmb3IgKHZhciBsaW5lTnVtYmVyIGluIHRo aXMuX3ZpZXdlclN0YXRlLmJyZWFrcG9pbnRzKQogICAgICAgICAgICAgICAgIHRoaXMuX2RlbGVn YXRlLnJlbW92ZUJyZWFrcG9pbnQoTnVtYmVyKGxpbmVOdW1iZXIpKTsKIAogICAgICAgICAgICAg Zm9yICh2YXIgbGluZU51bWJlciBpbiBuZXdCcmVha3BvaW50cykgewogICAgICAgICAgICAgICAg IHZhciBicmVha3BvaW50ID0gbmV3QnJlYWtwb2ludHNbbGluZU51bWJlcl07CiAgICAgICAgICAg ICAgICAgdGhpcy5fZGVsZWdhdGUuc2V0QnJlYWtwb2ludChOdW1iZXIobGluZU51bWJlciksIGJy ZWFrcG9pbnQuY29uZGl0aW9uLCBicmVha3BvaW50LmVuYWJsZWQpOwogICAgICAgICAgICAgfQor CisgICAgICAgICAgICBkZWxldGUgdGhpcy5fdmlld2VyU3RhdGU7CisgICAgICAgICAgICB0aGlz Ll9kZWxlZ2F0ZS5zZXRTY3JpcHRTb3VyY2VJc0JlaW5nRWRpdGVkKGZhbHNlKTsKKworICAgICAg ICAgICAgY2FsbGJhY2soKTsKICAgICAgICAgfQotICAgICAgICB0aGlzLl9lZGl0Q29udGVudChu ZXdTb3VyY2UsIGRpZEVkaXRTY3JpcHRTb3VyY2UuYmluZCh0aGlzKSk7Ci0gICAgICAgIHRoaXMu X2VkaXRTY3JpcHRTb3VyY2VJblByb2dyZXNzID0gdHJ1ZTsKLSAgICAgICAgcmV0dXJuIHRydWU7 CisgICAgICAgIHRoaXMuX2VkaXRDb250ZW50KHRoaXMuX3RleHRNb2RlbC50ZXh0LCBkaWRFZGl0 Q29udGVudC5iaW5kKHRoaXMpKTsKICAgICB9LAogCiAgICAgX2VkaXRDb250ZW50OiBmdW5jdGlv bihuZXdDb250ZW50LCBjYWxsYmFjaykKQEAgLTk0MiwxNSArOTA5LDEwIEBAIFdlYkluc3BlY3Rv ci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2RlbGVnYXRlLmVkaXRT Y3JpcHRTb3VyY2UobmV3Q29udGVudCwgY2FsbGJhY2spOwogICAgIH0sCiAKLSAgICBfaGFuZGxl UmV2ZXJ0RWRpdGluZzogZnVuY3Rpb24oKQorICAgIGNhbmNlbEVkaXRpbmc6IGZ1bmN0aW9uKCkK ICAgICB7Ci0gICAgICAgIGlmICh0aGlzLl90ZXh0Vmlld2VyLnJlYWRPbmx5KQotICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwotCiAgICAgICAgIHRoaXMuX3Jlc3RvcmVWaWV3ZXJTdGF0ZSgpOwot ICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLnJlYWRPbmx5ID0gdHJ1ZTsKICAgICAgICAgdGhpcy5f ZGVsZWdhdGUuc2V0U2NyaXB0U291cmNlSXNCZWluZ0VkaXRlZChmYWxzZSk7Ci0gICAgICAgIHJl dHVybiB0cnVlOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9UZXh0Vmlld2VyLmpzCmluZGV4IDc0M2MyNjMuLjhmNGZhNGYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdlci5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanMKQEAgLTU0LDYg KzU0LDkgQEAgV2ViSW5zcGVjdG9yLlRleHRWaWV3ZXIgPSBmdW5jdGlvbih0ZXh0TW9kZWwsIHBs YXRmb3JtLCB1cmwsIGRlbGVnYXRlKQogICAgIH0uYmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAg dGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImRibGNsaWNrIiwgdGhpcy5fZG91YmxlQ2xp Y2suYmluZCh0aGlzKSwgdHJ1ZSk7CisgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIo ImtleWRvd24iLCB0aGlzLl9oYW5kbGVLZXlEb3duLmJpbmQodGhpcyksIGZhbHNlKTsKKworICAg IHRoaXMuX3JlZ2lzdGVyU2hvcnRjdXRzKCk7CiB9CiAKIFdlYkluc3BlY3Rvci5UZXh0Vmlld2Vy LnByb3RvdHlwZSA9IHsKQEAgLTYyLDE2ICs2NSw2IEBAIFdlYkluc3BlY3Rvci5UZXh0Vmlld2Vy LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fbWFpblBhbmVsLm1pbWVUeXBlID0gbWltZVR5 cGU7CiAgICAgfSwKIAotICAgIHNldCByZWFkT25seShyZWFkT25seSkKLSAgICB7Ci0gICAgICAg IHRoaXMuX21haW5QYW5lbC5yZWFkT25seSA9IHJlYWRPbmx5OwotICAgIH0sCi0KLSAgICBnZXQg cmVhZE9ubHkoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX21haW5QYW5lbC5yZWFkT25s eTsKLSAgICB9LAotCiAgICAgZ2V0IHRleHRNb2RlbCgpCiAgICAgewogICAgICAgICByZXR1cm4g dGhpcy5fdGV4dE1vZGVsOwpAQCAtMjI2LDE3ICsyMTksNjUgQEAgV2ViSW5zcGVjdG9yLlRleHRW aWV3ZXIucHJvdG90eXBlID0gewogCiAgICAgX2RvdWJsZUNsaWNrOiBmdW5jdGlvbihldmVudCkK ICAgICB7Ci0gICAgICAgIGlmICghdGhpcy5fZGVsZWdhdGUuaXNDb250ZW50RWRpdGFibGUoKSkK KyAgICAgICAgaWYgKCF0aGlzLl9tYWluUGFuZWwucmVhZE9ubHkgfHwgdGhpcy5fY29tbWl0RWRp dGluZ0luUHJvZ3Jlc3MpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgdmFyIGxpbmVS b3cgPSBldmVudC50YXJnZXQuZW5jbG9zaW5nTm9kZU9yU2VsZldpdGhDbGFzcygid2Via2l0LWxp bmUtY29udGVudCIpOwogICAgICAgICBpZiAoIWxpbmVSb3cpCiAgICAgICAgICAgICByZXR1cm47 ICAvLyBEbyBub3QgdHJpZ2dlciBlZGl0aW5nIGZyb20gbGluZSBudW1iZXJzLgogCi0gICAgICAg IGlmICh0aGlzLnJlYWRPbmx5KSB7Ci0gICAgICAgICAgICB0aGlzLnJlYWRPbmx5ID0gZmFsc2U7 Ci0gICAgICAgICAgICB3aW5kb3cuZ2V0U2VsZWN0aW9uKCkuY29sbGFwc2VUb1N0YXJ0KCk7Cisg ICAgICAgIGlmICghdGhpcy5fZGVsZWdhdGUuaXNDb250ZW50RWRpdGFibGUoKSkKKyAgICAgICAg ICAgIHJldHVybjsKKworICAgICAgICB0aGlzLl9tYWluUGFuZWwucmVhZE9ubHkgPSBmYWxzZTsK KyAgICAgICAgd2luZG93LmdldFNlbGVjdGlvbigpLmNvbGxhcHNlVG9TdGFydCgpOworICAgIH0s CisKKyAgICBfcmVnaXN0ZXJTaG9ydGN1dHM6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRo aXMuX3Nob3J0Y3V0cyA9IHt9OworICAgICAgICB2YXIgY29tbWl0RWRpdGluZyA9IHRoaXMuX2Nv bW1pdEVkaXRpbmcuYmluZCh0aGlzKTsKKyAgICAgICAgdmFyIGNhbmNlbEVkaXRpbmcgPSB0aGlz Ll9jYW5jZWxFZGl0aW5nLmJpbmQodGhpcyk7CisgICAgICAgIHRoaXMuX3Nob3J0Y3V0c1tXZWJJ bnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlS2V5KCJzIiwgV2ViSW5zcGVjdG9yLktleWJv YXJkU2hvcnRjdXQuTW9kaWZpZXJzLkN0cmxPck1ldGEpXSA9IGNvbW1pdEVkaXRpbmc7CisgICAg ICAgIHRoaXMuX3Nob3J0Y3V0c1tXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlS2V5 KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleXMuRW50ZXIuY29kZSwgV2ViSW5zcGVj dG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXJzLkN0cmxPck1ldGEpXSA9IGNvbW1pdEVkaXRp bmc7CisgICAgICAgIHRoaXMuX3Nob3J0Y3V0c1tXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1 dC5tYWtlS2V5KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleXMuRXNjLmNvZGUpXSA9 IGNhbmNlbEVkaXRpbmc7CisgICAgfSwKKworICAgIF9oYW5kbGVLZXlEb3duOiBmdW5jdGlvbihl KQorICAgIHsKKyAgICAgICAgdmFyIHNob3J0Y3V0S2V5ID0gV2ViSW5zcGVjdG9yLktleWJvYXJk U2hvcnRjdXQubWFrZUtleUZyb21FdmVudChlKTsKKyAgICAgICAgdmFyIGhhbmRsZXIgPSB0aGlz Ll9zaG9ydGN1dHNbc2hvcnRjdXRLZXldOworICAgICAgICBpZiAoaGFuZGxlciAmJiBoYW5kbGVy LmNhbGwodGhpcykpIHsKKyAgICAgICAgICAgIGUucHJldmVudERlZmF1bHQoKTsKKyAgICAgICAg ICAgIGUuc3RvcFByb3BhZ2F0aW9uKCk7CiAgICAgICAgIH0KKyAgICB9LAorCisgICAgX2NvbW1p dEVkaXRpbmc6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLl9tYWluUGFuZWwu cmVhZE9ubHkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgdGhpcy5fbWFp blBhbmVsLnJlYWRPbmx5ID0gdHJ1ZTsKKyAgICAgICAgZnVuY3Rpb24gZGlkQ29tbWl0RWRpdGlu ZyhlcnJvcikKKyAgICAgICAgeworICAgICAgICAgICAgdGhpcy5fY29tbWl0RWRpdGluZ0luUHJv Z3Jlc3MgPSBmYWxzZTsKKyAgICAgICAgICAgIGlmIChlcnJvcikKKyAgICAgICAgICAgICAgICB0 aGlzLl9tYWluUGFuZWwucmVhZE9ubHkgPSBmYWxzZTsKKyAgICAgICAgfQorICAgICAgICB0aGlz Ll9jb21taXRFZGl0aW5nSW5Qcm9ncmVzcyA9IHRydWU7CisgICAgICAgIHRoaXMuX2RlbGVnYXRl LmNvbW1pdEVkaXRpbmcoZGlkQ29tbWl0RWRpdGluZy5iaW5kKHRoaXMpKTsKKyAgICAgICAgcmV0 dXJuIHRydWU7CisgICAgfSwKKworICAgIF9jYW5jZWxFZGl0aW5nOiBmdW5jdGlvbigpCisgICAg eworICAgICAgICBpZiAodGhpcy5fbWFpblBhbmVsLnJlYWRPbmx5KQorICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOworCisgICAgICAgIHRoaXMuX21haW5QYW5lbC5yZWFkT25seSA9IHRydWU7Cisg ICAgICAgIHRoaXMuX2RlbGVnYXRlLmNhbmNlbEVkaXRpbmcoKTsKKyAgICAgICAgcmV0dXJuIHRy dWU7CiAgICAgfQogfQogCkBAIC0yNjAsNiArMzAxLDE2IEBAIFdlYkluc3BlY3Rvci5UZXh0Vmll d2VyRGVsZWdhdGUucHJvdG90eXBlID0gewogICAgIGVuZEVkaXRpbmc6IGZ1bmN0aW9uKG9sZFJh bmdlLCBuZXdSYW5nZSkKICAgICB7CiAgICAgICAgIC8vIFNob3VsZCBiZSBpbXBsZW1lbnRlZCBi eSBzdWJjbGFzc2VzLgorICAgIH0sCisKKyAgICBjb21taXRFZGl0aW5nOiBmdW5jdGlvbigpCisg ICAgeworICAgICAgICAvLyBTaG91bGQgYmUgaW1wbGVtZW50ZWQgYnkgc3ViY2xhc3Nlcy4KKyAg ICB9LAorCisgICAgY2FuY2VsRWRpdGluZzogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgLy8g U2hvdWxkIGJlIGltcGxlbWVudGVkIGJ5IHN1YmNsYXNzZXMuCiAgICAgfQogfQogCg==