96510 2012-09-12 07:10:38 -0700 Web Inspector: [TextEditor] Line numbers out of sync after closing breakpoint condition editor 2012-09-24 02:41:31 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 apavlov aandrey aandrey apavlov bweinstein joepeck keishi loislo mibalan pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 718321 0 apavlov 2012-09-12 07:10:38 -0700 1. On a breakpoint, invoke the "Edit Breakpoint..." context menu action 2. Click outside the editor popup so that it will close Observe the gap below the breakpoint line number in the line numbers gutter. 724378 1 mibalan 2012-09-20 03:40:03 -0700 OK, I'm attempting a fix on this one. 724534 2 mibalan 2012-09-20 08:15:49 -0700 I have a somewhat related question - why should the change be committed on blur? Because that's how it looks like from the code. 725308 3 pfeldman 2012-09-21 02:28:46 -0700 I guess adding this._syncDecorationsForLineListener(lineNumber); into WebInspector.TextEditorGutterPanel's add/removeDecoration will fix it. 725317 4 165095 aandrey 2012-09-21 02:37:40 -0700 Created attachment 165095 Patch 725323 5 165095 pfeldman 2012-09-21 02:46:32 -0700 Comment on attachment 165095 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=165095&action=review > Source/WebCore/inspector/front-end/DefaultTextEditor.js:-1072 > - this._textEditor = textEditor; Why did this change? I think you should do rename in a separate patch. > Source/WebCore/inspector/front-end/DefaultTextEditor.js:2549 > + if (this.linesCount === 1) Can we get here otherwise? > Source/WebCore/inspector/front-end/DefaultTextEditor.js:2564 > + if (this.linesCount === 1) ditto 725355 6 165104 aandrey 2012-09-21 03:08:25 -0700 Created attachment 165104 Patch 726497 7 165104 webkit.review.bot 2012-09-24 02:41:28 -0700 Comment on attachment 165104 Patch Clearing flags on attachment: 165104 Committed r129339: <http://trac.webkit.org/changeset/129339> 726498 8 webkit.review.bot 2012-09-24 02:41:31 -0700 All reviewed patches have been landed. Closing bug. 165095 2012-09-21 02:37:40 -0700 2012-09-21 03:08:20 -0700 Patch bug-96510-20120921133704.patch text/plain 8070 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MDAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGI2MjdiMDJmOWY0Mzg1 NGU0OTIwNTk0ZjEwYTIxN2YxYjNkN2Q3NS4uMDRjNmEyZWVkMTUzY2FhMTE2NGI5NDgwOTg4MWQx NjMxZWFkMjhiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA5LTIxICBBbmRy ZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtUZXh0RWRpdG9yXSBMaW5lIG51bWJlcnMgb3V0IG9mIHN5bmMgYWZ0ZXIgY2xvc2luZyBi cmVha3BvaW50IGNvbmRpdGlvbiBlZGl0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTk2NTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgU3luYyBsaW5lIGhlaWdodHMgb24gYWRkaW5nL3JlbW92aW5nIGRl Y29yYXRpb25zLgorICAgICAgICBEcml2ZS1ieTogdmFyaWFibGUgcmVuYW1lcywganNkb2NzLgor CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4dEVkaXRvci5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yR3V0dGVyQ2h1bmspOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0ZXJDaHVuay5wcm90b3R5cGUuYWRkRGVjb3JhdGlvbik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRlckNodW5rLnByb3RvdHlwZS5y ZW1vdmVEZWNvcmF0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yR3V0dGVy Q2h1bmsucHJvdG90eXBlLnNldCBleHBhbmRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4 dEVkaXRvckd1dHRlckNodW5rLnByb3RvdHlwZS5nZXQgaGVpZ2h0KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5UZXh0RWRpdG9yR3V0dGVyQ2h1bmsucHJvdG90eXBlLl9jcmVhdGVSb3cpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluQ2h1bmsucHJvdG90eXBlLmFkZERlY29y YXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluQ2h1bmsucHJvdG90 eXBlLnJlbW92ZURlY29yYXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JN YWluQ2h1bmsucHJvdG90eXBlLnJlbW92ZUFsbERlY29yYXRpb25zKToKKwogMjAxMi0wOS0xOSAg Sm9uYXRoYW4gRG9uZyAgPGpvbmF0aGFuLmRvbmdAdG9yY2htb2JpbGUuY29tLmNuPgogCiAgICAg ICAgIFtCbGFja0JlcnJ5XSByZW1vdmUgc3RhdGljX2Nhc3Qgd2hpY2ggd2lsbCBjYXVzZSB2aWRl byBjcmFzaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9E ZWZhdWx0VGV4dEVkaXRvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RGVmYXVsdFRleHRFZGl0b3IuanMKaW5kZXggM2E0NWM2YTc3NTIxNWVmMjcyNTJkYmFlMmQzZTEz ZjVhOGZlYTc0YS4uMGE4ODA5NzJkNTM2ZDIxMDBjYTg5Y2U5ZThiMzUwMTQ5NTQ0ZTRjZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4dEVk aXRvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlZmF1bHRU ZXh0RWRpdG9yLmpzCkBAIC0yMDgsNyArMjA4LDcgQEAgV2ViSW5zcGVjdG9yLkRlZmF1bHRUZXh0 RWRpdG9yLnByb3RvdHlwZSA9IHsKIAogICAgIC8qKgogICAgICAqIEBwYXJhbSB7bnVtYmVyfSBs aW5lTnVtYmVyCi0gICAgICogQHBhcmFtIHtFbGVtZW50fSBlbGVtZW50CisgICAgICogQHBhcmFt IHtzdHJpbmd8RWxlbWVudH0gZWxlbWVudAogICAgICAqLwogICAgIHJlbW92ZURlY29yYXRpb246 IGZ1bmN0aW9uKGxpbmVOdW1iZXIsIGVsZW1lbnQpCiAgICAgewpAQCAtMTA2NiwxMSArMTA2Niwx NCBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRlclBhbmVsLnByb3RvdHlwZS5fX3Byb3Rv X18gPSBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvcgogCiAvKioKICAqIEBjb25zdHJ1Y3RvcgorICog QHBhcmFtIHtXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckNodW5rZWRQYW5lbH0gY2h1bmtlZFBhbmVs CisgKiBAcGFyYW0ge251bWJlcn0gc3RhcnRMaW5lCisgKiBAcGFyYW0ge251bWJlcn0gZW5kTGlu ZQogICovCi1XZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRlckNodW5rID0gZnVuY3Rpb24odGV4 dEVkaXRvciwgc3RhcnRMaW5lLCBlbmRMaW5lKQorV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0 ZXJDaHVuayA9IGZ1bmN0aW9uKGNodW5rZWRQYW5lbCwgc3RhcnRMaW5lLCBlbmRMaW5lKQogewot ICAgIHRoaXMuX3RleHRFZGl0b3IgPSB0ZXh0RWRpdG9yOwotICAgIHRoaXMuX3RleHRNb2RlbCA9 IHRleHRFZGl0b3IuX3RleHRNb2RlbDsKKyAgICB0aGlzLl9jaHVua2VkUGFuZWwgPSBjaHVua2Vk UGFuZWw7CisgICAgdGhpcy5fdGV4dE1vZGVsID0gY2h1bmtlZFBhbmVsLl90ZXh0TW9kZWw7CiAK ICAgICB0aGlzLnN0YXJ0TGluZSA9IHN0YXJ0TGluZTsKICAgICBlbmRMaW5lID0gTWF0aC5taW4o dGhpcy5fdGV4dE1vZGVsLmxpbmVzQ291bnQsIGVuZExpbmUpOwpAQCAtMTEwMiwyNSArMTEwNSwy NSBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRlckNodW5rID0gZnVuY3Rpb24odGV4dEVk aXRvciwgc3RhcnRMaW5lLCBlbmRMaW5lKQogCiBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRl ckNodW5rLnByb3RvdHlwZSA9IHsKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge3N0cmluZ30gZGVj b3JhdGlvbgorICAgICAqIEBwYXJhbSB7c3RyaW5nfEVsZW1lbnR9IGRlY29yYXRpb24KICAgICAg Ki8KICAgICBhZGREZWNvcmF0aW9uOiBmdW5jdGlvbihkZWNvcmF0aW9uKQogICAgIHsKLSAgICAg ICAgdGhpcy5fdGV4dEVkaXRvci5iZWdpbkRvbVVwZGF0ZXMoKTsKKyAgICAgICAgdGhpcy5fY2h1 bmtlZFBhbmVsLmJlZ2luRG9tVXBkYXRlcygpOwogICAgICAgICBpZiAodHlwZW9mIGRlY29yYXRp b24gPT09ICJzdHJpbmciKQogICAgICAgICAgICAgdGhpcy5lbGVtZW50LmFkZFN0eWxlQ2xhc3Mo ZGVjb3JhdGlvbik7Ci0gICAgICAgIHRoaXMuX3RleHRFZGl0b3IuZW5kRG9tVXBkYXRlcygpOwor ICAgICAgICB0aGlzLl9jaHVua2VkUGFuZWwuZW5kRG9tVXBkYXRlcygpOwogICAgIH0sCiAKICAg ICAvKioKLSAgICAgKiBAcGFyYW0ge3N0cmluZ30gZGVjb3JhdGlvbgorICAgICAqIEBwYXJhbSB7 c3RyaW5nfEVsZW1lbnR9IGRlY29yYXRpb24KICAgICAgKi8KICAgICByZW1vdmVEZWNvcmF0aW9u OiBmdW5jdGlvbihkZWNvcmF0aW9uKQogICAgIHsKLSAgICAgICAgdGhpcy5fdGV4dEVkaXRvci5i ZWdpbkRvbVVwZGF0ZXMoKTsKKyAgICAgICAgdGhpcy5fY2h1bmtlZFBhbmVsLmJlZ2luRG9tVXBk YXRlcygpOwogICAgICAgICBpZiAodHlwZW9mIGRlY29yYXRpb24gPT09ICJzdHJpbmciKQogICAg ICAgICAgICAgdGhpcy5lbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoZGVjb3JhdGlvbik7Ci0gICAg ICAgIHRoaXMuX3RleHRFZGl0b3IuZW5kRG9tVXBkYXRlcygpOworICAgICAgICB0aGlzLl9jaHVu a2VkUGFuZWwuZW5kRG9tVXBkYXRlcygpOwogICAgIH0sCiAKICAgICAvKioKQEAgLTExMzQsNyAr MTEzNyw3IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yR3V0dGVyQ2h1bmsucHJvdG90eXBlID0g ewogICAgIHNldCBleHBhbmRlZChleHBhbmRlZCkKICAgICB7CiAgICAgICAgIGlmICh0aGlzLmxp bmVzQ291bnQgPT09IDEpCi0gICAgICAgICAgICB0aGlzLl90ZXh0RWRpdG9yLl9zeW5jRGVjb3Jh dGlvbnNGb3JMaW5lTGlzdGVuZXIodGhpcy5zdGFydExpbmUpOworICAgICAgICAgICAgdGhpcy5f Y2h1bmtlZFBhbmVsLl9zeW5jRGVjb3JhdGlvbnNGb3JMaW5lTGlzdGVuZXIodGhpcy5zdGFydExp bmUpOwogCiAgICAgICAgIGlmICh0aGlzLl9leHBhbmRlZCA9PT0gZXhwYW5kZWQpCiAgICAgICAg ICAgICByZXR1cm47CkBAIC0xMTQ0LDcgKzExNDcsNyBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRv ckd1dHRlckNodW5rLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHRoaXMubGluZXNDb3VudCA9 PT0gMSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB0aGlzLl90ZXh0RWRpdG9yLmJl Z2luRG9tVXBkYXRlcygpOworICAgICAgICB0aGlzLl9jaHVua2VkUGFuZWwuYmVnaW5Eb21VcGRh dGVzKCk7CiAKICAgICAgICAgaWYgKGV4cGFuZGVkKSB7CiAgICAgICAgICAgICB0aGlzLl9leHBh bmRlZExpbmVSb3dzID0gW107CkBAIC0xMTU1LDcgKzExNTgsNyBAQCBXZWJJbnNwZWN0b3IuVGV4 dEVkaXRvckd1dHRlckNodW5rLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICB0aGlzLl9l eHBhbmRlZExpbmVSb3dzLnB1c2gobGluZVJvdyk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAg ICBwYXJlbnRFbGVtZW50LnJlbW92ZUNoaWxkKHRoaXMuZWxlbWVudCk7Ci0gICAgICAgICAgICB0 aGlzLl90ZXh0RWRpdG9yLl9zeW5jTGluZUhlaWdodExpc3RlbmVyKHRoaXMuX2V4cGFuZGVkTGlu ZVJvd3NbMF0pOworICAgICAgICAgICAgdGhpcy5fY2h1bmtlZFBhbmVsLl9zeW5jTGluZUhlaWdo dExpc3RlbmVyKHRoaXMuX2V4cGFuZGVkTGluZVJvd3NbMF0pOwogICAgICAgICB9IGVsc2Ugewog ICAgICAgICAgICAgdmFyIGVsZW1lbnRJbnNlcnRlZCA9IGZhbHNlOwogICAgICAgICAgICAgZm9y ICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9leHBhbmRlZExpbmVSb3dzLmxlbmd0aDsgKytpKSB7CkBA IC0xMTY4LDEyICsxMTcxLDEyIEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yR3V0dGVyQ2h1bmsu cHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAg IHBhcmVudEVsZW1lbnQucmVtb3ZlQ2hpbGQobGluZVJvdyk7CiAgICAgICAgICAgICAgICAgfQot ICAgICAgICAgICAgICAgIHRoaXMuX3RleHRFZGl0b3IuX2NhY2hlZFJvd3MucHVzaChsaW5lUm93 KTsKKyAgICAgICAgICAgICAgICB0aGlzLl9jaHVua2VkUGFuZWwuX2NhY2hlZFJvd3MucHVzaChs aW5lUm93KTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9leHBhbmRl ZExpbmVSb3dzOwogICAgICAgICB9CiAKLSAgICAgICAgdGhpcy5fdGV4dEVkaXRvci5lbmREb21V cGRhdGVzKCk7CisgICAgICAgIHRoaXMuX2NodW5rZWRQYW5lbC5lbmREb21VcGRhdGVzKCk7CiAg ICAgfSwKIAogICAgIC8qKgpAQCAtMTE4Miw4ICsxMTg1LDggQEAgV2ViSW5zcGVjdG9yLlRleHRF ZGl0b3JHdXR0ZXJDaHVuay5wcm90b3R5cGUgPSB7CiAgICAgZ2V0IGhlaWdodCgpCiAgICAgewog ICAgICAgICBpZiAoIXRoaXMuX2V4cGFuZGVkTGluZVJvd3MpCi0gICAgICAgICAgICByZXR1cm4g dGhpcy5fdGV4dEVkaXRvci5fdG90YWxIZWlnaHQodGhpcy5lbGVtZW50KTsKLSAgICAgICAgcmV0 dXJuIHRoaXMuX3RleHRFZGl0b3IuX3RvdGFsSGVpZ2h0KHRoaXMuX2V4cGFuZGVkTGluZVJvd3Nb MF0sIHRoaXMuX2V4cGFuZGVkTGluZVJvd3NbdGhpcy5fZXhwYW5kZWRMaW5lUm93cy5sZW5ndGgg LSAxXSk7CisgICAgICAgICAgICByZXR1cm4gdGhpcy5fY2h1bmtlZFBhbmVsLl90b3RhbEhlaWdo dCh0aGlzLmVsZW1lbnQpOworICAgICAgICByZXR1cm4gdGhpcy5fY2h1bmtlZFBhbmVsLl90b3Rh bEhlaWdodCh0aGlzLl9leHBhbmRlZExpbmVSb3dzWzBdLCB0aGlzLl9leHBhbmRlZExpbmVSb3dz W3RoaXMuX2V4cGFuZGVkTGluZVJvd3MubGVuZ3RoIC0gMV0pOwogICAgIH0sCiAKICAgICAvKioK QEAgLTEyMDAsNyArMTIwMyw3IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yR3V0dGVyQ2h1bmsu cHJvdG90eXBlID0gewogICAgICAqLwogICAgIF9jcmVhdGVSb3c6IGZ1bmN0aW9uKGxpbmVOdW1i ZXIpCiAgICAgewotICAgICAgICB2YXIgbGluZVJvdyA9IHRoaXMuX3RleHRFZGl0b3IuX2NhY2hl ZFJvd3MucG9wKCkgfHwgZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAgIHZh ciBsaW5lUm93ID0gdGhpcy5fY2h1bmtlZFBhbmVsLl9jYWNoZWRSb3dzLnBvcCgpIHx8IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgICAgICBsaW5lUm93LmxpbmVOdW1iZXIgPSBs aW5lTnVtYmVyOwogICAgICAgICBsaW5lUm93LmNsYXNzTmFtZSA9ICJ3ZWJraXQtbGluZS1udW1i ZXIiOwogICAgICAgICBsaW5lUm93LnRleHRDb250ZW50ID0gbGluZU51bWJlciArIDE7CkBAIC0y NTI3LDYgKzI1MzAsOSBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5DaHVuayA9IGZ1bmN0 aW9uKGNodW5rZWRQYW5lbCwgc3RhcnRMaW5lLCBlbmRMaW5lKQogfQogCiBXZWJJbnNwZWN0b3Iu VGV4dEVkaXRvck1haW5DaHVuay5wcm90b3R5cGUgPSB7CisgICAgLyoqCisgICAgICogQHBhcmFt IHtzdHJpbmd8RWxlbWVudH0gZGVjb3JhdGlvbgorICAgICAqLwogICAgIGFkZERlY29yYXRpb246 IGZ1bmN0aW9uKGRlY29yYXRpb24pCiAgICAgewogICAgICAgICB0aGlzLl9jaHVua2VkUGFuZWwu YmVnaW5Eb21VcGRhdGVzKCk7CkBAIC0yNTQwLDYgKzI1NDYsOCBAQCBXZWJJbnNwZWN0b3IuVGV4 dEVkaXRvck1haW5DaHVuay5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB9CiAgICAgICAgICAg ICB0aGlzLmVsZW1lbnQuZGVjb3JhdGlvbnNFbGVtZW50LmFwcGVuZENoaWxkKGRlY29yYXRpb24p OwogICAgICAgICB9CisgICAgICAgIGlmICh0aGlzLmxpbmVzQ291bnQgPT09IDEpCisgICAgICAg ICAgICB0aGlzLl9jaHVua2VkUGFuZWwuX3N5bmNEZWNvcmF0aW9uc0ZvckxpbmVMaXN0ZW5lcih0 aGlzLnN0YXJ0TGluZSk7CiAgICAgICAgIHRoaXMuX2NodW5rZWRQYW5lbC5lbmREb21VcGRhdGVz KCk7CiAgICAgfSwKIApAQCAtMjU1Myw2ICsyNTYxLDggQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0 b3JNYWluQ2h1bmsucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5lbGVtZW50LnJlbW92 ZVN0eWxlQ2xhc3MoZGVjb3JhdGlvbik7CiAgICAgICAgIGVsc2UgaWYgKHRoaXMuZWxlbWVudC5k ZWNvcmF0aW9uc0VsZW1lbnQpCiAgICAgICAgICAgICB0aGlzLmVsZW1lbnQuZGVjb3JhdGlvbnNF bGVtZW50LnJlbW92ZUNoaWxkKGRlY29yYXRpb24pOworICAgICAgICBpZiAodGhpcy5saW5lc0Nv dW50ID09PSAxKQorICAgICAgICAgICAgdGhpcy5fY2h1bmtlZFBhbmVsLl9zeW5jRGVjb3JhdGlv bnNGb3JMaW5lTGlzdGVuZXIodGhpcy5zdGFydExpbmUpOwogICAgICAgICB0aGlzLl9jaHVua2Vk UGFuZWwuZW5kRG9tVXBkYXRlcygpOwogICAgIH0sCiAKQEAgLTI1NjQsNiArMjU3NCw4IEBAIFdl Ykluc3BlY3Rvci5UZXh0RWRpdG9yTWFpbkNodW5rLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAg IHRoaXMuZWxlbWVudC5yZW1vdmVDaGlsZCh0aGlzLmVsZW1lbnQuZGVjb3JhdGlvbnNFbGVtZW50 KTsKICAgICAgICAgICAgIGRlbGV0ZSB0aGlzLmVsZW1lbnQuZGVjb3JhdGlvbnNFbGVtZW50Owog ICAgICAgICB9CisgICAgICAgIGlmICh0aGlzLmxpbmVzQ291bnQgPT09IDEpCisgICAgICAgICAg ICB0aGlzLl9jaHVua2VkUGFuZWwuX3N5bmNEZWNvcmF0aW9uc0ZvckxpbmVMaXN0ZW5lcih0aGlz LnN0YXJ0TGluZSk7CiAgICAgICAgIHRoaXMuX2NodW5rZWRQYW5lbC5lbmREb21VcGRhdGVzKCk7 CiAgICAgfSwKIApAQCAtMjY2OCw2ICsyNjgwLDkgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JN YWluQ2h1bmsucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdGhpcy5fcmVhZE9ubHk7CiAg ICAgfSwKIAorICAgIC8qKgorICAgICAqIEBwYXJhbSB7RWxlbWVudH0gZWxlbWVudAorICAgICAq LwogICAgIF91cGRhdGVFbGVtZW50UmVhZE9ubHlTdGF0ZTogZnVuY3Rpb24oZWxlbWVudCkKICAg ICB7CiAgICAgICAgIGlmICh0aGlzLl9yZWFkT25seSkK 165104 2012-09-21 03:08:25 -0700 2012-09-24 02:41:28 -0700 Patch bug-96510-20120921140749.patch text/plain 2273 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MDAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGI2MjdiMDJmOWY0Mzg1 NGU0OTIwNTk0ZjEwYTIxN2YxYjNkN2Q3NS4uNzc1NGQ5NTNhZjE0MWI5NjEyMTcxMTU3MDU0MTQ3 NTIwNzU4YzgyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA5LTIxICBBbmRy ZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtUZXh0RWRpdG9yXSBMaW5lIG51bWJlcnMgb3V0IG9mIHN5bmMgYWZ0ZXIgY2xvc2luZyBi cmVha3BvaW50IGNvbmRpdGlvbiBlZGl0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTk2NTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgU3luYyBsaW5lIGhlaWdodHMgb24gYWRkaW5nL3JlbW92aW5nIGRl Y29yYXRpb25zLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4dEVk aXRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yR3V0dGVyQ2h1bmspOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0ZXJDaHVuay5wcm90b3R5cGUuYWRk RGVjb3JhdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRlckNodW5r LnByb3RvdHlwZS5yZW1vdmVEZWNvcmF0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0 RWRpdG9yR3V0dGVyQ2h1bmsucHJvdG90eXBlLnNldCBleHBhbmRlZCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVGV4dEVkaXRvckd1dHRlckNodW5rLnByb3RvdHlwZS5nZXQgaGVpZ2h0KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yR3V0dGVyQ2h1bmsucHJvdG90eXBlLl9jcmVh dGVSb3cpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluQ2h1bmsucHJvdG90 eXBlLmFkZERlY29yYXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWlu Q2h1bmsucHJvdG90eXBlLnJlbW92ZURlY29yYXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlRleHRFZGl0b3JNYWluQ2h1bmsucHJvdG90eXBlLnJlbW92ZUFsbERlY29yYXRpb25zKToKKwog MjAxMi0wOS0xOSAgSm9uYXRoYW4gRG9uZyAgPGpvbmF0aGFuLmRvbmdAdG9yY2htb2JpbGUuY29t LmNuPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSByZW1vdmUgc3RhdGljX2Nhc3Qgd2hpY2ggd2ls bCBjYXVzZSB2aWRlbyBjcmFzaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9EZWZhdWx0VGV4dEVkaXRvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRGVmYXVsdFRleHRFZGl0b3IuanMKaW5kZXggM2E0NWM2YTc3NTIxNWVmMjcy NTJkYmFlMmQzZTEzZjVhOGZlYTc0YS4uZjkwYjkwMmUzYmMwZTU3Y2Q5ZWY2MTZiZGU5MmQ1NjQ0 NzhiMTc5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9E ZWZhdWx0VGV4dEVkaXRvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0RlZmF1bHRUZXh0RWRpdG9yLmpzCkBAIC0yMDQsNiArMjA0LDcgQEAgV2ViSW5zcGVjdG9y LkRlZmF1bHRUZXh0RWRpdG9yLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHRoaXMuX21h aW5QYW5lbC5hZGREZWNvcmF0aW9uKGxpbmVOdW1iZXIsIGVsZW1lbnQpOwogICAgICAgICB0aGlz Ll9ndXR0ZXJQYW5lbC5hZGREZWNvcmF0aW9uKGxpbmVOdW1iZXIsIGVsZW1lbnQpOworICAgICAg ICB0aGlzLl9zeW5jRGVjb3JhdGlvbnNGb3JMaW5lKGxpbmVOdW1iZXIpOwogICAgIH0sCiAKICAg ICAvKioKQEAgLTIxNCw2ICsyMTUsNyBAQCBXZWJJbnNwZWN0b3IuRGVmYXVsdFRleHRFZGl0b3Iu cHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgdGhpcy5fbWFpblBhbmVsLnJlbW92ZURlY29y YXRpb24obGluZU51bWJlciwgZWxlbWVudCk7CiAgICAgICAgIHRoaXMuX2d1dHRlclBhbmVsLnJl bW92ZURlY29yYXRpb24obGluZU51bWJlciwgZWxlbWVudCk7CisgICAgICAgIHRoaXMuX3N5bmNE ZWNvcmF0aW9uc0ZvckxpbmUobGluZU51bWJlcik7CiAgICAgfSwKIAogICAgIC8qKgo=