78294 2012-02-09 16:35:30 -0800 Remove TreeOrderIterator and iterate over the child boxes directly. 2012-02-09 17:15:26 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ojan ojan tony oldest_to_newest 553611 0 ojan 2012-02-09 16:35:30 -0800 Remove TreeOrderIterator and iterate over the child boxes directly. 553614 1 126403 ojan 2012-02-09 16:36:25 -0800 Created attachment 126403 Patch 553621 2 126405 ojan 2012-02-09 16:57:21 -0800 Created attachment 126405 Patch 553623 3 126406 ojan 2012-02-09 17:07:19 -0800 Created attachment 126406 Patch 553630 4 ojan 2012-02-09 17:15:26 -0800 Committed r107317: <http://trac.webkit.org/changeset/107317> 126403 2012-02-09 16:36:25 -0800 2012-02-09 16:57:18 -0800 Patch bug-78294-20120209163624.patch text/plain 7705 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3MzAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTUwZTk1NTFkM2ViNjUw MzY3OTdhNDVkZThlYWUzYjBkMzY5ZjFmMi4uZmUxYjNlM2UzNTZkNmQ3YTY4NGUxMDgyMjQwYTRi YTI1YjI2OTFmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTAyLTA5ICBPamFu IFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmVtb3ZlIFRyZWVPcmRlckl0 ZXJhdG9yIGFuZCBpdGVyYXRlIG92ZXIgdGhlIGNoaWxkIGJveGVzIGRpcmVjdGx5LgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzgyOTQKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIFRo aXMgaXMgcHVyZWx5IGEgcmVmYWN0b3IuIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4gCisKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyRmxleGlibGVCb3g6OmxheW91dEZsZXhJdGVtcyk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5BeGlzUHJlZmVycmVkU2l6ZXMpOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oOgorICAgICAgICAoUmVuZGVyRmxleGli bGVCb3gpOgorICAgICAgICAoRmxleE9yZGVySGFzaFRyYWl0cyk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJGbGV4aWJsZUJveDo6RmxleE9yZGVySGFzaFRyYWl0czo6ZW1wdHlWYWx1ZSk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6RmxleE9yZGVySGFzaFRyYWl0czo6 Y29uc3RydWN0RGVsZXRlZFZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxl Qm94OjpGbGV4T3JkZXJIYXNoVHJhaXRzOjppc0RlbGV0ZWRWYWx1ZSk6CisKIDIwMTItMDItMDkg IE1hdHRoZXcgRGVsYW5leSAgPG1kZWxhbmV5QGFwcGxlLmNvbT4KIAogICAgICAgICBnZXRDb21w dXRlZFN0eWxlKCkgcmV0dXJucyBkaWZmZXJlbnQgdmFsdWVzIGZvciBkaWZmZXJlbnQgem9vbSBs ZXZlbHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJs ZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3Bw CmluZGV4IGIwMjVjZDMxNzhmYWU3NDJjNWFkY2VmOWNkNThjYjViNmY3OGJjNjIuLjE0NDkwODcz MGU2ZTY0NzEyMGU3ZDE0NzE1ZjEwZTY1ZmEyNjJkNDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtMzcsNTggKzM3LDYgQEAKIAogbmFt ZXNwYWNlIFdlYkNvcmUgewogCi0vLyBOb3JtYWxseSwgLTEgYW5kIDAgYXJlIG5vdCB2YWxpZCBp biBhIEhhc2hTZXQsIGJ1dCB0aGVzZSBhcmUgcmVsYXRpdmVseSBsaWtlbHkgZmxleC1vcmRlciB2 YWx1ZXMuIEluc3RlYWQsCi0vLyB3ZSBtYWtlIHRoZSB0d28gc21hbGxlc3QgaW50IHZhbHVlcyBp bnZhbGlkIGZsZXgtb3JkZXIgdmFsdWVzIChpbiB0aGUgY3NzIHBhcnNlciBjb2RlIHdlIGNsYW1w IHRoZW0gdG8KLS8vIGludCBtaW4gKyAyKS4KLXN0cnVjdCBGbGV4T3JkZXJIYXNoVHJhaXRzIDog V1RGOjpHZW5lcmljSGFzaFRyYWl0czxpbnQ+IHsKLSAgICBzdGF0aWMgY29uc3QgYm9vbCBlbXB0 eVZhbHVlSXNaZXJvID0gZmFsc2U7Ci0gICAgc3RhdGljIGludCBlbXB0eVZhbHVlKCkgeyByZXR1 cm4gc3RkOjpudW1lcmljX2xpbWl0czxpbnQ+OjptaW4oKTsgfQotICAgIHN0YXRpYyB2b2lkIGNv bnN0cnVjdERlbGV0ZWRWYWx1ZShpbnQmIHNsb3QpIHsgc2xvdCA9IHN0ZDo6bnVtZXJpY19saW1p dHM8aW50Pjo6bWluKCkgKyAxOyB9Ci0gICAgc3RhdGljIGJvb2wgaXNEZWxldGVkVmFsdWUoaW50 IHZhbHVlKSB7IHJldHVybiB2YWx1ZSA9PSBzdGQ6Om51bWVyaWNfbGltaXRzPGludD46Om1pbigp ICsgMTsgfQotfTsKLQotdHlwZWRlZiBIYXNoU2V0PGludCwgRGVmYXVsdEhhc2g8aW50Pjo6SGFz aCwgRmxleE9yZGVySGFzaFRyYWl0cz4gRmxleE9yZGVySGFzaFNldDsKLQotY2xhc3MgUmVuZGVy RmxleGlibGVCb3g6OlRyZWVPcmRlckl0ZXJhdG9yIHsKLXB1YmxpYzoKLSAgICBleHBsaWNpdCBU cmVlT3JkZXJJdGVyYXRvcihSZW5kZXJGbGV4aWJsZUJveCogZmxleGlibGVCb3gpCi0gICAgICAg IDogbV9mbGV4aWJsZUJveChmbGV4aWJsZUJveCkKLSAgICAgICAgLCBtX2N1cnJlbnRDaGlsZCgw KQotICAgIHsKLSAgICB9Ci0KLSAgICBSZW5kZXJCb3gqIGZpcnN0KCkKLSAgICB7Ci0gICAgICAg IHJlc2V0KCk7Ci0gICAgICAgIHJldHVybiBuZXh0KCk7Ci0gICAgfQotCi0gICAgUmVuZGVyQm94 KiBuZXh0KCkKLSAgICB7Ci0gICAgICAgIG1fY3VycmVudENoaWxkID0gbV9jdXJyZW50Q2hpbGQg PyBtX2N1cnJlbnRDaGlsZC0+bmV4dFNpYmxpbmdCb3goKSA6IG1fZmxleGlibGVCb3gtPmZpcnN0 Q2hpbGRCb3goKTsKLQotICAgICAgICBpZiAobV9jdXJyZW50Q2hpbGQpCi0gICAgICAgICAgICBt X2ZsZXhPcmRlclZhbHVlcy5hZGQobV9jdXJyZW50Q2hpbGQtPnN0eWxlKCktPmZsZXhPcmRlcigp KTsKLQotICAgICAgICByZXR1cm4gbV9jdXJyZW50Q2hpbGQ7Ci0gICAgfQotCi0gICAgdm9pZCBy ZXNldCgpCi0gICAgewotICAgICAgICBtX2N1cnJlbnRDaGlsZCA9IDA7Ci0gICAgfQotCi0gICAg Y29uc3QgRmxleE9yZGVySGFzaFNldCYgZmxleE9yZGVyVmFsdWVzKCkKLSAgICB7Ci0gICAgICAg IHJldHVybiBtX2ZsZXhPcmRlclZhbHVlczsKLSAgICB9Ci0KLXByaXZhdGU6Ci0gICAgUmVuZGVy RmxleGlibGVCb3gqIG1fZmxleGlibGVCb3g7Ci0gICAgUmVuZGVyQm94KiBtX2N1cnJlbnRDaGls ZDsKLSAgICBGbGV4T3JkZXJIYXNoU2V0IG1fZmxleE9yZGVyVmFsdWVzOwotfTsKLQogY2xhc3Mg UmVuZGVyRmxleGlibGVCb3g6OkZsZXhPcmRlckl0ZXJhdG9yIHsKIHB1YmxpYzoKICAgICBGbGV4 T3JkZXJJdGVyYXRvcihSZW5kZXJGbGV4aWJsZUJveCogZmxleGlibGVCb3gsIGNvbnN0IEZsZXhP cmRlckhhc2hTZXQmIGZsZXhPcmRlclZhbHVlcykKQEAgLTQ2NywxNiArNDE1LDE2IEBAIHZvaWQg UmVuZGVyRmxleGlibGVCb3g6OmxheW91dEZsZXhJdGVtcyhib29sIHJlbGF5b3V0Q2hpbGRyZW4p CiB7CiAgICAgZmxvYXQgdG90YWxQb3NpdGl2ZUZsZXhpYmlsaXR5OwogICAgIGZsb2F0IHRvdGFs TmVnYXRpdmVGbGV4aWJpbGl0eTsKLSAgICBUcmVlT3JkZXJJdGVyYXRvciB0cmVlSXRlcmF0b3Io dGhpcyk7CiAKKyAgICBGbGV4T3JkZXJIYXNoU2V0IGZsZXhPcmRlclZhbHVlczsKICAgICBXVEY6 OlZlY3RvcjxMYXlvdXRVbml0PiBwcmVmZXJyZWRTaXplczsKLSAgICBjb21wdXRlTWFpbkF4aXNQ cmVmZXJyZWRTaXplcyhyZWxheW91dENoaWxkcmVuLCB0cmVlSXRlcmF0b3IsIHByZWZlcnJlZFNp emVzLCB0b3RhbFBvc2l0aXZlRmxleGliaWxpdHksIHRvdGFsTmVnYXRpdmVGbGV4aWJpbGl0eSk7 CisgICAgY29tcHV0ZU1haW5BeGlzUHJlZmVycmVkU2l6ZXMocmVsYXlvdXRDaGlsZHJlbiwgZmxl eE9yZGVyVmFsdWVzLCBwcmVmZXJyZWRTaXplcywgdG90YWxQb3NpdGl2ZUZsZXhpYmlsaXR5LCB0 b3RhbE5lZ2F0aXZlRmxleGliaWxpdHkpOwogICAgIExheW91dFVuaXQgcHJlZmVycmVkTWFpbkF4 aXNFeHRlbnQgPSAwOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgcHJlZmVycmVkU2l6ZXMu c2l6ZSgpOyArK2kpCiAgICAgICAgIHByZWZlcnJlZE1haW5BeGlzRXh0ZW50ICs9IHByZWZlcnJl ZFNpemVzW2ldOwogICAgIExheW91dFVuaXQgYXZhaWxhYmxlRnJlZVNwYWNlID0gbWFpbkF4aXND b250ZW50RXh0ZW50KCkgLSBwcmVmZXJyZWRNYWluQXhpc0V4dGVudDsKIAotICAgIEZsZXhPcmRl ckl0ZXJhdG9yIGZsZXhJdGVyYXRvcih0aGlzLCB0cmVlSXRlcmF0b3IuZmxleE9yZGVyVmFsdWVz KCkpOworICAgIEZsZXhPcmRlckl0ZXJhdG9yIGZsZXhJdGVyYXRvcih0aGlzLCBmbGV4T3JkZXJW YWx1ZXMpOwogICAgIEluZmxleGlibGVGbGV4SXRlbVNpemUgaW5mbGV4aWJsZUl0ZW1zOwogICAg IFdURjo6VmVjdG9yPExheW91dFVuaXQ+IGNoaWxkU2l6ZXM7CiAgICAgd2hpbGUgKCFydW5GcmVl U3BhY2VBbGxvY2F0aW9uQWxnb3JpdGhtKGZsZXhJdGVyYXRvciwgYXZhaWxhYmxlRnJlZVNwYWNl LCB0b3RhbFBvc2l0aXZlRmxleGliaWxpdHksIHRvdGFsTmVnYXRpdmVGbGV4aWJpbGl0eSwgaW5m bGV4aWJsZUl0ZW1zLCBjaGlsZFNpemVzKSkgewpAQCAtNTEyLDEyICs0NjAsMTQgQEAgTGF5b3V0 VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6bWFyZ2luQm94QXNjZW50KFJlbmRlckJveCogY2hpbGQp CiAgICAgcmV0dXJuIGFzY2VudCArIGZsb3dBd2FyZU1hcmdpbkJlZm9yZUZvckNoaWxkKGNoaWxk KTsKIH0KIAotdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5BeGlzUHJlZmVycmVk U2l6ZXMoYm9vbCByZWxheW91dENoaWxkcmVuLCBUcmVlT3JkZXJJdGVyYXRvciYgaXRlcmF0b3Is IFdURjo6VmVjdG9yPExheW91dFVuaXQ+JiBwcmVmZXJyZWRTaXplcywgZmxvYXQmIHRvdGFsUG9z aXRpdmVGbGV4aWJpbGl0eSwgZmxvYXQmIHRvdGFsTmVnYXRpdmVGbGV4aWJpbGl0eSkKK3ZvaWQg UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluQXhpc1ByZWZlcnJlZFNpemVzKGJvb2wgcmVs YXlvdXRDaGlsZHJlbiwgRmxleE9yZGVySGFzaFNldCYgZmxleE9yZGVyVmFsdWVzLCBXVEY6OlZl Y3RvcjxMYXlvdXRVbml0PiYgcHJlZmVycmVkU2l6ZXMsIGZsb2F0JiB0b3RhbFBvc2l0aXZlRmxl eGliaWxpdHksIGZsb2F0JiB0b3RhbE5lZ2F0aXZlRmxleGliaWxpdHkpCiB7CiAgICAgdG90YWxQ b3NpdGl2ZUZsZXhpYmlsaXR5ID0gdG90YWxOZWdhdGl2ZUZsZXhpYmlsaXR5ID0gMDsKIAogICAg IExheW91dFVuaXQgZmxleGJveEF2YWlsYWJsZUNvbnRlbnRFeHRlbnQgPSBtYWluQXhpc0NvbnRl bnRFeHRlbnQoKTsKLSAgICBmb3IgKFJlbmRlckJveCogY2hpbGQgPSBpdGVyYXRvci5maXJzdCgp OyBjaGlsZDsgY2hpbGQgPSBpdGVyYXRvci5uZXh0KCkpIHsKKyAgICBmb3IgKFJlbmRlckJveCog Y2hpbGQgPSBmaXJzdENoaWxkQm94KCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGlu Z0JveCgpKSB7CisgICAgICAgIGZsZXhPcmRlclZhbHVlcy5hZGQoY2hpbGQtPnN0eWxlKCktPmZs ZXhPcmRlcigpKTsKKwogICAgICAgICBpZiAoY2hpbGQtPmlzUG9zaXRpb25lZCgpKSB7CiAgICAg ICAgICAgICBwcmVmZXJyZWRTaXplcy5hcHBlbmQoMCk7CiAgICAgICAgICAgICBjb250aW51ZTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5o IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKaW5kZXggMDgz MzIxN2I2ODQ5NjRlMTgzZjIyMTRmYjY0NjM1ZjYyZjM3MThhNC4uNmZjM2EzMjk0MDQ5ZDkyZTky YmU1NzEyMjRmNzIwYWY3YWNhOWQzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckZsZXhpYmxlQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckZsZXhpYmxlQm94LmgKQEAgLTQ5LDcgKzQ5LDE3IEBAIHB1YmxpYzoKICAgICBib29sIGlz SG9yaXpvbnRhbEZsb3coKSBjb25zdDsKIAogcHJpdmF0ZToKLSAgICBjbGFzcyBUcmVlT3JkZXJJ dGVyYXRvcjsKKyAgICAvLyBOb3JtYWxseSwgLTEgYW5kIDAgYXJlIG5vdCB2YWxpZCBpbiBhIEhh c2hTZXQsIGJ1dCB0aGVzZSBhcmUgcmVsYXRpdmVseSBsaWtlbHkgZmxleC1vcmRlciB2YWx1ZXMu IEluc3RlYWQsCisgICAgLy8gd2UgbWFrZSB0aGUgdHdvIHNtYWxsZXN0IGludCB2YWx1ZXMgaW52 YWxpZCBmbGV4LW9yZGVyIHZhbHVlcyAoaW4gdGhlIGNzcyBwYXJzZXIgY29kZSB3ZSBjbGFtcCB0 aGVtIHRvCisgICAgLy8gaW50IG1pbiArIDIpLgorICAgIHN0cnVjdCBGbGV4T3JkZXJIYXNoVHJh aXRzIDogV1RGOjpHZW5lcmljSGFzaFRyYWl0czxpbnQ+IHsKKyAgICAgICAgc3RhdGljIGNvbnN0 IGJvb2wgZW1wdHlWYWx1ZUlzWmVybyA9IGZhbHNlOworICAgICAgICBzdGF0aWMgaW50IGVtcHR5 VmFsdWUoKSB7IHJldHVybiBzdGQ6Om51bWVyaWNfbGltaXRzPGludD46Om1pbigpOyB9CisgICAg ICAgIHN0YXRpYyB2b2lkIGNvbnN0cnVjdERlbGV0ZWRWYWx1ZShpbnQmIHNsb3QpIHsgc2xvdCA9 IHN0ZDo6bnVtZXJpY19saW1pdHM8aW50Pjo6bWluKCkgKyAxOyB9CisgICAgICAgIHN0YXRpYyBi b29sIGlzRGVsZXRlZFZhbHVlKGludCB2YWx1ZSkgeyByZXR1cm4gdmFsdWUgPT0gc3RkOjpudW1l cmljX2xpbWl0czxpbnQ+OjptaW4oKSArIDE7IH0KKyAgICB9OworICAgIHR5cGVkZWYgSGFzaFNl dDxpbnQsIERlZmF1bHRIYXNoPGludD46Okhhc2gsIEZsZXhPcmRlckhhc2hUcmFpdHM+IEZsZXhP cmRlckhhc2hTZXQ7CisKICAgICBjbGFzcyBGbGV4T3JkZXJJdGVyYXRvcjsKICAgICB0eXBlZGVm IFdURjo6SGFzaE1hcDxjb25zdCBSZW5kZXJCb3gqLCBMYXlvdXRVbml0PiBJbmZsZXhpYmxlRmxl eEl0ZW1TaXplOwogCkBAIC05NSw3ICsxMDUsNyBAQCBwcml2YXRlOgogICAgIExheW91dFVuaXQg YXZhaWxhYmxlQWxpZ25tZW50U3BhY2VGb3JDaGlsZChSZW5kZXJCb3gqKTsKICAgICBMYXlvdXRV bml0IG1hcmdpbkJveEFzY2VudChSZW5kZXJCb3gqKTsKIAotICAgIHZvaWQgY29tcHV0ZU1haW5B eGlzUHJlZmVycmVkU2l6ZXMoYm9vbCByZWxheW91dENoaWxkcmVuLCBUcmVlT3JkZXJJdGVyYXRv ciYsIFdURjo6VmVjdG9yPExheW91dFVuaXQ+JiwgZmxvYXQmIHRvdGFsUG9zaXRpdmVGbGV4aWJp bGl0eSwgZmxvYXQmIHRvdGFsTmVnYXRpdmVGbGV4aWJpbGl0eSk7CisgICAgdm9pZCBjb21wdXRl TWFpbkF4aXNQcmVmZXJyZWRTaXplcyhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIEZsZXhPcmRlckhh c2hTZXQmLCBXVEY6OlZlY3RvcjxMYXlvdXRVbml0PiYsIGZsb2F0JiB0b3RhbFBvc2l0aXZlRmxl eGliaWxpdHksIGZsb2F0JiB0b3RhbE5lZ2F0aXZlRmxleGliaWxpdHkpOwogICAgIGJvb2wgcnVu RnJlZVNwYWNlQWxsb2NhdGlvbkFsZ29yaXRobShGbGV4T3JkZXJJdGVyYXRvciYsIExheW91dFVu aXQmIGF2YWlsYWJsZUZyZWVTcGFjZSwgZmxvYXQmIHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0eSwg ZmxvYXQmIHRvdGFsTmVnYXRpdmVGbGV4aWJpbGl0eSwgSW5mbGV4aWJsZUZsZXhJdGVtU2l6ZSYs IFdURjo6VmVjdG9yPExheW91dFVuaXQ+JiBjaGlsZFNpemVzKTsKICAgICB2b2lkIHNldExvZ2lj YWxPdmVycmlkZVNpemUoUmVuZGVyQm94KiBjaGlsZCwgTGF5b3V0VW5pdCBjaGlsZFByZWZlcnJl ZFNpemUpOwogICAgIHZvaWQgcHJlcGFyZUNoaWxkRm9yUG9zaXRpb25lZExheW91dChSZW5kZXJC b3gqIGNoaWxkLCBMYXlvdXRVbml0IG1haW5BeGlzT2Zmc2V0LCBMYXlvdXRVbml0IGNyb3NzQXhp c09mZnNldCk7Cg== 126405 2012-02-09 16:57:21 -0800 2012-02-09 17:07:16 -0800 Patch bug-78294-20120209165720.patch text/plain 7043 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3MzEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2FiYmE4ZGQ4OTNlNjFj ZTZmYTNjYjcyNmMxMTU2YzNlZmEwYzQ2YS4uYmMwMzA5NjVkNTVjNzNiOWIxZTY5MzAyM2Y5NjA0 OTA0ZmM4ZDY2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTAyLTA5ICBPamFu IFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmVtb3ZlIFRyZWVPcmRlckl0 ZXJhdG9yIGFuZCBpdGVyYXRlIG92ZXIgdGhlIGNoaWxkIGJveGVzIGRpcmVjdGx5LgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzgyOTQKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIFRo aXMgaXMgcHVyZWx5IGEgcmVmYWN0b3IuIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4gCisKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyRmxleGlibGVCb3g6OmxheW91dEZsZXhJdGVtcyk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5BeGlzUHJlZmVycmVkU2l6ZXMpOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oOgorICAgICAgICAoUmVuZGVyRmxleGli bGVCb3gpOgorICAgICAgICAoRmxleE9yZGVySGFzaFRyYWl0cyk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJGbGV4aWJsZUJveDo6RmxleE9yZGVySGFzaFRyYWl0czo6ZW1wdHlWYWx1ZSk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6RmxleE9yZGVySGFzaFRyYWl0czo6 Y29uc3RydWN0RGVsZXRlZFZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxl Qm94OjpGbGV4T3JkZXJIYXNoVHJhaXRzOjppc0RlbGV0ZWRWYWx1ZSk6CisKIDIwMTItMDItMDkg IFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KIAogICAgICAgICBtb3JlIHJlZmFjdG9y aW5nIG9mIFJlbmRlckZsZXhpYmxlQm94IGluIHByZXBhcmF0aW9uIGZvciBtdWx0aWxpbmUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IGJm ZTFkYjAxNWJlYzY1M2MzNTQzNzc0MTVkMTRlMjk0M2RhMDdhZDkuLjIyYWQ0ZDBhOTRiZjcyNzhl OGVjYzM3MjM5MjljM2MyZmFlOTVkNDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtMzcsNTggKzM3LDYgQEAKIAogbmFtZXNwYWNlIFdl YkNvcmUgewogCi0vLyBOb3JtYWxseSwgLTEgYW5kIDAgYXJlIG5vdCB2YWxpZCBpbiBhIEhhc2hT ZXQsIGJ1dCB0aGVzZSBhcmUgcmVsYXRpdmVseSBsaWtlbHkgZmxleC1vcmRlciB2YWx1ZXMuIElu c3RlYWQsCi0vLyB3ZSBtYWtlIHRoZSB0d28gc21hbGxlc3QgaW50IHZhbHVlcyBpbnZhbGlkIGZs ZXgtb3JkZXIgdmFsdWVzIChpbiB0aGUgY3NzIHBhcnNlciBjb2RlIHdlIGNsYW1wIHRoZW0gdG8K LS8vIGludCBtaW4gKyAyKS4KLXN0cnVjdCBGbGV4T3JkZXJIYXNoVHJhaXRzIDogV1RGOjpHZW5l cmljSGFzaFRyYWl0czxpbnQ+IHsKLSAgICBzdGF0aWMgY29uc3QgYm9vbCBlbXB0eVZhbHVlSXNa ZXJvID0gZmFsc2U7Ci0gICAgc3RhdGljIGludCBlbXB0eVZhbHVlKCkgeyByZXR1cm4gc3RkOjpu dW1lcmljX2xpbWl0czxpbnQ+OjptaW4oKTsgfQotICAgIHN0YXRpYyB2b2lkIGNvbnN0cnVjdERl bGV0ZWRWYWx1ZShpbnQmIHNsb3QpIHsgc2xvdCA9IHN0ZDo6bnVtZXJpY19saW1pdHM8aW50Pjo6 bWluKCkgKyAxOyB9Ci0gICAgc3RhdGljIGJvb2wgaXNEZWxldGVkVmFsdWUoaW50IHZhbHVlKSB7 IHJldHVybiB2YWx1ZSA9PSBzdGQ6Om51bWVyaWNfbGltaXRzPGludD46Om1pbigpICsgMTsgfQot fTsKLQotdHlwZWRlZiBIYXNoU2V0PGludCwgRGVmYXVsdEhhc2g8aW50Pjo6SGFzaCwgRmxleE9y ZGVySGFzaFRyYWl0cz4gRmxleE9yZGVySGFzaFNldDsKLQotY2xhc3MgUmVuZGVyRmxleGlibGVC b3g6OlRyZWVPcmRlckl0ZXJhdG9yIHsKLXB1YmxpYzoKLSAgICBleHBsaWNpdCBUcmVlT3JkZXJJ dGVyYXRvcihSZW5kZXJGbGV4aWJsZUJveCogZmxleGlibGVCb3gpCi0gICAgICAgIDogbV9mbGV4 aWJsZUJveChmbGV4aWJsZUJveCkKLSAgICAgICAgLCBtX2N1cnJlbnRDaGlsZCgwKQotICAgIHsK LSAgICB9Ci0KLSAgICBSZW5kZXJCb3gqIGZpcnN0KCkKLSAgICB7Ci0gICAgICAgIHJlc2V0KCk7 Ci0gICAgICAgIHJldHVybiBuZXh0KCk7Ci0gICAgfQotCi0gICAgUmVuZGVyQm94KiBuZXh0KCkK LSAgICB7Ci0gICAgICAgIG1fY3VycmVudENoaWxkID0gbV9jdXJyZW50Q2hpbGQgPyBtX2N1cnJl bnRDaGlsZC0+bmV4dFNpYmxpbmdCb3goKSA6IG1fZmxleGlibGVCb3gtPmZpcnN0Q2hpbGRCb3go KTsKLQotICAgICAgICBpZiAobV9jdXJyZW50Q2hpbGQpCi0gICAgICAgICAgICBtX2ZsZXhPcmRl clZhbHVlcy5hZGQobV9jdXJyZW50Q2hpbGQtPnN0eWxlKCktPmZsZXhPcmRlcigpKTsKLQotICAg ICAgICByZXR1cm4gbV9jdXJyZW50Q2hpbGQ7Ci0gICAgfQotCi0gICAgdm9pZCByZXNldCgpCi0g ICAgewotICAgICAgICBtX2N1cnJlbnRDaGlsZCA9IDA7Ci0gICAgfQotCi0gICAgY29uc3QgRmxl eE9yZGVySGFzaFNldCYgZmxleE9yZGVyVmFsdWVzKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiBt X2ZsZXhPcmRlclZhbHVlczsKLSAgICB9Ci0KLXByaXZhdGU6Ci0gICAgUmVuZGVyRmxleGlibGVC b3gqIG1fZmxleGlibGVCb3g7Ci0gICAgUmVuZGVyQm94KiBtX2N1cnJlbnRDaGlsZDsKLSAgICBG bGV4T3JkZXJIYXNoU2V0IG1fZmxleE9yZGVyVmFsdWVzOwotfTsKLQogY2xhc3MgUmVuZGVyRmxl eGlibGVCb3g6OkZsZXhPcmRlckl0ZXJhdG9yIHsKIHB1YmxpYzoKICAgICBGbGV4T3JkZXJJdGVy YXRvcihSZW5kZXJGbGV4aWJsZUJveCogZmxleGlibGVCb3gsIGNvbnN0IEZsZXhPcmRlckhhc2hT ZXQmIGZsZXhPcmRlclZhbHVlcykKQEAgLTQ2NSwxNCArNDEzLDE0IEBAIExheW91dFVuaXQgUmVu ZGVyRmxleGlibGVCb3g6OnByZWZlcnJlZE1haW5BeGlzQ29udGVudEV4dGVudEZvckNoaWxkKFJl bmRlckJveCoKIAogdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0RmxleEl0ZW1zKGJvb2wg cmVsYXlvdXRDaGlsZHJlbikKIHsKLSAgICBUcmVlT3JkZXJJdGVyYXRvciB0cmVlSXRlcmF0b3Io dGhpcyk7Ci0gICAgY29tcHV0ZU1haW5BeGlzUHJlZmVycmVkU2l6ZXMocmVsYXlvdXRDaGlsZHJl biwgdHJlZUl0ZXJhdG9yKTsKKyAgICBGbGV4T3JkZXJIYXNoU2V0IGZsZXhPcmRlclZhbHVlczsK KyAgICBjb21wdXRlTWFpbkF4aXNQcmVmZXJyZWRTaXplcyhyZWxheW91dENoaWxkcmVuLCBmbGV4 T3JkZXJWYWx1ZXMpOwogCiAgICAgT3JkZXJlZEZsZXhJdGVtTGlzdCBvcmRlcmVkQ2hpbGRyZW47 CiAgICAgTGF5b3V0VW5pdCBwcmVmZXJyZWRNYWluQXhpc0V4dGVudDsKICAgICBmbG9hdCB0b3Rh bFBvc2l0aXZlRmxleGliaWxpdHk7CiAgICAgZmxvYXQgdG90YWxOZWdhdGl2ZUZsZXhpYmlsaXR5 OwotICAgIEZsZXhPcmRlckl0ZXJhdG9yIGZsZXhJdGVyYXRvcih0aGlzLCB0cmVlSXRlcmF0b3Iu ZmxleE9yZGVyVmFsdWVzKCkpOworICAgIEZsZXhPcmRlckl0ZXJhdG9yIGZsZXhJdGVyYXRvcih0 aGlzLCBmbGV4T3JkZXJWYWx1ZXMpOwogICAgIGNvbXB1dGVGbGV4T3JkZXIoZmxleEl0ZXJhdG9y LCBvcmRlcmVkQ2hpbGRyZW4sIHByZWZlcnJlZE1haW5BeGlzRXh0ZW50LCB0b3RhbFBvc2l0aXZl RmxleGliaWxpdHksIHRvdGFsTmVnYXRpdmVGbGV4aWJpbGl0eSk7CiAKICAgICBMYXlvdXRVbml0 IGF2YWlsYWJsZUZyZWVTcGFjZSA9IG1haW5BeGlzQ29udGVudEV4dGVudCgpIC0gcHJlZmVycmVk TWFpbkF4aXNFeHRlbnQ7CkBAIC01MTEsMTAgKzQ1OSwxMiBAQCBMYXlvdXRVbml0IFJlbmRlckZs ZXhpYmxlQm94OjptYXJnaW5Cb3hBc2NlbnQoUmVuZGVyQm94KiBjaGlsZCkKICAgICByZXR1cm4g YXNjZW50ICsgZmxvd0F3YXJlTWFyZ2luQmVmb3JlRm9yQ2hpbGQoY2hpbGQpOwogfQogCi12b2lk IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpbkF4aXNQcmVmZXJyZWRTaXplcyhib29sIHJl bGF5b3V0Q2hpbGRyZW4sIFRyZWVPcmRlckl0ZXJhdG9yJiBpdGVyYXRvcikKK3ZvaWQgUmVuZGVy RmxleGlibGVCb3g6OmNvbXB1dGVNYWluQXhpc1ByZWZlcnJlZFNpemVzKGJvb2wgcmVsYXlvdXRD aGlsZHJlbiwgRmxleE9yZGVySGFzaFNldCYgZmxleE9yZGVyVmFsdWVzKQogewogICAgIExheW91 dFVuaXQgZmxleGJveEF2YWlsYWJsZUNvbnRlbnRFeHRlbnQgPSBtYWluQXhpc0NvbnRlbnRFeHRl bnQoKTsKLSAgICBmb3IgKFJlbmRlckJveCogY2hpbGQgPSBpdGVyYXRvci5maXJzdCgpOyBjaGls ZDsgY2hpbGQgPSBpdGVyYXRvci5uZXh0KCkpIHsKKyAgICBmb3IgKFJlbmRlckJveCogY2hpbGQg PSBmaXJzdENoaWxkQm94KCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZ0JveCgp KSB7CisgICAgICAgIGZsZXhPcmRlclZhbHVlcy5hZGQoY2hpbGQtPnN0eWxlKCktPmZsZXhPcmRl cigpKTsKKwogICAgICAgICBpZiAoY2hpbGQtPmlzUG9zaXRpb25lZCgpKQogICAgICAgICAgICAg Y29udGludWU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG bGV4aWJsZUJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94 LmgKaW5kZXggNzJkYmRjYjBlMDhlNzY0N2E3YjZkZTY0ZWVlZWMwZDRhZGQ2OGM1ZS4uNjBkMWI3 MjA2OTk0Y2Q1MjgwNDMyZDJiOTI3NWFmMTFjYjVhMWIxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKQEAgLTQ5LDcgKzQ5LDE3IEBAIHB1YmxpYzoK ICAgICBib29sIGlzSG9yaXpvbnRhbEZsb3coKSBjb25zdDsKIAogcHJpdmF0ZToKLSAgICBjbGFz cyBUcmVlT3JkZXJJdGVyYXRvcjsKKyAgICAvLyBOb3JtYWxseSwgLTEgYW5kIDAgYXJlIG5vdCB2 YWxpZCBpbiBhIEhhc2hTZXQsIGJ1dCB0aGVzZSBhcmUgcmVsYXRpdmVseSBsaWtlbHkgZmxleC1v cmRlciB2YWx1ZXMuIEluc3RlYWQsCisgICAgLy8gd2UgbWFrZSB0aGUgdHdvIHNtYWxsZXN0IGlu dCB2YWx1ZXMgaW52YWxpZCBmbGV4LW9yZGVyIHZhbHVlcyAoaW4gdGhlIGNzcyBwYXJzZXIgY29k ZSB3ZSBjbGFtcCB0aGVtIHRvCisgICAgLy8gaW50IG1pbiArIDIpLgorICAgIHN0cnVjdCBGbGV4 T3JkZXJIYXNoVHJhaXRzIDogV1RGOjpHZW5lcmljSGFzaFRyYWl0czxpbnQ+IHsKKyAgICAgICAg c3RhdGljIGNvbnN0IGJvb2wgZW1wdHlWYWx1ZUlzWmVybyA9IGZhbHNlOworICAgICAgICBzdGF0 aWMgaW50IGVtcHR5VmFsdWUoKSB7IHJldHVybiBzdGQ6Om51bWVyaWNfbGltaXRzPGludD46Om1p bigpOyB9CisgICAgICAgIHN0YXRpYyB2b2lkIGNvbnN0cnVjdERlbGV0ZWRWYWx1ZShpbnQmIHNs b3QpIHsgc2xvdCA9IHN0ZDo6bnVtZXJpY19saW1pdHM8aW50Pjo6bWluKCkgKyAxOyB9CisgICAg ICAgIHN0YXRpYyBib29sIGlzRGVsZXRlZFZhbHVlKGludCB2YWx1ZSkgeyByZXR1cm4gdmFsdWUg PT0gc3RkOjpudW1lcmljX2xpbWl0czxpbnQ+OjptaW4oKSArIDE7IH0KKyAgICB9OworICAgIHR5 cGVkZWYgSGFzaFNldDxpbnQsIERlZmF1bHRIYXNoPGludD46Okhhc2gsIEZsZXhPcmRlckhhc2hU cmFpdHM+IEZsZXhPcmRlckhhc2hTZXQ7CisKICAgICBjbGFzcyBGbGV4T3JkZXJJdGVyYXRvcjsK ICAgICB0eXBlZGVmIFdURjo6SGFzaE1hcDxjb25zdCBSZW5kZXJCb3gqLCBMYXlvdXRVbml0PiBJ bmZsZXhpYmxlRmxleEl0ZW1TaXplOwogICAgIHR5cGVkZWYgV1RGOjpWZWN0b3I8UmVuZGVyQm94 Kj4gT3JkZXJlZEZsZXhJdGVtTGlzdDsKQEAgLTk2LDcgKzEwNiw3IEBAIHByaXZhdGU6CiAgICAg TGF5b3V0VW5pdCBhdmFpbGFibGVBbGlnbm1lbnRTcGFjZUZvckNoaWxkKFJlbmRlckJveCopOwog ICAgIExheW91dFVuaXQgbWFyZ2luQm94QXNjZW50KFJlbmRlckJveCopOwogCi0gICAgdm9pZCBj b21wdXRlTWFpbkF4aXNQcmVmZXJyZWRTaXplcyhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIFRyZWVP cmRlckl0ZXJhdG9yJik7CisgICAgdm9pZCBjb21wdXRlTWFpbkF4aXNQcmVmZXJyZWRTaXplcyhi b29sIHJlbGF5b3V0Q2hpbGRyZW4sIEZsZXhPcmRlckhhc2hTZXQmKTsKICAgICB2b2lkIGNvbXB1 dGVGbGV4T3JkZXIoRmxleE9yZGVySXRlcmF0b3ImLCBPcmRlcmVkRmxleEl0ZW1MaXN0JiBvcmRl cmVkQ2hpbGRyZW4sIExheW91dFVuaXQmIHByZWZlcnJlZE1haW5BeGlzRXh0ZW50LCBmbG9hdCYg dG90YWxQb3NpdGl2ZUZsZXhpYmlsaXR5LCBmbG9hdCYgdG90YWxOZWdhdGl2ZUZsZXhpYmlsaXR5 KTsKICAgICBib29sIHJ1bkZyZWVTcGFjZUFsbG9jYXRpb25BbGdvcml0aG0oY29uc3QgT3JkZXJl ZEZsZXhJdGVtTGlzdCYsIExheW91dFVuaXQmIGF2YWlsYWJsZUZyZWVTcGFjZSwgZmxvYXQmIHRv dGFsUG9zaXRpdmVGbGV4aWJpbGl0eSwgZmxvYXQmIHRvdGFsTmVnYXRpdmVGbGV4aWJpbGl0eSwg SW5mbGV4aWJsZUZsZXhJdGVtU2l6ZSYsIFdURjo6VmVjdG9yPExheW91dFVuaXQ+JiBjaGlsZFNp emVzKTsKICAgICB2b2lkIHNldExvZ2ljYWxPdmVycmlkZVNpemUoUmVuZGVyQm94KiBjaGlsZCwg TGF5b3V0VW5pdCBjaGlsZFByZWZlcnJlZFNpemUpOwo= 126406 2012-02-09 17:07:19 -0800 2012-02-09 17:09:47 -0800 Patch bug-78294-20120209170718.patch text/plain 6493 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3MzEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2FiYmE4ZGQ4OTNlNjFj ZTZmYTNjYjcyNmMxMTU2YzNlZmEwYzQ2YS4uYmMwMzA5NjVkNTVjNzNiOWIxZTY5MzAyM2Y5NjA0 OTA0ZmM4ZDY2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTAyLTA5ICBPamFu IFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmVtb3ZlIFRyZWVPcmRlckl0 ZXJhdG9yIGFuZCBpdGVyYXRlIG92ZXIgdGhlIGNoaWxkIGJveGVzIGRpcmVjdGx5LgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzgyOTQKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIFRo aXMgaXMgcHVyZWx5IGEgcmVmYWN0b3IuIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4gCisKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyRmxleGlibGVCb3g6OmxheW91dEZsZXhJdGVtcyk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5BeGlzUHJlZmVycmVkU2l6ZXMpOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oOgorICAgICAgICAoUmVuZGVyRmxleGli bGVCb3gpOgorICAgICAgICAoRmxleE9yZGVySGFzaFRyYWl0cyk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJGbGV4aWJsZUJveDo6RmxleE9yZGVySGFzaFRyYWl0czo6ZW1wdHlWYWx1ZSk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6RmxleE9yZGVySGFzaFRyYWl0czo6 Y29uc3RydWN0RGVsZXRlZFZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxl Qm94OjpGbGV4T3JkZXJIYXNoVHJhaXRzOjppc0RlbGV0ZWRWYWx1ZSk6CisKIDIwMTItMDItMDkg IFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KIAogICAgICAgICBtb3JlIHJlZmFjdG9y aW5nIG9mIFJlbmRlckZsZXhpYmxlQm94IGluIHByZXBhcmF0aW9uIGZvciBtdWx0aWxpbmUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IGJm ZTFkYjAxNWJlYzY1M2MzNTQzNzc0MTVkMTRlMjk0M2RhMDdhZDkuLjlmYTU2NjA0Yzc3ZTFlN2Yy NzYwNDMwNzJmM2NmMTMwNjVhYzgwMGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtNDAsNTUgKzQwLDEzIEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKIC8vIE5vcm1hbGx5LCAtMSBhbmQgMCBhcmUgbm90IHZhbGlkIGluIGEgSGFzaFNldCwg YnV0IHRoZXNlIGFyZSByZWxhdGl2ZWx5IGxpa2VseSBmbGV4LW9yZGVyIHZhbHVlcy4gSW5zdGVh ZCwKIC8vIHdlIG1ha2UgdGhlIHR3byBzbWFsbGVzdCBpbnQgdmFsdWVzIGludmFsaWQgZmxleC1v cmRlciB2YWx1ZXMgKGluIHRoZSBjc3MgcGFyc2VyIGNvZGUgd2UgY2xhbXAgdGhlbSB0bwogLy8g aW50IG1pbiArIDIpLgotc3RydWN0IEZsZXhPcmRlckhhc2hUcmFpdHMgOiBXVEY6OkdlbmVyaWNI YXNoVHJhaXRzPGludD4geworc3RydWN0IFJlbmRlckZsZXhpYmxlQm94OjpGbGV4T3JkZXJIYXNo VHJhaXRzIDogV1RGOjpHZW5lcmljSGFzaFRyYWl0czxpbnQ+IHsKICAgICBzdGF0aWMgY29uc3Qg Ym9vbCBlbXB0eVZhbHVlSXNaZXJvID0gZmFsc2U7CiAgICAgc3RhdGljIGludCBlbXB0eVZhbHVl KCkgeyByZXR1cm4gc3RkOjpudW1lcmljX2xpbWl0czxpbnQ+OjptaW4oKTsgfQogICAgIHN0YXRp YyB2b2lkIGNvbnN0cnVjdERlbGV0ZWRWYWx1ZShpbnQmIHNsb3QpIHsgc2xvdCA9IHN0ZDo6bnVt ZXJpY19saW1pdHM8aW50Pjo6bWluKCkgKyAxOyB9CiAgICAgc3RhdGljIGJvb2wgaXNEZWxldGVk VmFsdWUoaW50IHZhbHVlKSB7IHJldHVybiB2YWx1ZSA9PSBzdGQ6Om51bWVyaWNfbGltaXRzPGlu dD46Om1pbigpICsgMTsgfQogfTsKIAotdHlwZWRlZiBIYXNoU2V0PGludCwgRGVmYXVsdEhhc2g8 aW50Pjo6SGFzaCwgRmxleE9yZGVySGFzaFRyYWl0cz4gRmxleE9yZGVySGFzaFNldDsKLQotY2xh c3MgUmVuZGVyRmxleGlibGVCb3g6OlRyZWVPcmRlckl0ZXJhdG9yIHsKLXB1YmxpYzoKLSAgICBl eHBsaWNpdCBUcmVlT3JkZXJJdGVyYXRvcihSZW5kZXJGbGV4aWJsZUJveCogZmxleGlibGVCb3gp Ci0gICAgICAgIDogbV9mbGV4aWJsZUJveChmbGV4aWJsZUJveCkKLSAgICAgICAgLCBtX2N1cnJl bnRDaGlsZCgwKQotICAgIHsKLSAgICB9Ci0KLSAgICBSZW5kZXJCb3gqIGZpcnN0KCkKLSAgICB7 Ci0gICAgICAgIHJlc2V0KCk7Ci0gICAgICAgIHJldHVybiBuZXh0KCk7Ci0gICAgfQotCi0gICAg UmVuZGVyQm94KiBuZXh0KCkKLSAgICB7Ci0gICAgICAgIG1fY3VycmVudENoaWxkID0gbV9jdXJy ZW50Q2hpbGQgPyBtX2N1cnJlbnRDaGlsZC0+bmV4dFNpYmxpbmdCb3goKSA6IG1fZmxleGlibGVC b3gtPmZpcnN0Q2hpbGRCb3goKTsKLQotICAgICAgICBpZiAobV9jdXJyZW50Q2hpbGQpCi0gICAg ICAgICAgICBtX2ZsZXhPcmRlclZhbHVlcy5hZGQobV9jdXJyZW50Q2hpbGQtPnN0eWxlKCktPmZs ZXhPcmRlcigpKTsKLQotICAgICAgICByZXR1cm4gbV9jdXJyZW50Q2hpbGQ7Ci0gICAgfQotCi0g ICAgdm9pZCByZXNldCgpCi0gICAgewotICAgICAgICBtX2N1cnJlbnRDaGlsZCA9IDA7Ci0gICAg fQotCi0gICAgY29uc3QgRmxleE9yZGVySGFzaFNldCYgZmxleE9yZGVyVmFsdWVzKCkKLSAgICB7 Ci0gICAgICAgIHJldHVybiBtX2ZsZXhPcmRlclZhbHVlczsKLSAgICB9Ci0KLXByaXZhdGU6Ci0g ICAgUmVuZGVyRmxleGlibGVCb3gqIG1fZmxleGlibGVCb3g7Ci0gICAgUmVuZGVyQm94KiBtX2N1 cnJlbnRDaGlsZDsKLSAgICBGbGV4T3JkZXJIYXNoU2V0IG1fZmxleE9yZGVyVmFsdWVzOwotfTsK LQogY2xhc3MgUmVuZGVyRmxleGlibGVCb3g6OkZsZXhPcmRlckl0ZXJhdG9yIHsKIHB1YmxpYzoK ICAgICBGbGV4T3JkZXJJdGVyYXRvcihSZW5kZXJGbGV4aWJsZUJveCogZmxleGlibGVCb3gsIGNv bnN0IEZsZXhPcmRlckhhc2hTZXQmIGZsZXhPcmRlclZhbHVlcykKQEAgLTQ2NSwxNCArNDIzLDE0 IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OnByZWZlcnJlZE1haW5BeGlzQ29udGVu dEV4dGVudEZvckNoaWxkKFJlbmRlckJveCoKIAogdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6bGF5 b3V0RmxleEl0ZW1zKGJvb2wgcmVsYXlvdXRDaGlsZHJlbikKIHsKLSAgICBUcmVlT3JkZXJJdGVy YXRvciB0cmVlSXRlcmF0b3IodGhpcyk7Ci0gICAgY29tcHV0ZU1haW5BeGlzUHJlZmVycmVkU2l6 ZXMocmVsYXlvdXRDaGlsZHJlbiwgdHJlZUl0ZXJhdG9yKTsKKyAgICBGbGV4T3JkZXJIYXNoU2V0 IGZsZXhPcmRlclZhbHVlczsKKyAgICBjb21wdXRlTWFpbkF4aXNQcmVmZXJyZWRTaXplcyhyZWxh eW91dENoaWxkcmVuLCBmbGV4T3JkZXJWYWx1ZXMpOwogCiAgICAgT3JkZXJlZEZsZXhJdGVtTGlz dCBvcmRlcmVkQ2hpbGRyZW47CiAgICAgTGF5b3V0VW5pdCBwcmVmZXJyZWRNYWluQXhpc0V4dGVu dDsKICAgICBmbG9hdCB0b3RhbFBvc2l0aXZlRmxleGliaWxpdHk7CiAgICAgZmxvYXQgdG90YWxO ZWdhdGl2ZUZsZXhpYmlsaXR5OwotICAgIEZsZXhPcmRlckl0ZXJhdG9yIGZsZXhJdGVyYXRvcih0 aGlzLCB0cmVlSXRlcmF0b3IuZmxleE9yZGVyVmFsdWVzKCkpOworICAgIEZsZXhPcmRlckl0ZXJh dG9yIGZsZXhJdGVyYXRvcih0aGlzLCBmbGV4T3JkZXJWYWx1ZXMpOwogICAgIGNvbXB1dGVGbGV4 T3JkZXIoZmxleEl0ZXJhdG9yLCBvcmRlcmVkQ2hpbGRyZW4sIHByZWZlcnJlZE1haW5BeGlzRXh0 ZW50LCB0b3RhbFBvc2l0aXZlRmxleGliaWxpdHksIHRvdGFsTmVnYXRpdmVGbGV4aWJpbGl0eSk7 CiAKICAgICBMYXlvdXRVbml0IGF2YWlsYWJsZUZyZWVTcGFjZSA9IG1haW5BeGlzQ29udGVudEV4 dGVudCgpIC0gcHJlZmVycmVkTWFpbkF4aXNFeHRlbnQ7CkBAIC01MTEsMTAgKzQ2OSwxMiBAQCBM YXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjptYXJnaW5Cb3hBc2NlbnQoUmVuZGVyQm94KiBj aGlsZCkKICAgICByZXR1cm4gYXNjZW50ICsgZmxvd0F3YXJlTWFyZ2luQmVmb3JlRm9yQ2hpbGQo Y2hpbGQpOwogfQogCi12b2lkIFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpbkF4aXNQcmVm ZXJyZWRTaXplcyhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIFRyZWVPcmRlckl0ZXJhdG9yJiBpdGVy YXRvcikKK3ZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluQXhpc1ByZWZlcnJlZFNp emVzKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgRmxleE9yZGVySGFzaFNldCYgZmxleE9yZGVyVmFs dWVzKQogewogICAgIExheW91dFVuaXQgZmxleGJveEF2YWlsYWJsZUNvbnRlbnRFeHRlbnQgPSBt YWluQXhpc0NvbnRlbnRFeHRlbnQoKTsKLSAgICBmb3IgKFJlbmRlckJveCogY2hpbGQgPSBpdGVy YXRvci5maXJzdCgpOyBjaGlsZDsgY2hpbGQgPSBpdGVyYXRvci5uZXh0KCkpIHsKKyAgICBmb3Ig KFJlbmRlckJveCogY2hpbGQgPSBmaXJzdENoaWxkQm94KCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxk LT5uZXh0U2libGluZ0JveCgpKSB7CisgICAgICAgIGZsZXhPcmRlclZhbHVlcy5hZGQoY2hpbGQt PnN0eWxlKCktPmZsZXhPcmRlcigpKTsKKwogICAgICAgICBpZiAoY2hpbGQtPmlzUG9zaXRpb25l ZCgpKQogICAgICAgICAgICAgY29udGludWU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckZsZXhpYmxlQm94LmgKaW5kZXggNzJkYmRjYjBlMDhlNzY0N2E3YjZkZTY0ZWVlZWMw ZDRhZGQ2OGM1ZS4uNDhlOWZiNThjNjZhMjEyMDU4OGUxYmQ1ODVmZDc1N2UxNmUxOWY3MyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKQEAgLTQ5LDcg KzQ5LDkgQEAgcHVibGljOgogICAgIGJvb2wgaXNIb3Jpem9udGFsRmxvdygpIGNvbnN0OwogCiBw cml2YXRlOgotICAgIGNsYXNzIFRyZWVPcmRlckl0ZXJhdG9yOworICAgIHN0cnVjdCBGbGV4T3Jk ZXJIYXNoVHJhaXRzOworICAgIHR5cGVkZWYgSGFzaFNldDxpbnQsIERlZmF1bHRIYXNoPGludD46 Okhhc2gsIEZsZXhPcmRlckhhc2hUcmFpdHM+IEZsZXhPcmRlckhhc2hTZXQ7CisKICAgICBjbGFz cyBGbGV4T3JkZXJJdGVyYXRvcjsKICAgICB0eXBlZGVmIFdURjo6SGFzaE1hcDxjb25zdCBSZW5k ZXJCb3gqLCBMYXlvdXRVbml0PiBJbmZsZXhpYmxlRmxleEl0ZW1TaXplOwogICAgIHR5cGVkZWYg V1RGOjpWZWN0b3I8UmVuZGVyQm94Kj4gT3JkZXJlZEZsZXhJdGVtTGlzdDsKQEAgLTk2LDcgKzk4 LDcgQEAgcHJpdmF0ZToKICAgICBMYXlvdXRVbml0IGF2YWlsYWJsZUFsaWdubWVudFNwYWNlRm9y Q2hpbGQoUmVuZGVyQm94Kik7CiAgICAgTGF5b3V0VW5pdCBtYXJnaW5Cb3hBc2NlbnQoUmVuZGVy Qm94Kik7CiAKLSAgICB2b2lkIGNvbXB1dGVNYWluQXhpc1ByZWZlcnJlZFNpemVzKGJvb2wgcmVs YXlvdXRDaGlsZHJlbiwgVHJlZU9yZGVySXRlcmF0b3ImKTsKKyAgICB2b2lkIGNvbXB1dGVNYWlu QXhpc1ByZWZlcnJlZFNpemVzKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgRmxleE9yZGVySGFzaFNl dCYpOwogICAgIHZvaWQgY29tcHV0ZUZsZXhPcmRlcihGbGV4T3JkZXJJdGVyYXRvciYsIE9yZGVy ZWRGbGV4SXRlbUxpc3QmIG9yZGVyZWRDaGlsZHJlbiwgTGF5b3V0VW5pdCYgcHJlZmVycmVkTWFp bkF4aXNFeHRlbnQsIGZsb2F0JiB0b3RhbFBvc2l0aXZlRmxleGliaWxpdHksIGZsb2F0JiB0b3Rh bE5lZ2F0aXZlRmxleGliaWxpdHkpOwogICAgIGJvb2wgcnVuRnJlZVNwYWNlQWxsb2NhdGlvbkFs Z29yaXRobShjb25zdCBPcmRlcmVkRmxleEl0ZW1MaXN0JiwgTGF5b3V0VW5pdCYgYXZhaWxhYmxl RnJlZVNwYWNlLCBmbG9hdCYgdG90YWxQb3NpdGl2ZUZsZXhpYmlsaXR5LCBmbG9hdCYgdG90YWxO ZWdhdGl2ZUZsZXhpYmlsaXR5LCBJbmZsZXhpYmxlRmxleEl0ZW1TaXplJiwgV1RGOjpWZWN0b3I8 TGF5b3V0VW5pdD4mIGNoaWxkU2l6ZXMpOwogICAgIHZvaWQgc2V0TG9naWNhbE92ZXJyaWRlU2l6 ZShSZW5kZXJCb3gqIGNoaWxkLCBMYXlvdXRVbml0IGNoaWxkUHJlZmVycmVkU2l6ZSk7Cg==