71848 2011-11-08 12:47:37 -0800 Web Inspector: ResourcesPanel should support adding subtitle to any BaseStorageTreeElement. 2011-11-09 03:58:18 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 498366 0 vsevik 2011-11-08 12:47:37 -0800 ResourcesPanel should support adding subtitle to any BaseStorageTreeElement. 498370 1 114139 vsevik 2011-11-08 12:50:32 -0800 Created attachment 114139 Patch 498371 2 vsevik 2011-11-08 12:51:24 -0800 We will need that to create tree elements for frames with particular application cache manifest. 498402 3 114146 vsevik 2011-11-08 13:41:01 -0800 Created attachment 114146 Patch 498405 4 114147 vsevik 2011-11-08 13:43:58 -0800 Created attachment 114147 Patch 498626 5 114147 pfeldman 2011-11-08 20:52:09 -0800 Comment on attachment 114147 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=114147&action=review > Source/WebCore/inspector/front-end/ResourcesPanel.js:870 > + this._updateTitles(); I know why you are setting titles when element is in the tree, but you could 'force' it and do it before. > Source/WebCore/inspector/front-end/ResourcesPanel.js:929 > + this._updateTitles(); So the common sequence below is at risk of creating title element twice?: treeElement.titleText = "foo"; treeElement.subtitleText = "bar"; I would manage title setters separately: title setter only changes its text, while preserving the subtitle + subtitle lazily creates / updates subtitle element. And you have to force both on attach. 498748 6 114227 vsevik 2011-11-09 02:24:54 -0800 Created attachment 114227 Patch 498798 7 vsevik 2011-11-09 03:58:18 -0800 Committed r99686: <http://trac.webkit.org/changeset/99686> 114139 2011-11-08 12:50:32 -0800 2011-11-08 13:40:53 -0800 Patch bug-71848-20111109005030.patch text/plain 4641 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogOTk1NDUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2NDBhZjFhOWE3NzQwMWRm MjRjZDI2MTk5YTY5MjY4NTk5ZDVmNTI1Li4wNDUwMDY4OTFlZjUyOTk5MmQyNThlMmY2YTkwMTg0 MzllYjI4MjgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMTEtMDggIFZzZXZv bG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogUmVzb3VyY2VzUGFuZWwgc2hvdWxkIHN1cHBvcnQgYWRkaW5nIHN1YnRpdGxlIHRvIGFueSBC YXNlU3RvcmFnZVRyZWVFbGVtZW50LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzE4NDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUub25h dHRhY2gpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQucHJv dG90eXBlLmdldCBkaXNwbGF5TmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQmFzZVN0b3Jh Z2VUcmVlRWxlbWVudC5wcm90b3R5cGUuX3VwZGF0ZVRpdGxlcyk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUuc2V0IHRpdGxlVGV4dCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUuZ2V0 IHN1YnRpdGxlVGV4dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxl bWVudC5wcm90b3R5cGUuc2V0IHN1YnRpdGxlVGV4dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu RnJhbWVUcmVlRWxlbWVudC5wcm90b3R5cGUuZnJhbWVOYXZpZ2F0ZWQpOgorCiAyMDExLTExLTA4 ICBOaWtvbGFzIFppbW1lcm1hbm4gIDxuemltbWVybWFubkByaW0uY29tPgogCiAgICAgICAgIE5v dCByZXZpZXdlZC4gRml4IGJ1aWxkLCBieSByZW1vdmluZyBhbiB1bnVzZWQgdmFyaWFibGUuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1Bh bmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5l bC5qcwppbmRleCAwYTY2M2IxMmM3ZTc1MTVjMDQwNDI2MmVlZjQzNmVlMjIwMGM4MjA3Li4xZjU4 MDk1ZjU0YzcyNjkxM2I2MGZhZjg4MGE0YzFjMDM3YzJkN2UxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKQEAgLTg2Niw4 ICs4NjYsMzIgQEAgV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQucHJvdG90eXBl ID0gewogCiAgICAgICAgIHRoaXMudGl0bGVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7CiAgICAgICAgIHRoaXMudGl0bGVFbGVtZW50LmNsYXNzTmFtZSA9ICJiYXNlLXN0 b3JhZ2UtdHJlZS1lbGVtZW50LXRpdGxlIjsKLSAgICAgICAgdGhpcy50aXRsZUVsZW1lbnQudGV4 dENvbnRlbnQgPSB0aGlzLl90aXRsZVRleHQ7CiAgICAgICAgIHRoaXMubGlzdEl0ZW1FbGVtZW50 LmFwcGVuZENoaWxkKHRoaXMudGl0bGVFbGVtZW50KTsKKyAgICAgICAgdGhpcy5fdXBkYXRlVGl0 bGVzKCk7CisgICAgfSwKKworICAgIGdldCBkaXNwbGF5TmFtZSgpCisgICAgeworICAgICAgICBy ZXR1cm4gdGhpcy5fZGlzcGxheU5hbWU7CisgICAgfSwKKworICAgIF91cGRhdGVUaXRsZXM6IGZ1 bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX2Rpc3BsYXlOYW1lID0gdGhpcy5fdGl0bGVU ZXh0IHx8ICIiOworICAgICAgICBpZiAodGhpcy5fc3VidGl0bGVUZXh0KQorICAgICAgICAgICAg dGhpcy5fZGlzcGxheU5hbWUgKz0gIiAoIiArIHRoaXMuX3N1YnRpdGxlVGV4dCArICIpIjsKKyAg ICAgICAgCisgICAgICAgIGlmICghdGhpcy50aXRsZUVsZW1lbnQpCisgICAgICAgICAgICByZXR1 cm47CisgICAgICAgIAorICAgICAgICB0aGlzLnRpdGxlRWxlbWVudC50ZXh0Q29udGVudCA9IHRo aXMuX3RpdGxlVGV4dCB8fCAiIjsKKyAgICAgICAgCisgICAgICAgIGlmICh0aGlzLl9zdWJ0aXRs ZVRleHQpIHsKKyAgICAgICAgICAgIHZhciBzdWJ0aXRsZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJzcGFuIik7CisgICAgICAgICAgICBzdWJ0aXRsZUVsZW1lbnQuY2xhc3NOYW1l ID0gImJhc2Utc3RvcmFnZS10cmVlLWVsZW1lbnQtc3VidGl0bGUiOworICAgICAgICAgICAgc3Vi dGl0bGVFbGVtZW50LnRleHRDb250ZW50ID0gIigiICsgdGhpcy5fc3VidGl0bGVUZXh0ICsgIiki OworICAgICAgICAgICAgdGhpcy50aXRsZUVsZW1lbnQuYXBwZW5kQ2hpbGQoc3VidGl0bGVFbGVt ZW50KTsKKyAgICAgICAgfQogICAgIH0sCiAKICAgICBvbnNlbGVjdDogZnVuY3Rpb24oKQpAQCAt ODkxLDggKzkxNSwxOCBAQCBXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90 b3R5cGUgPSB7CiAgICAgc2V0IHRpdGxlVGV4dCh0aXRsZVRleHQpCiAgICAgewogICAgICAgICB0 aGlzLl90aXRsZVRleHQgPSB0aXRsZVRleHQ7Ci0gICAgICAgIGlmICh0aGlzLnRpdGxlRWxlbWVu dCkKLSAgICAgICAgICAgIHRoaXMudGl0bGVFbGVtZW50LnRleHRDb250ZW50ID0gdGhpcy5fdGl0 bGVUZXh0OworICAgICAgICB0aGlzLl91cGRhdGVUaXRsZXMoKTsKKyAgICB9LAorCisgICAgZ2V0 IHN1YnRpdGxlVGV4dCgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fc3VidGl0bGVUZXh0 OworICAgIH0sCisKKyAgICBzZXQgc3VidGl0bGVUZXh0KHN1YnRpdGxlVGV4dCkKKyAgICB7Cisg ICAgICAgIHRoaXMuX3N1YnRpdGxlVGV4dCA9IHN1YnRpdGxlVGV4dDsKKyAgICAgICAgdGhpcy5f dXBkYXRlVGl0bGVzKCk7CiAgICAgfSwKIAogICAgIGdldCBzZWFyY2hNYXRjaGVzQ291bnQoKQpA QCAtOTc1LDkgKzEwMDksOCBAQCBXZWJJbnNwZWN0b3IuRnJhbWVUcmVlRWxlbWVudC5wcm90b3R5 cGUgPSB7CiAgICAgICAgIHRoaXMucmVtb3ZlQ2hpbGRyZW4oKTsKICAgICAgICAgdGhpcy5fZnJh bWVJZCA9IGZyYW1lLmlkOwogCi0gICAgICAgIHZhciB0aXRsZSA9IGZyYW1lLm5hbWU7Ci0gICAg ICAgIHZhciBzdWJ0aXRsZSA9IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5kaXNwbGF5TmFtZShmcmFt ZS51cmwpOwotICAgICAgICB0aGlzLnNldFRpdGxlcyh0aXRsZSwgc3VidGl0bGUpOworICAgICAg ICB0aGlzLnRpdGxlVGV4dCA9IGZyYW1lLm5hbWU7CisgICAgICAgIHRoaXMuc3VidGl0bGVUZXh0 ID0gV2ViSW5zcGVjdG9yLlJlc291cmNlLmRpc3BsYXlOYW1lKGZyYW1lLnVybCk7CiAKICAgICAg ICAgdGhpcy5fY2F0ZWdvcnlFbGVtZW50cyA9IHt9OwogICAgICAgICB0aGlzLl90cmVlRWxlbWVu dEZvclJlc291cmNlID0ge307CkBAIC0xMDA5LDMxICsxMDQyLDYgQEAgV2ViSW5zcGVjdG9yLkZy YW1lVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICBET01BZ2VudC5oaWRlSGlnaGxp Z2h0KCk7CiAgICAgfSwKIAotICAgIGdldCBkaXNwbGF5TmFtZSgpCi0gICAgewotICAgICAgICBy ZXR1cm4gdGhpcy5fZGlzcGxheU5hbWU7Ci0gICAgfSwKLQotICAgIHNldFRpdGxlczogZnVuY3Rp b24odGl0bGUsIHN1YnRpdGxlKQotICAgIHsKLSAgICAgICAgdGhpcy5fZGlzcGxheU5hbWUgPSB0 aXRsZSB8fCAiIjsKLSAgICAgICAgaWYgKHN1YnRpdGxlKQotICAgICAgICAgICAgdGhpcy5fZGlz cGxheU5hbWUgKz0gIiAoIiArIHN1YnRpdGxlICsgIikiOwotCi0gICAgICAgIGlmICh0aGlzLnBh cmVudCkgewotICAgICAgICAgICAgdGhpcy50aXRsZUVsZW1lbnQudGV4dENvbnRlbnQgPSB0aXRs ZSB8fCAiIjsKLSAgICAgICAgICAgIGlmIChzdWJ0aXRsZSkgewotICAgICAgICAgICAgICAgIHZh ciBzdWJ0aXRsZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7Ci0gICAg ICAgICAgICAgICAgc3VidGl0bGVFbGVtZW50LmNsYXNzTmFtZSA9ICJiYXNlLXN0b3JhZ2UtdHJl ZS1lbGVtZW50LXN1YnRpdGxlIjsKLSAgICAgICAgICAgICAgICBzdWJ0aXRsZUVsZW1lbnQudGV4 dENvbnRlbnQgPSAiKCIgKyBzdWJ0aXRsZSArICIpIjsKLSAgICAgICAgICAgICAgICB0aGlzLnRp dGxlRWxlbWVudC5hcHBlbmRDaGlsZChzdWJ0aXRsZUVsZW1lbnQpOwotICAgICAgICAgICAgfQot ICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgdGhpcy5fdGl0bGVUb1NldE9uQXR0YWNoID0g dGl0bGU7Ci0gICAgICAgICAgICB0aGlzLl9zdWJ0aXRsZVRvU2V0T25BdHRhY2ggPSBzdWJ0aXRs ZTsKLSAgICAgICAgfQotICAgIH0sCi0KICAgICBzZXQgaG92ZXJlZChob3ZlcmVkKQogICAgIHsK ICAgICAgICAgaWYgKGhvdmVyZWQpIHsK 114146 2011-11-08 13:41:01 -0800 2011-11-08 13:43:51 -0800 Patch bug-71848-20111109014059.patch text/plain 5476 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogOTk1NDUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2NDBhZjFhOWE3NzQwMWRm MjRjZDI2MTk5YTY5MjY4NTk5ZDVmNTI1Li4wNDUwMDY4OTFlZjUyOTk5MmQyNThlMmY2YTkwMTg0 MzllYjI4MjgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMTEtMDggIFZzZXZv bG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogUmVzb3VyY2VzUGFuZWwgc2hvdWxkIHN1cHBvcnQgYWRkaW5nIHN1YnRpdGxlIHRvIGFueSBC YXNlU3RvcmFnZVRyZWVFbGVtZW50LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzE4NDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUub25h dHRhY2gpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQucHJv dG90eXBlLmdldCBkaXNwbGF5TmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQmFzZVN0b3Jh Z2VUcmVlRWxlbWVudC5wcm90b3R5cGUuX3VwZGF0ZVRpdGxlcyk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUuc2V0IHRpdGxlVGV4dCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUuZ2V0 IHN1YnRpdGxlVGV4dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxl bWVudC5wcm90b3R5cGUuc2V0IHN1YnRpdGxlVGV4dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu RnJhbWVUcmVlRWxlbWVudC5wcm90b3R5cGUuZnJhbWVOYXZpZ2F0ZWQpOgorCiAyMDExLTExLTA4 ICBOaWtvbGFzIFppbW1lcm1hbm4gIDxuemltbWVybWFubkByaW0uY29tPgogCiAgICAgICAgIE5v dCByZXZpZXdlZC4gRml4IGJ1aWxkLCBieSByZW1vdmluZyBhbiB1bnVzZWQgdmFyaWFibGUuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1Bh bmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5l bC5qcwppbmRleCAwYTY2M2IxMmM3ZTc1MTVjMDQwNDI2MmVlZjQzNmVlMjIwMGM4MjA3Li5mNzAz NjgxMWRjNTAyZDYzOTJhYzFlMzc3MDcwNWI2NTY3YjE2ODU0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKQEAgLTg2Niw4 ICs4NjYsMzIgQEAgV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQucHJvdG90eXBl ID0gewogCiAgICAgICAgIHRoaXMudGl0bGVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7CiAgICAgICAgIHRoaXMudGl0bGVFbGVtZW50LmNsYXNzTmFtZSA9ICJiYXNlLXN0 b3JhZ2UtdHJlZS1lbGVtZW50LXRpdGxlIjsKLSAgICAgICAgdGhpcy50aXRsZUVsZW1lbnQudGV4 dENvbnRlbnQgPSB0aGlzLl90aXRsZVRleHQ7CiAgICAgICAgIHRoaXMubGlzdEl0ZW1FbGVtZW50 LmFwcGVuZENoaWxkKHRoaXMudGl0bGVFbGVtZW50KTsKKyAgICAgICAgdGhpcy5fdXBkYXRlVGl0 bGVzKCk7CisgICAgfSwKKworICAgIGdldCBkaXNwbGF5TmFtZSgpCisgICAgeworICAgICAgICBy ZXR1cm4gdGhpcy5fZGlzcGxheU5hbWU7CisgICAgfSwKKworICAgIF91cGRhdGVUaXRsZXM6IGZ1 bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX2Rpc3BsYXlOYW1lID0gdGhpcy5fdGl0bGVU ZXh0IHx8ICIiOworICAgICAgICBpZiAodGhpcy5fc3VidGl0bGVUZXh0KQorICAgICAgICAgICAg dGhpcy5fZGlzcGxheU5hbWUgKz0gIiAoIiArIHRoaXMuX3N1YnRpdGxlVGV4dCArICIpIjsKKyAg ICAgICAgCisgICAgICAgIGlmICghdGhpcy50aXRsZUVsZW1lbnQpCisgICAgICAgICAgICByZXR1 cm47CisgICAgICAgIAorICAgICAgICB0aGlzLnRpdGxlRWxlbWVudC50ZXh0Q29udGVudCA9IHRo aXMuX3RpdGxlVGV4dCB8fCAiIjsKKyAgICAgICAgCisgICAgICAgIGlmICh0aGlzLl9zdWJ0aXRs ZVRleHQpIHsKKyAgICAgICAgICAgIHZhciBzdWJ0aXRsZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJzcGFuIik7CisgICAgICAgICAgICBzdWJ0aXRsZUVsZW1lbnQuY2xhc3NOYW1l ID0gImJhc2Utc3RvcmFnZS10cmVlLWVsZW1lbnQtc3VidGl0bGUiOworICAgICAgICAgICAgc3Vi dGl0bGVFbGVtZW50LnRleHRDb250ZW50ID0gIigiICsgdGhpcy5fc3VidGl0bGVUZXh0ICsgIiki OworICAgICAgICAgICAgdGhpcy50aXRsZUVsZW1lbnQuYXBwZW5kQ2hpbGQoc3VidGl0bGVFbGVt ZW50KTsKKyAgICAgICAgfQogICAgIH0sCiAKICAgICBvbnNlbGVjdDogZnVuY3Rpb24oKQpAQCAt ODkxLDggKzkxNSwxOCBAQCBXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90 b3R5cGUgPSB7CiAgICAgc2V0IHRpdGxlVGV4dCh0aXRsZVRleHQpCiAgICAgewogICAgICAgICB0 aGlzLl90aXRsZVRleHQgPSB0aXRsZVRleHQ7Ci0gICAgICAgIGlmICh0aGlzLnRpdGxlRWxlbWVu dCkKLSAgICAgICAgICAgIHRoaXMudGl0bGVFbGVtZW50LnRleHRDb250ZW50ID0gdGhpcy5fdGl0 bGVUZXh0OworICAgICAgICB0aGlzLl91cGRhdGVUaXRsZXMoKTsKKyAgICB9LAorCisgICAgZ2V0 IHN1YnRpdGxlVGV4dCgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fc3VidGl0bGVUZXh0 OworICAgIH0sCisKKyAgICBzZXQgc3VidGl0bGVUZXh0KHN1YnRpdGxlVGV4dCkKKyAgICB7Cisg ICAgICAgIHRoaXMuX3N1YnRpdGxlVGV4dCA9IHN1YnRpdGxlVGV4dDsKKyAgICAgICAgdGhpcy5f dXBkYXRlVGl0bGVzKCk7CiAgICAgfSwKIAogICAgIGdldCBzZWFyY2hNYXRjaGVzQ291bnQoKQpA QCAtOTc1LDkgKzEwMDksOCBAQCBXZWJJbnNwZWN0b3IuRnJhbWVUcmVlRWxlbWVudC5wcm90b3R5 cGUgPSB7CiAgICAgICAgIHRoaXMucmVtb3ZlQ2hpbGRyZW4oKTsKICAgICAgICAgdGhpcy5fZnJh bWVJZCA9IGZyYW1lLmlkOwogCi0gICAgICAgIHZhciB0aXRsZSA9IGZyYW1lLm5hbWU7Ci0gICAg ICAgIHZhciBzdWJ0aXRsZSA9IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5kaXNwbGF5TmFtZShmcmFt ZS51cmwpOwotICAgICAgICB0aGlzLnNldFRpdGxlcyh0aXRsZSwgc3VidGl0bGUpOworICAgICAg ICB0aGlzLnRpdGxlVGV4dCA9IGZyYW1lLm5hbWU7CisgICAgICAgIHRoaXMuc3VidGl0bGVUZXh0 ID0gV2ViSW5zcGVjdG9yLlJlc291cmNlLmRpc3BsYXlOYW1lKGZyYW1lLnVybCk7CiAKICAgICAg ICAgdGhpcy5fY2F0ZWdvcnlFbGVtZW50cyA9IHt9OwogICAgICAgICB0aGlzLl90cmVlRWxlbWVu dEZvclJlc291cmNlID0ge307CkBAIC05ODcsNTMgKzEwMjAsMTggQEAgV2ViSW5zcGVjdG9yLkZy YW1lVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogCiAgICAgZ2V0IGl0ZW1VUkwoKQogICAgIHsK LSAgICAgICAgcmV0dXJuICJmcmFtZTovLyIgKyBlbmNvZGVVUkkodGhpcy5fZGlzcGxheU5hbWUp OwotICAgIH0sCi0KLSAgICBvbmF0dGFjaDogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgV2Vi SW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uYXR0YWNoLmNhbGwo dGhpcyk7Ci0gICAgICAgIGlmICh0aGlzLl90aXRsZVRvU2V0T25BdHRhY2ggfHwgdGhpcy5fc3Vi dGl0bGVUb1NldE9uQXR0YWNoKSB7Ci0gICAgICAgICAgICB0aGlzLnNldFRpdGxlcyh0aGlzLl90 aXRsZVRvU2V0T25BdHRhY2gsIHRoaXMuX3N1YnRpdGxlVG9TZXRPbkF0dGFjaCk7Ci0gICAgICAg ICAgICBkZWxldGUgdGhpcy5fdGl0bGVUb1NldE9uQXR0YWNoOwotICAgICAgICAgICAgZGVsZXRl IHRoaXMuX3N1YnRpdGxlVG9TZXRPbkF0dGFjaDsKLSAgICAgICAgfQorICAgICAgICByZXR1cm4g ImZyYW1lOi8vIiArIGVuY29kZVVSSSh0aGlzLmRpc3BsYXlOYW1lKTsKICAgICB9LAogCiAgICAg b25zZWxlY3Q6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5CYXNlU3Rv cmFnZVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbnNlbGVjdC5jYWxsKHRoaXMpOwotICAgICAgICB0 aGlzLl9zdG9yYWdlUGFuZWwuc2hvd0NhdGVnb3J5Vmlldyh0aGlzLl9kaXNwbGF5TmFtZSk7Cisg ICAgICAgIHRoaXMuX3N0b3JhZ2VQYW5lbC5zaG93Q2F0ZWdvcnlWaWV3KHRoaXMuZGlzcGxheU5h bWUpOwogCiAgICAgICAgIHRoaXMubGlzdEl0ZW1FbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImhv dmVyZWQiKTsKICAgICAgICAgRE9NQWdlbnQuaGlkZUhpZ2hsaWdodCgpOwogICAgIH0sCiAKLSAg ICBnZXQgZGlzcGxheU5hbWUoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2Rpc3BsYXlO YW1lOwotICAgIH0sCi0KLSAgICBzZXRUaXRsZXM6IGZ1bmN0aW9uKHRpdGxlLCBzdWJ0aXRsZSkK LSAgICB7Ci0gICAgICAgIHRoaXMuX2Rpc3BsYXlOYW1lID0gdGl0bGUgfHwgIiI7Ci0gICAgICAg IGlmIChzdWJ0aXRsZSkKLSAgICAgICAgICAgIHRoaXMuX2Rpc3BsYXlOYW1lICs9ICIgKCIgKyBz dWJ0aXRsZSArICIpIjsKLQotICAgICAgICBpZiAodGhpcy5wYXJlbnQpIHsKLSAgICAgICAgICAg IHRoaXMudGl0bGVFbGVtZW50LnRleHRDb250ZW50ID0gdGl0bGUgfHwgIiI7Ci0gICAgICAgICAg ICBpZiAoc3VidGl0bGUpIHsKLSAgICAgICAgICAgICAgICB2YXIgc3VidGl0bGVFbGVtZW50ID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwotICAgICAgICAgICAgICAgIHN1YnRpdGxl RWxlbWVudC5jbGFzc05hbWUgPSAiYmFzZS1zdG9yYWdlLXRyZWUtZWxlbWVudC1zdWJ0aXRsZSI7 Ci0gICAgICAgICAgICAgICAgc3VidGl0bGVFbGVtZW50LnRleHRDb250ZW50ID0gIigiICsgc3Vi dGl0bGUgKyAiKSI7Ci0gICAgICAgICAgICAgICAgdGhpcy50aXRsZUVsZW1lbnQuYXBwZW5kQ2hp bGQoc3VidGl0bGVFbGVtZW50KTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfSBlbHNlIHsKLSAg ICAgICAgICAgIHRoaXMuX3RpdGxlVG9TZXRPbkF0dGFjaCA9IHRpdGxlOwotICAgICAgICAgICAg dGhpcy5fc3VidGl0bGVUb1NldE9uQXR0YWNoID0gc3VidGl0bGU7Ci0gICAgICAgIH0KLSAgICB9 LAotCiAgICAgc2V0IGhvdmVyZWQoaG92ZXJlZCkKICAgICB7CiAgICAgICAgIGlmIChob3ZlcmVk KSB7Cg== 114147 2011-11-08 13:43:58 -0800 2011-11-09 02:24:45 -0800 Patch bug-71848-20111109014356.patch text/plain 5601 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogOTk1NDUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2NDBhZjFhOWE3NzQwMWRm MjRjZDI2MTk5YTY5MjY4NTk5ZDVmNTI1Li4zMDdmNmJjM2FlYWUzMmU3MTg1NmRmODRhZWJiMzYx ZmZmY2Y3ODhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMTEtMDggIFZzZXZv bG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogUmVzb3VyY2VzUGFuZWwgc2hvdWxkIHN1cHBvcnQgYWRkaW5nIHN1YnRpdGxlIHRvIGFueSBC YXNlU3RvcmFnZVRyZWVFbGVtZW50LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzE4NDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUub25h dHRhY2gpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQucHJv dG90eXBlLmdldCBkaXNwbGF5TmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQmFzZVN0b3Jh Z2VUcmVlRWxlbWVudC5wcm90b3R5cGUuX3VwZGF0ZVRpdGxlcyk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUuc2V0IHRpdGxlVGV4dCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUuZ2V0 IHN1YnRpdGxlVGV4dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxl bWVudC5wcm90b3R5cGUuc2V0IHN1YnRpdGxlVGV4dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu RnJhbWVUcmVlRWxlbWVudC5wcm90b3R5cGUuZnJhbWVOYXZpZ2F0ZWQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQucHJvdG90eXBlLmdldCBpdGVtVVJMKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5GcmFtZVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbnNlbGVjdCk6CisK IDIwMTEtMTEtMDggIE5pa29sYXMgWmltbWVybWFubiAgPG56aW1tZXJtYW5uQHJpbS5jb20+CiAK ICAgICAgICAgTm90IHJldmlld2VkLiBGaXggYnVpbGQsIGJ5IHJlbW92aW5nIGFuIHVudXNlZCB2 YXJpYWJsZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv UmVzb3VyY2VzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlc1BhbmVsLmpzCmluZGV4IDBhNjYzYjEyYzdlNzUxNWMwNDA0MjYyZWVmNDM2ZWUyMjAw YzgyMDcuLmY3MDM2ODExZGM1MDJkNjM5MmFjMWUzNzcwNzA1YjY1NjdiMTY4NTQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5q cwpAQCAtODY2LDggKzg2NiwzMiBAQCBXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVu dC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdGhpcy50aXRsZUVsZW1lbnQgPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICAgICAgdGhpcy50aXRsZUVsZW1lbnQuY2xhc3NOYW1l ID0gImJhc2Utc3RvcmFnZS10cmVlLWVsZW1lbnQtdGl0bGUiOwotICAgICAgICB0aGlzLnRpdGxl RWxlbWVudC50ZXh0Q29udGVudCA9IHRoaXMuX3RpdGxlVGV4dDsKICAgICAgICAgdGhpcy5saXN0 SXRlbUVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy50aXRsZUVsZW1lbnQpOworICAgICAgICB0aGlz Ll91cGRhdGVUaXRsZXMoKTsKKyAgICB9LAorCisgICAgZ2V0IGRpc3BsYXlOYW1lKCkKKyAgICB7 CisgICAgICAgIHJldHVybiB0aGlzLl9kaXNwbGF5TmFtZTsKKyAgICB9LAorCisgICAgX3VwZGF0 ZVRpdGxlczogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fZGlzcGxheU5hbWUgPSB0 aGlzLl90aXRsZVRleHQgfHwgIiI7CisgICAgICAgIGlmICh0aGlzLl9zdWJ0aXRsZVRleHQpCisg ICAgICAgICAgICB0aGlzLl9kaXNwbGF5TmFtZSArPSAiICgiICsgdGhpcy5fc3VidGl0bGVUZXh0 ICsgIikiOworICAgICAgICAKKyAgICAgICAgaWYgKCF0aGlzLnRpdGxlRWxlbWVudCkKKyAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgCisgICAgICAgIHRoaXMudGl0bGVFbGVtZW50LnRleHRD b250ZW50ID0gdGhpcy5fdGl0bGVUZXh0IHx8ICIiOworICAgICAgICAKKyAgICAgICAgaWYgKHRo aXMuX3N1YnRpdGxlVGV4dCkgeworICAgICAgICAgICAgdmFyIHN1YnRpdGxlRWxlbWVudCA9IGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKKyAgICAgICAgICAgIHN1YnRpdGxlRWxlbWVu dC5jbGFzc05hbWUgPSAiYmFzZS1zdG9yYWdlLXRyZWUtZWxlbWVudC1zdWJ0aXRsZSI7CisgICAg ICAgICAgICBzdWJ0aXRsZUVsZW1lbnQudGV4dENvbnRlbnQgPSAiKCIgKyB0aGlzLl9zdWJ0aXRs ZVRleHQgKyAiKSI7CisgICAgICAgICAgICB0aGlzLnRpdGxlRWxlbWVudC5hcHBlbmRDaGlsZChz dWJ0aXRsZUVsZW1lbnQpOworICAgICAgICB9CiAgICAgfSwKIAogICAgIG9uc2VsZWN0OiBmdW5j dGlvbigpCkBAIC04OTEsOCArOTE1LDE4IEBAIFdlYkluc3BlY3Rvci5CYXNlU3RvcmFnZVRyZWVF bGVtZW50LnByb3RvdHlwZSA9IHsKICAgICBzZXQgdGl0bGVUZXh0KHRpdGxlVGV4dCkKICAgICB7 CiAgICAgICAgIHRoaXMuX3RpdGxlVGV4dCA9IHRpdGxlVGV4dDsKLSAgICAgICAgaWYgKHRoaXMu dGl0bGVFbGVtZW50KQotICAgICAgICAgICAgdGhpcy50aXRsZUVsZW1lbnQudGV4dENvbnRlbnQg PSB0aGlzLl90aXRsZVRleHQ7CisgICAgICAgIHRoaXMuX3VwZGF0ZVRpdGxlcygpOworICAgIH0s CisKKyAgICBnZXQgc3VidGl0bGVUZXh0KCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9z dWJ0aXRsZVRleHQ7CisgICAgfSwKKworICAgIHNldCBzdWJ0aXRsZVRleHQoc3VidGl0bGVUZXh0 KQorICAgIHsKKyAgICAgICAgdGhpcy5fc3VidGl0bGVUZXh0ID0gc3VidGl0bGVUZXh0OworICAg ICAgICB0aGlzLl91cGRhdGVUaXRsZXMoKTsKICAgICB9LAogCiAgICAgZ2V0IHNlYXJjaE1hdGNo ZXNDb3VudCgpCkBAIC05NzUsOSArMTAwOSw4IEBAIFdlYkluc3BlY3Rvci5GcmFtZVRyZWVFbGVt ZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5yZW1vdmVDaGlsZHJlbigpOwogICAgICAg ICB0aGlzLl9mcmFtZUlkID0gZnJhbWUuaWQ7CiAKLSAgICAgICAgdmFyIHRpdGxlID0gZnJhbWUu bmFtZTsKLSAgICAgICAgdmFyIHN1YnRpdGxlID0gV2ViSW5zcGVjdG9yLlJlc291cmNlLmRpc3Bs YXlOYW1lKGZyYW1lLnVybCk7Ci0gICAgICAgIHRoaXMuc2V0VGl0bGVzKHRpdGxlLCBzdWJ0aXRs ZSk7CisgICAgICAgIHRoaXMudGl0bGVUZXh0ID0gZnJhbWUubmFtZTsKKyAgICAgICAgdGhpcy5z dWJ0aXRsZVRleHQgPSBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuZGlzcGxheU5hbWUoZnJhbWUudXJs KTsKIAogICAgICAgICB0aGlzLl9jYXRlZ29yeUVsZW1lbnRzID0ge307CiAgICAgICAgIHRoaXMu X3RyZWVFbGVtZW50Rm9yUmVzb3VyY2UgPSB7fTsKQEAgLTk4Nyw1MyArMTAyMCwxOCBAQCBXZWJJ bnNwZWN0b3IuRnJhbWVUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAKICAgICBnZXQgaXRlbVVS TCgpCiAgICAgewotICAgICAgICByZXR1cm4gImZyYW1lOi8vIiArIGVuY29kZVVSSSh0aGlzLl9k aXNwbGF5TmFtZSk7Ci0gICAgfSwKLQotICAgIG9uYXR0YWNoOiBmdW5jdGlvbigpCi0gICAgewot ICAgICAgICBXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUub25h dHRhY2guY2FsbCh0aGlzKTsKLSAgICAgICAgaWYgKHRoaXMuX3RpdGxlVG9TZXRPbkF0dGFjaCB8 fCB0aGlzLl9zdWJ0aXRsZVRvU2V0T25BdHRhY2gpIHsKLSAgICAgICAgICAgIHRoaXMuc2V0VGl0 bGVzKHRoaXMuX3RpdGxlVG9TZXRPbkF0dGFjaCwgdGhpcy5fc3VidGl0bGVUb1NldE9uQXR0YWNo KTsKLSAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl90aXRsZVRvU2V0T25BdHRhY2g7Ci0gICAgICAg ICAgICBkZWxldGUgdGhpcy5fc3VidGl0bGVUb1NldE9uQXR0YWNoOwotICAgICAgICB9CisgICAg ICAgIHJldHVybiAiZnJhbWU6Ly8iICsgZW5jb2RlVVJJKHRoaXMuZGlzcGxheU5hbWUpOwogICAg IH0sCiAKICAgICBvbnNlbGVjdDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgV2ViSW5zcGVj dG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uc2VsZWN0LmNhbGwodGhpcyk7 Ci0gICAgICAgIHRoaXMuX3N0b3JhZ2VQYW5lbC5zaG93Q2F0ZWdvcnlWaWV3KHRoaXMuX2Rpc3Bs YXlOYW1lKTsKKyAgICAgICAgdGhpcy5fc3RvcmFnZVBhbmVsLnNob3dDYXRlZ29yeVZpZXcodGhp cy5kaXNwbGF5TmFtZSk7CiAKICAgICAgICAgdGhpcy5saXN0SXRlbUVsZW1lbnQucmVtb3ZlU3R5 bGVDbGFzcygiaG92ZXJlZCIpOwogICAgICAgICBET01BZ2VudC5oaWRlSGlnaGxpZ2h0KCk7CiAg ICAgfSwKIAotICAgIGdldCBkaXNwbGF5TmFtZSgpCi0gICAgewotICAgICAgICByZXR1cm4gdGhp cy5fZGlzcGxheU5hbWU7Ci0gICAgfSwKLQotICAgIHNldFRpdGxlczogZnVuY3Rpb24odGl0bGUs IHN1YnRpdGxlKQotICAgIHsKLSAgICAgICAgdGhpcy5fZGlzcGxheU5hbWUgPSB0aXRsZSB8fCAi IjsKLSAgICAgICAgaWYgKHN1YnRpdGxlKQotICAgICAgICAgICAgdGhpcy5fZGlzcGxheU5hbWUg Kz0gIiAoIiArIHN1YnRpdGxlICsgIikiOwotCi0gICAgICAgIGlmICh0aGlzLnBhcmVudCkgewot ICAgICAgICAgICAgdGhpcy50aXRsZUVsZW1lbnQudGV4dENvbnRlbnQgPSB0aXRsZSB8fCAiIjsK LSAgICAgICAgICAgIGlmIChzdWJ0aXRsZSkgewotICAgICAgICAgICAgICAgIHZhciBzdWJ0aXRs ZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7Ci0gICAgICAgICAgICAg ICAgc3VidGl0bGVFbGVtZW50LmNsYXNzTmFtZSA9ICJiYXNlLXN0b3JhZ2UtdHJlZS1lbGVtZW50 LXN1YnRpdGxlIjsKLSAgICAgICAgICAgICAgICBzdWJ0aXRsZUVsZW1lbnQudGV4dENvbnRlbnQg PSAiKCIgKyBzdWJ0aXRsZSArICIpIjsKLSAgICAgICAgICAgICAgICB0aGlzLnRpdGxlRWxlbWVu dC5hcHBlbmRDaGlsZChzdWJ0aXRsZUVsZW1lbnQpOwotICAgICAgICAgICAgfQotICAgICAgICB9 IGVsc2UgewotICAgICAgICAgICAgdGhpcy5fdGl0bGVUb1NldE9uQXR0YWNoID0gdGl0bGU7Ci0g ICAgICAgICAgICB0aGlzLl9zdWJ0aXRsZVRvU2V0T25BdHRhY2ggPSBzdWJ0aXRsZTsKLSAgICAg ICAgfQotICAgIH0sCi0KICAgICBzZXQgaG92ZXJlZChob3ZlcmVkKQogICAgIHsKICAgICAgICAg aWYgKGhvdmVyZWQpIHsK 114227 2011-11-09 02:24:54 -0800 2011-11-09 03:50:22 -0800 Patch bug-71848-20111109142451.patch text/plain 6419 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogOTk1NDUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2NDBhZjFhOWE3NzQwMWRm MjRjZDI2MTk5YTY5MjY4NTk5ZDVmNTI1Li41YWFiNWI0ZDY3MGNmZDE3ZTYyNTVkZWIyOTUxMDg3 ZjUyMDRmNGI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMTEtMDkgIFZzZXZv bG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogUmVzb3VyY2VzUGFuZWwgc2hvdWxkIHN1cHBvcnQgYWRkaW5nIHN1YnRpdGxlIHRvIGFueSBC YXNlU3RvcmFnZVRyZWVFbGVtZW50LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzE4NDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUub25h dHRhY2gpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQucHJv dG90eXBlLmdldCBkaXNwbGF5TmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQmFzZVN0b3Jh Z2VUcmVlRWxlbWVudC5wcm90b3R5cGUuX3VwZGF0ZURpc3BsYXlOYW1lKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5CYXNlU3RvcmFnZVRyZWVFbGVtZW50LnByb3RvdHlwZS5fdXBkYXRlVGl0bGUp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQucHJvdG90eXBl Ll91cGRhdGVTdWJ0aXRsZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVl RWxlbWVudC5wcm90b3R5cGUuc2V0IHRpdGxlVGV4dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu QmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUuZ2V0IHN1YnRpdGxlVGV4dCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUuc2V0IHN1 YnRpdGxlVGV4dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRnJhbWVUcmVlRWxlbWVudC5wcm90 b3R5cGUuZnJhbWVOYXZpZ2F0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVs ZW1lbnQucHJvdG90eXBlLmdldCBpdGVtVVJMKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GcmFt ZVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbnNlbGVjdCk6CisKIDIwMTEtMTEtMDggIE5pa29sYXMg WmltbWVybWFubiAgPG56aW1tZXJtYW5uQHJpbS5jb20+CiAKICAgICAgICAgTm90IHJldmlld2Vk LiBGaXggYnVpbGQsIGJ5IHJlbW92aW5nIGFuIHVudXNlZCB2YXJpYWJsZS4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4 IDBhNjYzYjEyYzdlNzUxNWMwNDA0MjYyZWVmNDM2ZWUyMjAwYzgyMDcuLjQyZDdjMTJkZThkM2U3 NjhiMDI3M2JjNTNkMGYzMDBmMmFjMWQ0YWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwpAQCAtODY2LDEwICs4NjYsNTUg QEAgV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogCiAg ICAgICAgIHRoaXMudGl0bGVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7 CiAgICAgICAgIHRoaXMudGl0bGVFbGVtZW50LmNsYXNzTmFtZSA9ICJiYXNlLXN0b3JhZ2UtdHJl ZS1lbGVtZW50LXRpdGxlIjsKLSAgICAgICAgdGhpcy50aXRsZUVsZW1lbnQudGV4dENvbnRlbnQg PSB0aGlzLl90aXRsZVRleHQ7CisgICAgICAgIHRoaXMuX3RpdGxlVGV4dE5vZGUgPSBkb2N1bWVu dC5jcmVhdGVUZXh0Tm9kZSgiIik7CisgICAgICAgIHRoaXMudGl0bGVFbGVtZW50LmFwcGVuZENo aWxkKHRoaXMuX3RpdGxlVGV4dE5vZGUpOworICAgICAgICB0aGlzLl91cGRhdGVUaXRsZSgpOwor ICAgICAgICB0aGlzLl91cGRhdGVTdWJ0aXRsZSgpOwogICAgICAgICB0aGlzLmxpc3RJdGVtRWxl bWVudC5hcHBlbmRDaGlsZCh0aGlzLnRpdGxlRWxlbWVudCk7CiAgICAgfSwKIAorICAgIGdldCBk aXNwbGF5TmFtZSgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fZGlzcGxheU5hbWU7Cisg ICAgfSwKKworICAgIF91cGRhdGVEaXNwbGF5TmFtZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAg ICAgdGhpcy5fZGlzcGxheU5hbWUgPSB0aGlzLl90aXRsZVRleHQgfHwgIiI7CisgICAgICAgIGlm ICh0aGlzLl9zdWJ0aXRsZVRleHQpCisgICAgICAgICAgICB0aGlzLl9kaXNwbGF5TmFtZSArPSAi ICgiICsgdGhpcy5fc3VidGl0bGVUZXh0ICsgIikiOworICAgIH0sCisKKyAgICBfdXBkYXRlVGl0 bGU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX3VwZGF0ZURpc3BsYXlOYW1lKCk7 CisgICAgICAgIAorICAgICAgICBpZiAoIXRoaXMudGl0bGVFbGVtZW50KQorICAgICAgICAgICAg cmV0dXJuOworCisgICAgICAgIHRoaXMuX3RpdGxlVGV4dE5vZGUudGV4dENvbnRlbnQgPSB0aGlz Ll90aXRsZVRleHQgfHwgIiI7CisgICAgfSwKKworICAgIF91cGRhdGVTdWJ0aXRsZTogZnVuY3Rp b24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fdXBkYXRlRGlzcGxheU5hbWUoKTsKKyAgICAgICAg CisgICAgICAgIGlmICghdGhpcy50aXRsZUVsZW1lbnQpCisgICAgICAgICAgICByZXR1cm47CisK KyAgICAgICAgaWYgKHRoaXMuX3N1YnRpdGxlVGV4dCkgeworICAgICAgICAgICAgaWYgKCF0aGlz Ll9zdWJ0aXRsZUVsZW1lbnQpIHsKKyAgICAgICAgICAgICAgICB0aGlzLl9zdWJ0aXRsZUVsZW1l bnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CisgICAgICAgICAgICAgICAgdGhp cy5fc3VidGl0bGVFbGVtZW50LmNsYXNzTmFtZSA9ICJiYXNlLXN0b3JhZ2UtdHJlZS1lbGVtZW50 LXN1YnRpdGxlIjsKKyAgICAgICAgICAgICAgICB0aGlzLnRpdGxlRWxlbWVudC5hcHBlbmRDaGls ZCh0aGlzLl9zdWJ0aXRsZUVsZW1lbnQpOworICAgICAgICAgICAgfQorICAgICAgICAgICAgdGhp cy5fc3VidGl0bGVFbGVtZW50LnRleHRDb250ZW50ID0gIigiICsgdGhpcy5fc3VidGl0bGVUZXh0 ICsgIikiOworICAgICAgICB9IGVsc2UgaWYgKHRoaXMuX3N1YnRpdGxlRWxlbWVudCkgeworICAg ICAgICAgICAgdGhpcy50aXRsZUVsZW1lbnQucmVtb3ZlQ2hpbGQodGhpcy5fc3VidGl0bGVFbGVt ZW50KTsKKyAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9zdWJ0aXRsZUVsZW1lbnQ7CisgICAgICAg IH0KKyAgICB9LAorCiAgICAgb25zZWxlY3Q6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHZh ciBpdGVtVVJMID0gdGhpcy5pdGVtVVJMOwpAQCAtODkxLDggKzkzNiwxOCBAQCBXZWJJbnNwZWN0 b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgc2V0IHRpdGxlVGV4 dCh0aXRsZVRleHQpCiAgICAgewogICAgICAgICB0aGlzLl90aXRsZVRleHQgPSB0aXRsZVRleHQ7 Ci0gICAgICAgIGlmICh0aGlzLnRpdGxlRWxlbWVudCkKLSAgICAgICAgICAgIHRoaXMudGl0bGVF bGVtZW50LnRleHRDb250ZW50ID0gdGhpcy5fdGl0bGVUZXh0OworICAgICAgICB0aGlzLl91cGRh dGVUaXRsZSgpOworICAgIH0sCisKKyAgICBnZXQgc3VidGl0bGVUZXh0KCkKKyAgICB7CisgICAg ICAgIHJldHVybiB0aGlzLl9zdWJ0aXRsZVRleHQ7CisgICAgfSwKKworICAgIHNldCBzdWJ0aXRs ZVRleHQoc3VidGl0bGVUZXh0KQorICAgIHsKKyAgICAgICAgdGhpcy5fc3VidGl0bGVUZXh0ID0g c3VidGl0bGVUZXh0OworICAgICAgICB0aGlzLl91cGRhdGVTdWJ0aXRsZSgpOwogICAgIH0sCiAK ICAgICBnZXQgc2VhcmNoTWF0Y2hlc0NvdW50KCkKQEAgLTk3NSw5ICsxMDMwLDggQEAgV2ViSW5z cGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLnJlbW92 ZUNoaWxkcmVuKCk7CiAgICAgICAgIHRoaXMuX2ZyYW1lSWQgPSBmcmFtZS5pZDsKIAotICAgICAg ICB2YXIgdGl0bGUgPSBmcmFtZS5uYW1lOwotICAgICAgICB2YXIgc3VidGl0bGUgPSBXZWJJbnNw ZWN0b3IuUmVzb3VyY2UuZGlzcGxheU5hbWUoZnJhbWUudXJsKTsKLSAgICAgICAgdGhpcy5zZXRU aXRsZXModGl0bGUsIHN1YnRpdGxlKTsKKyAgICAgICAgdGhpcy50aXRsZVRleHQgPSBmcmFtZS5u YW1lOworICAgICAgICB0aGlzLnN1YnRpdGxlVGV4dCA9IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5k aXNwbGF5TmFtZShmcmFtZS51cmwpOwogCiAgICAgICAgIHRoaXMuX2NhdGVnb3J5RWxlbWVudHMg PSB7fTsKICAgICAgICAgdGhpcy5fdHJlZUVsZW1lbnRGb3JSZXNvdXJjZSA9IHt9OwpAQCAtOTg3 LDUzICsxMDQxLDE4IEBAIFdlYkluc3BlY3Rvci5GcmFtZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9 IHsKIAogICAgIGdldCBpdGVtVVJMKCkKICAgICB7Ci0gICAgICAgIHJldHVybiAiZnJhbWU6Ly8i ICsgZW5jb2RlVVJJKHRoaXMuX2Rpc3BsYXlOYW1lKTsKLSAgICB9LAotCi0gICAgb25hdHRhY2g6 IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5CYXNlU3RvcmFnZVRyZWVF bGVtZW50LnByb3RvdHlwZS5vbmF0dGFjaC5jYWxsKHRoaXMpOwotICAgICAgICBpZiAodGhpcy5f dGl0bGVUb1NldE9uQXR0YWNoIHx8IHRoaXMuX3N1YnRpdGxlVG9TZXRPbkF0dGFjaCkgewotICAg ICAgICAgICAgdGhpcy5zZXRUaXRsZXModGhpcy5fdGl0bGVUb1NldE9uQXR0YWNoLCB0aGlzLl9z dWJ0aXRsZVRvU2V0T25BdHRhY2gpOwotICAgICAgICAgICAgZGVsZXRlIHRoaXMuX3RpdGxlVG9T ZXRPbkF0dGFjaDsKLSAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9zdWJ0aXRsZVRvU2V0T25BdHRh Y2g7Ci0gICAgICAgIH0KKyAgICAgICAgcmV0dXJuICJmcmFtZTovLyIgKyBlbmNvZGVVUkkodGhp cy5kaXNwbGF5TmFtZSk7CiAgICAgfSwKIAogICAgIG9uc2VsZWN0OiBmdW5jdGlvbigpCiAgICAg ewogICAgICAgICBXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUu b25zZWxlY3QuY2FsbCh0aGlzKTsKLSAgICAgICAgdGhpcy5fc3RvcmFnZVBhbmVsLnNob3dDYXRl Z29yeVZpZXcodGhpcy5fZGlzcGxheU5hbWUpOworICAgICAgICB0aGlzLl9zdG9yYWdlUGFuZWwu c2hvd0NhdGVnb3J5Vmlldyh0aGlzLmRpc3BsYXlOYW1lKTsKIAogICAgICAgICB0aGlzLmxpc3RJ dGVtRWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJob3ZlcmVkIik7CiAgICAgICAgIERPTUFnZW50 LmhpZGVIaWdobGlnaHQoKTsKICAgICB9LAogCi0gICAgZ2V0IGRpc3BsYXlOYW1lKCkKLSAgICB7 Ci0gICAgICAgIHJldHVybiB0aGlzLl9kaXNwbGF5TmFtZTsKLSAgICB9LAotCi0gICAgc2V0VGl0 bGVzOiBmdW5jdGlvbih0aXRsZSwgc3VidGl0bGUpCi0gICAgewotICAgICAgICB0aGlzLl9kaXNw bGF5TmFtZSA9IHRpdGxlIHx8ICIiOwotICAgICAgICBpZiAoc3VidGl0bGUpCi0gICAgICAgICAg ICB0aGlzLl9kaXNwbGF5TmFtZSArPSAiICgiICsgc3VidGl0bGUgKyAiKSI7Ci0KLSAgICAgICAg aWYgKHRoaXMucGFyZW50KSB7Ci0gICAgICAgICAgICB0aGlzLnRpdGxlRWxlbWVudC50ZXh0Q29u dGVudCA9IHRpdGxlIHx8ICIiOwotICAgICAgICAgICAgaWYgKHN1YnRpdGxlKSB7Ci0gICAgICAg ICAgICAgICAgdmFyIHN1YnRpdGxlRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNw YW4iKTsKLSAgICAgICAgICAgICAgICBzdWJ0aXRsZUVsZW1lbnQuY2xhc3NOYW1lID0gImJhc2Ut c3RvcmFnZS10cmVlLWVsZW1lbnQtc3VidGl0bGUiOwotICAgICAgICAgICAgICAgIHN1YnRpdGxl RWxlbWVudC50ZXh0Q29udGVudCA9ICIoIiArIHN1YnRpdGxlICsgIikiOwotICAgICAgICAgICAg ICAgIHRoaXMudGl0bGVFbGVtZW50LmFwcGVuZENoaWxkKHN1YnRpdGxlRWxlbWVudCk7Ci0gICAg ICAgICAgICB9Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICB0aGlzLl90aXRsZVRvU2V0 T25BdHRhY2ggPSB0aXRsZTsKLSAgICAgICAgICAgIHRoaXMuX3N1YnRpdGxlVG9TZXRPbkF0dGFj aCA9IHN1YnRpdGxlOwotICAgICAgICB9Ci0gICAgfSwKLQogICAgIHNldCBob3ZlcmVkKGhvdmVy ZWQpCiAgICAgewogICAgICAgICBpZiAoaG92ZXJlZCkgewo=