102927 2012-11-21 05:32:41 -0800 Web Inspector: simplify the _updateChunksForRanges routine 2012-11-22 12:19:35 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 772831 0 pfeldman 2012-11-21 05:32:41 -0800 It is very messy today. 772850 1 175419 pfeldman 2012-11-21 05:50:05 -0800 Created attachment 175419 Patch 772950 2 175440 pfeldman 2012-11-21 07:29:08 -0800 Created attachment 175440 Patch 773548 3 175584 pfeldman 2012-11-21 21:36:29 -0800 Created attachment 175584 Patch 773634 4 pfeldman 2012-11-21 23:42:12 -0800 Committed r135483: <http://trac.webkit.org/changeset/135483> 774067 5 175584 pfeldman 2012-11-22 12:19:35 -0800 Comment on attachment 175584 Patch Clearing r? from the patch that has landed 175419 2012-11-21 05:50:05 -0800 2012-11-21 07:29:02 -0800 Patch bug-102927-20121121174752.patch text/plain 8892 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1Mjg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTA5YmRmOTkxYTY3YzJk Yzc5NGJjOTUyM2IzNmU1N2ZhZTc5YTZmYi4uN2QzNGMwYjQ4ZjQ3NmEyMDBkNDg5YjVkNDg4MmNi N2U0ZTJmZTUxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTExLTIxICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHNpbXBsaWZ5IHRoZSBfdXBkYXRlQ2h1bmtzRm9yUmFuZ2VzIHJvdXRpbmUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjkyNworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9EZWZhdWx0VGV4dEVkaXRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRp dG9yTWFpblBhbmVsLnByb3RvdHlwZS5fdXBkYXRlQ2h1bmtzRm9yUmFuZ2VzKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpbkNodW5rLnByb3RvdHlwZS51cGRhdGVDb2xsYXBz ZWRMaW5lUm93KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpbkNodW5rLnBy b3RvdHlwZS5kZXRhY2hGcm9tRE9NKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9y TWFpbkNodW5rLnByb3RvdHlwZS5hbmNob3JFbGVtZW50KToKKwogMjAxMi0xMS0xOSAgUGF2ZWwg RmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9y OiBzaW1wbGlmeT8gZGFtYWdlZCByZWdpb24gY29tcHV0YXRpb24gaW4gdGhlIGVkaXRvcgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4dEVk aXRvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVmYXVsdFRleHRF ZGl0b3IuanMKaW5kZXggNTY3YTk2YjY2Njk5NmYzYWM4OTZmZTgyOGJjYWE3MzcyN2ViZmM2NS4u NjM0NjVhNDI5OWIyMzBhYWIxNzU2NGY5NzQ4YTdiNDM0OTgyYzFiOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4dEVkaXRvci5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlZmF1bHRUZXh0RWRpdG9yLmpz CkBAIC0yMzA2LDk4ICsyMzA2LDQyIEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVs LnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBfdXBkYXRlQ2h1bmtzRm9yUmFuZ2VzOiBmdW5j dGlvbihvbGRSYW5nZSwgbmV3UmFuZ2UpCiAgICAgewotICAgICAgICAvLyBVcGRhdGUgdGhlIGNo dW5rcyBpbiByYW5nZTogZmlyc3RDaHVua051bWJlciA8PSBpbmRleCA8PSBsYXN0Q2h1bmtOdW1i ZXIKLSAgICAgICAgdmFyIGZpcnN0Q2h1bmtOdW1iZXIgPSB0aGlzLl9jaHVua051bWJlckZvckxp bmUob2xkUmFuZ2Uuc3RhcnRMaW5lKTsKLSAgICAgICAgdmFyIGxhc3RDaHVua051bWJlciA9IGZp cnN0Q2h1bmtOdW1iZXI7Ci0gICAgICAgIHdoaWxlIChsYXN0Q2h1bmtOdW1iZXIgKyAxIDwgdGhp cy5fdGV4dENodW5rcy5sZW5ndGgpIHsKLSAgICAgICAgICAgIGlmICh0aGlzLl90ZXh0Q2h1bmtz W2xhc3RDaHVua051bWJlciArIDFdLnN0YXJ0TGluZSA+IG9sZFJhbmdlLmVuZExpbmUpCisgICAg ICAgIHZhciBmaXJzdERhbWFnZWRDaHVua051bWJlciA9IHRoaXMuX2NodW5rTnVtYmVyRm9yTGlu ZShvbGRSYW5nZS5zdGFydExpbmUpOworICAgICAgICB2YXIgbGFzdERhbWFnZWRDaHVua051bWJl ciA9IGZpcnN0RGFtYWdlZENodW5rTnVtYmVyOworICAgICAgICB3aGlsZSAobGFzdERhbWFnZWRD aHVua051bWJlciArIDEgPCB0aGlzLl90ZXh0Q2h1bmtzLmxlbmd0aCkgeworICAgICAgICAgICAg aWYgKHRoaXMuX3RleHRDaHVua3NbbGFzdERhbWFnZWRDaHVua051bWJlciArIDFdLnN0YXJ0TGlu ZSA+IG9sZFJhbmdlLmVuZExpbmUpCiAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAg ICArK2xhc3RDaHVua051bWJlcjsKKyAgICAgICAgICAgICsrbGFzdERhbWFnZWRDaHVua051bWJl cjsKICAgICAgICAgfQogCi0gICAgICAgIHZhciBzdGFydExpbmUgPSB0aGlzLl90ZXh0Q2h1bmtz W2ZpcnN0Q2h1bmtOdW1iZXJdLnN0YXJ0TGluZTsKLSAgICAgICAgdmFyIGxpbmVzQ291bnQgPSB0 aGlzLl90ZXh0Q2h1bmtzW2xhc3RDaHVua051bWJlcl0uc3RhcnRMaW5lICsgdGhpcy5fdGV4dENo dW5rc1tsYXN0Q2h1bmtOdW1iZXJdLmxpbmVzQ291bnQgLSBzdGFydExpbmU7CisgICAgICAgIHZh ciBmaXJzdERhbWFnZWRDaHVuayA9IHRoaXMuX3RleHRDaHVua3NbZmlyc3REYW1hZ2VkQ2h1bmtO dW1iZXJdOworICAgICAgICB2YXIgbGFzdERhbWFnZWRDaHVuayA9IHRoaXMuX3RleHRDaHVua3Nb bGFzdERhbWFnZWRDaHVua051bWJlcl07CisKICAgICAgICAgdmFyIGxpbmVzRGlmZiA9IG5ld1Jh bmdlLmxpbmVzQ291bnQgLSBvbGRSYW5nZS5saW5lc0NvdW50OwotICAgICAgICBsaW5lc0NvdW50 ICs9IGxpbmVzRGlmZjsKIAorICAgICAgICAvLyBGaXJzdCwgZGV0ZWN0IGNodW5rcyB0aGF0IGhh dmUgbm90IGJlZW4gbW9kaWZpZWQgYW5kIHNpbXBseSBzaGlmdCB0aGVtLgogICAgICAgICBpZiAo bGluZXNEaWZmKSB7Ci0gICAgICAgICAgICAvLyBMaW5lcyBzaGlmdGVkLCB1cGRhdGUgdGhlIGxp bmUgbnVtYmVycyBvZiB0aGUgY2h1bmtzIGJlbG93LgotICAgICAgICAgICAgZm9yICh2YXIgY2h1 bmtOdW1iZXIgPSBsYXN0Q2h1bmtOdW1iZXIgKyAxOyBjaHVua051bWJlciA8IHRoaXMuX3RleHRD aHVua3MubGVuZ3RoOyArK2NodW5rTnVtYmVyKQorICAgICAgICAgICAgZm9yICh2YXIgY2h1bmtO dW1iZXIgPSBsYXN0RGFtYWdlZENodW5rTnVtYmVyICsgMTsgY2h1bmtOdW1iZXIgPCB0aGlzLl90 ZXh0Q2h1bmtzLmxlbmd0aDsgKytjaHVua051bWJlcikKICAgICAgICAgICAgICAgICB0aGlzLl90 ZXh0Q2h1bmtzW2NodW5rTnVtYmVyXS5zdGFydExpbmUgKz0gbGluZXNEaWZmOwogICAgICAgICB9 CiAKLSAgICAgICAgdmFyIGZpcnN0TGluZVJvdzsKLSAgICAgICAgaWYgKGZpcnN0Q2h1bmtOdW1i ZXIpIHsKLSAgICAgICAgICAgIHZhciBjaHVuayA9IHRoaXMuX3RleHRDaHVua3NbZmlyc3RDaHVu a051bWJlciAtIDFdOwotICAgICAgICAgICAgZmlyc3RMaW5lUm93ID0gY2h1bmsuZXhwYW5kZWQg PyBjaHVuay5leHBhbmRlZExpbmVSb3coY2h1bmsuc3RhcnRMaW5lICsgY2h1bmsubGluZXNDb3Vu dCAtIDEpIDogY2h1bmsuZWxlbWVudDsKLSAgICAgICAgICAgIGZpcnN0TGluZVJvdyA9IGZpcnN0 TGluZVJvdy5uZXh0U2libGluZzsKLSAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICBmaXJzdExp bmVSb3cgPSB0aGlzLl9jb250YWluZXIuZmlyc3RDaGlsZDsKLQotICAgICAgICAvLyBNb3N0IGZy ZXF1ZW50IGNhc2U6IGEgY2h1bmsgcmVtYWluZWQgdGhlIHNhbWUuCi0gICAgICAgIGZvciAodmFy IGNodW5rTnVtYmVyID0gZmlyc3RDaHVua051bWJlcjsgY2h1bmtOdW1iZXIgPD0gbGFzdENodW5r TnVtYmVyOyArK2NodW5rTnVtYmVyKSB7Ci0gICAgICAgICAgICB2YXIgY2h1bmsgPSB0aGlzLl90 ZXh0Q2h1bmtzW2NodW5rTnVtYmVyXTsKLSAgICAgICAgICAgIGlmIChjaHVuay5zdGFydExpbmUg KyBjaHVuay5saW5lc0NvdW50ID4gdGhpcy5fdGV4dE1vZGVsLmxpbmVzQ291bnQpCi0gICAgICAg ICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB2YXIgbGluZU51bWJlciA9IGNodW5rLnN0YXJ0 TGluZTsKLSAgICAgICAgICAgIGZvciAodmFyIGxpbmVSb3cgPSBmaXJzdExpbmVSb3c7IGxpbmVS b3cgJiYgbGluZU51bWJlciA8IGNodW5rLnN0YXJ0TGluZSArIGNodW5rLmxpbmVzQ291bnQ7IGxp bmVSb3cgPSBsaW5lUm93Lm5leHRTaWJsaW5nKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGxpbmVS b3cubGluZU51bWJlciAhPT0gbGluZU51bWJlciB8fCBsaW5lUm93ICE9PSBjaHVuay5leHBhbmRl ZExpbmVSb3cobGluZU51bWJlcikgfHwgbGluZVJvdy50ZXh0Q29udGVudCAhPT0gdGhpcy5fdGV4 dE1vZGVsLmxpbmUobGluZU51bWJlcikgfHwgIWxpbmVSb3cuZmlyc3RDaGlsZCkKLSAgICAgICAg ICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgKytsaW5lTnVtYmVyOwotICAgICAg ICAgICAgfQotICAgICAgICAgICAgaWYgKGxpbmVOdW1iZXIgPCBjaHVuay5zdGFydExpbmUgKyBj aHVuay5saW5lc0NvdW50KQotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2h1 bmsudXBkYXRlQ29sbGFwc2VkTGluZVJvdygpOwotICAgICAgICAgICAgKytmaXJzdENodW5rTnVt YmVyOwotICAgICAgICAgICAgZmlyc3RMaW5lUm93ID0gbGluZVJvdzsKLSAgICAgICAgICAgIHN0 YXJ0TGluZSArPSBjaHVuay5saW5lc0NvdW50OwotICAgICAgICAgICAgbGluZXNDb3VudCAtPSBj aHVuay5saW5lc0NvdW50OwotICAgICAgICB9Ci0KLSAgICAgICAgaWYgKGZpcnN0Q2h1bmtOdW1i ZXIgPiBsYXN0Q2h1bmtOdW1iZXIgJiYgbGluZXNDb3VudCA9PT0gMCkKLSAgICAgICAgICAgIHJl dHVybjsKLQotICAgICAgICAvLyBNYXliZSBtZXJnZSB3aXRoIHRoZSBuZXh0IGNodW5rLCBzbyB0 aGF0IHdlIHNob3VsZCBub3QgY3JlYXRlIDEtc2l6ZWQgY2h1bmtzIHdoZW4gYXBwZW5kaW5nIG5l dyBsaW5lcyBvbmUgYnkgb25lLgotICAgICAgICB2YXIgY2h1bmsgPSB0aGlzLl90ZXh0Q2h1bmtz W2xhc3RDaHVua051bWJlciArIDFdOwotICAgICAgICB2YXIgbGluZXNJbkxhc3RDaHVuayA9IGxp bmVzQ291bnQgJSB0aGlzLl9kZWZhdWx0Q2h1bmtTaXplOwotICAgICAgICBpZiAoY2h1bmsgJiYg IWNodW5rLmlzRGVjb3JhdGVkKCkgJiYgbGluZXNJbkxhc3RDaHVuayA+IDAgJiYgbGluZXNJbkxh c3RDaHVuayArIGNodW5rLmxpbmVzQ291bnQgPD0gdGhpcy5fZGVmYXVsdENodW5rU2l6ZSkgewot ICAgICAgICAgICAgKytsYXN0Q2h1bmtOdW1iZXI7Ci0gICAgICAgICAgICBsaW5lc0NvdW50ICs9 IGNodW5rLmxpbmVzQ291bnQ7Ci0gICAgICAgIH0KLQotICAgICAgICB2YXIgc2Nyb2xsVG9wID0g dGhpcy5lbGVtZW50LnNjcm9sbFRvcDsKLSAgICAgICAgdmFyIHNjcm9sbExlZnQgPSB0aGlzLmVs ZW1lbnQuc2Nyb2xsTGVmdDsKLQotICAgICAgICAvLyBEZWxldGUgYWxsIERPTSBlbGVtZW50cyB0 aGF0IHdlcmUgZWl0aGVyIGNvbnRyb2xsZWQgYnkgdGhlIG9sZCBjaHVua3MsIG9yIGhhdmUganVz dCBiZWVuIGluc2VydGVkLgotICAgICAgICB2YXIgZmlyc3RVbm1vZGlmaWVkTGluZVJvdyA9IG51 bGw7Ci0gICAgICAgIGNodW5rID0gdGhpcy5fdGV4dENodW5rc1tsYXN0Q2h1bmtOdW1iZXIgKyAx XTsKLSAgICAgICAgaWYgKGNodW5rKQotICAgICAgICAgICAgZmlyc3RVbm1vZGlmaWVkTGluZVJv dyA9IGNodW5rLmV4cGFuZGVkID8gY2h1bmsuZXhwYW5kZWRMaW5lUm93KGNodW5rLnN0YXJ0TGlu ZSkgOiBjaHVuay5lbGVtZW50OwotCi0gICAgICAgIHdoaWxlIChmaXJzdExpbmVSb3cgJiYgZmly c3RMaW5lUm93ICE9PSBmaXJzdFVubW9kaWZpZWRMaW5lUm93KSB7Ci0gICAgICAgICAgICB2YXIg bGluZVJvdyA9IGZpcnN0TGluZVJvdzsKLSAgICAgICAgICAgIGZpcnN0TGluZVJvdyA9IGZpcnN0 TGluZVJvdy5uZXh0U2libGluZzsKLSAgICAgICAgICAgIHRoaXMuX2NvbnRhaW5lci5yZW1vdmVD aGlsZChsaW5lUm93KTsKLSAgICAgICAgfQotCi0gICAgICAgIC8vIFJlcGxhY2Ugb2xkIGNodW5r cyB3aXRoIHRoZSBuZXcgb25lcy4KLSAgICAgICAgZm9yICh2YXIgY2h1bmtOdW1iZXIgPSBmaXJz dENodW5rTnVtYmVyOyBsaW5lc0NvdW50ID4gMDsgKytjaHVua051bWJlcikgewotICAgICAgICAg ICAgdmFyIGNodW5rTGluZXNDb3VudCA9IE1hdGgubWluKHRoaXMuX2RlZmF1bHRDaHVua1NpemUs IGxpbmVzQ291bnQpOwotICAgICAgICAgICAgdmFyIG5ld0NodW5rID0gdGhpcy5fY3JlYXRlTmV3 Q2h1bmsoc3RhcnRMaW5lLCBzdGFydExpbmUgKyBjaHVua0xpbmVzQ291bnQpOwotICAgICAgICAg ICAgdGhpcy5fY29udGFpbmVyLmluc2VydEJlZm9yZShuZXdDaHVuay5lbGVtZW50LCBmaXJzdFVu bW9kaWZpZWRMaW5lUm93KTsKKyAgICAgICAgLy8gQ29tcHV0ZSBkYW1hZ2VkIGNodW5rcyBzcGFu CisgICAgICAgIHZhciBzdGFydExpbmUgPSBmaXJzdERhbWFnZWRDaHVuay5zdGFydExpbmU7Cisg ICAgICAgIHZhciBlbmRMaW5lID0gbGFzdERhbWFnZWRDaHVuay5lbmRMaW5lICsgbGluZXNEaWZm OwogCi0gICAgICAgICAgICBpZiAoY2h1bmtOdW1iZXIgPD0gbGFzdENodW5rTnVtYmVyKQotICAg ICAgICAgICAgICAgIHRoaXMuX3RleHRDaHVua3NbY2h1bmtOdW1iZXJdID0gbmV3Q2h1bms7Ci0g ICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgdGhpcy5fdGV4dENodW5rcy5zcGxpY2Uo Y2h1bmtOdW1iZXIsIDAsIG5ld0NodW5rKTsKLSAgICAgICAgICAgIHN0YXJ0TGluZSArPSBjaHVu a0xpbmVzQ291bnQ7Ci0gICAgICAgICAgICBsaW5lc0NvdW50IC09IGNodW5rTGluZXNDb3VudDsK KyAgICAgICAgLy8gUmUtY3JlYXRlIGNodW5rcyBmb3IgZGFtYWdlZCBhcmVhLgorICAgICAgICB2 YXIgaW5zZXJ0ZWRDaHVua3MgPSBbXTsKKyAgICAgICAgdmFyIGluc2VydGlvbkluZGV4ID0gbGFz dERhbWFnZWRDaHVua051bWJlciArIDE7CisgICAgICAgIGZvciAodmFyIGkgPSBzdGFydExpbmU7 IGkgPCBlbmRMaW5lOyBpICs9IHRoaXMuX2RlZmF1bHRDaHVua1NpemUpIHsKKyAgICAgICAgICAg IHZhciBjaHVuayA9IHRoaXMuX2NyZWF0ZU5ld0NodW5rKGksIE1hdGgubWluKGVuZExpbmUsIGkg KyB0aGlzLl9kZWZhdWx0Q2h1bmtTaXplKSk7CisgICAgICAgICAgICB0aGlzLl90ZXh0Q2h1bmtz LnNwbGljZShpbnNlcnRpb25JbmRleCsrLCAwLCBjaHVuayk7CisgICAgICAgICAgICB0aGlzLl9j b250YWluZXIuaW5zZXJ0QmVmb3JlKGNodW5rLmVsZW1lbnQsIGZpcnN0RGFtYWdlZENodW5rLmFu Y2hvckVsZW1lbnQoKSk7CiAgICAgICAgIH0KLSAgICAgICAgaWYgKGNodW5rTnVtYmVyIDw9IGxh c3RDaHVua051bWJlcikKLSAgICAgICAgICAgIHRoaXMuX3RleHRDaHVua3Muc3BsaWNlKGNodW5r TnVtYmVyLCBsYXN0Q2h1bmtOdW1iZXIgLSBjaHVua051bWJlciArIDEpOwogCi0gICAgICAgIHRo aXMuZWxlbWVudC5zY3JvbGxUb3AgPSBzY3JvbGxUb3A7Ci0gICAgICAgIHRoaXMuZWxlbWVudC5z Y3JvbGxMZWZ0ID0gc2Nyb2xsTGVmdDsKKyAgICAgICAgLy8gUmVtb3ZlIGRhbWFnZWQgY2h1bmtz IGZyb20gRE9NIGFuZCB0aGUgY2h1bmtzIGxpc3QuCisgICAgICAgIHZhciByZW1vdmVkQ2h1bmtz ID0gdGhpcy5fdGV4dENodW5rcy5zcGxpY2UoZmlyc3REYW1hZ2VkQ2h1bmtOdW1iZXIsIGxhc3RE YW1hZ2VkQ2h1bmtOdW1iZXIgLSBmaXJzdERhbWFnZWRDaHVua051bWJlciArIDEpOworICAgICAg ICBmb3IgKHZhciBpID0gMDsgaSA8IHJlbW92ZWRDaHVua3MubGVuZ3RoOyArK2kpCisgICAgICAg ICAgICByZW1vdmVkQ2h1bmtzW2ldLmRldGFjaEZyb21ET00oKTsKICAgICB9LAogCiAgICAgLyoq CkBAIC0yNjg1LDEzICsyNjI5LDMwIEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpbkNodW5r LnByb3RvdHlwZSA9IHsKICAgICAgICAgZm9yICh2YXIgaSA9IHRoaXMuc3RhcnRMaW5lOyBpIDwg dGhpcy5zdGFydExpbmUgKyB0aGlzLmxpbmVzQ291bnQ7ICsraSkKICAgICAgICAgICAgIGxpbmVz LnB1c2godGhpcy5fdGV4dE1vZGVsLmxpbmUoaSkpOwogCisgICAgICAgIGlmIChXZWJJbnNwZWN0 b3IuZGVidWdEZWZhdWx0VGV4dEVkaXRvcikKKyAgICAgICAgICAgIGNvbnNvbGUubG9nKCJSZWJ1 aWxkaW5nIGNodW5rIHdpdGggIiArIGxpbmVzLmxlbmd0aCArICIgbGluZXMiKTsKKwogICAgICAg ICB0aGlzLmVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKICAgICAgICAgdGhpcy5lbGVtZW50LnRl eHRDb250ZW50ID0gbGluZXMuam9pbigiXG4iKTsKLQogICAgICAgICAvLyBUaGUgbGFzdCBlbXB0 eSBsaW5lIHdpbGwgZ2V0IHN3YWxsb3dlZCBvdGhlcndpc2UuCiAgICAgICAgIGlmICghbGluZXNb bGluZXMubGVuZ3RoIC0gMV0pCiAgICAgICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQo ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnIiKSk7CisgICAgfSwKKworICAgIGRldGFjaEZyb21E T006IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLl9leHBhbmRlZExpbmVSb3dz KSB7CisgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX2V4cGFuZGVkTGluZVJv d3MubGVuZ3RoOyArK2kpCisgICAgICAgICAgICAgICAgdGhpcy5fZXhwYW5kZWRMaW5lUm93c1tp XS5yZW1vdmUoKTsKKyAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9leHBhbmRlZExpbmVSb3dzOwor ICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIHRoaXMuZWxlbWVudC5yZW1vdmUoKTsKKyAgICB9 LAorCisgICAgYW5jaG9yRWxlbWVudDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJu IHRoaXMuX2V4cGFuZGVkTGluZVJvd3MgPyB0aGlzLl9leHBhbmRlZExpbmVSb3dzWzBdIDogdGhp cy5lbGVtZW50OwogICAgIH0KIH0KIAotV2ViSW5zcGVjdG9yLmRlYnVnRGVmYXVsdFRleHRFZGl0 b3IgPSBmYWxzZTsKK1dlYkluc3BlY3Rvci5kZWJ1Z0RlZmF1bHRUZXh0RWRpdG9yID0gdHJ1ZTsK 175440 2012-11-21 07:29:08 -0800 2012-11-21 21:36:24 -0800 Patch bug-102927-20121121192654.patch text/plain 8957 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1Mjg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTA5YmRmOTkxYTY3YzJk Yzc5NGJjOTUyM2IzNmU1N2ZhZTc5YTZmYi4uN2QzNGMwYjQ4ZjQ3NmEyMDBkNDg5YjVkNDg4MmNi N2U0ZTJmZTUxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTExLTIxICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHNpbXBsaWZ5IHRoZSBfdXBkYXRlQ2h1bmtzRm9yUmFuZ2VzIHJvdXRpbmUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjkyNworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9EZWZhdWx0VGV4dEVkaXRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRp dG9yTWFpblBhbmVsLnByb3RvdHlwZS5fdXBkYXRlQ2h1bmtzRm9yUmFuZ2VzKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpbkNodW5rLnByb3RvdHlwZS51cGRhdGVDb2xsYXBz ZWRMaW5lUm93KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpbkNodW5rLnBy b3RvdHlwZS5kZXRhY2hGcm9tRE9NKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9y TWFpbkNodW5rLnByb3RvdHlwZS5hbmNob3JFbGVtZW50KToKKwogMjAxMi0xMS0xOSAgUGF2ZWwg RmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9y OiBzaW1wbGlmeT8gZGFtYWdlZCByZWdpb24gY29tcHV0YXRpb24gaW4gdGhlIGVkaXRvcgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4dEVk aXRvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVmYXVsdFRleHRF ZGl0b3IuanMKaW5kZXggNTY3YTk2YjY2Njk5NmYzYWM4OTZmZTgyOGJjYWE3MzcyN2ViZmM2NS4u ODMyOTRmY2ViOTgyZTdiN2U3OTk1MmM3ZmVmOGQzNDY2YWE4NWU5MyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4dEVkaXRvci5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlZmF1bHRUZXh0RWRpdG9yLmpz CkBAIC0yMzA2LDk4ICsyMzA2LDQ3IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVs LnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBfdXBkYXRlQ2h1bmtzRm9yUmFuZ2VzOiBmdW5j dGlvbihvbGRSYW5nZSwgbmV3UmFuZ2UpCiAgICAgewotICAgICAgICAvLyBVcGRhdGUgdGhlIGNo dW5rcyBpbiByYW5nZTogZmlyc3RDaHVua051bWJlciA8PSBpbmRleCA8PSBsYXN0Q2h1bmtOdW1i ZXIKLSAgICAgICAgdmFyIGZpcnN0Q2h1bmtOdW1iZXIgPSB0aGlzLl9jaHVua051bWJlckZvckxp bmUob2xkUmFuZ2Uuc3RhcnRMaW5lKTsKLSAgICAgICAgdmFyIGxhc3RDaHVua051bWJlciA9IGZp cnN0Q2h1bmtOdW1iZXI7Ci0gICAgICAgIHdoaWxlIChsYXN0Q2h1bmtOdW1iZXIgKyAxIDwgdGhp cy5fdGV4dENodW5rcy5sZW5ndGgpIHsKLSAgICAgICAgICAgIGlmICh0aGlzLl90ZXh0Q2h1bmtz W2xhc3RDaHVua051bWJlciArIDFdLnN0YXJ0TGluZSA+IG9sZFJhbmdlLmVuZExpbmUpCisgICAg ICAgIHZhciBmaXJzdERhbWFnZWRDaHVua051bWJlciA9IHRoaXMuX2NodW5rTnVtYmVyRm9yTGlu ZShvbGRSYW5nZS5zdGFydExpbmUpOworICAgICAgICB2YXIgbGFzdERhbWFnZWRDaHVua051bWJl ciA9IGZpcnN0RGFtYWdlZENodW5rTnVtYmVyOworICAgICAgICB3aGlsZSAobGFzdERhbWFnZWRD aHVua051bWJlciArIDEgPCB0aGlzLl90ZXh0Q2h1bmtzLmxlbmd0aCkgeworICAgICAgICAgICAg aWYgKHRoaXMuX3RleHRDaHVua3NbbGFzdERhbWFnZWRDaHVua051bWJlciArIDFdLnN0YXJ0TGlu ZSA+IG9sZFJhbmdlLmVuZExpbmUpCiAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAg ICArK2xhc3RDaHVua051bWJlcjsKKyAgICAgICAgICAgICsrbGFzdERhbWFnZWRDaHVua051bWJl cjsKICAgICAgICAgfQogCi0gICAgICAgIHZhciBzdGFydExpbmUgPSB0aGlzLl90ZXh0Q2h1bmtz W2ZpcnN0Q2h1bmtOdW1iZXJdLnN0YXJ0TGluZTsKLSAgICAgICAgdmFyIGxpbmVzQ291bnQgPSB0 aGlzLl90ZXh0Q2h1bmtzW2xhc3RDaHVua051bWJlcl0uc3RhcnRMaW5lICsgdGhpcy5fdGV4dENo dW5rc1tsYXN0Q2h1bmtOdW1iZXJdLmxpbmVzQ291bnQgLSBzdGFydExpbmU7CisgICAgICAgIHZh ciBmaXJzdERhbWFnZWRDaHVuayA9IHRoaXMuX3RleHRDaHVua3NbZmlyc3REYW1hZ2VkQ2h1bmtO dW1iZXJdOworICAgICAgICB2YXIgbGFzdERhbWFnZWRDaHVuayA9IHRoaXMuX3RleHRDaHVua3Nb bGFzdERhbWFnZWRDaHVua051bWJlcl07CisKICAgICAgICAgdmFyIGxpbmVzRGlmZiA9IG5ld1Jh bmdlLmxpbmVzQ291bnQgLSBvbGRSYW5nZS5saW5lc0NvdW50OwotICAgICAgICBsaW5lc0NvdW50 ICs9IGxpbmVzRGlmZjsKIAorICAgICAgICAvLyBGaXJzdCwgZGV0ZWN0IGNodW5rcyB0aGF0IGhh dmUgbm90IGJlZW4gbW9kaWZpZWQgYW5kIHNpbXBseSBzaGlmdCB0aGVtLgogICAgICAgICBpZiAo bGluZXNEaWZmKSB7Ci0gICAgICAgICAgICAvLyBMaW5lcyBzaGlmdGVkLCB1cGRhdGUgdGhlIGxp bmUgbnVtYmVycyBvZiB0aGUgY2h1bmtzIGJlbG93LgotICAgICAgICAgICAgZm9yICh2YXIgY2h1 bmtOdW1iZXIgPSBsYXN0Q2h1bmtOdW1iZXIgKyAxOyBjaHVua051bWJlciA8IHRoaXMuX3RleHRD aHVua3MubGVuZ3RoOyArK2NodW5rTnVtYmVyKQorICAgICAgICAgICAgZm9yICh2YXIgY2h1bmtO dW1iZXIgPSBsYXN0RGFtYWdlZENodW5rTnVtYmVyICsgMTsgY2h1bmtOdW1iZXIgPCB0aGlzLl90 ZXh0Q2h1bmtzLmxlbmd0aDsgKytjaHVua051bWJlcikKICAgICAgICAgICAgICAgICB0aGlzLl90 ZXh0Q2h1bmtzW2NodW5rTnVtYmVyXS5zdGFydExpbmUgKz0gbGluZXNEaWZmOwogICAgICAgICB9 CiAKLSAgICAgICAgdmFyIGZpcnN0TGluZVJvdzsKLSAgICAgICAgaWYgKGZpcnN0Q2h1bmtOdW1i ZXIpIHsKLSAgICAgICAgICAgIHZhciBjaHVuayA9IHRoaXMuX3RleHRDaHVua3NbZmlyc3RDaHVu a051bWJlciAtIDFdOwotICAgICAgICAgICAgZmlyc3RMaW5lUm93ID0gY2h1bmsuZXhwYW5kZWQg PyBjaHVuay5leHBhbmRlZExpbmVSb3coY2h1bmsuc3RhcnRMaW5lICsgY2h1bmsubGluZXNDb3Vu dCAtIDEpIDogY2h1bmsuZWxlbWVudDsKLSAgICAgICAgICAgIGZpcnN0TGluZVJvdyA9IGZpcnN0 TGluZVJvdy5uZXh0U2libGluZzsKLSAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICBmaXJzdExp bmVSb3cgPSB0aGlzLl9jb250YWluZXIuZmlyc3RDaGlsZDsKLQotICAgICAgICAvLyBNb3N0IGZy ZXF1ZW50IGNhc2U6IGEgY2h1bmsgcmVtYWluZWQgdGhlIHNhbWUuCi0gICAgICAgIGZvciAodmFy IGNodW5rTnVtYmVyID0gZmlyc3RDaHVua051bWJlcjsgY2h1bmtOdW1iZXIgPD0gbGFzdENodW5r TnVtYmVyOyArK2NodW5rTnVtYmVyKSB7Ci0gICAgICAgICAgICB2YXIgY2h1bmsgPSB0aGlzLl90 ZXh0Q2h1bmtzW2NodW5rTnVtYmVyXTsKLSAgICAgICAgICAgIGlmIChjaHVuay5zdGFydExpbmUg KyBjaHVuay5saW5lc0NvdW50ID4gdGhpcy5fdGV4dE1vZGVsLmxpbmVzQ291bnQpCi0gICAgICAg ICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB2YXIgbGluZU51bWJlciA9IGNodW5rLnN0YXJ0 TGluZTsKLSAgICAgICAgICAgIGZvciAodmFyIGxpbmVSb3cgPSBmaXJzdExpbmVSb3c7IGxpbmVS b3cgJiYgbGluZU51bWJlciA8IGNodW5rLnN0YXJ0TGluZSArIGNodW5rLmxpbmVzQ291bnQ7IGxp bmVSb3cgPSBsaW5lUm93Lm5leHRTaWJsaW5nKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGxpbmVS b3cubGluZU51bWJlciAhPT0gbGluZU51bWJlciB8fCBsaW5lUm93ICE9PSBjaHVuay5leHBhbmRl ZExpbmVSb3cobGluZU51bWJlcikgfHwgbGluZVJvdy50ZXh0Q29udGVudCAhPT0gdGhpcy5fdGV4 dE1vZGVsLmxpbmUobGluZU51bWJlcikgfHwgIWxpbmVSb3cuZmlyc3RDaGlsZCkKLSAgICAgICAg ICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgKytsaW5lTnVtYmVyOwotICAgICAg ICAgICAgfQotICAgICAgICAgICAgaWYgKGxpbmVOdW1iZXIgPCBjaHVuay5zdGFydExpbmUgKyBj aHVuay5saW5lc0NvdW50KQotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2h1 bmsudXBkYXRlQ29sbGFwc2VkTGluZVJvdygpOwotICAgICAgICAgICAgKytmaXJzdENodW5rTnVt YmVyOwotICAgICAgICAgICAgZmlyc3RMaW5lUm93ID0gbGluZVJvdzsKLSAgICAgICAgICAgIHN0 YXJ0TGluZSArPSBjaHVuay5saW5lc0NvdW50OwotICAgICAgICAgICAgbGluZXNDb3VudCAtPSBj aHVuay5saW5lc0NvdW50OwotICAgICAgICB9Ci0KLSAgICAgICAgaWYgKGZpcnN0Q2h1bmtOdW1i ZXIgPiBsYXN0Q2h1bmtOdW1iZXIgJiYgbGluZXNDb3VudCA9PT0gMCkKLSAgICAgICAgICAgIHJl dHVybjsKLQotICAgICAgICAvLyBNYXliZSBtZXJnZSB3aXRoIHRoZSBuZXh0IGNodW5rLCBzbyB0 aGF0IHdlIHNob3VsZCBub3QgY3JlYXRlIDEtc2l6ZWQgY2h1bmtzIHdoZW4gYXBwZW5kaW5nIG5l dyBsaW5lcyBvbmUgYnkgb25lLgotICAgICAgICB2YXIgY2h1bmsgPSB0aGlzLl90ZXh0Q2h1bmtz W2xhc3RDaHVua051bWJlciArIDFdOwotICAgICAgICB2YXIgbGluZXNJbkxhc3RDaHVuayA9IGxp bmVzQ291bnQgJSB0aGlzLl9kZWZhdWx0Q2h1bmtTaXplOwotICAgICAgICBpZiAoY2h1bmsgJiYg IWNodW5rLmlzRGVjb3JhdGVkKCkgJiYgbGluZXNJbkxhc3RDaHVuayA+IDAgJiYgbGluZXNJbkxh c3RDaHVuayArIGNodW5rLmxpbmVzQ291bnQgPD0gdGhpcy5fZGVmYXVsdENodW5rU2l6ZSkgewot ICAgICAgICAgICAgKytsYXN0Q2h1bmtOdW1iZXI7Ci0gICAgICAgICAgICBsaW5lc0NvdW50ICs9 IGNodW5rLmxpbmVzQ291bnQ7Ci0gICAgICAgIH0KKyAgICAgICAgLy8gQ29tcHV0ZSBkYW1hZ2Vk IGNodW5rcyBzcGFuCisgICAgICAgIHZhciBzdGFydExpbmUgPSBmaXJzdERhbWFnZWRDaHVuay5z dGFydExpbmU7CisgICAgICAgIHZhciBlbmRMaW5lID0gbGFzdERhbWFnZWRDaHVuay5lbmRMaW5l ICsgbGluZXNEaWZmOwogCi0gICAgICAgIHZhciBzY3JvbGxUb3AgPSB0aGlzLmVsZW1lbnQuc2Ny b2xsVG9wOwotICAgICAgICB2YXIgc2Nyb2xsTGVmdCA9IHRoaXMuZWxlbWVudC5zY3JvbGxMZWZ0 OworICAgICAgICAvLyBSZS1jcmVhdGUgY2h1bmtzIGZvciBkYW1hZ2VkIGFyZWEuCisgICAgICAg IHZhciBpbnNlcnRlZENodW5rcyA9IFtdOworICAgICAgICB2YXIgaW5zZXJ0aW9uSW5kZXggPSBs YXN0RGFtYWdlZENodW5rTnVtYmVyICsgMTsKIAotICAgICAgICAvLyBEZWxldGUgYWxsIERPTSBl bGVtZW50cyB0aGF0IHdlcmUgZWl0aGVyIGNvbnRyb2xsZWQgYnkgdGhlIG9sZCBjaHVua3MsIG9y IGhhdmUganVzdCBiZWVuIGluc2VydGVkLgotICAgICAgICB2YXIgZmlyc3RVbm1vZGlmaWVkTGlu ZVJvdyA9IG51bGw7Ci0gICAgICAgIGNodW5rID0gdGhpcy5fdGV4dENodW5rc1tsYXN0Q2h1bmtO dW1iZXIgKyAxXTsKLSAgICAgICAgaWYgKGNodW5rKQotICAgICAgICAgICAgZmlyc3RVbm1vZGlm aWVkTGluZVJvdyA9IGNodW5rLmV4cGFuZGVkID8gY2h1bmsuZXhwYW5kZWRMaW5lUm93KGNodW5r LnN0YXJ0TGluZSkgOiBjaHVuay5lbGVtZW50OworICAgICAgICB2YXIgbGluZVNwYW4gPSBlbmRM aW5lIC0gc3RhcnRMaW5lOworICAgICAgICB2YXIgY2h1bmtTaXplID0gTWF0aC5jZWlsKGxpbmVT cGFuIC8gTWF0aC5jZWlsKGxpbmVTcGFuIC8gdGhpcy5fZGVmYXVsdENodW5rU2l6ZSkpOwogCi0g ICAgICAgIHdoaWxlIChmaXJzdExpbmVSb3cgJiYgZmlyc3RMaW5lUm93ICE9PSBmaXJzdFVubW9k aWZpZWRMaW5lUm93KSB7Ci0gICAgICAgICAgICB2YXIgbGluZVJvdyA9IGZpcnN0TGluZVJvdzsK LSAgICAgICAgICAgIGZpcnN0TGluZVJvdyA9IGZpcnN0TGluZVJvdy5uZXh0U2libGluZzsKLSAg ICAgICAgICAgIHRoaXMuX2NvbnRhaW5lci5yZW1vdmVDaGlsZChsaW5lUm93KTsKKyAgICAgICAg Zm9yICh2YXIgaSA9IHN0YXJ0TGluZTsgaSA8IGVuZExpbmU7IGkgKz0gY2h1bmtTaXplKSB7Cisg ICAgICAgICAgICB2YXIgY2h1bmsgPSB0aGlzLl9jcmVhdGVOZXdDaHVuayhpLCBNYXRoLm1pbihl bmRMaW5lLCBpICsgY2h1bmtTaXplKSk7CisgICAgICAgICAgICB0aGlzLl90ZXh0Q2h1bmtzLnNw bGljZShpbnNlcnRpb25JbmRleCsrLCAwLCBjaHVuayk7CisgICAgICAgICAgICB0aGlzLl9jb250 YWluZXIuaW5zZXJ0QmVmb3JlKGNodW5rLmVsZW1lbnQsIGZpcnN0RGFtYWdlZENodW5rLmFuY2hv ckVsZW1lbnQoKSk7CiAgICAgICAgIH0KIAotICAgICAgICAvLyBSZXBsYWNlIG9sZCBjaHVua3Mg d2l0aCB0aGUgbmV3IG9uZXMuCi0gICAgICAgIGZvciAodmFyIGNodW5rTnVtYmVyID0gZmlyc3RD aHVua051bWJlcjsgbGluZXNDb3VudCA+IDA7ICsrY2h1bmtOdW1iZXIpIHsKLSAgICAgICAgICAg IHZhciBjaHVua0xpbmVzQ291bnQgPSBNYXRoLm1pbih0aGlzLl9kZWZhdWx0Q2h1bmtTaXplLCBs aW5lc0NvdW50KTsKLSAgICAgICAgICAgIHZhciBuZXdDaHVuayA9IHRoaXMuX2NyZWF0ZU5ld0No dW5rKHN0YXJ0TGluZSwgc3RhcnRMaW5lICsgY2h1bmtMaW5lc0NvdW50KTsKLSAgICAgICAgICAg IHRoaXMuX2NvbnRhaW5lci5pbnNlcnRCZWZvcmUobmV3Q2h1bmsuZWxlbWVudCwgZmlyc3RVbm1v ZGlmaWVkTGluZVJvdyk7Ci0KLSAgICAgICAgICAgIGlmIChjaHVua051bWJlciA8PSBsYXN0Q2h1 bmtOdW1iZXIpCi0gICAgICAgICAgICAgICAgdGhpcy5fdGV4dENodW5rc1tjaHVua051bWJlcl0g PSBuZXdDaHVuazsKLSAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICB0aGlzLl90ZXh0 Q2h1bmtzLnNwbGljZShjaHVua051bWJlciwgMCwgbmV3Q2h1bmspOwotICAgICAgICAgICAgc3Rh cnRMaW5lICs9IGNodW5rTGluZXNDb3VudDsKLSAgICAgICAgICAgIGxpbmVzQ291bnQgLT0gY2h1 bmtMaW5lc0NvdW50OwotICAgICAgICB9Ci0gICAgICAgIGlmIChjaHVua051bWJlciA8PSBsYXN0 Q2h1bmtOdW1iZXIpCi0gICAgICAgICAgICB0aGlzLl90ZXh0Q2h1bmtzLnNwbGljZShjaHVua051 bWJlciwgbGFzdENodW5rTnVtYmVyIC0gY2h1bmtOdW1iZXIgKyAxKTsKLQotICAgICAgICB0aGlz LmVsZW1lbnQuc2Nyb2xsVG9wID0gc2Nyb2xsVG9wOwotICAgICAgICB0aGlzLmVsZW1lbnQuc2Ny b2xsTGVmdCA9IHNjcm9sbExlZnQ7CisgICAgICAgIC8vIFJlbW92ZSBkYW1hZ2VkIGNodW5rcyBm cm9tIERPTSBhbmQgdGhlIGNodW5rcyBsaXN0LgorICAgICAgICB2YXIgcmVtb3ZlZENodW5rcyA9 IHRoaXMuX3RleHRDaHVua3Muc3BsaWNlKGZpcnN0RGFtYWdlZENodW5rTnVtYmVyLCBsYXN0RGFt YWdlZENodW5rTnVtYmVyIC0gZmlyc3REYW1hZ2VkQ2h1bmtOdW1iZXIgKyAxKTsKKyAgICAgICAg Zm9yICh2YXIgaSA9IDA7IGkgPCByZW1vdmVkQ2h1bmtzLmxlbmd0aDsgKytpKQorICAgICAgICAg ICAgcmVtb3ZlZENodW5rc1tpXS5kZXRhY2hGcm9tRE9NKCk7CisgICAgICAgIHRoaXMuX2Fzc2Vy dERPTU1hdGNoZXNUZXh0TW9kZWwoKTsKICAgICB9LAogCiAgICAgLyoqCkBAIC0yNjg1LDEyICsy NjM0LDI5IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpbkNodW5rLnByb3RvdHlwZSA9IHsK ICAgICAgICAgZm9yICh2YXIgaSA9IHRoaXMuc3RhcnRMaW5lOyBpIDwgdGhpcy5zdGFydExpbmUg KyB0aGlzLmxpbmVzQ291bnQ7ICsraSkKICAgICAgICAgICAgIGxpbmVzLnB1c2godGhpcy5fdGV4 dE1vZGVsLmxpbmUoaSkpOwogCisgICAgICAgIGlmIChXZWJJbnNwZWN0b3IuZGVidWdEZWZhdWx0 VGV4dEVkaXRvcikKKyAgICAgICAgICAgIGNvbnNvbGUubG9nKCJSZWJ1aWxkaW5nIGNodW5rIHdp dGggIiArIGxpbmVzLmxlbmd0aCArICIgbGluZXMiKTsKKwogICAgICAgICB0aGlzLmVsZW1lbnQu cmVtb3ZlQ2hpbGRyZW4oKTsKICAgICAgICAgdGhpcy5lbGVtZW50LnRleHRDb250ZW50ID0gbGlu ZXMuam9pbigiXG4iKTsKLQogICAgICAgICAvLyBUaGUgbGFzdCBlbXB0eSBsaW5lIHdpbGwgZ2V0 IHN3YWxsb3dlZCBvdGhlcndpc2UuCiAgICAgICAgIGlmICghbGluZXNbbGluZXMubGVuZ3RoIC0g MV0pCiAgICAgICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgiYnIiKSk7CisgICAgfSwKKworICAgIGRldGFjaEZyb21ET006IGZ1bmN0aW9uKCkK KyAgICB7CisgICAgICAgIGlmICh0aGlzLl9leHBhbmRlZExpbmVSb3dzKSB7CisgICAgICAgICAg ICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX2V4cGFuZGVkTGluZVJvd3MubGVuZ3RoOyArK2kp CisgICAgICAgICAgICAgICAgdGhpcy5fZXhwYW5kZWRMaW5lUm93c1tpXS5yZW1vdmUoKTsKKyAg ICAgICAgICAgIGRlbGV0ZSB0aGlzLl9leHBhbmRlZExpbmVSb3dzOworICAgICAgICB9IGVsc2UK KyAgICAgICAgICAgIHRoaXMuZWxlbWVudC5yZW1vdmUoKTsKKyAgICB9LAorCisgICAgYW5jaG9y RWxlbWVudDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2V4cGFuZGVk TGluZVJvd3MgPyB0aGlzLl9leHBhbmRlZExpbmVSb3dzWzBdIDogdGhpcy5lbGVtZW50OwogICAg IH0KIH0KIAo= 175584 2012-11-21 21:36:29 -0800 2012-11-22 12:19:34 -0800 Patch bug-102927-20121122093414.patch text/plain 10467 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1Mjg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTA5YmRmOTkxYTY3YzJk Yzc5NGJjOTUyM2IzNmU1N2ZhZTc5YTZmYi4uN2QzNGMwYjQ4ZjQ3NmEyMDBkNDg5YjVkNDg4MmNi N2U0ZTJmZTUxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTExLTIxICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHNpbXBsaWZ5IHRoZSBfdXBkYXRlQ2h1bmtzRm9yUmFuZ2VzIHJvdXRpbmUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjkyNworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9EZWZhdWx0VGV4dEVkaXRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRp dG9yTWFpblBhbmVsLnByb3RvdHlwZS5fdXBkYXRlQ2h1bmtzRm9yUmFuZ2VzKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpbkNodW5rLnByb3RvdHlwZS51cGRhdGVDb2xsYXBz ZWRMaW5lUm93KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpbkNodW5rLnBy b3RvdHlwZS5kZXRhY2hGcm9tRE9NKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9y TWFpbkNodW5rLnByb3RvdHlwZS5hbmNob3JFbGVtZW50KToKKwogMjAxMi0xMS0xOSAgUGF2ZWwg RmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9y OiBzaW1wbGlmeT8gZGFtYWdlZCByZWdpb24gY29tcHV0YXRpb24gaW4gdGhlIGVkaXRvcgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4dEVk aXRvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVmYXVsdFRleHRF ZGl0b3IuanMKaW5kZXggNTY3YTk2YjY2Njk5NmYzYWM4OTZmZTgyOGJjYWE3MzcyN2ViZmM2NS4u ZTU1ZmZkNmM5MTkzMzljNjg2NTc0ZDA1ZjdhMmM3OGVkYTJmNTIwNyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4dEVkaXRvci5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlZmF1bHRUZXh0RWRpdG9yLmpz CkBAIC0yMTUwLDkgKzIxNTAsNiBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5w cm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgZWRpdEluZm8gPSBuZXcgV2ViSW5zcGVjdG9y LkRlZmF1bHRUZXh0RWRpdG9yLkVkaXRJbmZvKHJhbmdlLCBsaW5lcy5qb2luKCJcbiIpKTsKICAg ICAgICAgfQogCi0gICAgICAgIGlmICh0aGlzLl90ZXh0TW9kZWwuY29weVJhbmdlKGVkaXRJbmZv LnJhbmdlKSA9PT0gZWRpdEluZm8udGV4dCkKLSAgICAgICAgICAgIHJldHVybjsgLy8gTm9vcAot CiAgICAgICAgIHZhciBzZWxlY3Rpb24gPSB0aGlzLl9nZXRTZWxlY3Rpb24oY29sbGVjdExpbmVz RnJvbU5vZGUpOwogCiAgICAgICAgIC8vIFVuaW5kZW50IGFmdGVyIGJsb2NrCkBAIC0yMzA2LDk4 ICsyMzAzLDQ3IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9 IHsKICAgICAgKi8KICAgICBfdXBkYXRlQ2h1bmtzRm9yUmFuZ2VzOiBmdW5jdGlvbihvbGRSYW5n ZSwgbmV3UmFuZ2UpCiAgICAgewotICAgICAgICAvLyBVcGRhdGUgdGhlIGNodW5rcyBpbiByYW5n ZTogZmlyc3RDaHVua051bWJlciA8PSBpbmRleCA8PSBsYXN0Q2h1bmtOdW1iZXIKLSAgICAgICAg dmFyIGZpcnN0Q2h1bmtOdW1iZXIgPSB0aGlzLl9jaHVua051bWJlckZvckxpbmUob2xkUmFuZ2Uu c3RhcnRMaW5lKTsKLSAgICAgICAgdmFyIGxhc3RDaHVua051bWJlciA9IGZpcnN0Q2h1bmtOdW1i ZXI7Ci0gICAgICAgIHdoaWxlIChsYXN0Q2h1bmtOdW1iZXIgKyAxIDwgdGhpcy5fdGV4dENodW5r cy5sZW5ndGgpIHsKLSAgICAgICAgICAgIGlmICh0aGlzLl90ZXh0Q2h1bmtzW2xhc3RDaHVua051 bWJlciArIDFdLnN0YXJ0TGluZSA+IG9sZFJhbmdlLmVuZExpbmUpCisgICAgICAgIHZhciBmaXJz dERhbWFnZWRDaHVua051bWJlciA9IHRoaXMuX2NodW5rTnVtYmVyRm9yTGluZShvbGRSYW5nZS5z dGFydExpbmUpOworICAgICAgICB2YXIgbGFzdERhbWFnZWRDaHVua051bWJlciA9IGZpcnN0RGFt YWdlZENodW5rTnVtYmVyOworICAgICAgICB3aGlsZSAobGFzdERhbWFnZWRDaHVua051bWJlciAr IDEgPCB0aGlzLl90ZXh0Q2h1bmtzLmxlbmd0aCkgeworICAgICAgICAgICAgaWYgKHRoaXMuX3Rl eHRDaHVua3NbbGFzdERhbWFnZWRDaHVua051bWJlciArIDFdLnN0YXJ0TGluZSA+IG9sZFJhbmdl LmVuZExpbmUpCiAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICArK2xhc3RDaHVu a051bWJlcjsKKyAgICAgICAgICAgICsrbGFzdERhbWFnZWRDaHVua051bWJlcjsKICAgICAgICAg fQogCi0gICAgICAgIHZhciBzdGFydExpbmUgPSB0aGlzLl90ZXh0Q2h1bmtzW2ZpcnN0Q2h1bmtO dW1iZXJdLnN0YXJ0TGluZTsKLSAgICAgICAgdmFyIGxpbmVzQ291bnQgPSB0aGlzLl90ZXh0Q2h1 bmtzW2xhc3RDaHVua051bWJlcl0uc3RhcnRMaW5lICsgdGhpcy5fdGV4dENodW5rc1tsYXN0Q2h1 bmtOdW1iZXJdLmxpbmVzQ291bnQgLSBzdGFydExpbmU7CisgICAgICAgIHZhciBmaXJzdERhbWFn ZWRDaHVuayA9IHRoaXMuX3RleHRDaHVua3NbZmlyc3REYW1hZ2VkQ2h1bmtOdW1iZXJdOworICAg ICAgICB2YXIgbGFzdERhbWFnZWRDaHVuayA9IHRoaXMuX3RleHRDaHVua3NbbGFzdERhbWFnZWRD aHVua051bWJlcl07CisKICAgICAgICAgdmFyIGxpbmVzRGlmZiA9IG5ld1JhbmdlLmxpbmVzQ291 bnQgLSBvbGRSYW5nZS5saW5lc0NvdW50OwotICAgICAgICBsaW5lc0NvdW50ICs9IGxpbmVzRGlm ZjsKIAorICAgICAgICAvLyBGaXJzdCwgZGV0ZWN0IGNodW5rcyB0aGF0IGhhdmUgbm90IGJlZW4g bW9kaWZpZWQgYW5kIHNpbXBseSBzaGlmdCB0aGVtLgogICAgICAgICBpZiAobGluZXNEaWZmKSB7 Ci0gICAgICAgICAgICAvLyBMaW5lcyBzaGlmdGVkLCB1cGRhdGUgdGhlIGxpbmUgbnVtYmVycyBv ZiB0aGUgY2h1bmtzIGJlbG93LgotICAgICAgICAgICAgZm9yICh2YXIgY2h1bmtOdW1iZXIgPSBs YXN0Q2h1bmtOdW1iZXIgKyAxOyBjaHVua051bWJlciA8IHRoaXMuX3RleHRDaHVua3MubGVuZ3Ro OyArK2NodW5rTnVtYmVyKQorICAgICAgICAgICAgZm9yICh2YXIgY2h1bmtOdW1iZXIgPSBsYXN0 RGFtYWdlZENodW5rTnVtYmVyICsgMTsgY2h1bmtOdW1iZXIgPCB0aGlzLl90ZXh0Q2h1bmtzLmxl bmd0aDsgKytjaHVua051bWJlcikKICAgICAgICAgICAgICAgICB0aGlzLl90ZXh0Q2h1bmtzW2No dW5rTnVtYmVyXS5zdGFydExpbmUgKz0gbGluZXNEaWZmOwogICAgICAgICB9CiAKLSAgICAgICAg dmFyIGZpcnN0TGluZVJvdzsKLSAgICAgICAgaWYgKGZpcnN0Q2h1bmtOdW1iZXIpIHsKLSAgICAg ICAgICAgIHZhciBjaHVuayA9IHRoaXMuX3RleHRDaHVua3NbZmlyc3RDaHVua051bWJlciAtIDFd OwotICAgICAgICAgICAgZmlyc3RMaW5lUm93ID0gY2h1bmsuZXhwYW5kZWQgPyBjaHVuay5leHBh bmRlZExpbmVSb3coY2h1bmsuc3RhcnRMaW5lICsgY2h1bmsubGluZXNDb3VudCAtIDEpIDogY2h1 bmsuZWxlbWVudDsKLSAgICAgICAgICAgIGZpcnN0TGluZVJvdyA9IGZpcnN0TGluZVJvdy5uZXh0 U2libGluZzsKLSAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICBmaXJzdExpbmVSb3cgPSB0aGlz Ll9jb250YWluZXIuZmlyc3RDaGlsZDsKLQotICAgICAgICAvLyBNb3N0IGZyZXF1ZW50IGNhc2U6 IGEgY2h1bmsgcmVtYWluZWQgdGhlIHNhbWUuCi0gICAgICAgIGZvciAodmFyIGNodW5rTnVtYmVy ID0gZmlyc3RDaHVua051bWJlcjsgY2h1bmtOdW1iZXIgPD0gbGFzdENodW5rTnVtYmVyOyArK2No dW5rTnVtYmVyKSB7Ci0gICAgICAgICAgICB2YXIgY2h1bmsgPSB0aGlzLl90ZXh0Q2h1bmtzW2No dW5rTnVtYmVyXTsKLSAgICAgICAgICAgIGlmIChjaHVuay5zdGFydExpbmUgKyBjaHVuay5saW5l c0NvdW50ID4gdGhpcy5fdGV4dE1vZGVsLmxpbmVzQ291bnQpCi0gICAgICAgICAgICAgICAgYnJl YWs7Ci0gICAgICAgICAgICB2YXIgbGluZU51bWJlciA9IGNodW5rLnN0YXJ0TGluZTsKLSAgICAg ICAgICAgIGZvciAodmFyIGxpbmVSb3cgPSBmaXJzdExpbmVSb3c7IGxpbmVSb3cgJiYgbGluZU51 bWJlciA8IGNodW5rLnN0YXJ0TGluZSArIGNodW5rLmxpbmVzQ291bnQ7IGxpbmVSb3cgPSBsaW5l Um93Lm5leHRTaWJsaW5nKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGxpbmVSb3cubGluZU51bWJl ciAhPT0gbGluZU51bWJlciB8fCBsaW5lUm93ICE9PSBjaHVuay5leHBhbmRlZExpbmVSb3cobGlu ZU51bWJlcikgfHwgbGluZVJvdy50ZXh0Q29udGVudCAhPT0gdGhpcy5fdGV4dE1vZGVsLmxpbmUo bGluZU51bWJlcikgfHwgIWxpbmVSb3cuZmlyc3RDaGlsZCkKLSAgICAgICAgICAgICAgICAgICAg YnJlYWs7Ci0gICAgICAgICAgICAgICAgKytsaW5lTnVtYmVyOwotICAgICAgICAgICAgfQotICAg ICAgICAgICAgaWYgKGxpbmVOdW1iZXIgPCBjaHVuay5zdGFydExpbmUgKyBjaHVuay5saW5lc0Nv dW50KQotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2h1bmsudXBkYXRlQ29s bGFwc2VkTGluZVJvdygpOwotICAgICAgICAgICAgKytmaXJzdENodW5rTnVtYmVyOwotICAgICAg ICAgICAgZmlyc3RMaW5lUm93ID0gbGluZVJvdzsKLSAgICAgICAgICAgIHN0YXJ0TGluZSArPSBj aHVuay5saW5lc0NvdW50OwotICAgICAgICAgICAgbGluZXNDb3VudCAtPSBjaHVuay5saW5lc0Nv dW50OwotICAgICAgICB9Ci0KLSAgICAgICAgaWYgKGZpcnN0Q2h1bmtOdW1iZXIgPiBsYXN0Q2h1 bmtOdW1iZXIgJiYgbGluZXNDb3VudCA9PT0gMCkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAg ICAgICAvLyBNYXliZSBtZXJnZSB3aXRoIHRoZSBuZXh0IGNodW5rLCBzbyB0aGF0IHdlIHNob3Vs ZCBub3QgY3JlYXRlIDEtc2l6ZWQgY2h1bmtzIHdoZW4gYXBwZW5kaW5nIG5ldyBsaW5lcyBvbmUg Ynkgb25lLgotICAgICAgICB2YXIgY2h1bmsgPSB0aGlzLl90ZXh0Q2h1bmtzW2xhc3RDaHVua051 bWJlciArIDFdOwotICAgICAgICB2YXIgbGluZXNJbkxhc3RDaHVuayA9IGxpbmVzQ291bnQgJSB0 aGlzLl9kZWZhdWx0Q2h1bmtTaXplOwotICAgICAgICBpZiAoY2h1bmsgJiYgIWNodW5rLmlzRGVj b3JhdGVkKCkgJiYgbGluZXNJbkxhc3RDaHVuayA+IDAgJiYgbGluZXNJbkxhc3RDaHVuayArIGNo dW5rLmxpbmVzQ291bnQgPD0gdGhpcy5fZGVmYXVsdENodW5rU2l6ZSkgewotICAgICAgICAgICAg KytsYXN0Q2h1bmtOdW1iZXI7Ci0gICAgICAgICAgICBsaW5lc0NvdW50ICs9IGNodW5rLmxpbmVz Q291bnQ7Ci0gICAgICAgIH0KLQotICAgICAgICB2YXIgc2Nyb2xsVG9wID0gdGhpcy5lbGVtZW50 LnNjcm9sbFRvcDsKLSAgICAgICAgdmFyIHNjcm9sbExlZnQgPSB0aGlzLmVsZW1lbnQuc2Nyb2xs TGVmdDsKKyAgICAgICAgLy8gQ29tcHV0ZSBkYW1hZ2VkIGNodW5rcyBzcGFuCisgICAgICAgIHZh ciBzdGFydExpbmUgPSBmaXJzdERhbWFnZWRDaHVuay5zdGFydExpbmU7CisgICAgICAgIHZhciBl bmRMaW5lID0gbGFzdERhbWFnZWRDaHVuay5lbmRMaW5lICsgbGluZXNEaWZmOwogCi0gICAgICAg IC8vIERlbGV0ZSBhbGwgRE9NIGVsZW1lbnRzIHRoYXQgd2VyZSBlaXRoZXIgY29udHJvbGxlZCBi eSB0aGUgb2xkIGNodW5rcywgb3IgaGF2ZSBqdXN0IGJlZW4gaW5zZXJ0ZWQuCi0gICAgICAgIHZh ciBmaXJzdFVubW9kaWZpZWRMaW5lUm93ID0gbnVsbDsKLSAgICAgICAgY2h1bmsgPSB0aGlzLl90 ZXh0Q2h1bmtzW2xhc3RDaHVua051bWJlciArIDFdOwotICAgICAgICBpZiAoY2h1bmspCi0gICAg ICAgICAgICBmaXJzdFVubW9kaWZpZWRMaW5lUm93ID0gY2h1bmsuZXhwYW5kZWQgPyBjaHVuay5l eHBhbmRlZExpbmVSb3coY2h1bmsuc3RhcnRMaW5lKSA6IGNodW5rLmVsZW1lbnQ7CisgICAgICAg IC8vIFJlLWNyZWF0ZSBjaHVua3MgZm9yIGRhbWFnZWQgYXJlYS4KKyAgICAgICAgdmFyIGluc2Vy dGVkQ2h1bmtzID0gW107CisgICAgICAgIHZhciBpbnNlcnRpb25JbmRleCA9IGxhc3REYW1hZ2Vk Q2h1bmtOdW1iZXIgKyAxOwogCi0gICAgICAgIHdoaWxlIChmaXJzdExpbmVSb3cgJiYgZmlyc3RM aW5lUm93ICE9PSBmaXJzdFVubW9kaWZpZWRMaW5lUm93KSB7Ci0gICAgICAgICAgICB2YXIgbGlu ZVJvdyA9IGZpcnN0TGluZVJvdzsKLSAgICAgICAgICAgIGZpcnN0TGluZVJvdyA9IGZpcnN0TGlu ZVJvdy5uZXh0U2libGluZzsKLSAgICAgICAgICAgIHRoaXMuX2NvbnRhaW5lci5yZW1vdmVDaGls ZChsaW5lUm93KTsKLSAgICAgICAgfQotCi0gICAgICAgIC8vIFJlcGxhY2Ugb2xkIGNodW5rcyB3 aXRoIHRoZSBuZXcgb25lcy4KLSAgICAgICAgZm9yICh2YXIgY2h1bmtOdW1iZXIgPSBmaXJzdENo dW5rTnVtYmVyOyBsaW5lc0NvdW50ID4gMDsgKytjaHVua051bWJlcikgewotICAgICAgICAgICAg dmFyIGNodW5rTGluZXNDb3VudCA9IE1hdGgubWluKHRoaXMuX2RlZmF1bHRDaHVua1NpemUsIGxp bmVzQ291bnQpOwotICAgICAgICAgICAgdmFyIG5ld0NodW5rID0gdGhpcy5fY3JlYXRlTmV3Q2h1 bmsoc3RhcnRMaW5lLCBzdGFydExpbmUgKyBjaHVua0xpbmVzQ291bnQpOwotICAgICAgICAgICAg dGhpcy5fY29udGFpbmVyLmluc2VydEJlZm9yZShuZXdDaHVuay5lbGVtZW50LCBmaXJzdFVubW9k aWZpZWRMaW5lUm93KTsKKyAgICAgICAgdmFyIGxpbmVTcGFuID0gZW5kTGluZSAtIHN0YXJ0TGlu ZTsKKyAgICAgICAgdmFyIGNodW5rU2l6ZSA9IE1hdGguY2VpbChsaW5lU3BhbiAvIE1hdGguY2Vp bChsaW5lU3BhbiAvIHRoaXMuX2RlZmF1bHRDaHVua1NpemUpKTsKIAotICAgICAgICAgICAgaWYg KGNodW5rTnVtYmVyIDw9IGxhc3RDaHVua051bWJlcikKLSAgICAgICAgICAgICAgICB0aGlzLl90 ZXh0Q2h1bmtzW2NodW5rTnVtYmVyXSA9IG5ld0NodW5rOwotICAgICAgICAgICAgZWxzZQotICAg ICAgICAgICAgICAgIHRoaXMuX3RleHRDaHVua3Muc3BsaWNlKGNodW5rTnVtYmVyLCAwLCBuZXdD aHVuayk7Ci0gICAgICAgICAgICBzdGFydExpbmUgKz0gY2h1bmtMaW5lc0NvdW50OwotICAgICAg ICAgICAgbGluZXNDb3VudCAtPSBjaHVua0xpbmVzQ291bnQ7CisgICAgICAgIGZvciAodmFyIGkg PSBzdGFydExpbmU7IGkgPCBlbmRMaW5lOyBpICs9IGNodW5rU2l6ZSkgeworICAgICAgICAgICAg dmFyIGNodW5rID0gdGhpcy5fY3JlYXRlTmV3Q2h1bmsoaSwgTWF0aC5taW4oZW5kTGluZSwgaSAr IGNodW5rU2l6ZSkpOworICAgICAgICAgICAgdGhpcy5fdGV4dENodW5rcy5zcGxpY2UoaW5zZXJ0 aW9uSW5kZXgrKywgMCwgY2h1bmspOworICAgICAgICAgICAgdGhpcy5fY29udGFpbmVyLmluc2Vy dEJlZm9yZShjaHVuay5lbGVtZW50LCBmaXJzdERhbWFnZWRDaHVuay5hbmNob3JFbGVtZW50KCkp OwogICAgICAgICB9Ci0gICAgICAgIGlmIChjaHVua051bWJlciA8PSBsYXN0Q2h1bmtOdW1iZXIp Ci0gICAgICAgICAgICB0aGlzLl90ZXh0Q2h1bmtzLnNwbGljZShjaHVua051bWJlciwgbGFzdENo dW5rTnVtYmVyIC0gY2h1bmtOdW1iZXIgKyAxKTsKIAotICAgICAgICB0aGlzLmVsZW1lbnQuc2Ny b2xsVG9wID0gc2Nyb2xsVG9wOwotICAgICAgICB0aGlzLmVsZW1lbnQuc2Nyb2xsTGVmdCA9IHNj cm9sbExlZnQ7CisgICAgICAgIC8vIFJlbW92ZSBkYW1hZ2VkIGNodW5rcyBmcm9tIERPTSBhbmQg dGhlIGNodW5rcyBsaXN0LgorICAgICAgICB2YXIgcmVtb3ZlZENodW5rcyA9IHRoaXMuX3RleHRD aHVua3Muc3BsaWNlKGZpcnN0RGFtYWdlZENodW5rTnVtYmVyLCBsYXN0RGFtYWdlZENodW5rTnVt YmVyIC0gZmlyc3REYW1hZ2VkQ2h1bmtOdW1iZXIgKyAxKTsKKyAgICAgICAgZm9yICh2YXIgaSA9 IDA7IGkgPCByZW1vdmVkQ2h1bmtzLmxlbmd0aDsgKytpKQorICAgICAgICAgICAgcmVtb3ZlZENo dW5rc1tpXS5kZXRhY2hGcm9tRE9NKCk7CisgICAgICAgIHRoaXMuX2Fzc2VydERPTU1hdGNoZXNU ZXh0TW9kZWwoKTsKICAgICB9LAogCiAgICAgLyoqCkBAIC0yNjg1LDEyICsyNjMxLDI5IEBAIFdl Ykluc3BlY3Rvci5UZXh0RWRpdG9yTWFpbkNodW5rLnByb3RvdHlwZSA9IHsKICAgICAgICAgZm9y ICh2YXIgaSA9IHRoaXMuc3RhcnRMaW5lOyBpIDwgdGhpcy5zdGFydExpbmUgKyB0aGlzLmxpbmVz Q291bnQ7ICsraSkKICAgICAgICAgICAgIGxpbmVzLnB1c2godGhpcy5fdGV4dE1vZGVsLmxpbmUo aSkpOwogCisgICAgICAgIGlmIChXZWJJbnNwZWN0b3IuZGVidWdEZWZhdWx0VGV4dEVkaXRvcikK KyAgICAgICAgICAgIGNvbnNvbGUubG9nKCJSZWJ1aWxkaW5nIGNodW5rIHdpdGggIiArIGxpbmVz Lmxlbmd0aCArICIgbGluZXMiKTsKKwogICAgICAgICB0aGlzLmVsZW1lbnQucmVtb3ZlQ2hpbGRy ZW4oKTsKICAgICAgICAgdGhpcy5lbGVtZW50LnRleHRDb250ZW50ID0gbGluZXMuam9pbigiXG4i KTsKLQogICAgICAgICAvLyBUaGUgbGFzdCBlbXB0eSBsaW5lIHdpbGwgZ2V0IHN3YWxsb3dlZCBv dGhlcndpc2UuCiAgICAgICAgIGlmICghbGluZXNbbGluZXMubGVuZ3RoIC0gMV0pCiAgICAgICAg ICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnIi KSk7CisgICAgfSwKKworICAgIGRldGFjaEZyb21ET006IGZ1bmN0aW9uKCkKKyAgICB7CisgICAg ICAgIGlmICh0aGlzLl9leHBhbmRlZExpbmVSb3dzKSB7CisgICAgICAgICAgICBmb3IgKHZhciBp ID0gMDsgaSA8IHRoaXMuX2V4cGFuZGVkTGluZVJvd3MubGVuZ3RoOyArK2kpCisgICAgICAgICAg ICAgICAgdGhpcy5fZXhwYW5kZWRMaW5lUm93c1tpXS5yZW1vdmUoKTsKKyAgICAgICAgICAgIGRl bGV0ZSB0aGlzLl9leHBhbmRlZExpbmVSb3dzOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAg IHRoaXMuZWxlbWVudC5yZW1vdmUoKTsKKyAgICB9LAorCisgICAgYW5jaG9yRWxlbWVudDogZnVu Y3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2V4cGFuZGVkTGluZVJvd3MgPyB0 aGlzLl9leHBhbmRlZExpbmVSb3dzWzBdIDogdGhpcy5lbGVtZW50OwogICAgIH0KIH0KIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0RWRpdG9yTW9k ZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3JNb2Rl bC5qcwppbmRleCBlYjBiMWI0YTQ5Y2MxMjU4MGMyMzdhNDJiNjZiZTg2YzQ3Y2Y4OTUxLi44N2E2 ZjViZTNjMzUyYTAwMWRhNjRjOTk2MmQzMjM2Mjk5ZWY2ZTJjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3JNb2RlbC5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3JNb2RlbC5qcwpAQCAtMjYy LDEyICsyNjIsMTMgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNb2RlbC5wcm90b3R5cGUgPSB7 CiAgICAgX2lubmVyRWRpdFJhbmdlOiBmdW5jdGlvbihyYW5nZSwgdGV4dCkKICAgICB7CiAgICAg ICAgIHZhciBvcmlnaW5hbFRleHQgPSB0aGlzLmNvcHlSYW5nZShyYW5nZSk7Ci0gICAgICAgIGlm ICh0ZXh0ID09PSBvcmlnaW5hbFRleHQpCi0gICAgICAgICAgICByZXR1cm4gcmFuZ2U7IC8vIE5v b3AKLQotICAgICAgICB2YXIgbmV3UmFuZ2UgPSB0aGlzLl9pbm5lclNldFRleHQocmFuZ2UsIHRl eHQpOwogICAgICAgICB0aGlzLl9sYXN0RWRpdGVkUmFuZ2UgPSBuZXdSYW5nZTsKLSAgICAgICAg dGhpcy5fcHVzaFVuZG9hYmxlQ29tbWFuZChuZXdSYW5nZSwgb3JpZ2luYWxUZXh0KTsKKyAgICAg ICAgdmFyIG5ld1JhbmdlID0gcmFuZ2U7CisgICAgICAgIGlmICh0ZXh0ICE9PSBvcmlnaW5hbFRl eHQpIHsKKyAgICAgICAgICAgIG5ld1JhbmdlID0gdGhpcy5faW5uZXJTZXRUZXh0KHJhbmdlLCB0 ZXh0KTsKKyAgICAgICAgICAgIHRoaXMuX3B1c2hVbmRvYWJsZUNvbW1hbmQobmV3UmFuZ2UsIG9y aWdpbmFsVGV4dCk7CisgICAgICAgIH0KKwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xp c3RlbmVycyhXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1vZGVsLkV2ZW50cy5UZXh0Q2hhbmdlZCwg eyBvbGRSYW5nZTogcmFuZ2UsIG5ld1JhbmdlOiBuZXdSYW5nZSwgZWRpdFJhbmdlOiB0cnVlIH0p OwogICAgICAgICByZXR1cm4gbmV3UmFuZ2U7CiAgICAgfSwK