111732 2013-03-07 07:59:03 -0800 Web Inspector: Polish TabbedEditorContaner and ScriptsNavigator behavior. 2013-03-08 07:27:13 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 vsevik vsevik apavlov dglazkov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 850097 0 vsevik 2013-03-07 07:59:03 -0800 Resources matching inspectedPageURL are always expanded in NavigatorView now. Snippets tab in scripts navigator is not automatically opened anymore. Cleared saved TabbedEditorContainer history because it might have been corrupted due to errors in earlier versions. Snippets are not revealed in TabbedEditorContainer anymore unless they were actually selected by user or there is no other tabs opened. 850101 1 192002 vsevik 2013-03-07 08:02:23 -0800 Created attachment 192002 Patch 850129 2 192002 webkit.review.bot 2013-03-07 08:45:00 -0800 Comment on attachment 192002 Patch Attachment 192002 did not pass chromium-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/17055345 New failing tests: inspector/debugger/pause-in-inline-script.html inspector/audits/audits-panel-functional.html inspector/debugger/debugger-script-preprocessor.html inspector/debugger/source-frame-count.html inspector/debugger/debugger-reload-on-pause.html inspector/debugger/debugger-scripts-reload.html inspector/debugger/dom-breakpoints.html inspector/debugger/debugger-breakpoints-not-activated-on-reload.html http/tests/inspector/compiler-source-mapping-debug.html inspector/debugger/watch-expressions-preserve-expansion.html 850144 3 192015 vsevik 2013-03-07 09:12:46 -0800 Created attachment 192015 Patch 851182 4 192015 webkit.review.bot 2013-03-08 07:27:09 -0800 Comment on attachment 192015 Patch Clearing flags on attachment: 192015 Committed r145220: <http://trac.webkit.org/changeset/145220> 851183 5 webkit.review.bot 2013-03-08 07:27:13 -0800 All reviewed patches have been landed. Closing bug. 192002 2013-03-07 08:02:23 -0800 2013-03-07 09:12:41 -0800 Patch bug-111732-20130307195827.patch text/plain 10596 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MDc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWY4ZjU4NmNhMWI0ZjUy MDNmMGY3NzkwYzVlYjAyYWYxZWUyMzBkZS4uY2EzNDg1MTFlMGJkZjFlYWM5YTdiMTI5MWFmOTJl NmU1MjEzNGZiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM2IEBACiAyMDEzLTAzLTA3ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFBvbGlzaCBUYWJiZWRFZGl0b3JDb250YW5lciBhbmQgU2NyaXB0c05hdmlnYXRvciBiZWhh dmlvci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEx MTczMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl c291cmNlcyBtYXRjaGluZyBpbnNwZWN0ZWRQYWdlVVJMIGFyZSBhbHdheXMgZXhwYW5kZWQgaW4g TmF2aWdhdG9yVmlldyBub3cuCisgICAgICAgIFNuaXBwZXRzIHRhYiBpbiBzY3JpcHRzIG5hdmln YXRvciBpcyBub3QgYXV0b21hdGljYWxseSBvcGVuZWQgYW55bW9yZS4KKyAgICAgICAgQ2xlYXJl ZCBzYXZlZCBUYWJiZWRFZGl0b3JDb250YWluZXIgaGlzdG9yeSBiZWNhdXNlIGl0IG1pZ2h0IGhh dmUgYmVlbiBjb3JydXB0ZWQgZHVlIHRvIGVycm9ycyBpbiBlYXJsaWVyIHZlcnNpb25zLgorICAg ICAgICBTbmlwcGV0cyBhcmUgbm90IHJldmVhbGVkIGluIFRhYmJlZEVkaXRvckNvbnRhaW5lciBh bnltb3JlIHVubGVzcyB0aGV5IHdlcmUgYWN0dWFsbHkgc2VsZWN0ZWQgYnkgdXNlciBvciB0aGVy ZSBpcyBubyBvdGhlciB0YWJzIG9wZW5lZC4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvTmF2aWdhdG9yVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JWaWV3 KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JWaWV3LnByb3RvdHlwZS5hZGRVSVNv dXJjZUNvZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRvclZpZXcucHJvdG90eXBl Ll9pbnNwZWN0ZWRVUkxDaGFuZ2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JW aWV3LnByb3RvdHlwZS5yZXZlYWxVSVNvdXJjZUNvZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9y Lk5hdmlnYXRvckZvbGRlclRyZWVFbGVtZW50LnByb3RvdHlwZS5vbmF0dGFjaCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVUlTb3VyY2VDb2RlVHJlZU5vZGUucHJvdG90eXBlLnVp U291cmNlQ29kZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVUlTb3VyY2VDb2Rl VHJlZU5vZGUucHJvdG90eXBlLnJldmVhbCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzTmF2aWdhdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZp Z2F0b3IucHJvdG90eXBlLnJldmVhbFVJU291cmNlQ29kZSk6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0 c1BhbmVsLnByb3RvdHlwZS5fc2hvd0ZpbGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvU2V0dGluZ3MuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmVyc2lvbkNvbnRyb2xsZXIu cHJvdG90eXBlLl91cGRhdGVWZXJzaW9uRnJvbTFUbzIpOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvVGFiYmVkRWRpdG9yQ29udGFpbmVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlRhYmJlZEVkaXRvckNvbnRhaW5lci5wcm90b3R5cGUuYWRkVUlTb3VyY2VDb2RlLnRhYklkLnRo aXMuX3RhYklkcy5nZXQgdGhpcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiYmVkRWRpdG9y Q29udGFpbmVyLnByb3RvdHlwZS5hZGRVSVNvdXJjZUNvZGUpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRhYmJlZEVkaXRvckNvbnRhaW5lci5IaXN0b3J5LnByb3RvdHlwZS5fcmVidWlsZEl0ZW1J bmRleCk6CisKKzIwMTMtMDMtMDcgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5v cmc+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogQWRkIHNvbWUgbW9yZSBjb21waWxhdGlvbiBh bm5vdGF0aW9ucyB0byBOYXZpZ2F0b3JWaWV3CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE3MzAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9OYXZpZ2F0b3JWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9OYXZpZ2F0b3JWaWV3LmpzCmluZGV4IDIyYzk2ZWE4YzI2MTU0MjY2 MDgxMWQzMmVmZTBhM2EzZWE2MmEyYmQuLjE4M2ViMTYyMzkwMDQyZDIyNGVlMDUzNTUzZWM3ZGYz NmE1NTkyNTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv TmF2aWdhdG9yVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L05hdmlnYXRvclZpZXcuanMKQEAgLTU3LDYgKzU3LDggQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRv clZpZXcgPSBmdW5jdGlvbigpCiAKICAgICB0aGlzLl9yb290Tm9kZSA9IG5ldyBXZWJJbnNwZWN0 b3IuTmF2aWdhdG9yUm9vdFRyZWVOb2RlKHRoaXMpOwogICAgIHRoaXMuX3Jvb3ROb2RlLnBvcHVs YXRlKCk7CisKKyAgICBXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwuYWRkRXZlbnRMaXN0 ZW5lcihXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5JbnNwZWN0ZWRV UkxDaGFuZ2VkLCB0aGlzLl9pbnNwZWN0ZWRVUkxDaGFuZ2VkLCB0aGlzKTsKIH0KIAogV2ViSW5z cGVjdG9yLk5hdmlnYXRvclZpZXcuRXZlbnRzID0gewpAQCAtODMsNiArODUsMjIgQEAgV2ViSW5z cGVjdG9yLk5hdmlnYXRvclZpZXcucHJvdG90eXBlID0gewogICAgICAgICB2YXIgdWlTb3VyY2VD b2RlTm9kZSA9IG5ldyBXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVUlTb3VyY2VDb2RlVHJlZU5vZGUo dGhpcywgdWlTb3VyY2VDb2RlKTsKICAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlTm9kZXNbdWlT b3VyY2VDb2RlLnVyaSgpXSA9IHVpU291cmNlQ29kZU5vZGU7CiAgICAgICAgIG5vZGUuYXBwZW5k Q2hpbGQodWlTb3VyY2VDb2RlTm9kZSk7CisgICAgICAgIGlmICh1aVNvdXJjZUNvZGUudXJsID09 PSBXZWJJbnNwZWN0b3IuaW5zcGVjdGVkUGFnZVVSTCkKKyAgICAgICAgICAgIHRoaXMucmV2ZWFs VUlTb3VyY2VDb2RlKHVpU291cmNlQ29kZSk7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBw YXJhbSB7V2ViSW5zcGVjdG9yLkV2ZW50fSBldmVudAorICAgICAqLworICAgIF9pbnNwZWN0ZWRV UkxDaGFuZ2VkOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHZhciBub2RlcyA9IE9i amVjdC52YWx1ZXModGhpcy5fdWlTb3VyY2VDb2RlTm9kZXMpOworICAgICAgICBmb3IgKHZhciBp ID0gMDsgaSA8IG5vZGVzLmxlbmd0aDsgKytpKSB7CisgICAgICAgICAgICB2YXIgdWlTb3VyY2VD b2RlID0gbm9kZXNbaV0udWlTb3VyY2VDb2RlKCk7CisgICAgICAgICAgICBpZiAodWlTb3VyY2VD b2RlLnVybCA9PT0gV2ViSW5zcGVjdG9yLmluc3BlY3RlZFBhZ2VVUkwpCisgICAgICAgICAgICAg ICAgdGhpcy5yZXZlYWxVSVNvdXJjZUNvZGUodWlTb3VyY2VDb2RlKTsKKyAgICAgICAgfQorCiAg ICAgfSwKIAogICAgIC8qKgpAQCAtMTg5LDggKzIwNyw5IEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0 b3JWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgIC8qKgogICAgICAqIEBwYXJhbSB7V2ViSW5zcGVj dG9yLlVJU291cmNlQ29kZX0gdWlTb3VyY2VDb2RlCisgICAgICogQHBhcmFtIHtib29sZWFuPX0g c2VsZWN0CiAgICAgICovCi0gICAgcmV2ZWFsVUlTb3VyY2VDb2RlOiBmdW5jdGlvbih1aVNvdXJj ZUNvZGUpCisgICAgcmV2ZWFsVUlTb3VyY2VDb2RlOiBmdW5jdGlvbih1aVNvdXJjZUNvZGUsIHNl bGVjdCkKICAgICB7CiAgICAgICAgIHZhciBub2RlID0gdGhpcy5fdWlTb3VyY2VDb2RlTm9kZXNb dWlTb3VyY2VDb2RlLnVyaSgpXTsKICAgICAgICAgaWYgKCFub2RlKQpAQCAtMTk4LDcgKzIxNyw3 IEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYg KHRoaXMuX3NjcmlwdHNUcmVlLnNlbGVjdGVkVHJlZUVsZW1lbnQpCiAgICAgICAgICAgICB0aGlz Ll9zY3JpcHRzVHJlZS5zZWxlY3RlZFRyZWVFbGVtZW50LmRlc2VsZWN0KCk7CiAgICAgICAgIHRo aXMuX2xhc3RTZWxlY3RlZFVJU291cmNlQ29kZSA9IHVpU291cmNlQ29kZTsKLSAgICAgICAgbm9k ZS5yZXZlYWwoKTsKKyAgICAgICAgbm9kZS5yZXZlYWwoc2VsZWN0KTsKICAgICB9LAogCiAgICAg LyoqCkBAIC00NzMsMTAgKzQ5Miw3IEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JGb2xkZXJUcmVl RWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgb25hdHRhY2g6IGZ1bmN0aW9uKCkKICAgICB7CiAg ICAgICAgIFdlYkluc3BlY3Rvci5CYXNlTmF2aWdhdG9yVHJlZUVsZW1lbnQucHJvdG90eXBlLm9u YXR0YWNoLmNhbGwodGhpcyk7Ci0gICAgICAgIGlmICh0aGlzLnR5cGUoKSA9PT0gV2ViSW5zcGVj dG9yLk5hdmlnYXRvclRyZWVPdXRsaW5lLlR5cGVzLkRvbWFpbiAmJiB0aGlzLnRpdGxlVGV4dCA9 PT0gV2ViSW5zcGVjdG9yLmluc3BlY3RlZFBhZ2VEb21haW4pCi0gICAgICAgICAgICB0aGlzLmV4 cGFuZCgpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICB0aGlzLmNvbGxhcHNlKCk7CisgICAg ICAgIHRoaXMuY29sbGFwc2UoKTsKICAgICB9LAogCiAgICAgX19wcm90b19fOiBXZWJJbnNwZWN0 b3IuQmFzZU5hdmlnYXRvclRyZWVFbGVtZW50LnByb3RvdHlwZQpAQCAtNzQ1LDYgKzc2MSwxNCBA QCBXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVUlTb3VyY2VDb2RlVHJlZU5vZGUgPSBmdW5jdGlvbihu YXZpZ2F0b3JWaWV3LCB1aVNvdXJjZUNvZAogCiBXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVUlTb3Vy Y2VDb2RlVHJlZU5vZGUucHJvdG90eXBlID0gewogICAgIC8qKgorICAgICAqIEByZXR1cm4ge1dl Ykluc3BlY3Rvci5VSVNvdXJjZUNvZGV9CisgICAgICovCisgICAgdWlTb3VyY2VDb2RlOiBmdW5j dGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fdWlTb3VyY2VDb2RlOworICAgIH0s CisKKyAgICAvKioKICAgICAgKiBAcmV0dXJuIHtUcmVlRWxlbWVudH0KICAgICAgKi8KICAgICB0 cmVlRWxlbWVudDogZnVuY3Rpb24oKQpAQCAtODE3LDExICs4NDEsMTYgQEAgV2ViSW5zcGVjdG9y Lk5hdmlnYXRvclVJU291cmNlQ29kZVRyZWVOb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhp cy51cGRhdGVUaXRsZSgpOwogICAgIH0sCiAKLSAgICByZXZlYWw6IGZ1bmN0aW9uKCkKKyAgICAv KioKKyAgICAgKiBAcGFyYW0ge2Jvb2xlYW49fSBzZWxlY3QKKyAgICAgKi8KKyAgICByZXZlYWw6 IGZ1bmN0aW9uKHNlbGVjdCkKICAgICB7CiAgICAgICAgIHRoaXMucGFyZW50LnBvcHVsYXRlKCk7 CiAgICAgICAgIHRoaXMucGFyZW50LnRyZWVFbGVtZW50KCkuZXhwYW5kKCk7Ci0gICAgICAgIHRo aXMuX3RyZWVFbGVtZW50LnJldmVhbEFuZFNlbGVjdCgpOworICAgICAgICB0aGlzLl90cmVlRWxl bWVudC5yZXZlYWwoKTsKKyAgICAgICAgaWYgKHNlbGVjdCkKKyAgICAgICAgICAgIHRoaXMuX3Ry ZWVFbGVtZW50LnNlbGVjdCgpOwogICAgIH0sCiAKICAgICAvKioKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c05hdmlnYXRvci5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c05hdmlnYXRvci5qcwppbmRleCA2 Mjg2NmNkYWIwZDg3YTY3MzAwYzUyNmI2MmIyNzBhZWEwYjhkNTdiLi4wY2VjYTA2ZGM0MDVlMzFi MDMyNDFiMjJjMDY2OWFmYTI3OTBiM2Y0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNOYXZpZ2F0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzTmF2aWdhdG9yLmpzCkBAIC0xMDgsMTUgKzEwOCwx NCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvci5wcm90b3R5cGUgPSB7CiAKICAgICAv KioKICAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29k ZQorICAgICAqIEBwYXJhbSB7Ym9vbGVhbj19IHNlbGVjdAogICAgICAqLwotICAgIHJldmVhbFVJ U291cmNlQ29kZTogZnVuY3Rpb24odWlTb3VyY2VDb2RlKQorICAgIHJldmVhbFVJU291cmNlQ29k ZTogZnVuY3Rpb24odWlTb3VyY2VDb2RlLCBzZWxlY3QpCiAgICAgewotICAgICAgICB0aGlzLl9u YXZpZ2F0b3JWaWV3Rm9yVUlTb3VyY2VDb2RlKHVpU291cmNlQ29kZSkucmV2ZWFsVUlTb3VyY2VD b2RlKHVpU291cmNlQ29kZSk7CisgICAgICAgIHRoaXMuX25hdmlnYXRvclZpZXdGb3JVSVNvdXJj ZUNvZGUodWlTb3VyY2VDb2RlKS5yZXZlYWxVSVNvdXJjZUNvZGUodWlTb3VyY2VDb2RlLCBzZWxl Y3QpOwogICAgICAgICBpZiAodWlTb3VyY2VDb2RlLmlzQ29udGVudFNjcmlwdCkKICAgICAgICAg ICAgIHRoaXMuX3RhYmJlZFBhbmUuc2VsZWN0VGFiKFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdh dG9yLkNvbnRlbnRTY3JpcHRzVGFiKTsKLSAgICAgICAgZWxzZSBpZiAodWlTb3VyY2VDb2RlLnBy b2plY3QoKS50eXBlKCkgPT09IFdlYkluc3BlY3Rvci5wcm9qZWN0VHlwZXMuU25pcHBldHMpCi0g ICAgICAgICAgICB0aGlzLl90YWJiZWRQYW5lLnNlbGVjdFRhYihXZWJJbnNwZWN0b3IuU2NyaXB0 c05hdmlnYXRvci5TbmlwcGV0c1RhYik7Ci0gICAgICAgIGVsc2UKKyAgICAgICAgZWxzZSBpZiAo dWlTb3VyY2VDb2RlLnByb2plY3QoKS50eXBlKCkgIT09IFdlYkluc3BlY3Rvci5wcm9qZWN0VHlw ZXMuU25pcHBldHMpCiAgICAgICAgICAgICB0aGlzLl90YWJiZWRQYW5lLnNlbGVjdFRhYihXZWJJ bnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvci5TY3JpcHRzVGFiKTsKICAgICB9LAogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4 IDAyZTk0NmQwNTExZmI1NjU1NDUxMmYyNTJkMTQ1MWFhZGVjNzJkZjkuLmYzMWMzOTdjZmZhNmNk MTQzMDczMTkyZGM1Zjc3ZTNkYTQxODYxYmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC00MzMsNyArNDMzLDcgQEAgV2Vi SW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm4g c291cmNlRnJhbWU7CiAgICAgICAgIHRoaXMuX2N1cnJlbnRVSVNvdXJjZUNvZGUgPSB1aVNvdXJj ZUNvZGU7CiAgICAgICAgIGlmICghdWlTb3VyY2VDb2RlLnByb2plY3QoKS5pc1NlcnZpY2VQcm9q ZWN0KCkpCi0gICAgICAgICAgICB0aGlzLl9uYXZpZ2F0b3IucmV2ZWFsVUlTb3VyY2VDb2RlKHVp U291cmNlQ29kZSk7CisgICAgICAgICAgICB0aGlzLl9uYXZpZ2F0b3IucmV2ZWFsVUlTb3VyY2VD b2RlKHVpU291cmNlQ29kZSwgdHJ1ZSk7CiAgICAgICAgIHRoaXMuX2VkaXRvckNvbnRhaW5lci5z aG93RmlsZSh1aVNvdXJjZUNvZGUpOwogICAgICAgICB0aGlzLl91cGRhdGVTY3JpcHRWaWV3U3Rh dHVzQmFySXRlbXMoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TZXR0aW5ncy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2V0dGluZ3MuanMKaW5kZXggZmFjODY4MjdjMWY5ZDcwNjg2M2FkMTMxNWJmNDU4MWZhNGZkZGU4 Mi4uYTM2YzhlMzQ4OGU5ZGUyMmEzNDRhNWI3NTQ1Nzc5YmE5ZDAxN2U3OCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzCkBAIC0zNTcsNyArMzU3 LDcgQEAgV2ViSW5zcGVjdG9yLlZlcnNpb25Db250cm9sbGVyID0gZnVuY3Rpb24oKQogewogfQog Ci1XZWJJbnNwZWN0b3IuVmVyc2lvbkNvbnRyb2xsZXIuY3VycmVudFZlcnNpb24gPSAxOworV2Vi SW5zcGVjdG9yLlZlcnNpb25Db250cm9sbGVyLmN1cnJlbnRWZXJzaW9uID0gMjsKIAogV2ViSW5z cGVjdG9yLlZlcnNpb25Db250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICB1cGRhdGVWZXJzaW9u OiBmdW5jdGlvbigpCkBAIC0zODgsNiArMzg4LDEyIEBAIFdlYkluc3BlY3Rvci5WZXJzaW9uQ29u dHJvbGxlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2NsZWFyQnJlYWtwb2ludHNXaGVu VG9vTWFueShXZWJJbnNwZWN0b3Iuc2V0dGluZ3MuYnJlYWtwb2ludHMsIDUwMDAwMCk7CiAgICAg fSwKIAorICAgIF91cGRhdGVWZXJzaW9uRnJvbTFUbzI6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAg ICAgIHZhciB2ZXJzaW9uU2V0dGluZyA9IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5jcmVhdGVTZXR0 aW5nKCJwcmV2aW91c2x5Vmlld2VkRmlsZXMiLCBbXSk7CisgICAgICAgIHZlcnNpb25TZXR0aW5n LnNldChbXSk7CisgICAgfSwKKwogICAgIC8qKgogICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9y LlNldHRpbmd9IGJyZWFrcG9pbnRzU2V0dGluZwogICAgICAqIEBwYXJhbSB7bnVtYmVyfSBtYXhC cmVha3BvaW50c0NvdW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1RhYmJlZEVkaXRvckNvbnRhaW5lci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVGFiYmVkRWRpdG9yQ29udGFpbmVyLmpzCmluZGV4IDZiMDg0YWIyZjg0ZTdh MDAyY2NjMDNkNGVkOWM1ZTkyY2ZhNWVjMDkuLmVlODQyMDNkYWNhMjVlYmRjMjY2NjllMzE3ODQ2 MDk1ODgzODg5ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVGFiYmVkRWRpdG9yQ29udGFpbmVyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVGFiYmVkRWRpdG9yQ29udGFpbmVyLmpzCkBAIC0xOTIsOCArMTkyLDE5IEBA IFdlYkluc3BlY3Rvci5UYWJiZWRFZGl0b3JDb250YWluZXIucHJvdG90eXBlID0gewogCiAgICAg ICAgIHZhciB0YWJJZCA9IHRoaXMuX3RhYklkcy5nZXQodWlTb3VyY2VDb2RlKSB8fCB0aGlzLl9h cHBlbmRGaWxlVGFiKHVpU291cmNlQ29kZSwgZmFsc2UpOwogCisgICAgICAgIGlmICghdGhpcy5f Y3VycmVudEZpbGUpCisgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgLy8gU2VsZWN0IHRh YiBpZiB0aGlzIGZpbGUgd2FzIHRoZSBsYXN0IHRvIGJlIHNob3duLgotICAgICAgICBpZiAoIWlu ZGV4KQorICAgICAgICBpZiAoIWluZGV4KSB7CisgICAgICAgICAgICB0aGlzLl9pbm5lclNob3dG aWxlKHVpU291cmNlQ29kZSwgdHJ1ZSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0K KworICAgICAgICB2YXIgY3VycmVudFByb2plY3RUeXBlID0gdGhpcy5fY3VycmVudEZpbGUucHJv amVjdCgpLnR5cGUoKTsKKyAgICAgICAgdmFyIGFkZGVkUHJvamVjdFR5cGUgPSB1aVNvdXJjZUNv ZGUucHJvamVjdCgpLnR5cGUoKTsKKyAgICAgICAgdmFyIHNuaXBwZXRzUHJvamVjdFR5cGUgPSBX ZWJJbnNwZWN0b3IucHJvamVjdFR5cGVzLlNuaXBwZXRzOworICAgICAgICBpZiAodGhpcy5faGlz dG9yeS5pbmRleCh0aGlzLl9jdXJyZW50RmlsZS51cmkoKSkgJiYgY3VycmVudFByb2plY3RUeXBl ID09PSBzbmlwcGV0c1Byb2plY3RUeXBlICYmIGFkZGVkUHJvamVjdFR5cGUgIT09IHNuaXBwZXRz UHJvamVjdFR5cGUpCiAgICAgICAgICAgICB0aGlzLl9pbm5lclNob3dGaWxlKHVpU291cmNlQ29k ZSwgdHJ1ZSk7CiAgICAgfSwKIApAQCAtNDgxLDggKzQ5MiwxMCBAQCBXZWJJbnNwZWN0b3IuVGFi YmVkRWRpdG9yQ29udGFpbmVyLkhpc3RvcnkucHJvdG90eXBlID0gewogICAgIF9yZWJ1aWxkSXRl bUluZGV4OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLl9pdGVtc0luZGV4ID0ge307 Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5faXRlbXMubGVuZ3RoOyArK2kpCisg ICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5faXRlbXMubGVuZ3RoOyArK2kpIHsKKyAg ICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCF0aGlzLl9pdGVtc0luZGV4Lmhhc093blByb3BlcnR5 KHRoaXMuX2l0ZW1zW2ldLnVybCkpOwogICAgICAgICAgICAgdGhpcy5faXRlbXNJbmRleFt0aGlz Ll9pdGVtc1tpXS51cmxdID0gaTsKKyAgICAgICAgfQogICAgIH0sCiAKICAgICAvKioK 192015 2013-03-07 09:12:46 -0800 2013-03-08 07:27:09 -0800 Patch bug-111732-20130307210849.patch text/plain 10919 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjEwMWM3OWQ4NjU5Y2Q1 NGVhODM2MGFhZTE5MDJlZjg1ZmE1MWZjYy4uYjYxMzZmNGZiMmM4NjA4NTI2NWFkY2E3OGQwZWI5 YzgyYWZjNDY4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEzLTAzLTA3ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFBvbGlzaCBUYWJiZWRFZGl0b3JDb250YW5lciBhbmQgU2NyaXB0c05hdmlnYXRvciBiZWhh dmlvci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEx MTczMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl c291cmNlcyBtYXRjaGluZyBpbnNwZWN0ZWRQYWdlVVJMIGFyZSBhbHdheXMgZXhwYW5kZWQgaW4g TmF2aWdhdG9yVmlldyBub3cuCisgICAgICAgIFNuaXBwZXRzIHRhYiBpbiBzY3JpcHRzIG5hdmln YXRvciBpcyBub3QgYXV0b21hdGljYWxseSBvcGVuZWQgYW55bW9yZS4KKyAgICAgICAgQ2xlYXJl ZCBzYXZlZCBUYWJiZWRFZGl0b3JDb250YWluZXIgaGlzdG9yeSBiZWNhdXNlIGl0IG1pZ2h0IGhh dmUgYmVlbiBjb3JydXB0ZWQgZHVlIHRvIGVycm9ycyBpbiBlYXJsaWVyIHZlcnNpb25zLgorICAg ICAgICBTbmlwcGV0cyBhcmUgbm90IHJldmVhbGVkIGluIFRhYmJlZEVkaXRvckNvbnRhaW5lciBh bnltb3JlIHVubGVzcyB0aGV5IHdlcmUgYWN0dWFsbHkgc2VsZWN0ZWQgYnkgdXNlciBvciB0aGVy ZSBpcyBubyBvdGhlciB0YWJzIG9wZW5lZC4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvTmF2aWdhdG9yVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JWaWV3 KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JWaWV3LnByb3RvdHlwZS5hZGRVSVNv dXJjZUNvZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRvclZpZXcucHJvdG90eXBl Ll9pbnNwZWN0ZWRVUkxDaGFuZ2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JW aWV3LnByb3RvdHlwZS5yZXZlYWxVSVNvdXJjZUNvZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9y Lk5hdmlnYXRvclZpZXcucHJvdG90eXBlLnJlbW92ZVVJU291cmNlQ29kZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuTmF2aWdhdG9yRm9sZGVyVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uYXR0YWNo KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JVSVNvdXJjZUNvZGVUcmVlTm9kZS5w cm90b3R5cGUudWlTb3VyY2VDb2RlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JV SVNvdXJjZUNvZGVUcmVlTm9kZS5wcm90b3R5cGUucmV2ZWFsKToKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdHNOYXZpZ2F0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U2NyaXB0c05hdmlnYXRvci5wcm90b3R5cGUucmV2ZWFsVUlTb3VyY2VDb2RlKToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9zaG93RmlsZSk6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5WZXJzaW9u Q29udHJvbGxlci5wcm90b3R5cGUuX3VwZGF0ZVZlcnNpb25Gcm9tMVRvMik6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRFZGl0b3JDb250YWluZXIuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFpbmVyLnByb3RvdHlwZS5hZGRVSVNvdXJjZUNv ZGUudGFiSWQudGhpcy5fdGFiSWRzLmdldCB0aGlzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U YWJiZWRFZGl0b3JDb250YWluZXIucHJvdG90eXBlLmFkZFVJU291cmNlQ29kZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFpbmVyLkhpc3RvcnkucHJvdG90eXBlLl9y ZWJ1aWxkSXRlbUluZGV4KToKKwogMjAxMy0wMy0wNyAgWmFuIERvYmVyc2VrICA8emRvYmVyc2Vr QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gTGltaXQgdGhlIHN1cHBvcnRlZCBjb21waWxl cnMgdG8gR0NDID49IDQuNyBhbmQgQ2xhbmcgPj0gMy4wCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05hdmlnYXRvclZpZXcuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05hdmlnYXRvclZpZXcuanMKaW5kZXggMjJjOTZlYThjMjYx NTQyNjYwODExZDMyZWZlMGEzYTNlYTYyYTJiZC4uMjg5NjQ0NTcyNDVhYmIxYTU1Yjk5YzlhNDIz ODcwOTMxYmQ4MjE5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9OYXZpZ2F0b3JWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvTmF2aWdhdG9yVmlldy5qcwpAQCAtNTcsNiArNTcsOCBAQCBXZWJJbnNwZWN0b3IuTmF2 aWdhdG9yVmlldyA9IGZ1bmN0aW9uKCkKIAogICAgIHRoaXMuX3Jvb3ROb2RlID0gbmV3IFdlYklu c3BlY3Rvci5OYXZpZ2F0b3JSb290VHJlZU5vZGUodGhpcyk7CiAgICAgdGhpcy5fcm9vdE5vZGUu cG9wdWxhdGUoKTsKKworICAgIFdlYkluc3BlY3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5hZGRFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLkluc3Bl Y3RlZFVSTENoYW5nZWQsIHRoaXMuX2luc3BlY3RlZFVSTENoYW5nZWQsIHRoaXMpOwogfQogCiBX ZWJJbnNwZWN0b3IuTmF2aWdhdG9yVmlldy5FdmVudHMgPSB7CkBAIC04Myw2ICs4NSwyMiBAQCBX ZWJJbnNwZWN0b3IuTmF2aWdhdG9yVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciB1aVNv dXJjZUNvZGVOb2RlID0gbmV3IFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JVSVNvdXJjZUNvZGVUcmVl Tm9kZSh0aGlzLCB1aVNvdXJjZUNvZGUpOwogICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGVOb2Rl c1t1aVNvdXJjZUNvZGUudXJpKCldID0gdWlTb3VyY2VDb2RlTm9kZTsKICAgICAgICAgbm9kZS5h cHBlbmRDaGlsZCh1aVNvdXJjZUNvZGVOb2RlKTsKKyAgICAgICAgaWYgKHVpU291cmNlQ29kZS51 cmwgPT09IFdlYkluc3BlY3Rvci5pbnNwZWN0ZWRQYWdlVVJMKQorICAgICAgICAgICAgdGhpcy5y ZXZlYWxVSVNvdXJjZUNvZGUodWlTb3VyY2VDb2RlKTsKKyAgICB9LAorCisgICAgLyoqCisgICAg ICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuRXZlbnR9IGV2ZW50CisgICAgICovCisgICAgX2luc3Bl Y3RlZFVSTENoYW5nZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgdmFyIG5vZGVz ID0gT2JqZWN0LnZhbHVlcyh0aGlzLl91aVNvdXJjZUNvZGVOb2Rlcyk7CisgICAgICAgIGZvciAo dmFyIGkgPSAwOyBpIDwgbm9kZXMubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIHZhciB1aVNv dXJjZUNvZGUgPSBub2Rlc1tpXS51aVNvdXJjZUNvZGUoKTsKKyAgICAgICAgICAgIGlmICh1aVNv dXJjZUNvZGUudXJsID09PSBXZWJJbnNwZWN0b3IuaW5zcGVjdGVkUGFnZVVSTCkKKyAgICAgICAg ICAgICAgICB0aGlzLnJldmVhbFVJU291cmNlQ29kZSh1aVNvdXJjZUNvZGUpOworICAgICAgICB9 CisKICAgICB9LAogCiAgICAgLyoqCkBAIC0xODksOCArMjA3LDkgQEAgV2ViSW5zcGVjdG9yLk5h dmlnYXRvclZpZXcucHJvdG90eXBlID0gewogCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtXZWJJ bnNwZWN0b3IuVUlTb3VyY2VDb2RlfSB1aVNvdXJjZUNvZGUKKyAgICAgKiBAcGFyYW0ge2Jvb2xl YW49fSBzZWxlY3QKICAgICAgKi8KLSAgICByZXZlYWxVSVNvdXJjZUNvZGU6IGZ1bmN0aW9uKHVp U291cmNlQ29kZSkKKyAgICByZXZlYWxVSVNvdXJjZUNvZGU6IGZ1bmN0aW9uKHVpU291cmNlQ29k ZSwgc2VsZWN0KQogICAgIHsKICAgICAgICAgdmFyIG5vZGUgPSB0aGlzLl91aVNvdXJjZUNvZGVO b2Rlc1t1aVNvdXJjZUNvZGUudXJpKCldOwogICAgICAgICBpZiAoIW5vZGUpCkBAIC0xOTgsNyAr MjE3LDcgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRvclZpZXcucHJvdG90eXBlID0gewogICAgICAg ICBpZiAodGhpcy5fc2NyaXB0c1RyZWUuc2VsZWN0ZWRUcmVlRWxlbWVudCkKICAgICAgICAgICAg IHRoaXMuX3NjcmlwdHNUcmVlLnNlbGVjdGVkVHJlZUVsZW1lbnQuZGVzZWxlY3QoKTsKICAgICAg ICAgdGhpcy5fbGFzdFNlbGVjdGVkVUlTb3VyY2VDb2RlID0gdWlTb3VyY2VDb2RlOwotICAgICAg ICBub2RlLnJldmVhbCgpOworICAgICAgICBub2RlLnJldmVhbChzZWxlY3QpOwogICAgIH0sCiAK ICAgICAvKioKQEAgLTIyMyw2ICsyNDIsNyBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVmlldy5w cm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBub2RlID0gdGhpcy5fdWlTb3VyY2VDb2RlTm9kZXNb dWlTb3VyY2VDb2RlLnVyaSgpXTsKICAgICAgICAgaWYgKCFub2RlKQogICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICBkZWxldGUgdGhpcy5fdWlTb3VyY2VDb2RlTm9kZXNbdWlTb3VyY2VDb2Rl LnVyaSgpXQogICAgICAgICBwYXJlbnROb2RlLnJlbW92ZUNoaWxkKG5vZGUpOwogICAgICAgICBu b2RlID0gcGFyZW50Tm9kZTsKICAgICAgICAgd2hpbGUgKG5vZGUpIHsKQEAgLTQ3MywxMCArNDkz LDcgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRvckZvbGRlclRyZWVFbGVtZW50LnByb3RvdHlwZSA9 IHsKICAgICBvbmF0dGFjaDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgV2ViSW5zcGVjdG9y LkJhc2VOYXZpZ2F0b3JUcmVlRWxlbWVudC5wcm90b3R5cGUub25hdHRhY2guY2FsbCh0aGlzKTsK LSAgICAgICAgaWYgKHRoaXMudHlwZSgpID09PSBXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVHJlZU91 dGxpbmUuVHlwZXMuRG9tYWluICYmIHRoaXMudGl0bGVUZXh0ID09PSBXZWJJbnNwZWN0b3IuaW5z cGVjdGVkUGFnZURvbWFpbikKLSAgICAgICAgICAgIHRoaXMuZXhwYW5kKCk7Ci0gICAgICAgIGVs c2UKLSAgICAgICAgICAgIHRoaXMuY29sbGFwc2UoKTsKKyAgICAgICAgdGhpcy5jb2xsYXBzZSgp OwogICAgIH0sCiAKICAgICBfX3Byb3RvX186IFdlYkluc3BlY3Rvci5CYXNlTmF2aWdhdG9yVHJl ZUVsZW1lbnQucHJvdG90eXBlCkBAIC03NDUsNiArNzYyLDE0IEBAIFdlYkluc3BlY3Rvci5OYXZp Z2F0b3JVSVNvdXJjZUNvZGVUcmVlTm9kZSA9IGZ1bmN0aW9uKG5hdmlnYXRvclZpZXcsIHVpU291 cmNlQ29kCiAKIFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JVSVNvdXJjZUNvZGVUcmVlTm9kZS5wcm90 b3R5cGUgPSB7CiAgICAgLyoqCisgICAgICogQHJldHVybiB7V2ViSW5zcGVjdG9yLlVJU291cmNl Q29kZX0KKyAgICAgKi8KKyAgICB1aVNvdXJjZUNvZGU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAg ICAgIHJldHVybiB0aGlzLl91aVNvdXJjZUNvZGU7CisgICAgfSwKKworICAgIC8qKgogICAgICAq IEByZXR1cm4ge1RyZWVFbGVtZW50fQogICAgICAqLwogICAgIHRyZWVFbGVtZW50OiBmdW5jdGlv bigpCkBAIC04MTcsMTEgKzg0MiwxNiBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVUlTb3VyY2VD b2RlVHJlZU5vZGUucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLnVwZGF0ZVRpdGxlKCk7CiAg ICAgfSwKIAotICAgIHJldmVhbDogZnVuY3Rpb24oKQorICAgIC8qKgorICAgICAqIEBwYXJhbSB7 Ym9vbGVhbj19IHNlbGVjdAorICAgICAqLworICAgIHJldmVhbDogZnVuY3Rpb24oc2VsZWN0KQog ICAgIHsKICAgICAgICAgdGhpcy5wYXJlbnQucG9wdWxhdGUoKTsKICAgICAgICAgdGhpcy5wYXJl bnQudHJlZUVsZW1lbnQoKS5leHBhbmQoKTsKLSAgICAgICAgdGhpcy5fdHJlZUVsZW1lbnQucmV2 ZWFsQW5kU2VsZWN0KCk7CisgICAgICAgIHRoaXMuX3RyZWVFbGVtZW50LnJldmVhbCgpOworICAg ICAgICBpZiAoc2VsZWN0KQorICAgICAgICAgICAgdGhpcy5fdHJlZUVsZW1lbnQuc2VsZWN0KCk7 CiAgICAgfSwKIAogICAgIC8qKgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TY3JpcHRzTmF2aWdhdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TY3JpcHRzTmF2aWdhdG9yLmpzCmluZGV4IDYyODY2Y2RhYjBkODdhNjczMDBj NTI2YjYyYjI3MGFlYTBiOGQ1N2IuLjBjZWNhMDZkYzQwNWUzMWIwMzI0MWIyMmMwNjY5YWZhMjc5 MGIzZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2Ny aXB0c05hdmlnYXRvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NjcmlwdHNOYXZpZ2F0b3IuanMKQEAgLTEwOCwxNSArMTA4LDE0IEBAIFdlYkluc3BlY3Rvci5T Y3JpcHRzTmF2aWdhdG9yLnByb3RvdHlwZSA9IHsKIAogICAgIC8qKgogICAgICAqIEBwYXJhbSB7 V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gdWlTb3VyY2VDb2RlCisgICAgICogQHBhcmFtIHti b29sZWFuPX0gc2VsZWN0CiAgICAgICovCi0gICAgcmV2ZWFsVUlTb3VyY2VDb2RlOiBmdW5jdGlv bih1aVNvdXJjZUNvZGUpCisgICAgcmV2ZWFsVUlTb3VyY2VDb2RlOiBmdW5jdGlvbih1aVNvdXJj ZUNvZGUsIHNlbGVjdCkKICAgICB7Ci0gICAgICAgIHRoaXMuX25hdmlnYXRvclZpZXdGb3JVSVNv dXJjZUNvZGUodWlTb3VyY2VDb2RlKS5yZXZlYWxVSVNvdXJjZUNvZGUodWlTb3VyY2VDb2RlKTsK KyAgICAgICAgdGhpcy5fbmF2aWdhdG9yVmlld0ZvclVJU291cmNlQ29kZSh1aVNvdXJjZUNvZGUp LnJldmVhbFVJU291cmNlQ29kZSh1aVNvdXJjZUNvZGUsIHNlbGVjdCk7CiAgICAgICAgIGlmICh1 aVNvdXJjZUNvZGUuaXNDb250ZW50U2NyaXB0KQogICAgICAgICAgICAgdGhpcy5fdGFiYmVkUGFu ZS5zZWxlY3RUYWIoV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3IuQ29udGVudFNjcmlwdHNU YWIpOwotICAgICAgICBlbHNlIGlmICh1aVNvdXJjZUNvZGUucHJvamVjdCgpLnR5cGUoKSA9PT0g V2ViSW5zcGVjdG9yLnByb2plY3RUeXBlcy5TbmlwcGV0cykKLSAgICAgICAgICAgIHRoaXMuX3Rh YmJlZFBhbmUuc2VsZWN0VGFiKFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLlNuaXBwZXRz VGFiKTsKLSAgICAgICAgZWxzZQorICAgICAgICBlbHNlIGlmICh1aVNvdXJjZUNvZGUucHJvamVj dCgpLnR5cGUoKSAhPT0gV2ViSW5zcGVjdG9yLnByb2plY3RUeXBlcy5TbmlwcGV0cykKICAgICAg ICAgICAgIHRoaXMuX3RhYmJlZFBhbmUuc2VsZWN0VGFiKFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2 aWdhdG9yLlNjcmlwdHNUYWIpOwogICAgIH0sCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggMDJlOTQ2ZDA1MTFmYjU2NTU0 NTEyZjI1MmQxNDUxYWFkZWM3MmRmOS4uZjMxYzM5N2NmZmE2Y2QxNDMwNzMxOTJkYzVmNzdlM2Rh NDE4NjFiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHRzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHRzUGFuZWwuanMKQEAgLTQzMyw3ICs0MzMsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1Bh bmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybiBzb3VyY2VGcmFtZTsKICAgICAg ICAgdGhpcy5fY3VycmVudFVJU291cmNlQ29kZSA9IHVpU291cmNlQ29kZTsKICAgICAgICAgaWYg KCF1aVNvdXJjZUNvZGUucHJvamVjdCgpLmlzU2VydmljZVByb2plY3QoKSkKLSAgICAgICAgICAg IHRoaXMuX25hdmlnYXRvci5yZXZlYWxVSVNvdXJjZUNvZGUodWlTb3VyY2VDb2RlKTsKKyAgICAg ICAgICAgIHRoaXMuX25hdmlnYXRvci5yZXZlYWxVSVNvdXJjZUNvZGUodWlTb3VyY2VDb2RlLCB0 cnVlKTsKICAgICAgICAgdGhpcy5fZWRpdG9yQ29udGFpbmVyLnNob3dGaWxlKHVpU291cmNlQ29k ZSk7CiAgICAgICAgIHRoaXMuX3VwZGF0ZVNjcmlwdFZpZXdTdGF0dXNCYXJJdGVtcygpOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcwppbmRleCBm YWM4NjgyN2MxZjlkNzA2ODYzYWQxMzE1YmY0NTgxZmE0ZmRkZTgyLi5hMzZjOGUzNDg4ZTlkZTIy YTM0NGE1Yjc1NDU3NzliYTlkMDE3ZTc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU2V0dGluZ3MuanMKQEAgLTM1Nyw3ICszNTcsNyBAQCBXZWJJbnNwZWN0b3Iu VmVyc2lvbkNvbnRyb2xsZXIgPSBmdW5jdGlvbigpCiB7CiB9CiAKLVdlYkluc3BlY3Rvci5WZXJz aW9uQ29udHJvbGxlci5jdXJyZW50VmVyc2lvbiA9IDE7CitXZWJJbnNwZWN0b3IuVmVyc2lvbkNv bnRyb2xsZXIuY3VycmVudFZlcnNpb24gPSAyOwogCiBXZWJJbnNwZWN0b3IuVmVyc2lvbkNvbnRy b2xsZXIucHJvdG90eXBlID0gewogICAgIHVwZGF0ZVZlcnNpb246IGZ1bmN0aW9uKCkKQEAgLTM4 OCw2ICszODgsMTIgQEAgV2ViSW5zcGVjdG9yLlZlcnNpb25Db250cm9sbGVyLnByb3RvdHlwZSA9 IHsKICAgICAgICAgdGhpcy5fY2xlYXJCcmVha3BvaW50c1doZW5Ub29NYW55KFdlYkluc3BlY3Rv ci5zZXR0aW5ncy5icmVha3BvaW50cywgNTAwMDAwKTsKICAgICB9LAogCisgICAgX3VwZGF0ZVZl cnNpb25Gcm9tMVRvMjogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdmFyIHZlcnNpb25TZXR0 aW5nID0gV2ViSW5zcGVjdG9yLnNldHRpbmdzLmNyZWF0ZVNldHRpbmcoInByZXZpb3VzbHlWaWV3 ZWRGaWxlcyIsIFtdKTsKKyAgICAgICAgdmVyc2lvblNldHRpbmcuc2V0KFtdKTsKKyAgICB9LAor CiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuU2V0dGluZ30gYnJlYWtwb2lu dHNTZXR0aW5nCiAgICAgICogQHBhcmFtIHtudW1iZXJ9IG1heEJyZWFrcG9pbnRzQ291bnQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkRWRpdG9y Q29udGFpbmVyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRF ZGl0b3JDb250YWluZXIuanMKaW5kZXggNmIwODRhYjJmODRlN2EwMDJjY2MwM2Q0ZWQ5YzVlOTJj ZmE1ZWMwOS4uZWU4NDIwM2RhY2EyNWViZGMyNjY2OWUzMTc4NDYwOTU4ODM4ODk4NiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRFZGl0b3JDb250 YWluZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRF ZGl0b3JDb250YWluZXIuanMKQEAgLTE5Miw4ICsxOTIsMTkgQEAgV2ViSW5zcGVjdG9yLlRhYmJl ZEVkaXRvckNvbnRhaW5lci5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdmFyIHRhYklkID0gdGhp cy5fdGFiSWRzLmdldCh1aVNvdXJjZUNvZGUpIHx8IHRoaXMuX2FwcGVuZEZpbGVUYWIodWlTb3Vy Y2VDb2RlLCBmYWxzZSk7CiAKKyAgICAgICAgaWYgKCF0aGlzLl9jdXJyZW50RmlsZSkKKyAgICAg ICAgICAgIHJldHVybjsKKwogICAgICAgICAvLyBTZWxlY3QgdGFiIGlmIHRoaXMgZmlsZSB3YXMg dGhlIGxhc3QgdG8gYmUgc2hvd24uCi0gICAgICAgIGlmICghaW5kZXgpCisgICAgICAgIGlmICgh aW5kZXgpIHsKKyAgICAgICAgICAgIHRoaXMuX2lubmVyU2hvd0ZpbGUodWlTb3VyY2VDb2RlLCB0 cnVlKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIHZhciBjdXJy ZW50UHJvamVjdFR5cGUgPSB0aGlzLl9jdXJyZW50RmlsZS5wcm9qZWN0KCkudHlwZSgpOworICAg ICAgICB2YXIgYWRkZWRQcm9qZWN0VHlwZSA9IHVpU291cmNlQ29kZS5wcm9qZWN0KCkudHlwZSgp OworICAgICAgICB2YXIgc25pcHBldHNQcm9qZWN0VHlwZSA9IFdlYkluc3BlY3Rvci5wcm9qZWN0 VHlwZXMuU25pcHBldHM7CisgICAgICAgIGlmICh0aGlzLl9oaXN0b3J5LmluZGV4KHRoaXMuX2N1 cnJlbnRGaWxlLnVyaSgpKSAmJiBjdXJyZW50UHJvamVjdFR5cGUgPT09IHNuaXBwZXRzUHJvamVj dFR5cGUgJiYgYWRkZWRQcm9qZWN0VHlwZSAhPT0gc25pcHBldHNQcm9qZWN0VHlwZSkKICAgICAg ICAgICAgIHRoaXMuX2lubmVyU2hvd0ZpbGUodWlTb3VyY2VDb2RlLCB0cnVlKTsKICAgICB9LAog CkBAIC00ODEsOCArNDkyLDEwIEBAIFdlYkluc3BlY3Rvci5UYWJiZWRFZGl0b3JDb250YWluZXIu SGlzdG9yeS5wcm90b3R5cGUgPSB7CiAgICAgX3JlYnVpbGRJdGVtSW5kZXg6IGZ1bmN0aW9uKCkK ICAgICB7CiAgICAgICAgIHRoaXMuX2l0ZW1zSW5kZXggPSB7fTsKLSAgICAgICAgZm9yICh2YXIg aSA9IDA7IGkgPCB0aGlzLl9pdGVtcy5sZW5ndGg7ICsraSkKKyAgICAgICAgZm9yICh2YXIgaSA9 IDA7IGkgPCB0aGlzLl9pdGVtcy5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgY29uc29sZS5h c3NlcnQoIXRoaXMuX2l0ZW1zSW5kZXguaGFzT3duUHJvcGVydHkodGhpcy5faXRlbXNbaV0udXJs KSk7CiAgICAgICAgICAgICB0aGlzLl9pdGVtc0luZGV4W3RoaXMuX2l0ZW1zW2ldLnVybF0gPSBp OworICAgICAgICB9CiAgICAgfSwKIAogICAgIC8qKgo=