80143 2012-03-02 04:00:42 -0800 Web Inspector: update execution line using LiveLocation. 2012-03-02 05:15:38 -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 yurys oldest_to_newest 569518 0 podivilov 2012-03-02 04:00:42 -0800 Web Inspector: update execution line using LiveLocation. 569519 1 129871 podivilov 2012-03-02 04:03:25 -0800 Created attachment 129871 Patch 569530 2 129871 vsevik 2012-03-02 04:17:23 -0800 Comment on attachment 129871 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=129871&action=review > Source/WebCore/inspector/front-end/DebuggerPresentationModel.js:547 > + this._exectionLineLiveLocation.dispose(); _execUtionLineLiveLocation typo ^ > Source/WebCore/inspector/front-end/DebuggerPresentationModel.js:548 > + this._exectionLineLiveLocation = null; This logic should be moved to selectedCallFrame setter, so that you don't need to call dispose twice. 569531 3 129872 podivilov 2012-03-02 04:19:20 -0800 Created attachment 129872 Patch 569533 4 129873 podivilov 2012-03-02 04:20:45 -0800 Created attachment 129873 Patch 569538 5 129873 vsevik 2012-03-02 04:23:25 -0800 Comment on attachment 129873 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=129873&action=review > Source/WebCore/inspector/front-end/DebuggerPresentationModel.js:559 > + this._executionLineLiveLocation = null; delete this._executionLineLiveLocation ? 569580 6 podivilov 2012-03-02 05:15:38 -0800 Committed r109560: <http://trac.webkit.org/changeset/109560> 129871 2012-03-02 04:03:25 -0800 2012-03-02 04:19:14 -0800 Patch bug-80143-20120302160323.patch text/plain 4567 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5MzUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjRlNDI1YzMwNTU0MjFj NmMxZjRlZTE5NGJmOGRjYzAxNjMyMTA2MS4uNDA1OTM1MTM5YmMyYjZmZTZlYzA1NzM0ZGJjNDRl OWY3ZDQ2NTU2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTAzLTAyICBQYXZl bCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IHVwZGF0ZSBleGVjdXRpb24gbGluZSB1c2luZyBMaXZlTG9jYXRpb24uCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDE0MworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLl91aVNvdXJjZUNvZGVMaXN0Q2hh bmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5w cm90b3R5cGUuX2RlYnVnZ2VyUmVzdW1lZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdn ZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuc2V0IHNlbGVjdGVkQ2FsbEZyYW1lLnVwZGF0 ZUV4ZWN1dGlvbkxpbmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0 aW9uTW9kZWwucHJvdG90eXBlLnNldCBzZWxlY3RlZENhbGxGcmFtZSk6CisKIDIwMTItMDMtMDEg IFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2Vi IEluc3BlY3RvcjogdXNlIGxpdmUgbG9jYXRpb24gdG8gdXBkYXRlIGNvbnNvbGUgbWVzc2FnZSBi dWJibGVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9E ZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCmluZGV4IDc3Yjk0YTdhMTJmZWJl OWYzZjE0MjI3MzQwYjIwM2RkZmY4NmM5ZDguLjg1ZjllZTJhYzYyYWY0NDJhNzYyMmJlMWRiNzJj ZjQ3NTNlZTBhOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKQEAgLTIxMCw3ICsy MTAsNiBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUg PSB7CiAgICAgICAgIH0KIAogICAgICAgICB0aGlzLl9yZXN0b3JlQnJlYWtwb2ludHMocmF3U291 cmNlQ29kZSk7Ci0gICAgICAgIHRoaXMuX3Jlc3RvcmVFeGVjdXRpb25MaW5lKHJhd1NvdXJjZUNv ZGUpOwogCiAgICAgICAgIHZhciB1aVNvdXJjZUNvZGVMaXN0ID0gcmF3U291cmNlQ29kZS51aVNv dXJjZUNvZGVMaXN0KCk7CiAgICAgICAgIGlmICghb2xkVUlTb3VyY2VDb2RlTGlzdC5sZW5ndGgp IHsKQEAgLTIzOCwxOCArMjM3LDYgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9u TW9kZWwucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge1dl Ykluc3BlY3Rvci5SYXdTb3VyY2VDb2RlfSByYXdTb3VyY2VDb2RlCi0gICAgICovCi0gICAgX3Jl c3RvcmVFeGVjdXRpb25MaW5lOiBmdW5jdGlvbihyYXdTb3VyY2VDb2RlKQotICAgIHsKLSAgICAg ICAgaWYgKCF0aGlzLl9zZWxlY3RlZENhbGxGcmFtZSB8fCB0aGlzLl9zZWxlY3RlZENhbGxGcmFt ZS5yYXdTb3VyY2VDb2RlICE9PSByYXdTb3VyY2VDb2RlKQotICAgICAgICAgICAgcmV0dXJuOwot Ci0gICAgICAgIHZhciB1aUxvY2F0aW9uID0gcmF3U291cmNlQ29kZS5yYXdMb2NhdGlvblRvVUlM b2NhdGlvbih0aGlzLl9zZWxlY3RlZENhbGxGcmFtZS5fY2FsbEZyYW1lLmxvY2F0aW9uKTsKLSAg ICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2Vy UHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLkV4ZWN1dGlvbkxpbmVDaGFuZ2VkLCB1aUxvY2F0aW9u KTsKLSAgICB9LAotCi0gICAgLyoqCiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlTb3Vy Y2VDb2RlfSB1aVNvdXJjZUNvZGUKICAgICAgKiBAcmV0dXJuIHtib29sZWFufQogICAgICAqLwpA QCAtNTU3LDYgKzU0NCw4IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVs LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHRoaXMuX3ByZXNlbnRhdGlvbkNhbGxGcmFt ZXMgPSBbXTsKICAgICAgICAgdGhpcy5zZWxlY3RlZENhbGxGcmFtZSA9IG51bGw7CisgICAgICAg IHRoaXMuX2V4ZWN0aW9uTGluZUxpdmVMb2NhdGlvbi5kaXNwb3NlKCk7CisgICAgICAgIHRoaXMu X2V4ZWN0aW9uTGluZUxpdmVMb2NhdGlvbiA9IG51bGw7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hF dmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLkV2 ZW50cy5EZWJ1Z2dlclJlc3VtZWQpOwogICAgIH0sCiAKQEAgLTU3NCw5ICs1NjMsMTQgQEAgV2Vi SW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogICAgICAg ICB0aGlzLl9zZWxlY3RlZENhbGxGcmFtZS5yYXdTb3VyY2VDb2RlLmZvcmNlVXBkYXRlU291cmNl TWFwcGluZygpOwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNw ZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuQ2FsbEZyYW1lU2VsZWN0ZWQs IGNhbGxGcmFtZSk7CiAKLSAgICAgICAgdmFyIHVpTG9jYXRpb24gPSBjYWxsRnJhbWUucmF3U291 cmNlQ29kZS5yYXdMb2NhdGlvblRvVUlMb2NhdGlvbihjYWxsRnJhbWUuX2NhbGxGcmFtZS5sb2Nh dGlvbik7Ci0gICAgICAgIGlmICh1aUxvY2F0aW9uKQorICAgICAgICBmdW5jdGlvbiB1cGRhdGVF eGVjdXRpb25MaW5lKHVpTG9jYXRpb24pCisgICAgICAgIHsKICAgICAgICAgICAgIHRoaXMuZGlz cGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1v ZGVsLkV2ZW50cy5FeGVjdXRpb25MaW5lQ2hhbmdlZCwgdWlMb2NhdGlvbik7CisgICAgICAgIH0K KyAgICAgICAgaWYgKHRoaXMuX2V4ZWN0aW9uTGluZUxpdmVMb2NhdGlvbikKKyAgICAgICAgICAg IHRoaXMuX2V4ZWN0aW9uTGluZUxpdmVMb2NhdGlvbi5kaXNwb3NlKCk7CisgICAgICAgIHRoaXMu X2V4ZWN0aW9uTGluZUxpdmVMb2NhdGlvbiA9IHRoaXMuX3NlbGVjdGVkQ2FsbEZyYW1lLnJhd1Nv dXJjZUNvZGUuY3JlYXRlTGl2ZUxvY2F0aW9uKGNhbGxGcmFtZS5fY2FsbEZyYW1lLmxvY2F0aW9u LCB1cGRhdGVFeGVjdXRpb25MaW5lLmJpbmQodGhpcykpOworICAgICAgICB0aGlzLl9leGVjdGlv bkxpbmVMaXZlTG9jYXRpb24uaW5pdCgpOwogICAgIH0sCiAKICAgICBnZXQgc2VsZWN0ZWRDYWxs RnJhbWUoKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2NhbGxz dGFjay1wbGFjYXJkcy1kaXNjYXJkZWQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2RlYnVnZ2VyL2NhbGxzdGFjay1wbGFjYXJkcy1kaXNjYXJkZWQtZXhwZWN0ZWQudHh0Cmlu ZGV4IGUxNjY0MDA2OGNhMWQwMjgyYWRkNmI5MjQ1NmQ5OTk1ZDYyMTMyZTkuLmY1YmM0NWM0ZDRi NWNhZDQ1M2Q2ZWQ0Y2U1ZjI0M2U4NzRlMDU0YjcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2lu c3BlY3Rvci9kZWJ1Z2dlci9jYWxsc3RhY2stcGxhY2FyZHMtZGlzY2FyZGVkLWV4cGVjdGVkLnR4 dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvY2FsbHN0YWNrLXBsYWNhcmRz LWRpc2NhcmRlZC1leHBlY3RlZC50eHQKQEAgLTcsMTMgKzcsMTMgQEAgU2NyaXB0IHNvdXJjZSB3 YXMgc2hvd24uCiBTZXQgdGltZXIgZm9yIHRlc3QgZnVuY3Rpb24uCiBSZWNlaXZlZCBEZWJ1Z2dl clBhdXNlZCBldmVudC4KIEZ1bmN0aW9uIG5hbWU6IHRlc3RGdW5jdGlvbgotTGlzdGVuZXJzIGxl bmd0aDogMgorTGlzdGVuZXJzIGxlbmd0aDogMwogU2NyaXB0IGV4ZWN1dGlvbiBwYXVzZWQuCiBT Y3JpcHQgZXhlY3V0aW9uIHJlc3VtZWQuCiBTZXQgdGltZXIgZm9yIHRlc3QgZnVuY3Rpb24uCiBS ZWNlaXZlZCBEZWJ1Z2dlclBhdXNlZCBldmVudC4KIEZ1bmN0aW9uIG5hbWU6IHRlc3RGdW5jdGlv bgotTGlzdGVuZXJzIGxlbmd0aDogMgorTGlzdGVuZXJzIGxlbmd0aDogMwogU2NyaXB0IGV4ZWN1 dGlvbiBwYXVzZWQuCiBTY3JpcHQgZXhlY3V0aW9uIHJlc3VtZWQuCiBEZWJ1Z2dlciB3YXMgZGlz YWJsZWQuCg== 129872 2012-03-02 04:19:20 -0800 2012-03-02 04:20:38 -0800 Patch bug-80143-20120302161919.patch text/plain 4476 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5MzUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjRlNDI1YzMwNTU0MjFj NmMxZjRlZTE5NGJmOGRjYzAxNjMyMTA2MS4uNDA1OTM1MTM5YmMyYjZmZTZlYzA1NzM0ZGJjNDRl OWY3ZDQ2NTU2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTAzLTAyICBQYXZl bCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IHVwZGF0ZSBleGVjdXRpb24gbGluZSB1c2luZyBMaXZlTG9jYXRpb24uCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDE0MworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLl91aVNvdXJjZUNvZGVMaXN0Q2hh bmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5w cm90b3R5cGUuX2RlYnVnZ2VyUmVzdW1lZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdn ZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuc2V0IHNlbGVjdGVkQ2FsbEZyYW1lLnVwZGF0 ZUV4ZWN1dGlvbkxpbmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0 aW9uTW9kZWwucHJvdG90eXBlLnNldCBzZWxlY3RlZENhbGxGcmFtZSk6CisKIDIwMTItMDMtMDEg IFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2Vi IEluc3BlY3RvcjogdXNlIGxpdmUgbG9jYXRpb24gdG8gdXBkYXRlIGNvbnNvbGUgbWVzc2FnZSBi dWJibGVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9E ZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCmluZGV4IDc3Yjk0YTdhMTJmZWJl OWYzZjE0MjI3MzQwYjIwM2RkZmY4NmM5ZDguLjU1Y2ViNWNiNDc2MzI2MDRiZmU5YzM1ZDNjNjY2 NjQ1NGE3YzBmNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKQEAgLTIxMCw3ICsy MTAsNiBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUg PSB7CiAgICAgICAgIH0KIAogICAgICAgICB0aGlzLl9yZXN0b3JlQnJlYWtwb2ludHMocmF3U291 cmNlQ29kZSk7Ci0gICAgICAgIHRoaXMuX3Jlc3RvcmVFeGVjdXRpb25MaW5lKHJhd1NvdXJjZUNv ZGUpOwogCiAgICAgICAgIHZhciB1aVNvdXJjZUNvZGVMaXN0ID0gcmF3U291cmNlQ29kZS51aVNv dXJjZUNvZGVMaXN0KCk7CiAgICAgICAgIGlmICghb2xkVUlTb3VyY2VDb2RlTGlzdC5sZW5ndGgp IHsKQEAgLTIzOCwxOCArMjM3LDYgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9u TW9kZWwucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge1dl Ykluc3BlY3Rvci5SYXdTb3VyY2VDb2RlfSByYXdTb3VyY2VDb2RlCi0gICAgICovCi0gICAgX3Jl c3RvcmVFeGVjdXRpb25MaW5lOiBmdW5jdGlvbihyYXdTb3VyY2VDb2RlKQotICAgIHsKLSAgICAg ICAgaWYgKCF0aGlzLl9zZWxlY3RlZENhbGxGcmFtZSB8fCB0aGlzLl9zZWxlY3RlZENhbGxGcmFt ZS5yYXdTb3VyY2VDb2RlICE9PSByYXdTb3VyY2VDb2RlKQotICAgICAgICAgICAgcmV0dXJuOwot Ci0gICAgICAgIHZhciB1aUxvY2F0aW9uID0gcmF3U291cmNlQ29kZS5yYXdMb2NhdGlvblRvVUlM b2NhdGlvbih0aGlzLl9zZWxlY3RlZENhbGxGcmFtZS5fY2FsbEZyYW1lLmxvY2F0aW9uKTsKLSAg ICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2Vy UHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLkV4ZWN1dGlvbkxpbmVDaGFuZ2VkLCB1aUxvY2F0aW9u KTsKLSAgICB9LAotCi0gICAgLyoqCiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlTb3Vy Y2VDb2RlfSB1aVNvdXJjZUNvZGUKICAgICAgKiBAcmV0dXJuIHtib29sZWFufQogICAgICAqLwpA QCAtNTY3LDYgKzU1NCwxMCBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2Rl bC5wcm90b3R5cGUgPSB7CiAKICAgICBzZXQgc2VsZWN0ZWRDYWxsRnJhbWUoY2FsbEZyYW1lKQog ICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2V4ZWN0aW9uTGluZUxpdmVMb2NhdGlvbikKKyAgICAg ICAgICAgIHRoaXMuX2V4ZWN0aW9uTGluZUxpdmVMb2NhdGlvbi5kaXNwb3NlKCk7CisgICAgICAg IHRoaXMuX2V4ZWN0aW9uTGluZUxpdmVMb2NhdGlvbiA9IG51bGw7CisgICAgICAgIAogICAgICAg ICB0aGlzLl9zZWxlY3RlZENhbGxGcmFtZSA9IGNhbGxGcmFtZTsKICAgICAgICAgaWYgKCF0aGlz Ll9zZWxlY3RlZENhbGxGcmFtZSkKICAgICAgICAgICAgIHJldHVybjsKQEAgLTU3NCw5ICs1NjUs MTIgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0g ewogICAgICAgICB0aGlzLl9zZWxlY3RlZENhbGxGcmFtZS5yYXdTb3VyY2VDb2RlLmZvcmNlVXBk YXRlU291cmNlTWFwcGluZygpOwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVy cyhXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuQ2FsbEZyYW1l U2VsZWN0ZWQsIGNhbGxGcmFtZSk7CiAKLSAgICAgICAgdmFyIHVpTG9jYXRpb24gPSBjYWxsRnJh bWUucmF3U291cmNlQ29kZS5yYXdMb2NhdGlvblRvVUlMb2NhdGlvbihjYWxsRnJhbWUuX2NhbGxG cmFtZS5sb2NhdGlvbik7Ci0gICAgICAgIGlmICh1aUxvY2F0aW9uKQorICAgICAgICBmdW5jdGlv biB1cGRhdGVFeGVjdXRpb25MaW5lKHVpTG9jYXRpb24pCisgICAgICAgIHsKICAgICAgICAgICAg IHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNl bnRhdGlvbk1vZGVsLkV2ZW50cy5FeGVjdXRpb25MaW5lQ2hhbmdlZCwgdWlMb2NhdGlvbik7Cisg ICAgICAgIH0KKyAgICAgICAgdGhpcy5fZXhlY3Rpb25MaW5lTGl2ZUxvY2F0aW9uID0gdGhpcy5f c2VsZWN0ZWRDYWxsRnJhbWUucmF3U291cmNlQ29kZS5jcmVhdGVMaXZlTG9jYXRpb24oY2FsbEZy YW1lLl9jYWxsRnJhbWUubG9jYXRpb24sIHVwZGF0ZUV4ZWN1dGlvbkxpbmUuYmluZCh0aGlzKSk7 CisgICAgICAgIHRoaXMuX2V4ZWN0aW9uTGluZUxpdmVMb2NhdGlvbi5pbml0KCk7CiAgICAgfSwK IAogICAgIGdldCBzZWxlY3RlZENhbGxGcmFtZSgpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvZGVidWdnZXIvY2FsbHN0YWNrLXBsYWNhcmRzLWRpc2NhcmRlZC1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvY2FsbHN0YWNrLXBsYWNhcmRzLWRp c2NhcmRlZC1leHBlY3RlZC50eHQKaW5kZXggZTE2NjQwMDY4Y2ExZDAyODJhZGQ2YjkyNDU2ZDk5 OTVkNjIxMzJlOS4uZjViYzQ1YzRkNGI1Y2FkNDUzZDZlZDRjZTVmMjQzZTg3NGUwNTRiNyAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2NhbGxzdGFjay1wbGFjYXJk cy1kaXNjYXJkZWQtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1 Z2dlci9jYWxsc3RhY2stcGxhY2FyZHMtZGlzY2FyZGVkLWV4cGVjdGVkLnR4dApAQCAtNywxMyAr NywxMyBAQCBTY3JpcHQgc291cmNlIHdhcyBzaG93bi4KIFNldCB0aW1lciBmb3IgdGVzdCBmdW5j dGlvbi4KIFJlY2VpdmVkIERlYnVnZ2VyUGF1c2VkIGV2ZW50LgogRnVuY3Rpb24gbmFtZTogdGVz dEZ1bmN0aW9uCi1MaXN0ZW5lcnMgbGVuZ3RoOiAyCitMaXN0ZW5lcnMgbGVuZ3RoOiAzCiBTY3Jp cHQgZXhlY3V0aW9uIHBhdXNlZC4KIFNjcmlwdCBleGVjdXRpb24gcmVzdW1lZC4KIFNldCB0aW1l ciBmb3IgdGVzdCBmdW5jdGlvbi4KIFJlY2VpdmVkIERlYnVnZ2VyUGF1c2VkIGV2ZW50LgogRnVu Y3Rpb24gbmFtZTogdGVzdEZ1bmN0aW9uCi1MaXN0ZW5lcnMgbGVuZ3RoOiAyCitMaXN0ZW5lcnMg bGVuZ3RoOiAzCiBTY3JpcHQgZXhlY3V0aW9uIHBhdXNlZC4KIFNjcmlwdCBleGVjdXRpb24gcmVz dW1lZC4KIERlYnVnZ2VyIHdhcyBkaXNhYmxlZC4K 129873 2012-03-02 04:20:45 -0800 2012-03-02 04:23:25 -0800 Patch bug-80143-20120302162043.patch text/plain 4481 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5MzUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjRlNDI1YzMwNTU0MjFj NmMxZjRlZTE5NGJmOGRjYzAxNjMyMTA2MS4uNDA1OTM1MTM5YmMyYjZmZTZlYzA1NzM0ZGJjNDRl OWY3ZDQ2NTU2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTAzLTAyICBQYXZl bCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IHVwZGF0ZSBleGVjdXRpb24gbGluZSB1c2luZyBMaXZlTG9jYXRpb24uCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDE0MworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLl91aVNvdXJjZUNvZGVMaXN0Q2hh bmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5w cm90b3R5cGUuX2RlYnVnZ2VyUmVzdW1lZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdn ZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuc2V0IHNlbGVjdGVkQ2FsbEZyYW1lLnVwZGF0 ZUV4ZWN1dGlvbkxpbmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0 aW9uTW9kZWwucHJvdG90eXBlLnNldCBzZWxlY3RlZENhbGxGcmFtZSk6CisKIDIwMTItMDMtMDEg IFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2Vi IEluc3BlY3RvcjogdXNlIGxpdmUgbG9jYXRpb24gdG8gdXBkYXRlIGNvbnNvbGUgbWVzc2FnZSBi dWJibGVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9E ZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCmluZGV4IDc3Yjk0YTdhMTJmZWJl OWYzZjE0MjI3MzQwYjIwM2RkZmY4NmM5ZDguLmZlMjY3NDI3ZWMzYzI0MDJmM2FmYjM4ZTc2OThm ZWQ5ZTQyOWZkNWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKQEAgLTIxMCw3ICsy MTAsNiBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUg PSB7CiAgICAgICAgIH0KIAogICAgICAgICB0aGlzLl9yZXN0b3JlQnJlYWtwb2ludHMocmF3U291 cmNlQ29kZSk7Ci0gICAgICAgIHRoaXMuX3Jlc3RvcmVFeGVjdXRpb25MaW5lKHJhd1NvdXJjZUNv ZGUpOwogCiAgICAgICAgIHZhciB1aVNvdXJjZUNvZGVMaXN0ID0gcmF3U291cmNlQ29kZS51aVNv dXJjZUNvZGVMaXN0KCk7CiAgICAgICAgIGlmICghb2xkVUlTb3VyY2VDb2RlTGlzdC5sZW5ndGgp IHsKQEAgLTIzOCwxOCArMjM3LDYgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9u TW9kZWwucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge1dl Ykluc3BlY3Rvci5SYXdTb3VyY2VDb2RlfSByYXdTb3VyY2VDb2RlCi0gICAgICovCi0gICAgX3Jl c3RvcmVFeGVjdXRpb25MaW5lOiBmdW5jdGlvbihyYXdTb3VyY2VDb2RlKQotICAgIHsKLSAgICAg ICAgaWYgKCF0aGlzLl9zZWxlY3RlZENhbGxGcmFtZSB8fCB0aGlzLl9zZWxlY3RlZENhbGxGcmFt ZS5yYXdTb3VyY2VDb2RlICE9PSByYXdTb3VyY2VDb2RlKQotICAgICAgICAgICAgcmV0dXJuOwot Ci0gICAgICAgIHZhciB1aUxvY2F0aW9uID0gcmF3U291cmNlQ29kZS5yYXdMb2NhdGlvblRvVUlM b2NhdGlvbih0aGlzLl9zZWxlY3RlZENhbGxGcmFtZS5fY2FsbEZyYW1lLmxvY2F0aW9uKTsKLSAg ICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2Vy UHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLkV4ZWN1dGlvbkxpbmVDaGFuZ2VkLCB1aUxvY2F0aW9u KTsKLSAgICB9LAotCi0gICAgLyoqCiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlTb3Vy Y2VDb2RlfSB1aVNvdXJjZUNvZGUKICAgICAgKiBAcmV0dXJuIHtib29sZWFufQogICAgICAqLwpA QCAtNTY3LDYgKzU1NCwxMCBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2Rl bC5wcm90b3R5cGUgPSB7CiAKICAgICBzZXQgc2VsZWN0ZWRDYWxsRnJhbWUoY2FsbEZyYW1lKQog ICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2V4ZWN1dGlvbkxpbmVMaXZlTG9jYXRpb24pCisgICAg ICAgICAgICB0aGlzLl9leGVjdXRpb25MaW5lTGl2ZUxvY2F0aW9uLmRpc3Bvc2UoKTsKKyAgICAg ICAgdGhpcy5fZXhlY3V0aW9uTGluZUxpdmVMb2NhdGlvbiA9IG51bGw7CisgICAgICAgIAogICAg ICAgICB0aGlzLl9zZWxlY3RlZENhbGxGcmFtZSA9IGNhbGxGcmFtZTsKICAgICAgICAgaWYgKCF0 aGlzLl9zZWxlY3RlZENhbGxGcmFtZSkKICAgICAgICAgICAgIHJldHVybjsKQEAgLTU3NCw5ICs1 NjUsMTIgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBl ID0gewogICAgICAgICB0aGlzLl9zZWxlY3RlZENhbGxGcmFtZS5yYXdTb3VyY2VDb2RlLmZvcmNl VXBkYXRlU291cmNlTWFwcGluZygpOwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3Rl bmVycyhXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuQ2FsbEZy YW1lU2VsZWN0ZWQsIGNhbGxGcmFtZSk7CiAKLSAgICAgICAgdmFyIHVpTG9jYXRpb24gPSBjYWxs RnJhbWUucmF3U291cmNlQ29kZS5yYXdMb2NhdGlvblRvVUlMb2NhdGlvbihjYWxsRnJhbWUuX2Nh bGxGcmFtZS5sb2NhdGlvbik7Ci0gICAgICAgIGlmICh1aUxvY2F0aW9uKQorICAgICAgICBmdW5j dGlvbiB1cGRhdGVFeGVjdXRpb25MaW5lKHVpTG9jYXRpb24pCisgICAgICAgIHsKICAgICAgICAg ICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclBy ZXNlbnRhdGlvbk1vZGVsLkV2ZW50cy5FeGVjdXRpb25MaW5lQ2hhbmdlZCwgdWlMb2NhdGlvbik7 CisgICAgICAgIH0KKyAgICAgICAgdGhpcy5fZXhlY3V0aW9uTGluZUxpdmVMb2NhdGlvbiA9IHRo aXMuX3NlbGVjdGVkQ2FsbEZyYW1lLnJhd1NvdXJjZUNvZGUuY3JlYXRlTGl2ZUxvY2F0aW9uKGNh bGxGcmFtZS5fY2FsbEZyYW1lLmxvY2F0aW9uLCB1cGRhdGVFeGVjdXRpb25MaW5lLmJpbmQodGhp cykpOworICAgICAgICB0aGlzLl9leGVjdXRpb25MaW5lTGl2ZUxvY2F0aW9uLmluaXQoKTsKICAg ICB9LAogCiAgICAgZ2V0IHNlbGVjdGVkQ2FsbEZyYW1lKCkKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9jYWxsc3RhY2stcGxhY2FyZHMtZGlzY2FyZGVkLWV4cGVj dGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9jYWxsc3RhY2stcGxhY2Fy ZHMtZGlzY2FyZGVkLWV4cGVjdGVkLnR4dAppbmRleCBlMTY2NDAwNjhjYTFkMDI4MmFkZDZiOTI0 NTZkOTk5NWQ2MjEzMmU5Li5mNWJjNDVjNGQ0YjVjYWQ0NTNkNmVkNGNlNWYyNDNlODc0ZTA1NGI3 IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvY2FsbHN0YWNrLXBs YWNhcmRzLWRpc2NhcmRlZC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2RlYnVnZ2VyL2NhbGxzdGFjay1wbGFjYXJkcy1kaXNjYXJkZWQtZXhwZWN0ZWQudHh0CkBAIC03 LDEzICs3LDEzIEBAIFNjcmlwdCBzb3VyY2Ugd2FzIHNob3duLgogU2V0IHRpbWVyIGZvciB0ZXN0 IGZ1bmN0aW9uLgogUmVjZWl2ZWQgRGVidWdnZXJQYXVzZWQgZXZlbnQuCiBGdW5jdGlvbiBuYW1l OiB0ZXN0RnVuY3Rpb24KLUxpc3RlbmVycyBsZW5ndGg6IDIKK0xpc3RlbmVycyBsZW5ndGg6IDMK IFNjcmlwdCBleGVjdXRpb24gcGF1c2VkLgogU2NyaXB0IGV4ZWN1dGlvbiByZXN1bWVkLgogU2V0 IHRpbWVyIGZvciB0ZXN0IGZ1bmN0aW9uLgogUmVjZWl2ZWQgRGVidWdnZXJQYXVzZWQgZXZlbnQu CiBGdW5jdGlvbiBuYW1lOiB0ZXN0RnVuY3Rpb24KLUxpc3RlbmVycyBsZW5ndGg6IDIKK0xpc3Rl bmVycyBsZW5ndGg6IDMKIFNjcmlwdCBleGVjdXRpb24gcGF1c2VkLgogU2NyaXB0IGV4ZWN1dGlv biByZXN1bWVkLgogRGVidWdnZXIgd2FzIGRpc2FibGVkLgo=