34400 2010-01-31 13:55:18 -0800 Web Inspector: Fix rest of the NativeTextViewer (line numbers, conditional breakpoints, selection). 2010-02-01 06:07:12 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman bweinstein joepeck rik timothy oldest_to_newest 186229 0 pfeldman 2010-01-31 13:55:18 -0800 Some more testing and we are ready to flip the preferences bit. 186231 1 47799 pfeldman 2010-01-31 13:57:40 -0800 Created attachment 47799 [PATCH] Proposed change. 186232 2 47799 timothy 2010-01-31 14:00:23 -0800 Comment on attachment 47799 [PATCH] Proposed change. > + return nextElement.offsetTop - element.offsetTop; > + } else > + return element.parentElement.offsetHeight - element.offsetTop; NO need for the "} else" after a return. 186381 3 pfeldman 2010-02-01 06:07:12 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/front-end/NativeTextViewer.js M WebCore/inspector/front-end/Settings.js M WebCore/inspector/front-end/SourceFrame.js M WebCore/inspector/front-end/TextEditor.js M WebCore/inspector/front-end/inspector.css M WebCore/inspector/front-end/textEditor.css Committed r54133 47799 2010-01-31 13:57:40 -0800 2010-01-31 14:00:23 -0800 [PATCH] Proposed change. native_view text/plain 10297 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDhjZjk4MS4uYzkxZDA3MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwzMSBAQAogCiAgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEZpeCByZXN0IG9mIHRoZSBO YXRpdmVUZXh0Vmlld2VyIChsaW5lIG51bWJlcnMsCisgICAgICAgIGNvbmRpdGlvbmFsIGJyZWFr cG9pbnRzLCBzZWxlY3Rpb24pLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9OYXRp dmVUZXh0Vmlld2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdGl2ZVRleHRWaWV3ZXIp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdGl2ZVRleHRWaWV3ZXIucHJvdG90eXBlLl91cGRh dGVQcmVmZXJyZWRTaXplKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXRpdmVUZXh0Vmlld2Vy LnByb3RvdHlwZS5fcmVnaXN0ZXJNb3VzZUxpc3RlbmVycyk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuTmF0aXZlVGV4dFZpZXdlci5wcm90b3R5cGUuX21vdXNlRG93bik6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuTmF0aXZlVGV4dFZpZXdlci5wcm90b3R5cGUuX2NvbnRleHRNZW51KToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5OYXRpdmVUZXh0Vmlld2VyLnByb3RvdHlwZS5fbGluZUZvck1vdXNl RXZlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdGl2ZVRleHRWaWV3ZXIucHJvdG90eXBl Ll9saW5lSGVpZ2h0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3Iu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvcik6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVGV4dEVkaXRvci5wcm90b3R5cGUuX3JlZ2lzdGVyTW91c2VMaXN0ZW5lcnMpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3IucHJvdG90eXBlLl9vZmZzZXRUb0xpbmUpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3IucHJvdG90eXBlLl9saW5lSGVpZ2h0KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yLnByb3RvdHlwZS5yZXZlYWwpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3IucHJvdG90eXBlLl9wYWludCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvci5wcm90b3R5cGUuX3VwZGF0ZURpdkRlY29yYXRpb25z KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yLnByb3RvdHlwZS5fcGFpbnRTZWxl Y3Rpb24pOgorCisyMDEwLTAxLTMxICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0u b3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IFtSRUdSRVNTSU9OXSBCcmVha3BvaW50IHNvdXJjZSBsaW5lIGlzIG5vdCBk aXNwbGF5ZWQKICAgICAgICAgaW4gdGhlIGJyZWFrcG9pbnQgbWFuYWdlci4KIApkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05hdGl2ZVRleHRWaWV3ZXIuanMgYi9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmF0aXZlVGV4dFZpZXdlci5qcwppbmRleCA1M2IyMTNk Li45NjI1NGZmIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmF0aXZl VGV4dFZpZXdlci5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmF0aXZlVGV4 dFZpZXdlci5qcwpAQCAtMzUsNiArMzUsNyBAQCBXZWJJbnNwZWN0b3IuTmF0aXZlVGV4dFZpZXdl ciA9IGZ1bmN0aW9uKHRleHRNb2RlbCwgcGxhdGZvcm0pCiAgICAgdGhpcy5fc2hlZXQudGFiSW5k ZXggPSAwOwogICAgIHRoaXMuX2NhbnZhcy5zdHlsZS56SW5kZXggPSAwOwogICAgIHRoaXMuX2Ny ZWF0ZUxpbmVEaXZzKCk7CisgICAgdGhpcy5fc2VsZWN0aW9uQ29sb3IgPSAicmdiKDI0MSwgMjM0 LCAwKSI7CiB9CiAKIFdlYkluc3BlY3Rvci5OYXRpdmVUZXh0Vmlld2VyLnByb3RvdHlwZSA9IHsK QEAgLTY4LDcgKzY5LDcgQEAgV2ViSW5zcGVjdG9yLk5hdGl2ZVRleHRWaWV3ZXIucHJvdG90eXBl ID0gewogICAgICAgICB2YXIgbmV3TGluZU51bWJlckRpZ2l0cyA9IHRoaXMuX2RlY2ltYWxEaWdp dHModGhpcy5fdGV4dE1vZGVsLmxpbmVzQ291bnQpOwogICAgICAgICB0aGlzLl9saW5lTnVtYmVy V2lkdGggPSAobmV3TGluZU51bWJlckRpZ2l0cyArIDIpICogdGhpcy5fZGlnaXRXaWR0aDsKIAot ICAgICAgICB0aGlzLl9zaGVldC5zdHlsZS5wYWRkaW5nTGVmdCA9IHRoaXMuX3RleHRXaWR0aCAr IHRoaXMuX2xpbmVOdW1iZXJXaWR0aCArICJweCI7CisgICAgICAgIHRoaXMuX2NvbnRhaW5lci5z dHlsZS5sZWZ0ID0gdGhpcy5fbGluZU51bWJlcldpZHRoICsgInB4IjsKIAogICAgICAgICB0aGlz Ll9saW5lTnVtYmVyRGlnaXRzID0gbmV3TGluZU51bWJlckRpZ2l0czsKICAgICAgICAgdGhpcy5y ZXBhaW50QWxsKCk7CkBAIC04Niw3ICs4Nyw4IEBAIFdlYkluc3BlY3Rvci5OYXRpdmVUZXh0Vmll d2VyLnByb3RvdHlwZSA9IHsKIAogICAgIF9yZWdpc3Rlck1vdXNlTGlzdGVuZXJzOiBmdW5jdGlv bigpCiAgICAgewotICAgICAgICB0aGlzLl9zaGVldC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRv d24iLCB0aGlzLl9tb3VzZURvd24uYmluZCh0aGlzKSwgZmFsc2UpOworICAgICAgICB0aGlzLmVs ZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY29udGV4dG1lbnUiLCB0aGlzLl9jb250ZXh0TWVudS5i aW5kKHRoaXMpLCBmYWxzZSk7CisgICAgICAgIHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVy KCJtb3VzZWRvd24iLCB0aGlzLl9tb3VzZURvd24uYmluZCh0aGlzKSwgZmFsc2UpOwogICAgIH0s CiAKICAgICBfcmVnaXN0ZXJLZXlib2FyZExpc3RlbmVyczogZnVuY3Rpb24oKQpAQCAtOTksMTEg KzEwMSw2IEBAIFdlYkluc3BlY3Rvci5OYXRpdmVUZXh0Vmlld2VyLnByb3RvdHlwZSA9IHsKICAg ICAgICAgLy8gTm9vcCAtIGxldCBicm93c2VyIHRha2UgY2FyZSBvZiB0aGlzLgogICAgIH0sCiAK LSAgICBfcGFpbnRTZWxlY3Rpb246IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIC8vIE5vb3Ag LSBsZXQgYnJvd3NlciB0YWtlIGNhcmUgb2YgdGhpcy4KLSAgICB9LAotCiAgICAgX3Bvc2l0aW9u RGl2RGVjb3JhdGlvbjogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgLy8gRGl2IGRlY29yYXRp b25zIGhhdmUgZml4ZWQgcG9zaXRpb25zIGluIG91ciBjYXNlLgpAQCAtMTExLDMyICsxMDgsMzYg QEAgV2ViSW5zcGVjdG9yLk5hdGl2ZVRleHRWaWV3ZXIucHJvdG90eXBlID0gewogCiAgICAgX21v dXNlRG93bjogZnVuY3Rpb24oZSkKICAgICB7Ci0gICAgICAgIGlmIChlLm9mZnNldFggKyBlLnRh cmdldC5vZmZzZXRUb3AgPj0gdGhpcy5fbGluZU51bWJlcldpZHRoICYmIHRoaXMuX2xpbmVOdW1i ZXJEZWNvcmF0b3IpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgaWYgKGUuYnV0dG9u ID09PSAyIHx8ICh0aGlzLl9pc01hYyAmJiBlLmN0cmxLZXkpKQorICAgICAgICBpZiAoZS50YXJn ZXQgIT09IHRoaXMuZWxlbWVudCB8fCBlLmJ1dHRvbiA9PT0gMiB8fCAodGhpcy5faXNNYWMgJiYg ZS5jdHJsS2V5KSkKICAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICB2YXIgbG9jYXRpb24g PSB0aGlzLl9jYXJldEZvck1vdXNlRXZlbnQoZSk7Ci0gICAgICAgIHRoaXMuX2xpbmVOdW1iZXJE ZWNvcmF0b3IubW91c2VEb3duKGxvY2F0aW9uLmxpbmUsIGUpOworICAgICAgICB0aGlzLl9saW5l TnVtYmVyRGVjb3JhdG9yLm1vdXNlRG93bih0aGlzLl9saW5lRm9yTW91c2VFdmVudChlKSwgZSk7 CiAgICAgfSwKIAogICAgIF9jb250ZXh0TWVudTogZnVuY3Rpb24oZSkKICAgICB7Ci0gICAgICAg IC8vIE92ZXJyaWRlIGVkaXRvcidzIGltcGxlbWVudGF0aW9uIHRvIGFkZCB0aGUgbGluZSdzIG9m ZnNldHMuCi0gICAgICAgIGlmIChlLm9mZnNldFggKyBlLnRhcmdldC5vZmZzZXRUb3AgPj0gdGhp cy5fbGluZU51bWJlcldpZHRoICYmIHRoaXMuX2xpbmVOdW1iZXJEZWNvcmF0b3IpCisgICAgICAg IGlmIChlLnRhcmdldCAhPT0gdGhpcy5lbGVtZW50KQogICAgICAgICAgICAgcmV0dXJuOworICAg ICAgICB0aGlzLl9saW5lTnVtYmVyRGVjb3JhdG9yLmNvbnRleHRNZW51KHRoaXMuX2xpbmVGb3JN b3VzZUV2ZW50KGUpLCBlKTsKKyAgICB9LAogCi0gICAgICAgIHZhciBsb2NhdGlvbiA9IHRoaXMu X2NhcmV0Rm9yTW91c2VFdmVudChlKTsKLSAgICAgICAgdGhpcy5fbGluZU51bWJlckRlY29yYXRv ci5jb250ZXh0TWVudShsb2NhdGlvbi5saW5lLCBlKTsKKyAgICBfbGluZUZvck1vdXNlRXZlbnQ6 IGZ1bmN0aW9uKGUpCisgICAgeworICAgICAgICByZXR1cm4gTWF0aC5tYXgoMCwgdGhpcy5fb2Zm c2V0VG9MaW5lKGUub2Zmc2V0WSArIHRoaXMuX3Njcm9sbFRvcCkgLSAxKTsKICAgICB9LAogCi0g ICAgX2NhcmV0Rm9yTW91c2VFdmVudDogZnVuY3Rpb24oZSkKKyAgICBfbGluZUhlaWdodDogZnVu Y3Rpb24obGluZU51bWJlcikKICAgICB7Ci0gICAgICAgIC8vIE92ZXJyaWRlIGVkaXRvcidzIGlt cGxlbWVudGF0aW9uIHRvIGFkZCB0aGUgbGluZSdzIG9mZnNldHMuCi0gICAgICAgIHZhciBsaW5l TnVtYmVyID0gTWF0aC5tYXgoMCwgdGhpcy5fb2Zmc2V0VG9MaW5lKGUub2Zmc2V0WSArIGUudGFy Z2V0Lm9mZnNldFRvcCkgLSAxKTsKLSAgICAgICAgdmFyIG9mZnNldCA9IGUub2Zmc2V0WCArIGUu dGFyZ2V0Lm9mZnNldExlZnQgKyB0aGlzLl9zY3JvbGxMZWZ0IC0gdGhpcy5fbGluZU51bWJlcldp ZHRoOwotICAgICAgICByZXR1cm4geyBsaW5lOiBsaW5lTnVtYmVyLCBjb2x1bW46IHRoaXMuX2Nv bHVtbkZvck9mZnNldChsaW5lTnVtYmVyLCBvZmZzZXQpIH07CisgICAgICAgIC8vIFVzZSBjYWNo ZWQgdmFsdWUgZmlyc3QuCisgICAgICAgIGlmICh0aGlzLl9saW5lT2Zmc2V0c0NhY2hlW2xpbmVO dW1iZXIgKyAxXSkKKyAgICAgICAgICAgIHJldHVybiB0aGlzLl9saW5lT2Zmc2V0c0NhY2hlW2xp bmVOdW1iZXIgKyAxXSAtIHRoaXMuX2xpbmVPZmZzZXRzQ2FjaGVbbGluZU51bWJlcl07CisKKyAg ICAgICAgLy8gR2V0IG1ldHJpY3MgZnJvbSB0aGUgYnJvd3Nlci4KKyAgICAgICAgdmFyIGVsZW1l bnQgPSB0aGlzLl90ZXh0TW9kZWwuZ2V0QXR0cmlidXRlKGxpbmVOdW1iZXIsICJsaW5lLWRpdiIp OworICAgICAgICBpZiAobGluZU51bWJlciArIDEgPCB0aGlzLl90ZXh0TW9kZWwubGluZXNDb3Vu dCkgeworICAgICAgICAgICAgdmFyIG5leHRFbGVtZW50ID0gdGhpcy5fdGV4dE1vZGVsLmdldEF0 dHJpYnV0ZShsaW5lTnVtYmVyICsgMSwgImxpbmUtZGl2Iik7CisgICAgICAgICAgICByZXR1cm4g bmV4dEVsZW1lbnQub2Zmc2V0VG9wIC0gZWxlbWVudC5vZmZzZXRUb3A7CisgICAgICAgIH0gZWxz ZQorICAgICAgICAgICAgcmV0dXJuIGVsZW1lbnQucGFyZW50RWxlbWVudC5vZmZzZXRIZWlnaHQg LSBlbGVtZW50Lm9mZnNldFRvcDsKICAgICB9LAogCiAgICAgX3BhaW50TGluZTogZnVuY3Rpb24o bGluZU51bWJlciwgbGluZU9mZnNldCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9UZXh0RWRpdG9yLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRF ZGl0b3IuanMKaW5kZXggYWZhOTdjMS4uZDZhOWNhYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3IuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1RleHRFZGl0b3IuanMKQEAgLTU1LDcgKzU1LDYgQEAgV2ViSW5zcGVjdG9yLlRleHRF ZGl0b3IgPSBmdW5jdGlvbih0ZXh0TW9kZWwsIHBsYXRmb3JtKQogICAgIHRoaXMuX2N1cnNvciA9 IG5ldyBXZWJJbnNwZWN0b3IuVGV4dEN1cnNvcihjdXJzb3JFbGVtZW50KTsKIAogICAgIHRoaXMu X2NvbnRhaW5lci5hZGRFdmVudExpc3RlbmVyKCJzY3JvbGwiLCB0aGlzLl9zY3JvbGwuYmluZCh0 aGlzKSwgZmFsc2UpOwotICAgIHRoaXMuX3NoZWV0LmFkZEV2ZW50TGlzdGVuZXIoImNvbnRleHRt ZW51IiwgdGhpcy5fY29udGV4dE1lbnUuYmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAgdGhpcy5f cmVnaXN0ZXJNb3VzZUxpc3RlbmVycygpOwogICAgIHRoaXMuX3JlZ2lzdGVyS2V5Ym9hcmRMaXN0 ZW5lcnMoKTsKQEAgLTg0LDYgKzgzLDcgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3IgPSBmdW5j dGlvbih0ZXh0TW9kZWwsIHBsYXRmb3JtKQogCiAgICAgdGhpcy5fbGluZU9mZnNldHNDYWNoZSA9 IFswXTsKICAgICB0aGlzLl9yZWFkT25seSA9IGZhbHNlOworICAgIHRoaXMuX3NlbGVjdGlvbkNv bG9yID0gInJnYigxODEsIDIxMywgMjU1KSI7CiB9CiAKIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9y LnByb3RvdHlwZSA9IHsKQEAgLTE1Miw2ICsxNTIsNyBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRv ci5wcm90b3R5cGUgPSB7CiAKICAgICBfcmVnaXN0ZXJNb3VzZUxpc3RlbmVyczogZnVuY3Rpb24o KQogICAgIHsKKyAgICAgICAgdGhpcy5fc2hlZXQuYWRkRXZlbnRMaXN0ZW5lcigiY29udGV4dG1l bnUiLCB0aGlzLl9jb250ZXh0TWVudS5iaW5kKHRoaXMpLCBmYWxzZSk7CiAgICAgICAgIHRoaXMu X3NoZWV0LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNldXAiLCB0aGlzLl9tb3VzZVVwLmJpbmQodGhp cyksIGZhbHNlKTsKICAgICAgICAgdGhpcy5fc2hlZXQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vk b3duIiwgdGhpcy5fbW91c2VEb3duLmJpbmQodGhpcyksIGZhbHNlKTsKICAgICAgICAgdGhpcy5f c2hlZXQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vtb3ZlIiwgdGhpcy5fbW91c2VNb3ZlLmJpbmQo dGhpcyksIGZhbHNlKTsKQEAgLTE4MCw3ICsxODEsNyBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRv ci5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmIChvZmZzZXQgPiB0aGlzLl9saW5lT2Zmc2V0c0Nh Y2hlW3RoaXMuX2xpbmVPZmZzZXRzQ2FjaGUubGVuZ3RoIC0gMV0pIHsKICAgICAgICAgICAgIC8v IFNlZWtpbmcgb3V0c2lkZSBjYWNoZWQgYXJlYS4gRmlsbCB0aGUgY2FjaGUuCiAgICAgICAgICAg ICB2YXIgbGluZU51bWJlciA9IHRoaXMuX2xpbmVPZmZzZXRzQ2FjaGUubGVuZ3RoOwotICAgICAg ICAgICAgd2hpbGUgKHRoaXMuX2xpbmVUb09mZnNldChsaW5lTnVtYmVyKSA8IG9mZnNldCkKKyAg ICAgICAgICAgIHdoaWxlIChsaW5lTnVtYmVyIDwgdGhpcy5fdGV4dE1vZGVsLmxpbmVzQ291bnQg JiYgdGhpcy5fbGluZVRvT2Zmc2V0KGxpbmVOdW1iZXIpIDwgb2Zmc2V0KQogICAgICAgICAgICAg ICAgIGxpbmVOdW1iZXIrKzsKICAgICAgICAgICAgIHJldHVybiBsaW5lTnVtYmVyOwogICAgICAg ICB9CkBAIC0yMTcsNiArMjE4LDEwIEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yLnByb3RvdHlw ZSA9IHsKIAogICAgIF9saW5lSGVpZ2h0OiBmdW5jdGlvbihsaW5lTnVtYmVyKQogICAgIHsKKyAg ICAgICAgLy8gVXNlIGNhY2hlZCB2YWx1ZSBmaXJzdC4KKyAgICAgICAgaWYgKHRoaXMuX2xpbmVP ZmZzZXRzQ2FjaGVbbGluZU51bWJlciArIDFdKQorICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2xp bmVPZmZzZXRzQ2FjaGVbbGluZU51bWJlciArIDFdIC0gdGhpcy5fbGluZU9mZnNldHNDYWNoZVts aW5lTnVtYmVyXTsKKwogICAgICAgICB2YXIgZWxlbWVudCA9IHRoaXMuX3RleHRNb2RlbC5nZXRB dHRyaWJ1dGUobGluZU51bWJlciwgImRpdi1kZWNvcmF0aW9uIik7CiAgICAgICAgIGlmIChlbGVt ZW50KQogICAgICAgICAgICAgcmV0dXJuIDIgKiB0aGlzLl90ZXh0TGluZUhlaWdodCArIGVsZW1l bnQuY2xpZW50SGVpZ2h0OwpAQCAtMjM3LDggKzI0MiwxMCBAQCBXZWJJbnNwZWN0b3IuVGV4dEVk aXRvci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBtaW5TY3JvbGxMZWZ0ID0gbWF4U2Nyb2xs TGVmdCAtIHRoaXMuX2NvbnRhaW5lci5jbGllbnRXaWR0aCArIHRoaXMuX2xpbmVOdW1iZXJXaWR0 aDsKICAgICAgICAgaWYgKHRoaXMuX3Njcm9sbExlZnQgPCBtaW5TY3JvbGxMZWZ0KQogICAgICAg ICAgICAgdGhpcy5fY29udGFpbmVyLnNjcm9sbExlZnQgPSBtaW5TY3JvbGxMZWZ0ICsgMTAwOwot ICAgICAgICBpZiAodGhpcy5fc2Nyb2xsTGVmdCA+IG1heFNjcm9sbExlZnQpCisgICAgICAgIGVs c2UgaWYgKHRoaXMuX3Njcm9sbExlZnQgPiBtYXhTY3JvbGxMZWZ0KQogICAgICAgICAgICAgdGhp cy5fY29udGFpbmVyLnNjcm9sbExlZnQgPSBtYXhTY3JvbGxMZWZ0OworICAgICAgICBlbHNlIGlm IChtaW5TY3JvbGxMZWZ0IDwgMCAmJiBtYXhTY3JvbGxMZWZ0ID4gMCkKKyAgICAgICAgICAgIHRo aXMuX2NvbnRhaW5lci5zY3JvbGxMZWZ0ID0gMDsKICAgICB9LAogCiAgICAgLy8gV2ViSW5zcGVj dG9yLlRleHRNb2RlbCBsaXN0ZW5lcgpAQCAtMzc5LDEzICszODYsMTQgQEAgV2ViSW5zcGVjdG9y LlRleHRFZGl0b3IucHJvdG90eXBlID0gewogICAgICAgICBpZiAodGhpcy5fcGFpbnRDb2FsZXNj aW5nTGV2ZWwpCiAgICAgICAgICAgICByZXR1cm47CiAKKyAgICAgICAgdGhpcy5fdXBkYXRlRGl2 RGVjb3JhdGlvbnMoKTsKKwogICAgICAgICB0aGlzLnBhaW50TGluZU51bWJlcnMoKTsKIAogICAg ICAgICBmb3IgKHZhciBpID0gMDsgdGhpcy5fZGFtYWdlICYmIGkgPCB0aGlzLl9kYW1hZ2UubGVu Z3RoOyArK2kpCiAgICAgICAgICAgICB0aGlzLl9wYWludExpbmVzKHRoaXMuX2RhbWFnZVtpXS5z dGFydExpbmUsIHRoaXMuX2RhbWFnZVtpXS5lbmRMaW5lKTsKICAgICAgICAgZGVsZXRlIHRoaXMu X2RhbWFnZTsKIAotICAgICAgICB0aGlzLl91cGRhdGVEaXZEZWNvcmF0aW9ucygpOwogICAgICAg ICB0aGlzLl91cGRhdGVDdXJzb3IodGhpcy5fc2VsZWN0aW9uLmVuZExpbmUsIHRoaXMuX3NlbGVj dGlvbi5lbmRDb2x1bW4pOwogICAgIH0sCiAKQEAgLTgxMSw4ICs4MTksMTAgQEAgV2ViSW5zcGVj dG9yLlRleHRFZGl0b3IucHJvdG90eXBlID0gewogICAgICAgICB2YXIgbGluZXNDb3VudCA9IHRo aXMuX3RleHRNb2RlbC5saW5lc0NvdW50OwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGxp bmVzQ291bnQ7ICsraSkgewogICAgICAgICAgICAgdmFyIGVsZW1lbnQgPSB0aGlzLl90ZXh0TW9k ZWwuZ2V0QXR0cmlidXRlKGksICJkaXYtZGVjb3JhdGlvbiIpOwotICAgICAgICAgICAgaWYgKGVs ZW1lbnQpCisgICAgICAgICAgICBpZiAoZWxlbWVudCkgeworICAgICAgICAgICAgICAgIHRoaXMu X2xpbmVPZmZzZXRzQ2FjaGUubGVuZ3RoID0gTWF0aC5taW4odGhpcy5fbGluZU9mZnNldHNDYWNo ZS5sZW5ndGgsIGkgKyAxKTsKICAgICAgICAgICAgICAgICB0aGlzLl9wb3NpdGlvbkRpdkRlY29y YXRpb24oaSwgZWxlbWVudCwgaSA+IGZpcnN0TGluZSAmJiBpIDwgbGFzdExpbmUpOworICAgICAg ICAgICAgfQogICAgICAgICB9CiAgICAgfSwKIApAQCAtODQ4LDcgKzg1OCw3IEBAIFdlYkluc3Bl Y3Rvci5UZXh0RWRpdG9yLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHRoaXMuX3NlbGVjdGlv bi5pc0VtcHR5KCkpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIHZhciByYW5nZSA9IHRo aXMuX3NlbGVjdGlvbi5yYW5nZSgpOwotICAgICAgICB0aGlzLl9jdHguZmlsbFN0eWxlID0gInJn YigxODEsIDIxMywgMjU1KSI7CisgICAgICAgIHRoaXMuX2N0eC5maWxsU3R5bGUgPSB0aGlzLl9z ZWxlY3Rpb25Db2xvcjsKIAogICAgICAgICBmaXJzdExpbmUgPSBNYXRoLm1heChmaXJzdExpbmUs IHJhbmdlLnN0YXJ0TGluZSk7CiAgICAgICAgIGVuZExpbmUgPSBNYXRoLm1pbihsYXN0TGluZSwg cmFuZ2UuZW5kTGluZSArIDEpOwpAQCAtODY5LDcgKzg3OSw3IEBAIFdlYkluc3BlY3Rvci5UZXh0 RWRpdG9yLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgICAg IHRvID0gdGhpcy5fY2FudmFzLndpZHRoOwogCi0gICAgICAgICAgICB0aGlzLl9jdHguZmlsbFJl Y3QoZnJvbSwgdGhpcy5fbGluZVRvT2Zmc2V0KGkpIC0gdGhpcy5fc2Nyb2xsVG9wLCB0byAtIGZy b20sIHRoaXMuX2xpbmVIZWlnaHQoaSkpOworICAgICAgICAgICAgdGhpcy5fY3R4LmZpbGxSZWN0 KGZyb20sIHRoaXMuX2xpbmVUb09mZnNldChpKSAtIHRoaXMuX3Njcm9sbFRvcCwgdG8gLSBmcm9t LCB0aGlzLl9saW5lSGVpZ2h0KGkpIC0gMSk7CiAgICAgICAgIH0KICAgICAgICAgdGhpcy5fY3R4 LmZpbGxTdHlsZSA9ICJyZ2IoMCwgMCwgMCkiOwogICAgIH0sCg==