105415 2012-12-19 04:37:35 -0800 Web Inspector: refactor DefaultTextEditor's |expanded| setters 2012-12-19 08:08:23 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 105429 1 lushnikov lushnikov apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 794517 0 lushnikov 2012-12-19 04:37:35 -0800 Refactor DefaultTextEditor's |expanded| setters to appropriate methods 794541 1 180138 lushnikov 2012-12-19 05:05:14 -0800 Created attachment 180138 Patch 794639 2 180138 pfeldman 2012-12-19 07:06:07 -0800 Comment on attachment 180138 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=180138&action=review > Source/WebCore/inspector/front-end/DefaultTextEditor.js:781 > + var wasExpanded = oldChunk.isExpanded(); expanded() ? 794669 3 180165 lushnikov 2012-12-19 07:48:41 -0800 Created attachment 180165 Patch 794678 4 180165 webkit.review.bot 2012-12-19 08:08:20 -0800 Comment on attachment 180165 Patch Clearing flags on attachment: 180165 Committed r138164: <http://trac.webkit.org/changeset/138164> 794679 5 webkit.review.bot 2012-12-19 08:08:23 -0800 All reviewed patches have been landed. Closing bug. 180138 2012-12-19 05:05:14 -0800 2012-12-19 07:48:37 -0800 Patch bug-105415-20121219170230.patch text/plain 11619 lushnikov U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3ODgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWFiMTdhNDgxNjBlNTVj NmRjM2U4ZWI0MGQ0ZWNjMzU0YjI1MmQzMi4uZWNjMjkyYjk3NGQ0ZmM1NTNhNDc5Yzk4Y2JjYzRi ZDY2MTMzOGYzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTEyLTE5ICBBbmRy ZXkgTHVzaG5pa292ICA8bHVzaG5pa292QGNocm9taXVtLmNvbT4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiByZWZhY3RvciBEZWZhdWx0VGV4dEVkaXRvcidzIHxleHBhbmRlZHwgc2V0dGVycwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1NDE1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVmYWN0b3Ig fGV4cGFuZGVkfCBzZXR0ZXJzIGFuZCBnZXR0ZXJzIGludG8gfGNvbGxhcHNlKCl8LCB8ZXhwYW5k KCl8CisgICAgICAgIGFuZCB8aXNFeHBhbmRlZCgpfCBtZXRob2RzCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL0RlZmF1bHRUZXh0RWRpdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRleHRFZGl0b3JDaHVua2VkUGFuZWwucHJvdG90eXBlLl9zcGxpdENodW5rT25BTGluZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckNodW5rZWRQYW5lbC5wcm90b3R5cGUu X2V4cGFuZENodW5rcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRlclBh bmVsLnByb3RvdHlwZS50ZXh0Q2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVk aXRvckd1dHRlckNodW5rLnByb3RvdHlwZS5pc0V4cGFuZGVkKTogQWRkZWQuCisgICAgICAgIChX ZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRlckNodW5rLnByb3RvdHlwZS5jb2xsYXBzZSk6IEFk ZGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0ZXJDaHVuay5wcm90b3R5 cGUuZXhwYW5kKTogQWRkZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5Q YW5lbC5wcm90b3R5cGUubWFya0FuZFJldmVhbFJhbmdlKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZS5fdXBkYXRlSGlnaGxpZ2h0c0ZvclJhbmdl KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpbkNodW5rLnByb3RvdHlwZS5p c0V4cGFuZGVkKTogQWRkZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5D aHVuay5wcm90b3R5cGUuY29sbGFwc2UpOiBBZGRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5U ZXh0RWRpdG9yTWFpbkNodW5rLnByb3RvdHlwZS5leHBhbmQpOiBBZGRlZC4KKwogMjAxMi0xMi0x NiAgQXJ2aWQgTmlsc3NvbiAgPGFuaWxzc29uQHJpbS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVy cnldIEFkYXB0IHRvIG5ldyBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6VG91Y2hQb2ludCBBUEkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVmYXVsdFRleHRF ZGl0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlZmF1bHRUZXh0 RWRpdG9yLmpzCmluZGV4IDhhMzdiYzQ5N2MzYjk2M2ViNmY1ODQzMzQ0ZmE3NTczODQ3NzRiMmQu LjVkOTA1MWJkNzgyODc2MWU5NTI1N2NjYTI5YTY4NzdkMTAxYjE1NDIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVmYXVsdFRleHRFZGl0b3IuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4dEVkaXRvci5q cwpAQCAtNzc4LDggKzc3OCw4IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yQ2h1bmtlZFBhbmVs LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5iZWdpbkRvbVVwZGF0ZXMoKTsKIAogICAgICAg ICB2YXIgb2xkQ2h1bmsgPSB0aGlzLl90ZXh0Q2h1bmtzW2NodW5rTnVtYmVyXTsKLSAgICAgICAg dmFyIHdhc0V4cGFuZGVkID0gb2xkQ2h1bmsuZXhwYW5kZWQ7Ci0gICAgICAgIG9sZENodW5rLmV4 cGFuZGVkID0gZmFsc2U7CisgICAgICAgIHZhciB3YXNFeHBhbmRlZCA9IG9sZENodW5rLmlzRXhw YW5kZWQoKTsKKyAgICAgICAgb2xkQ2h1bmsuY29sbGFwc2UoKTsKIAogICAgICAgICB2YXIgaW5z ZXJ0SW5kZXggPSBjaHVua051bWJlciArIDE7CiAKQEAgLTgwOSwxMCArODA5LDEwIEBAIFdlYklu c3BlY3Rvci5UZXh0RWRpdG9yQ2h1bmtlZFBhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICBp ZiAod2FzRXhwYW5kZWQpIHsKICAgICAgICAgICAgIGlmIChwcmVmaXhDaHVuaykKLSAgICAgICAg ICAgICAgICBwcmVmaXhDaHVuay5leHBhbmRlZCA9IHRydWU7Ci0gICAgICAgICAgICBsaW5lQ2h1 bmsuZXhwYW5kZWQgPSB0cnVlOworICAgICAgICAgICAgICAgIHByZWZpeENodW5rLmV4cGFuZCgp OworICAgICAgICAgICAgbGluZUNodW5rLmV4cGFuZCgpOwogICAgICAgICAgICAgaWYgKHN1ZmZp eENodW5rKQotICAgICAgICAgICAgICAgIHN1ZmZpeENodW5rLmV4cGFuZGVkID0gdHJ1ZTsKKyAg ICAgICAgICAgICAgICBzdWZmaXhDaHVuay5leHBhbmQoKTsKICAgICAgICAgfQogCiAgICAgICAg IHRoaXMuZW5kRG9tVXBkYXRlcygpOwpAQCAtOTYxLDExICs5NjEsMTEgQEAgV2ViSW5zcGVjdG9y LlRleHRFZGl0b3JDaHVua2VkUGFuZWwucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgLy8g Rmlyc3QgY29sbGFwc2UgY2h1bmtzIHRvIGNvbGxlY3QgdGhlIERPTSBlbGVtZW50cyBpbnRvIGEg Y2FjaGUgdG8gcmV1c2UgdGhlbSBsYXRlci4KICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBm cm9tSW5kZXg7ICsraSkKLSAgICAgICAgICAgIHRoaXMuX3RleHRDaHVua3NbaV0uZXhwYW5kZWQg PSBmYWxzZTsKKyAgICAgICAgICAgIHRoaXMuX3RleHRDaHVua3NbaV0uY29sbGFwc2UoKTsKICAg ICAgICAgZm9yICh2YXIgaSA9IHRvSW5kZXg7IGkgPCB0aGlzLl90ZXh0Q2h1bmtzLmxlbmd0aDsg KytpKQotICAgICAgICAgICAgdGhpcy5fdGV4dENodW5rc1tpXS5leHBhbmRlZCA9IGZhbHNlOwor ICAgICAgICAgICAgdGhpcy5fdGV4dENodW5rc1tpXS5jb2xsYXBzZSgpOwogICAgICAgICBmb3Ig KHZhciBpID0gZnJvbUluZGV4OyBpIDwgdG9JbmRleDsgKytpKQotICAgICAgICAgICAgdGhpcy5f dGV4dENodW5rc1tpXS5leHBhbmRlZCA9IHRydWU7CisgICAgICAgICAgICB0aGlzLl90ZXh0Q2h1 bmtzW2ldLmV4cGFuZCgpOwogICAgIH0sCiAKICAgICAvKioKQEAgLTEwNTIsNyArMTA1Miw3IEBA IFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yR3V0dGVyUGFuZWwucHJvdG90eXBlID0gewogICAgICAg ICAgICAgICAgIHZhciBjaHVuayA9IHRoaXMuX3RleHRDaHVua3NbY2h1bmtOdW1iZXJdOwogICAg ICAgICAgICAgICAgIGlmIChjaHVuay5zdGFydExpbmUgKyBjaHVuay5saW5lc0NvdW50IDw9IHRo aXMuX3RleHRNb2RlbC5saW5lc0NvdW50KQogICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAg ICAgICAgICAgICAgICBjaHVuay5leHBhbmRlZCA9IGZhbHNlOworICAgICAgICAgICAgICAgIGNo dW5rLmNvbGxhcHNlKCk7CiAgICAgICAgICAgICAgICAgdGhpcy5fY29udGFpbmVyLnJlbW92ZUNo aWxkKGNodW5rLmVsZW1lbnQpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgdGhpcy5fdGV4 dENodW5rcy5sZW5ndGggPSBjaHVua051bWJlciArIDE7CkBAIC0xMjE1LDUyICsxMjE1LDY4IEBA IFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yR3V0dGVyQ2h1bmsucHJvdG90eXBlID0gewogICAgIC8q KgogICAgICAqIEByZXR1cm4ge2Jvb2xlYW59CiAgICAgICovCi0gICAgZ2V0IGV4cGFuZGVkKCkK KyAgICBpc0V4cGFuZGVkOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5f ZXhwYW5kZWQ7CiAgICAgfSwKIAotICAgIHNldCBleHBhbmRlZChleHBhbmRlZCkKKyAgICBjb2xs YXBzZTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMubGluZXNDb3VudCA9PT0g MSkKICAgICAgICAgICAgIHRoaXMuX3RleHRFZGl0b3IuX3N5bmNEZWNvcmF0aW9uc0ZvckxpbmVM aXN0ZW5lcih0aGlzLnN0YXJ0TGluZSk7CiAKLSAgICAgICAgaWYgKHRoaXMuX2V4cGFuZGVkID09 PSBleHBhbmRlZCkKKyAgICAgICAgaWYgKCF0aGlzLl9leHBhbmRlZCkKICAgICAgICAgICAgIHJl dHVybjsKIAotICAgICAgICB0aGlzLl9leHBhbmRlZCA9IGV4cGFuZGVkOworICAgICAgICB0aGlz Ll9leHBhbmRlZCA9IGZhbHNlOwogCiAgICAgICAgIGlmICh0aGlzLmxpbmVzQ291bnQgPT09IDEp CiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgdGhpcy5fdGV4dEVkaXRvci5iZWdpbkRv bVVwZGF0ZXMoKTsKIAotICAgICAgICBpZiAoZXhwYW5kZWQpIHsKLSAgICAgICAgICAgIHRoaXMu X2V4cGFuZGVkTGluZVJvd3MgPSBbXTsKLSAgICAgICAgICAgIHZhciBwYXJlbnRFbGVtZW50ID0g dGhpcy5lbGVtZW50LnBhcmVudEVsZW1lbnQ7Ci0gICAgICAgICAgICBmb3IgKHZhciBpID0gdGhp cy5zdGFydExpbmU7IGkgPCB0aGlzLnN0YXJ0TGluZSArIHRoaXMubGluZXNDb3VudDsgKytpKSB7 Ci0gICAgICAgICAgICAgICAgdmFyIGxpbmVSb3cgPSB0aGlzLl9jcmVhdGVSb3coaSk7Ci0gICAg ICAgICAgICAgICAgcGFyZW50RWxlbWVudC5pbnNlcnRCZWZvcmUobGluZVJvdywgdGhpcy5lbGVt ZW50KTsKLSAgICAgICAgICAgICAgICB0aGlzLl9leHBhbmRlZExpbmVSb3dzLnB1c2gobGluZVJv dyk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBwYXJlbnRFbGVtZW50LnJlbW92ZUNoaWxk KHRoaXMuZWxlbWVudCk7Ci0gICAgICAgICAgICB0aGlzLl90ZXh0RWRpdG9yLl9zeW5jTGluZUhl aWdodExpc3RlbmVyKHRoaXMuX2V4cGFuZGVkTGluZVJvd3NbMF0pOwotICAgICAgICB9IGVsc2Ug ewotICAgICAgICAgICAgdmFyIGVsZW1lbnRJbnNlcnRlZCA9IGZhbHNlOwotICAgICAgICAgICAg Zm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9leHBhbmRlZExpbmVSb3dzLmxlbmd0aDsgKytpKSB7 Ci0gICAgICAgICAgICAgICAgdmFyIGxpbmVSb3cgPSB0aGlzLl9leHBhbmRlZExpbmVSb3dzW2ld OwotICAgICAgICAgICAgICAgIHZhciBwYXJlbnRFbGVtZW50ID0gbGluZVJvdy5wYXJlbnRFbGVt ZW50OwotICAgICAgICAgICAgICAgIGlmIChwYXJlbnRFbGVtZW50KSB7Ci0gICAgICAgICAgICAg ICAgICAgIGlmICghZWxlbWVudEluc2VydGVkKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBl bGVtZW50SW5zZXJ0ZWQgPSB0cnVlOwotICAgICAgICAgICAgICAgICAgICAgICAgcGFyZW50RWxl bWVudC5pbnNlcnRCZWZvcmUodGhpcy5lbGVtZW50LCBsaW5lUm93KTsKLSAgICAgICAgICAgICAg ICAgICAgfQotICAgICAgICAgICAgICAgICAgICBwYXJlbnRFbGVtZW50LnJlbW92ZUNoaWxkKGxp bmVSb3cpOworICAgICAgICB2YXIgZWxlbWVudEluc2VydGVkID0gZmFsc2U7CisgICAgICAgIGZv ciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fZXhwYW5kZWRMaW5lUm93cy5sZW5ndGg7ICsraSkgewor ICAgICAgICAgICAgdmFyIGxpbmVSb3cgPSB0aGlzLl9leHBhbmRlZExpbmVSb3dzW2ldOworICAg ICAgICAgICAgdmFyIHBhcmVudEVsZW1lbnQgPSBsaW5lUm93LnBhcmVudEVsZW1lbnQ7CisgICAg ICAgICAgICBpZiAocGFyZW50RWxlbWVudCkgeworICAgICAgICAgICAgICAgIGlmICghZWxlbWVu dEluc2VydGVkKSB7CisgICAgICAgICAgICAgICAgICAgIGVsZW1lbnRJbnNlcnRlZCA9IHRydWU7 CisgICAgICAgICAgICAgICAgICAgIHBhcmVudEVsZW1lbnQuaW5zZXJ0QmVmb3JlKHRoaXMuZWxl bWVudCwgbGluZVJvdyk7CiAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIHRoaXMu X3RleHRFZGl0b3IuX2NhY2hlZFJvd3MucHVzaChsaW5lUm93KTsKKyAgICAgICAgICAgICAgICBw YXJlbnRFbGVtZW50LnJlbW92ZUNoaWxkKGxpbmVSb3cpOwogICAgICAgICAgICAgfQotICAgICAg ICAgICAgZGVsZXRlIHRoaXMuX2V4cGFuZGVkTGluZVJvd3M7CisgICAgICAgICAgICB0aGlzLl90 ZXh0RWRpdG9yLl9jYWNoZWRSb3dzLnB1c2gobGluZVJvdyk7CisgICAgICAgIH0KKyAgICAgICAg ZGVsZXRlIHRoaXMuX2V4cGFuZGVkTGluZVJvd3M7CisKKyAgICAgICAgdGhpcy5fdGV4dEVkaXRv ci5lbmREb21VcGRhdGVzKCk7CisgICAgfSwKKworICAgIGV4cGFuZDogZnVuY3Rpb24oKQorICAg IHsKKyAgICAgICAgaWYgKHRoaXMubGluZXNDb3VudCA9PT0gMSkKKyAgICAgICAgICAgIHRoaXMu X3RleHRFZGl0b3IuX3N5bmNEZWNvcmF0aW9uc0ZvckxpbmVMaXN0ZW5lcih0aGlzLnN0YXJ0TGlu ZSk7CisKKyAgICAgICAgaWYgKHRoaXMuX2V4cGFuZGVkKQorICAgICAgICAgICAgcmV0dXJuOwor CisgICAgICAgIHRoaXMuX2V4cGFuZGVkID0gdHJ1ZTsKKworICAgICAgICBpZiAodGhpcy5saW5l c0NvdW50ID09PSAxKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHRoaXMuX3RleHRF ZGl0b3IuYmVnaW5Eb21VcGRhdGVzKCk7CisKKyAgICAgICAgdGhpcy5fZXhwYW5kZWRMaW5lUm93 cyA9IFtdOworICAgICAgICB2YXIgcGFyZW50RWxlbWVudCA9IHRoaXMuZWxlbWVudC5wYXJlbnRF bGVtZW50OworICAgICAgICBmb3IgKHZhciBpID0gdGhpcy5zdGFydExpbmU7IGkgPCB0aGlzLnN0 YXJ0TGluZSArIHRoaXMubGluZXNDb3VudDsgKytpKSB7CisgICAgICAgICAgICB2YXIgbGluZVJv dyA9IHRoaXMuX2NyZWF0ZVJvdyhpKTsKKyAgICAgICAgICAgIHBhcmVudEVsZW1lbnQuaW5zZXJ0 QmVmb3JlKGxpbmVSb3csIHRoaXMuZWxlbWVudCk7CisgICAgICAgICAgICB0aGlzLl9leHBhbmRl ZExpbmVSb3dzLnB1c2gobGluZVJvdyk7CiAgICAgICAgIH0KKyAgICAgICAgcGFyZW50RWxlbWVu dC5yZW1vdmVDaGlsZCh0aGlzLmVsZW1lbnQpOworICAgICAgICB0aGlzLl90ZXh0RWRpdG9yLl9z eW5jTGluZUhlaWdodExpc3RlbmVyKHRoaXMuX2V4cGFuZGVkTGluZVJvd3NbMF0pOwogCiAgICAg ICAgIHRoaXMuX3RleHRFZGl0b3IuZW5kRG9tVXBkYXRlcygpOwogICAgIH0sCkBAIC0xNDUyLDEw ICsxNDY4LDExIEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgIC8vIFJlbW92ZSB0aGUgbWFya2VkIHJlZ2lvbiBpbW1lZGlhdGVseS4K ICAgICAgICAgICAgIHRoaXMuYmVnaW5Eb21VcGRhdGVzKCk7CiAgICAgICAgICAgICB2YXIgY2h1 bmsgPSB0aGlzLmNodW5rRm9yTGluZShtYXJrZWRMaW5lKTsKLSAgICAgICAgICAgIHZhciB3YXNF eHBhbmRlZCA9IGNodW5rLmV4cGFuZGVkOwotICAgICAgICAgICAgY2h1bmsuZXhwYW5kZWQgPSBm YWxzZTsKKyAgICAgICAgICAgIHZhciB3YXNFeHBhbmRlZCA9IGNodW5rLmlzRXhwYW5kZWQoKTsK KyAgICAgICAgICAgIGNodW5rLmNvbGxhcHNlKCk7CiAgICAgICAgICAgICBjaHVuay51cGRhdGVD b2xsYXBzZWRMaW5lUm93KCk7Ci0gICAgICAgICAgICBjaHVuay5leHBhbmRlZCA9IHdhc0V4cGFu ZGVkOworICAgICAgICAgICAgaWYgKHdhc0V4cGFuZGVkKQorICAgICAgICAgICAgICAgIGNodW5r LmV4cGFuZCgpOwogICAgICAgICAgICAgdGhpcy5lbmREb21VcGRhdGVzKCk7CiAgICAgICAgIH0K IApAQCAtMjQ3Niw3ICsyNDkzLDcgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwu cHJvdG90eXBlID0gewogICAgICAgICBpZiAoIXVwZGF0ZWQpIHsKICAgICAgICAgICAgIC8vIEhp Z2hsaWdodHMgZm9yIHRoZSBjaHVua3MgYmVsb3cgYXJlIGludmFsaWQsIHNvIGp1c3QgY29sbGFw c2UgdGhlbS4KICAgICAgICAgICAgIGZvciAodmFyIGkgPSB0aGlzLl9jaHVua051bWJlckZvckxp bmUocmFuZ2Uuc3RhcnRMaW5lKTsgaSA8IHRoaXMuX3RleHRDaHVua3MubGVuZ3RoOyArK2kpCi0g ICAgICAgICAgICAgICAgdGhpcy5fdGV4dENodW5rc1tpXS5leHBhbmRlZCA9IGZhbHNlOworICAg ICAgICAgICAgICAgIHRoaXMuX3RleHRDaHVua3NbaV0uY29sbGFwc2UoKTsKICAgICAgICAgfQog CiAgICAgICAgIHRoaXMuX3JlcGFpbnRBbGwoKTsKQEAgLTI2MjksNTIgKzI2NDYsNjMgQEAgV2Vi SW5zcGVjdG9yLlRleHRFZGl0b3JNYWluQ2h1bmsucHJvdG90eXBlID0gewogICAgIC8qKgogICAg ICAqIEByZXR1cm4ge2Jvb2xlYW59CiAgICAgICovCi0gICAgZ2V0IGV4cGFuZGVkKCkKKyAgICBp c0V4cGFuZGVkOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fZXhwYW5k ZWQ7CiAgICAgfSwKIAotICAgIHNldCBleHBhbmRlZChleHBhbmRlZCkKKyAgICBjb2xsYXBzZTog ZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX2V4cGFuZGVkID09PSBleHBhbmRl ZCkKKyAgICAgICAgaWYgKCF0aGlzLl9leHBhbmRlZCkKKyAgICAgICAgICAgIHJldHVybjsKKwor ICAgICAgICB0aGlzLl9leHBhbmRlZCA9IGZhbHNlOworICAgICAgICBpZiAodGhpcy5saW5lc0Nv dW50ID09PSAxKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHRoaXMuX2V4cGFuZGVk ID0gZXhwYW5kZWQ7CisgICAgICAgIHRoaXMuX2NodW5rZWRQYW5lbC5iZWdpbkRvbVVwZGF0ZXMo KTsKKworICAgICAgICB2YXIgZWxlbWVudEluc2VydGVkID0gZmFsc2U7CisgICAgICAgIGZvciAo dmFyIGkgPSAwOyBpIDwgdGhpcy5fZXhwYW5kZWRMaW5lUm93cy5sZW5ndGg7ICsraSkgeworICAg ICAgICAgICAgdmFyIGxpbmVSb3cgPSB0aGlzLl9leHBhbmRlZExpbmVSb3dzW2ldOworICAgICAg ICAgICAgdmFyIHBhcmVudEVsZW1lbnQgPSBsaW5lUm93LnBhcmVudEVsZW1lbnQ7CisgICAgICAg ICAgICBpZiAocGFyZW50RWxlbWVudCkgeworICAgICAgICAgICAgICAgIGlmICghZWxlbWVudElu c2VydGVkKSB7CisgICAgICAgICAgICAgICAgICAgIGVsZW1lbnRJbnNlcnRlZCA9IHRydWU7Cisg ICAgICAgICAgICAgICAgICAgIHBhcmVudEVsZW1lbnQuaW5zZXJ0QmVmb3JlKHRoaXMuZWxlbWVu dCwgbGluZVJvdyk7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIHBhcmVudEVs ZW1lbnQucmVtb3ZlQ2hpbGQobGluZVJvdyk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICB0 aGlzLl9jaHVua2VkUGFuZWwuX3JlbGVhc2VMaW5lc0hpZ2hsaWdodChsaW5lUm93KTsKKyAgICAg ICAgfQorICAgICAgICBkZWxldGUgdGhpcy5fZXhwYW5kZWRMaW5lUm93czsKKworICAgICAgICB0 aGlzLl9jaHVua2VkUGFuZWwuZW5kRG9tVXBkYXRlcygpOworICAgIH0sCisKKyAgICBleHBhbmQ6 IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLl9leHBhbmRlZCkKKyAgICAgICAg ICAgIHJldHVybjsKKworICAgICAgICB0aGlzLl9leHBhbmRlZCA9IHRydWU7CiAKICAgICAgICAg aWYgKHRoaXMubGluZXNDb3VudCA9PT0gMSkgewotICAgICAgICAgICAgaWYgKGV4cGFuZGVkKQot ICAgICAgICAgICAgICAgIHRoaXMuX2NodW5rZWRQYW5lbC5fcGFpbnRMaW5lKHRoaXMuZWxlbWVu dCk7CisgICAgICAgICAgICB0aGlzLl9jaHVua2VkUGFuZWwuX3BhaW50TGluZSh0aGlzLmVsZW1l bnQpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKICAgICAgICAgdGhpcy5fY2h1 bmtlZFBhbmVsLmJlZ2luRG9tVXBkYXRlcygpOwogCi0gICAgICAgIGlmIChleHBhbmRlZCkgewot ICAgICAgICAgICAgdGhpcy5fZXhwYW5kZWRMaW5lUm93cyA9IFtdOwotICAgICAgICAgICAgdmFy IHBhcmVudEVsZW1lbnQgPSB0aGlzLmVsZW1lbnQucGFyZW50RWxlbWVudDsKLSAgICAgICAgICAg IGZvciAodmFyIGkgPSB0aGlzLnN0YXJ0TGluZTsgaSA8IHRoaXMuc3RhcnRMaW5lICsgdGhpcy5s aW5lc0NvdW50OyArK2kpIHsKLSAgICAgICAgICAgICAgICB2YXIgbGluZVJvdyA9IHRoaXMuX2Ny ZWF0ZVJvdyhpKTsKLSAgICAgICAgICAgICAgICBwYXJlbnRFbGVtZW50Lmluc2VydEJlZm9yZShs aW5lUm93LCB0aGlzLmVsZW1lbnQpOwotICAgICAgICAgICAgICAgIHRoaXMuX2V4cGFuZGVkTGlu ZVJvd3MucHVzaChsaW5lUm93KTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHBhcmVudEVs ZW1lbnQucmVtb3ZlQ2hpbGQodGhpcy5lbGVtZW50KTsKLSAgICAgICAgICAgIHRoaXMuX2NodW5r ZWRQYW5lbC5fcGFpbnRMaW5lcyh0aGlzLnN0YXJ0TGluZSwgdGhpcy5zdGFydExpbmUgKyB0aGlz LmxpbmVzQ291bnQpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgdmFyIGVsZW1lbnRJ bnNlcnRlZCA9IGZhbHNlOwotICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9l eHBhbmRlZExpbmVSb3dzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICAgICAgdmFyIGxpbmVS b3cgPSB0aGlzLl9leHBhbmRlZExpbmVSb3dzW2ldOwotICAgICAgICAgICAgICAgIHZhciBwYXJl bnRFbGVtZW50ID0gbGluZVJvdy5wYXJlbnRFbGVtZW50OwotICAgICAgICAgICAgICAgIGlmIChw YXJlbnRFbGVtZW50KSB7Ci0gICAgICAgICAgICAgICAgICAgIGlmICghZWxlbWVudEluc2VydGVk KSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBlbGVtZW50SW5zZXJ0ZWQgPSB0cnVlOwotICAg ICAgICAgICAgICAgICAgICAgICAgcGFyZW50RWxlbWVudC5pbnNlcnRCZWZvcmUodGhpcy5lbGVt ZW50LCBsaW5lUm93KTsKLSAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAg ICBwYXJlbnRFbGVtZW50LnJlbW92ZUNoaWxkKGxpbmVSb3cpOwotICAgICAgICAgICAgICAgIH0K LSAgICAgICAgICAgICAgICB0aGlzLl9jaHVua2VkUGFuZWwuX3JlbGVhc2VMaW5lc0hpZ2hsaWdo dChsaW5lUm93KTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9leHBh bmRlZExpbmVSb3dzOworICAgICAgICB0aGlzLl9leHBhbmRlZExpbmVSb3dzID0gW107CisgICAg ICAgIHZhciBwYXJlbnRFbGVtZW50ID0gdGhpcy5lbGVtZW50LnBhcmVudEVsZW1lbnQ7CisgICAg ICAgIGZvciAodmFyIGkgPSB0aGlzLnN0YXJ0TGluZTsgaSA8IHRoaXMuc3RhcnRMaW5lICsgdGhp cy5saW5lc0NvdW50OyArK2kpIHsKKyAgICAgICAgICAgIHZhciBsaW5lUm93ID0gdGhpcy5fY3Jl YXRlUm93KGkpOworICAgICAgICAgICAgcGFyZW50RWxlbWVudC5pbnNlcnRCZWZvcmUobGluZVJv dywgdGhpcy5lbGVtZW50KTsKKyAgICAgICAgICAgIHRoaXMuX2V4cGFuZGVkTGluZVJvd3MucHVz aChsaW5lUm93KTsKICAgICAgICAgfQorICAgICAgICBwYXJlbnRFbGVtZW50LnJlbW92ZUNoaWxk KHRoaXMuZWxlbWVudCk7CisgICAgICAgIHRoaXMuX2NodW5rZWRQYW5lbC5fcGFpbnRMaW5lcyh0 aGlzLnN0YXJ0TGluZSwgdGhpcy5zdGFydExpbmUgKyB0aGlzLmxpbmVzQ291bnQpOwogCiAgICAg ICAgIHRoaXMuX2NodW5rZWRQYW5lbC5lbmREb21VcGRhdGVzKCk7CiAgICAgfSwK 180165 2012-12-19 07:48:41 -0800 2012-12-19 08:08:19 -0800 Patch bug-105415-20121219194557.patch text/plain 11992 lushnikov U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4MTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjQyZTc3ODU5MjUzNDI0 Mjc3ZDEzZmM2YjE3N2Q0M2I5YjI2OTM3NS4uNzFlYjFkM2NhOTkzMmQ2NDBmZDdmYzZjZjgwYmI2 ZjEyNWJiZjljZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTEyLTE5ICBBbmRy ZXkgTHVzaG5pa292ICA8bHVzaG5pa292QGNocm9taXVtLmNvbT4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiByZWZhY3RvciBEZWZhdWx0VGV4dEVkaXRvcidzIHxleHBhbmRlZHwgc2V0dGVycwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1NDE1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVmYWN0b3Ig fGV4cGFuZGVkfCBzZXR0ZXJzIGFuZCBnZXR0ZXJzIGludG8gfGNvbGxhcHNlKCl8LCB8ZXhwYW5k KCl8CisgICAgICAgIGFuZCB8ZXhwYW5kZWQoKXwgbWV0aG9kcworCisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4dEVkaXRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5UZXh0RWRpdG9yQ2h1bmtlZFBhbmVsLnByb3RvdHlwZS5fc3BsaXRDaHVua09uQUxpbmUpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JDaHVua2VkUGFuZWwucHJvdG90eXBlLl9l eHBhbmRDaHVua3MpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0ZXJQYW5l bC5wcm90b3R5cGUudGV4dENoYW5nZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0 b3JHdXR0ZXJDaHVuay5wcm90b3R5cGUuZXhwYW5kZWQpOiBBZGRlZC4KKyAgICAgICAgKFdlYklu c3BlY3Rvci5UZXh0RWRpdG9yR3V0dGVyQ2h1bmsucHJvdG90eXBlLmNvbGxhcHNlKTogQWRkZWQu CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRlckNodW5rLnByb3RvdHlwZS5l eHBhbmQpOiBBZGRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVs LnByb3RvdHlwZS5tYXJrQW5kUmV2ZWFsUmFuZ2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRl eHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlLl91cGRhdGVIaWdobGlnaHRzRm9yUmFuZ2UpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluQ2h1bmsucHJvdG90eXBlLmV4cGFu ZGVkKTogQWRkZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5DaHVuay5w cm90b3R5cGUuY29sbGFwc2UpOiBBZGRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRp dG9yTWFpbkNodW5rLnByb3RvdHlwZS5leHBhbmQpOiBBZGRlZC4KKwogMjAxMi0xMi0xOSAgTm8n YW0gUm9zZW50aGFsICA8bm9hbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtUZXhtYXBdIEluc3Rl YWQgb2YgaGF2aW5nIG11bHRpcGxlIHNoYWRlcnMgc291cmNlcyB3aXRoIGxvdHMgb2YgZHVwbGlj YXRpb24sIHdlIHNob3VsZCBoYXZlIG9uZSBzaGFkZXIgc291cmNlIHdpdGggTUFDUk8gdmFyaWFu dHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVmYXVs dFRleHRFZGl0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlZmF1 bHRUZXh0RWRpdG9yLmpzCmluZGV4IDhhMzdiYzQ5N2MzYjk2M2ViNmY1ODQzMzQ0ZmE3NTczODQ3 NzRiMmQuLmNkZTViY2FmZDY2YTg0M2Y3YTkwMzI1MzNjZDNmYjM2NzE5YmVjODIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVmYXVsdFRleHRFZGl0b3Iu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4dEVk aXRvci5qcwpAQCAtNzc4LDggKzc3OCw4IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yQ2h1bmtl ZFBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5iZWdpbkRvbVVwZGF0ZXMoKTsKIAog ICAgICAgICB2YXIgb2xkQ2h1bmsgPSB0aGlzLl90ZXh0Q2h1bmtzW2NodW5rTnVtYmVyXTsKLSAg ICAgICAgdmFyIHdhc0V4cGFuZGVkID0gb2xkQ2h1bmsuZXhwYW5kZWQ7Ci0gICAgICAgIG9sZENo dW5rLmV4cGFuZGVkID0gZmFsc2U7CisgICAgICAgIHZhciB3YXNFeHBhbmRlZCA9IG9sZENodW5r LmV4cGFuZGVkKCk7CisgICAgICAgIG9sZENodW5rLmNvbGxhcHNlKCk7CiAKICAgICAgICAgdmFy IGluc2VydEluZGV4ID0gY2h1bmtOdW1iZXIgKyAxOwogCkBAIC04MDksMTAgKzgwOSwxMCBAQCBX ZWJJbnNwZWN0b3IuVGV4dEVkaXRvckNodW5rZWRQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICAg ICAgaWYgKHdhc0V4cGFuZGVkKSB7CiAgICAgICAgICAgICBpZiAocHJlZml4Q2h1bmspCi0gICAg ICAgICAgICAgICAgcHJlZml4Q2h1bmsuZXhwYW5kZWQgPSB0cnVlOwotICAgICAgICAgICAgbGlu ZUNodW5rLmV4cGFuZGVkID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICBwcmVmaXhDaHVuay5leHBh bmQoKTsKKyAgICAgICAgICAgIGxpbmVDaHVuay5leHBhbmQoKTsKICAgICAgICAgICAgIGlmIChz dWZmaXhDaHVuaykKLSAgICAgICAgICAgICAgICBzdWZmaXhDaHVuay5leHBhbmRlZCA9IHRydWU7 CisgICAgICAgICAgICAgICAgc3VmZml4Q2h1bmsuZXhwYW5kKCk7CiAgICAgICAgIH0KIAogICAg ICAgICB0aGlzLmVuZERvbVVwZGF0ZXMoKTsKQEAgLTkxMCw3ICs5MTAsNyBAQCBXZWJJbnNwZWN0 b3IuVGV4dEVkaXRvckNodW5rZWRQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgX2ZpbmRGaXJzdFZp c2libGVMaW5lTnVtYmVyOiBmdW5jdGlvbih2aXNpYmxlRnJvbSkKICAgICB7CiAgICAgICAgIHZh ciBjaHVuayA9IHRoaXMuX3RleHRDaHVua3NbdGhpcy5fZmluZEZpcnN0VmlzaWJsZUNodW5rTnVt YmVyKHZpc2libGVGcm9tKV07Ci0gICAgICAgIGlmICghY2h1bmsuZXhwYW5kZWQpCisgICAgICAg IGlmICghY2h1bmsuZXhwYW5kZWQoKSkKICAgICAgICAgICAgIHJldHVybiBjaHVuay5zdGFydExp bmU7CiAKICAgICAgICAgdmFyIGxpbmVOdW1iZXJzID0gW107CkBAIC05NjEsMTEgKzk2MSwxMSBA QCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckNodW5rZWRQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAg ewogICAgICAgICAvLyBGaXJzdCBjb2xsYXBzZSBjaHVua3MgdG8gY29sbGVjdCB0aGUgRE9NIGVs ZW1lbnRzIGludG8gYSBjYWNoZSB0byByZXVzZSB0aGVtIGxhdGVyLgogICAgICAgICBmb3IgKHZh ciBpID0gMDsgaSA8IGZyb21JbmRleDsgKytpKQotICAgICAgICAgICAgdGhpcy5fdGV4dENodW5r c1tpXS5leHBhbmRlZCA9IGZhbHNlOworICAgICAgICAgICAgdGhpcy5fdGV4dENodW5rc1tpXS5j b2xsYXBzZSgpOwogICAgICAgICBmb3IgKHZhciBpID0gdG9JbmRleDsgaSA8IHRoaXMuX3RleHRD aHVua3MubGVuZ3RoOyArK2kpCi0gICAgICAgICAgICB0aGlzLl90ZXh0Q2h1bmtzW2ldLmV4cGFu ZGVkID0gZmFsc2U7CisgICAgICAgICAgICB0aGlzLl90ZXh0Q2h1bmtzW2ldLmNvbGxhcHNlKCk7 CiAgICAgICAgIGZvciAodmFyIGkgPSBmcm9tSW5kZXg7IGkgPCB0b0luZGV4OyArK2kpCi0gICAg ICAgICAgICB0aGlzLl90ZXh0Q2h1bmtzW2ldLmV4cGFuZGVkID0gdHJ1ZTsKKyAgICAgICAgICAg IHRoaXMuX3RleHRDaHVua3NbaV0uZXhwYW5kKCk7CiAgICAgfSwKIAogICAgIC8qKgpAQCAtMTA1 Miw3ICsxMDUyLDcgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0ZXJQYW5lbC5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICAgICAgdmFyIGNodW5rID0gdGhpcy5fdGV4dENodW5rc1tjaHVu a051bWJlcl07CiAgICAgICAgICAgICAgICAgaWYgKGNodW5rLnN0YXJ0TGluZSArIGNodW5rLmxp bmVzQ291bnQgPD0gdGhpcy5fdGV4dE1vZGVsLmxpbmVzQ291bnQpCiAgICAgICAgICAgICAgICAg ICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIGNodW5rLmV4cGFuZGVkID0gZmFsc2U7CisgICAg ICAgICAgICAgICAgY2h1bmsuY29sbGFwc2UoKTsKICAgICAgICAgICAgICAgICB0aGlzLl9jb250 YWluZXIucmVtb3ZlQ2hpbGQoY2h1bmsuZWxlbWVudCk7CiAgICAgICAgICAgICB9CiAgICAgICAg ICAgICB0aGlzLl90ZXh0Q2h1bmtzLmxlbmd0aCA9IGNodW5rTnVtYmVyICsgMTsKQEAgLTEyMTUs NTIgKzEyMTUsNjggQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0ZXJDaHVuay5wcm90b3R5 cGUgPSB7CiAgICAgLyoqCiAgICAgICogQHJldHVybiB7Ym9vbGVhbn0KICAgICAgKi8KLSAgICBn ZXQgZXhwYW5kZWQoKQorICAgIGV4cGFuZGVkOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBy ZXR1cm4gdGhpcy5fZXhwYW5kZWQ7CiAgICAgfSwKIAotICAgIHNldCBleHBhbmRlZChleHBhbmRl ZCkKKyAgICBleHBhbmQ6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIGlmICh0aGlzLmxpbmVz Q291bnQgPT09IDEpCiAgICAgICAgICAgICB0aGlzLl90ZXh0RWRpdG9yLl9zeW5jRGVjb3JhdGlv bnNGb3JMaW5lTGlzdGVuZXIodGhpcy5zdGFydExpbmUpOwogCi0gICAgICAgIGlmICh0aGlzLl9l eHBhbmRlZCA9PT0gZXhwYW5kZWQpCisgICAgICAgIGlmICh0aGlzLl9leHBhbmRlZCkKICAgICAg ICAgICAgIHJldHVybjsKIAotICAgICAgICB0aGlzLl9leHBhbmRlZCA9IGV4cGFuZGVkOworICAg ICAgICB0aGlzLl9leHBhbmRlZCA9IHRydWU7CiAKICAgICAgICAgaWYgKHRoaXMubGluZXNDb3Vu dCA9PT0gMSkKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICB0aGlzLl90ZXh0RWRpdG9y LmJlZ2luRG9tVXBkYXRlcygpOwogCi0gICAgICAgIGlmIChleHBhbmRlZCkgewotICAgICAgICAg ICAgdGhpcy5fZXhwYW5kZWRMaW5lUm93cyA9IFtdOwotICAgICAgICAgICAgdmFyIHBhcmVudEVs ZW1lbnQgPSB0aGlzLmVsZW1lbnQucGFyZW50RWxlbWVudDsKLSAgICAgICAgICAgIGZvciAodmFy IGkgPSB0aGlzLnN0YXJ0TGluZTsgaSA8IHRoaXMuc3RhcnRMaW5lICsgdGhpcy5saW5lc0NvdW50 OyArK2kpIHsKLSAgICAgICAgICAgICAgICB2YXIgbGluZVJvdyA9IHRoaXMuX2NyZWF0ZVJvdyhp KTsKLSAgICAgICAgICAgICAgICBwYXJlbnRFbGVtZW50Lmluc2VydEJlZm9yZShsaW5lUm93LCB0 aGlzLmVsZW1lbnQpOwotICAgICAgICAgICAgICAgIHRoaXMuX2V4cGFuZGVkTGluZVJvd3MucHVz aChsaW5lUm93KTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHBhcmVudEVsZW1lbnQucmVt b3ZlQ2hpbGQodGhpcy5lbGVtZW50KTsKLSAgICAgICAgICAgIHRoaXMuX3RleHRFZGl0b3IuX3N5 bmNMaW5lSGVpZ2h0TGlzdGVuZXIodGhpcy5fZXhwYW5kZWRMaW5lUm93c1swXSk7Ci0gICAgICAg IH0gZWxzZSB7Ci0gICAgICAgICAgICB2YXIgZWxlbWVudEluc2VydGVkID0gZmFsc2U7Ci0gICAg ICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX2V4cGFuZGVkTGluZVJvd3MubGVuZ3Ro OyArK2kpIHsKLSAgICAgICAgICAgICAgICB2YXIgbGluZVJvdyA9IHRoaXMuX2V4cGFuZGVkTGlu ZVJvd3NbaV07Ci0gICAgICAgICAgICAgICAgdmFyIHBhcmVudEVsZW1lbnQgPSBsaW5lUm93LnBh cmVudEVsZW1lbnQ7Ci0gICAgICAgICAgICAgICAgaWYgKHBhcmVudEVsZW1lbnQpIHsKLSAgICAg ICAgICAgICAgICAgICAgaWYgKCFlbGVtZW50SW5zZXJ0ZWQpIHsKLSAgICAgICAgICAgICAgICAg ICAgICAgIGVsZW1lbnRJbnNlcnRlZCA9IHRydWU7Ci0gICAgICAgICAgICAgICAgICAgICAgICBw YXJlbnRFbGVtZW50Lmluc2VydEJlZm9yZSh0aGlzLmVsZW1lbnQsIGxpbmVSb3cpOwotICAgICAg ICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICAgIHBhcmVudEVsZW1lbnQucmVtb3Zl Q2hpbGQobGluZVJvdyk7CisgICAgICAgIHRoaXMuX2V4cGFuZGVkTGluZVJvd3MgPSBbXTsKKyAg ICAgICAgdmFyIHBhcmVudEVsZW1lbnQgPSB0aGlzLmVsZW1lbnQucGFyZW50RWxlbWVudDsKKyAg ICAgICAgZm9yICh2YXIgaSA9IHRoaXMuc3RhcnRMaW5lOyBpIDwgdGhpcy5zdGFydExpbmUgKyB0 aGlzLmxpbmVzQ291bnQ7ICsraSkgeworICAgICAgICAgICAgdmFyIGxpbmVSb3cgPSB0aGlzLl9j cmVhdGVSb3coaSk7CisgICAgICAgICAgICBwYXJlbnRFbGVtZW50Lmluc2VydEJlZm9yZShsaW5l Um93LCB0aGlzLmVsZW1lbnQpOworICAgICAgICAgICAgdGhpcy5fZXhwYW5kZWRMaW5lUm93cy5w dXNoKGxpbmVSb3cpOworICAgICAgICB9CisgICAgICAgIHBhcmVudEVsZW1lbnQucmVtb3ZlQ2hp bGQodGhpcy5lbGVtZW50KTsKKyAgICAgICAgdGhpcy5fdGV4dEVkaXRvci5fc3luY0xpbmVIZWln aHRMaXN0ZW5lcih0aGlzLl9leHBhbmRlZExpbmVSb3dzWzBdKTsKKworICAgICAgICB0aGlzLl90 ZXh0RWRpdG9yLmVuZERvbVVwZGF0ZXMoKTsKKyAgICB9LAorCisgICAgY29sbGFwc2U6IGZ1bmN0 aW9uKCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLmxpbmVzQ291bnQgPT09IDEpCisgICAgICAg ICAgICB0aGlzLl90ZXh0RWRpdG9yLl9zeW5jRGVjb3JhdGlvbnNGb3JMaW5lTGlzdGVuZXIodGhp cy5zdGFydExpbmUpOworCisgICAgICAgIGlmICghdGhpcy5fZXhwYW5kZWQpCisgICAgICAgICAg ICByZXR1cm47CisKKyAgICAgICAgdGhpcy5fZXhwYW5kZWQgPSBmYWxzZTsKKworICAgICAgICBp ZiAodGhpcy5saW5lc0NvdW50ID09PSAxKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAg IHRoaXMuX3RleHRFZGl0b3IuYmVnaW5Eb21VcGRhdGVzKCk7CisKKyAgICAgICAgdmFyIGVsZW1l bnRJbnNlcnRlZCA9IGZhbHNlOworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX2V4 cGFuZGVkTGluZVJvd3MubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIHZhciBsaW5lUm93ID0g dGhpcy5fZXhwYW5kZWRMaW5lUm93c1tpXTsKKyAgICAgICAgICAgIHZhciBwYXJlbnRFbGVtZW50 ID0gbGluZVJvdy5wYXJlbnRFbGVtZW50OworICAgICAgICAgICAgaWYgKHBhcmVudEVsZW1lbnQp IHsKKyAgICAgICAgICAgICAgICBpZiAoIWVsZW1lbnRJbnNlcnRlZCkgeworICAgICAgICAgICAg ICAgICAgICBlbGVtZW50SW5zZXJ0ZWQgPSB0cnVlOworICAgICAgICAgICAgICAgICAgICBwYXJl bnRFbGVtZW50Lmluc2VydEJlZm9yZSh0aGlzLmVsZW1lbnQsIGxpbmVSb3cpOwogICAgICAgICAg ICAgICAgIH0KLSAgICAgICAgICAgICAgICB0aGlzLl90ZXh0RWRpdG9yLl9jYWNoZWRSb3dzLnB1 c2gobGluZVJvdyk7CisgICAgICAgICAgICAgICAgcGFyZW50RWxlbWVudC5yZW1vdmVDaGlsZChs aW5lUm93KTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9leHBhbmRl ZExpbmVSb3dzOworICAgICAgICAgICAgdGhpcy5fdGV4dEVkaXRvci5fY2FjaGVkUm93cy5wdXNo KGxpbmVSb3cpOwogICAgICAgICB9CisgICAgICAgIGRlbGV0ZSB0aGlzLl9leHBhbmRlZExpbmVS b3dzOwogCiAgICAgICAgIHRoaXMuX3RleHRFZGl0b3IuZW5kRG9tVXBkYXRlcygpOwogICAgIH0s CkBAIC0xNDUyLDEwICsxNDY4LDExIEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVs LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIC8vIFJlbW92ZSB0aGUgbWFya2VkIHJlZ2lvbiBp bW1lZGlhdGVseS4KICAgICAgICAgICAgIHRoaXMuYmVnaW5Eb21VcGRhdGVzKCk7CiAgICAgICAg ICAgICB2YXIgY2h1bmsgPSB0aGlzLmNodW5rRm9yTGluZShtYXJrZWRMaW5lKTsKLSAgICAgICAg ICAgIHZhciB3YXNFeHBhbmRlZCA9IGNodW5rLmV4cGFuZGVkOwotICAgICAgICAgICAgY2h1bmsu ZXhwYW5kZWQgPSBmYWxzZTsKKyAgICAgICAgICAgIHZhciB3YXNFeHBhbmRlZCA9IGNodW5rLmV4 cGFuZGVkKCk7CisgICAgICAgICAgICBjaHVuay5jb2xsYXBzZSgpOwogICAgICAgICAgICAgY2h1 bmsudXBkYXRlQ29sbGFwc2VkTGluZVJvdygpOwotICAgICAgICAgICAgY2h1bmsuZXhwYW5kZWQg PSB3YXNFeHBhbmRlZDsKKyAgICAgICAgICAgIGlmICh3YXNFeHBhbmRlZCkKKyAgICAgICAgICAg ICAgICBjaHVuay5leHBhbmQoKTsKICAgICAgICAgICAgIHRoaXMuZW5kRG9tVXBkYXRlcygpOwog ICAgICAgICB9CiAKQEAgLTI0NzYsNyArMjQ5Myw3IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9y TWFpblBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKCF1cGRhdGVkKSB7CiAgICAgICAg ICAgICAvLyBIaWdobGlnaHRzIGZvciB0aGUgY2h1bmtzIGJlbG93IGFyZSBpbnZhbGlkLCBzbyBq dXN0IGNvbGxhcHNlIHRoZW0uCiAgICAgICAgICAgICBmb3IgKHZhciBpID0gdGhpcy5fY2h1bmtO dW1iZXJGb3JMaW5lKHJhbmdlLnN0YXJ0TGluZSk7IGkgPCB0aGlzLl90ZXh0Q2h1bmtzLmxlbmd0 aDsgKytpKQotICAgICAgICAgICAgICAgIHRoaXMuX3RleHRDaHVua3NbaV0uZXhwYW5kZWQgPSBm YWxzZTsKKyAgICAgICAgICAgICAgICB0aGlzLl90ZXh0Q2h1bmtzW2ldLmNvbGxhcHNlKCk7CiAg ICAgICAgIH0KIAogICAgICAgICB0aGlzLl9yZXBhaW50QWxsKCk7CkBAIC0yNjI5LDUyICsyNjQ2 LDYzIEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpbkNodW5rLnByb3RvdHlwZSA9IHsKICAg ICAvKioKICAgICAgKiBAcmV0dXJuIHtib29sZWFufQogICAgICAqLwotICAgIGdldCBleHBhbmRl ZCgpCisgICAgZXhwYW5kZWQ6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlz Ll9leHBhbmRlZDsKICAgICB9LAogCi0gICAgc2V0IGV4cGFuZGVkKGV4cGFuZGVkKQorICAgIGV4 cGFuZDogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX2V4cGFuZGVkID09PSBl eHBhbmRlZCkKKyAgICAgICAgaWYgKHRoaXMuX2V4cGFuZGVkKQogICAgICAgICAgICAgcmV0dXJu OwogCi0gICAgICAgIHRoaXMuX2V4cGFuZGVkID0gZXhwYW5kZWQ7CisgICAgICAgIHRoaXMuX2V4 cGFuZGVkID0gdHJ1ZTsKIAogICAgICAgICBpZiAodGhpcy5saW5lc0NvdW50ID09PSAxKSB7Ci0g ICAgICAgICAgICBpZiAoZXhwYW5kZWQpCi0gICAgICAgICAgICAgICAgdGhpcy5fY2h1bmtlZFBh bmVsLl9wYWludExpbmUodGhpcy5lbGVtZW50KTsKKyAgICAgICAgICAgIHRoaXMuX2NodW5rZWRQ YW5lbC5fcGFpbnRMaW5lKHRoaXMuZWxlbWVudCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAg ICAgIH0KIAogICAgICAgICB0aGlzLl9jaHVua2VkUGFuZWwuYmVnaW5Eb21VcGRhdGVzKCk7CiAK LSAgICAgICAgaWYgKGV4cGFuZGVkKSB7Ci0gICAgICAgICAgICB0aGlzLl9leHBhbmRlZExpbmVS b3dzID0gW107Ci0gICAgICAgICAgICB2YXIgcGFyZW50RWxlbWVudCA9IHRoaXMuZWxlbWVudC5w YXJlbnRFbGVtZW50OwotICAgICAgICAgICAgZm9yICh2YXIgaSA9IHRoaXMuc3RhcnRMaW5lOyBp IDwgdGhpcy5zdGFydExpbmUgKyB0aGlzLmxpbmVzQ291bnQ7ICsraSkgewotICAgICAgICAgICAg ICAgIHZhciBsaW5lUm93ID0gdGhpcy5fY3JlYXRlUm93KGkpOwotICAgICAgICAgICAgICAgIHBh cmVudEVsZW1lbnQuaW5zZXJ0QmVmb3JlKGxpbmVSb3csIHRoaXMuZWxlbWVudCk7Ci0gICAgICAg ICAgICAgICAgdGhpcy5fZXhwYW5kZWRMaW5lUm93cy5wdXNoKGxpbmVSb3cpOwotICAgICAgICAg ICAgfQotICAgICAgICAgICAgcGFyZW50RWxlbWVudC5yZW1vdmVDaGlsZCh0aGlzLmVsZW1lbnQp OwotICAgICAgICAgICAgdGhpcy5fY2h1bmtlZFBhbmVsLl9wYWludExpbmVzKHRoaXMuc3RhcnRM aW5lLCB0aGlzLnN0YXJ0TGluZSArIHRoaXMubGluZXNDb3VudCk7Ci0gICAgICAgIH0gZWxzZSB7 Ci0gICAgICAgICAgICB2YXIgZWxlbWVudEluc2VydGVkID0gZmFsc2U7Ci0gICAgICAgICAgICBm b3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX2V4cGFuZGVkTGluZVJvd3MubGVuZ3RoOyArK2kpIHsK LSAgICAgICAgICAgICAgICB2YXIgbGluZVJvdyA9IHRoaXMuX2V4cGFuZGVkTGluZVJvd3NbaV07 Ci0gICAgICAgICAgICAgICAgdmFyIHBhcmVudEVsZW1lbnQgPSBsaW5lUm93LnBhcmVudEVsZW1l bnQ7Ci0gICAgICAgICAgICAgICAgaWYgKHBhcmVudEVsZW1lbnQpIHsKLSAgICAgICAgICAgICAg ICAgICAgaWYgKCFlbGVtZW50SW5zZXJ0ZWQpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGVs ZW1lbnRJbnNlcnRlZCA9IHRydWU7Ci0gICAgICAgICAgICAgICAgICAgICAgICBwYXJlbnRFbGVt ZW50Lmluc2VydEJlZm9yZSh0aGlzLmVsZW1lbnQsIGxpbmVSb3cpOwotICAgICAgICAgICAgICAg ICAgICB9Ci0gICAgICAgICAgICAgICAgICAgIHBhcmVudEVsZW1lbnQucmVtb3ZlQ2hpbGQobGlu ZVJvdyk7CisgICAgICAgIHRoaXMuX2V4cGFuZGVkTGluZVJvd3MgPSBbXTsKKyAgICAgICAgdmFy IHBhcmVudEVsZW1lbnQgPSB0aGlzLmVsZW1lbnQucGFyZW50RWxlbWVudDsKKyAgICAgICAgZm9y ICh2YXIgaSA9IHRoaXMuc3RhcnRMaW5lOyBpIDwgdGhpcy5zdGFydExpbmUgKyB0aGlzLmxpbmVz Q291bnQ7ICsraSkgeworICAgICAgICAgICAgdmFyIGxpbmVSb3cgPSB0aGlzLl9jcmVhdGVSb3co aSk7CisgICAgICAgICAgICBwYXJlbnRFbGVtZW50Lmluc2VydEJlZm9yZShsaW5lUm93LCB0aGlz LmVsZW1lbnQpOworICAgICAgICAgICAgdGhpcy5fZXhwYW5kZWRMaW5lUm93cy5wdXNoKGxpbmVS b3cpOworICAgICAgICB9CisgICAgICAgIHBhcmVudEVsZW1lbnQucmVtb3ZlQ2hpbGQodGhpcy5l bGVtZW50KTsKKyAgICAgICAgdGhpcy5fY2h1bmtlZFBhbmVsLl9wYWludExpbmVzKHRoaXMuc3Rh cnRMaW5lLCB0aGlzLnN0YXJ0TGluZSArIHRoaXMubGluZXNDb3VudCk7CisKKyAgICAgICAgdGhp cy5fY2h1bmtlZFBhbmVsLmVuZERvbVVwZGF0ZXMoKTsKKyAgICB9LAorCisgICAgY29sbGFwc2U6 IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5fZXhwYW5kZWQpCisgICAgICAg ICAgICByZXR1cm47CisKKyAgICAgICAgdGhpcy5fZXhwYW5kZWQgPSBmYWxzZTsKKyAgICAgICAg aWYgKHRoaXMubGluZXNDb3VudCA9PT0gMSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAg ICB0aGlzLl9jaHVua2VkUGFuZWwuYmVnaW5Eb21VcGRhdGVzKCk7CisKKyAgICAgICAgdmFyIGVs ZW1lbnRJbnNlcnRlZCA9IGZhbHNlOworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMu X2V4cGFuZGVkTGluZVJvd3MubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIHZhciBsaW5lUm93 ID0gdGhpcy5fZXhwYW5kZWRMaW5lUm93c1tpXTsKKyAgICAgICAgICAgIHZhciBwYXJlbnRFbGVt ZW50ID0gbGluZVJvdy5wYXJlbnRFbGVtZW50OworICAgICAgICAgICAgaWYgKHBhcmVudEVsZW1l bnQpIHsKKyAgICAgICAgICAgICAgICBpZiAoIWVsZW1lbnRJbnNlcnRlZCkgeworICAgICAgICAg ICAgICAgICAgICBlbGVtZW50SW5zZXJ0ZWQgPSB0cnVlOworICAgICAgICAgICAgICAgICAgICBw YXJlbnRFbGVtZW50Lmluc2VydEJlZm9yZSh0aGlzLmVsZW1lbnQsIGxpbmVSb3cpOwogICAgICAg ICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICB0aGlzLl9jaHVua2VkUGFuZWwuX3JlbGVhc2VM aW5lc0hpZ2hsaWdodChsaW5lUm93KTsKKyAgICAgICAgICAgICAgICBwYXJlbnRFbGVtZW50LnJl bW92ZUNoaWxkKGxpbmVSb3cpOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgZGVsZXRlIHRo aXMuX2V4cGFuZGVkTGluZVJvd3M7CisgICAgICAgICAgICB0aGlzLl9jaHVua2VkUGFuZWwuX3Jl bGVhc2VMaW5lc0hpZ2hsaWdodChsaW5lUm93KTsKICAgICAgICAgfQorICAgICAgICBkZWxldGUg dGhpcy5fZXhwYW5kZWRMaW5lUm93czsKIAogICAgICAgICB0aGlzLl9jaHVua2VkUGFuZWwuZW5k RG9tVXBkYXRlcygpOwogICAgIH0sCg==