40362 2010-06-09 07:12:06 -0700 [Qt] canvas/philip/tests/2d.path.stroke.overlap.html fails with Qt-4.6.2 or higher 2012-05-22 12:22:41 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 79666 1 ossy rafael.lobo abarth eric noam ossy rafael.lobo webkit.review.bot oldest_to_newest 235770 0 ossy 2010-06-09 07:12:06 -0700 canvas/philip/tests/2d.path.stroke.overlap.html passes with Qt-4.6.0, but fails with Qt-4.6.2 and Qt-4.7.0. --- /home/webkitbuildbot/slaves/release32bit-4.7.0/buildslave/qt-linux-32-release-qt470/build/layout-test-results/canvas/philip/tests/2d.path.stroke.overlap-expected.txt 2010-06-09 03:27:09.907399661 -0700 +++ /home/webkitbuildbot/slaves/release32bit-4.7.0/buildslave/qt-linux-32-release-qt470/build/layout-test-results/canvas/philip/tests/2d.path.stroke.overlap-actual.txt 2010-06-09 03:27:09.903399630 -0700 @@ -5,4 +5,4 @@ Actual output: Expected output: -Passed +Failed assertion: got pixel [0,191,0,255] at (50,25), expected [0,127,0,255] +/- 1 235778 1 ossy 2010-06-09 07:34:34 -0700 Skipped by http://trac.webkit.org/changeset/60890 until fix to make buildbots happy after update to Qt-4.6.2. 235791 2 webkit.review.bot 2010-06-09 08:36:01 -0700 http://trac.webkit.org/changeset/60890 might have broken GTK Linux 32-bit Debug The following changes are on the blame list: http://trac.webkit.org/changeset/60890 http://trac.webkit.org/changeset/60891 http://trac.webkit.org/changeset/60892 235805 3 ossy 2010-06-09 08:54:22 -0700 (In reply to comment #2) > http://trac.webkit.org/changeset/60890 might have broken GTK Linux 32-bit Debug > The following changes are on the blame list: > http://trac.webkit.org/changeset/60890 > http://trac.webkit.org/changeset/60891 > http://trac.webkit.org/changeset/60892 no, we are innocent now. :) 627602 4 ossy 2012-05-18 05:49:19 -0700 Still valid bug with Qt 4.8 and Qt 5 WK1 and WK2. 627763 5 rafael.lobo 2012-05-18 09:44:58 -0700 I'll investigate it. 629350 6 rafael.lobo 2012-05-21 12:02:58 -0700 (In reply to comment #5) > I'll investigate it. According to spec: "As a result of how the algorithm to trace a path is defined, overlapping parts of the paths in one stroke operation are treated as if _their union_ was what was painted." We are not handling like that, but we are painting the intersection darker, thus the failure on it. It came out that the problem is how the function QPainter::strokePath works, I'm still trying to figure out a great solution for it. 629758 7 143148 rafael.lobo 2012-05-21 17:34:04 -0700 Created attachment 143148 Patch Hey No'am, could you take a look? 630424 8 143148 noam 2012-05-22 09:07:57 -0700 Comment on attachment 143148 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=143148&action=review > Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp:575 > + QPainterPath stroke = pathStroker.createStroke(platformPath); > + p->fillPath(stroke, shadowPen.brush()); You repeat this sequence about 5 times, please put it in some static function. 630473 9 143318 rafael.lobo 2012-05-22 09:56:36 -0700 Created attachment 143318 Patch 630479 10 143318 noam 2012-05-22 10:03:08 -0700 Comment on attachment 143318 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=143318&action=review > Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp:531 > +inline static void fillPathStroke(QPainter* painter, QPainterPathStroker& pathStroker, QPainterPath& platformPath, const QBrush& brush) shouldn't platformPath be a const reference? 630527 11 143326 rafael.lobo 2012-05-22 10:41:41 -0700 Created attachment 143326 Patch 630659 12 143326 webkit.review.bot 2012-05-22 12:22:35 -0700 Comment on attachment 143326 Patch Clearing flags on attachment: 143326 Committed r118020: <http://trac.webkit.org/changeset/118020> 630660 13 webkit.review.bot 2012-05-22 12:22:41 -0700 All reviewed patches have been landed. Closing bug. 143148 2012-05-21 17:34:04 -0700 2012-05-22 09:56:28 -0700 Patch bug-40362-20120521213357.patch text/plain 6202 rafael.lobo U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3ODU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGY2NWM4NjNkYmFmMTMz YzA0N2IzYWRkNzNjODA3ZWMyN2Y5ZmM4Yi4uOTMzMjVhNzUwZjU5NjFkODM4YTJjMjlmYzY5YzVi NjYwNDkwMDE4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA1LTIxICBSYWZh ZWwgQnJhbmRhbyAgPHJhZmFlbC5sb2JvQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW1F0XSBj YW52YXMvcGhpbGlwL3Rlc3RzLzJkLnBhdGguc3Ryb2tlLm92ZXJsYXAuaHRtbCBmYWlscyB3aXRo IFF0LTQuNi4yIG9yIGhpZ2hlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NDAzNjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBCZWZvcmUgZHJhd2luZyB0aGUgc3Ryb2tlIGZyb20gYSBjZXJ0YWluIHBhdGgs IGl0IHNob3VsZCBtYWtlIHRoZSB1bmlvbiBvZiB0aGUgc3Ryb2tlIGFyZWFzLgorICAgICAgICBU aGUgcHJldmlvdXMgaW1wbGVtZW50YXRpb24gZGlkbid0IGNvbnNpZGVyIHRoYXQgc28gdGhlIGlu dGVyc2VjdGlvbiB3YXMgcGFpbnRlZCB0d2ljZS4KKyAgICAgICAgQnkgdXNpbmcgUVBhaW50ZXJQ YXRoU3Ryb2tlciwgd2UgY3JlYXRlIGEgUVBhaW50ZXJQYXRoIG9uIHRvcCBvZiB0aGUgcGxhdGZv cm0gcGF0aCwgYW5kCisgICAgICAgIHRoZW4gd2UgZmlsbCBpdCB3aXRoIHRoZSBleHBlY3RlZCBi cnVzaC4gVGhpcyB3YXkgd2UgYXZvaWQgcmVwYWludGluZyBhcmVhcy4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkdyYXBoaWNzQ29udGV4dDo6c3Ryb2tlUGF0aCk6CisKIDIwMTItMDUtMjEgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEZpeCBidWcgaW4gcGFpbnROaW5l UGllY2VJbWFnZSBleHBvc2VkIGJ5IHN1YnBpeGVsIGNoYW5nZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCmlu ZGV4IGI4ZTk1ZjI1ZjgxZDM4OTkxYjUzM2JmODUwMmZjOWIxMGUwNTM2Y2EuLjAxOWUxYzVjNzFi NjQ4MjExYzMwZDZmMjA5ZDk1ODRmNjNiYWVjNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHAKQEAgLTU5 LDYgKzU5LDcgQEAKICNpbmNsdWRlIDxRUGFpbnRFbmdpbmU+CiAjaW5jbHVkZSA8UVBhaW50ZXI+ CiAjaW5jbHVkZSA8UVBhaW50ZXJQYXRoPgorI2luY2x1ZGUgPFFQYWludGVyUGF0aFN0cm9rZXI+ CiAjaW5jbHVkZSA8UVBpeG1hcD4KICNpbmNsdWRlIDxRUG9seWdvbkY+CiAjaW5jbHVkZSA8UVN0 YWNrPgpAQCAtNTM2LDYgKzUzNywxMiBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6c3Ryb2tlUGF0 aChjb25zdCBQYXRoJiBwYXRoKQogICAgIFFQZW4gcGVuKHAtPnBlbigpKTsKICAgICBRUGFpbnRl clBhdGggcGxhdGZvcm1QYXRoID0gcGF0aC5wbGF0Zm9ybVBhdGgoKTsKICAgICBwbGF0Zm9ybVBh dGguc2V0RmlsbFJ1bGUodG9RdEZpbGxSdWxlKGZpbGxSdWxlKCkpKTsKKyAgICBRUGFpbnRlclBh dGhTdHJva2VyIHBhdGhTdHJva2VyOworICAgIHBhdGhTdHJva2VyLnNldEpvaW5TdHlsZShwZW4u am9pblN0eWxlKCkpOworICAgIHBhdGhTdHJva2VyLnNldERhc2hPZmZzZXQocGVuLmRhc2hPZmZz ZXQoKSk7CisgICAgcGF0aFN0cm9rZXIuc2V0TWl0ZXJMaW1pdChwZW4ubWl0ZXJMaW1pdCgpKTsK KyAgICBwYXRoU3Ryb2tlci5zZXRDYXBTdHlsZShwZW4uY2FwU3R5bGUoKSk7CisgICAgcGF0aFN0 cm9rZXIuc2V0V2lkdGgocGVuLndpZHRoRigpKTsKIAogICAgIGlmIChoYXNTaGFkb3coKSkgewog ICAgICAgICBTaGFkb3dCbHVyKiBzaGFkb3cgPSBzaGFkb3dCbHVyKCk7CkBAIC01NDksMTEgKzU1 NiwxMSBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6c3Ryb2tlUGF0aChjb25zdCBQYXRoJiBwYXRo KQogICAgICAgICAgICAgICAgIGlmIChtX3N0YXRlLnN0cm9rZUdyYWRpZW50KSB7CiAgICAgICAg ICAgICAgICAgICAgIFFCcnVzaCBicnVzaCgqbV9zdGF0ZS5zdHJva2VHcmFkaWVudC0+cGxhdGZv cm1HcmFkaWVudCgpKTsKICAgICAgICAgICAgICAgICAgICAgYnJ1c2guc2V0VHJhbnNmb3JtKG1f c3RhdGUuc3Ryb2tlR3JhZGllbnQtPmdyYWRpZW50U3BhY2VUcmFuc2Zvcm0oKSk7Ci0gICAgICAg ICAgICAgICAgICAgIFFQZW4gc2hhZG93UGVuKHBlbik7Ci0gICAgICAgICAgICAgICAgICAgIHNo YWRvd1Blbi5zZXRCcnVzaChicnVzaCk7Ci0gICAgICAgICAgICAgICAgICAgIHNoYWRvd1BhaW50 ZXItPnN0cm9rZVBhdGgocGxhdGZvcm1QYXRoLCBzaGFkb3dQZW4pOworICAgICAgICAgICAgICAg ICAgICBRUGFpbnRlclBhdGggc3Ryb2tlID0gcGF0aFN0cm9rZXIuY3JlYXRlU3Ryb2tlKHBsYXRm b3JtUGF0aCk7CisgICAgICAgICAgICAgICAgICAgIHNoYWRvd1BhaW50ZXItPmZpbGxQYXRoKHN0 cm9rZSwgYnJ1c2gpOwogICAgICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAg ICAgIHNoYWRvd1BhaW50ZXItPnN0cm9rZVBhdGgocGxhdGZvcm1QYXRoLCBwZW4pOworICAgICAg ICAgICAgICAgICAgICBRUGFpbnRlclBhdGggc3Ryb2tlID0gcGF0aFN0cm9rZXIuY3JlYXRlU3Ry b2tlKHBsYXRmb3JtUGF0aCk7CisgICAgICAgICAgICAgICAgICAgIHNoYWRvd1BhaW50ZXItPmZp bGxQYXRoKHN0cm9rZSwgcGVuLmJydXNoKCkpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAg ICAgICAgICBzaGFkb3ctPmVuZFNoYWRvd0xheWVyKHRoaXMpOwogICAgICAgICAgICAgfQpAQCAt NTY0LDI0ICs1NzEsMjYgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OnN0cm9rZVBhdGgoY29uc3Qg UGF0aCYgcGF0aCkKICAgICAgICAgICAgIHNoYWRvd0NvbG9yLnNldEFscGhhRihzaGFkb3dDb2xv ci5hbHBoYUYoKSAqIHBlbi5jb2xvcigpLmFscGhhRigpKTsKICAgICAgICAgICAgIFFQZW4gc2hh ZG93UGVuKHBlbik7CiAgICAgICAgICAgICBzaGFkb3dQZW4uc2V0Q29sb3Ioc2hhZG93Q29sb3Ip OwotICAgICAgICAgICAgcC0+c3Ryb2tlUGF0aChwbGF0Zm9ybVBhdGgsIHNoYWRvd1Blbik7Cisg ICAgICAgICAgICBRUGFpbnRlclBhdGggc3Ryb2tlID0gcGF0aFN0cm9rZXIuY3JlYXRlU3Ryb2tl KHBsYXRmb3JtUGF0aCk7CisgICAgICAgICAgICBwLT5maWxsUGF0aChzdHJva2UsIHNoYWRvd1Bl bi5icnVzaCgpKTsKICAgICAgICAgICAgIHAtPnRyYW5zbGF0ZSgtb2Zmc2V0KTsKICAgICAgICAg fQogICAgIH0KIAogICAgIGlmIChtX3N0YXRlLnN0cm9rZVBhdHRlcm4pIHsKICAgICAgICAgQWZm aW5lVHJhbnNmb3JtIGFmZmluZTsKLSAgICAgICAgcGVuLnNldEJydXNoKFFCcnVzaChtX3N0YXRl LnN0cm9rZVBhdHRlcm4tPmNyZWF0ZVBsYXRmb3JtUGF0dGVybihhZmZpbmUpKSk7Ci0gICAgICAg IHAtPnNldFBlbihwZW4pOwotICAgICAgICBwLT5zdHJva2VQYXRoKHBsYXRmb3JtUGF0aCwgcGVu KTsKKyAgICAgICAgUUJydXNoIGJydXNoID0gbV9zdGF0ZS5zdHJva2VQYXR0ZXJuLT5jcmVhdGVQ bGF0Zm9ybVBhdHRlcm4oYWZmaW5lKTsKKyAgICAgICAgUVBhaW50ZXJQYXRoIHN0cm9rZSA9IHBh dGhTdHJva2VyLmNyZWF0ZVN0cm9rZShwbGF0Zm9ybVBhdGgpOworICAgICAgICBwLT5maWxsUGF0 aChzdHJva2UsIGJydXNoKTsKICAgICB9IGVsc2UgaWYgKG1fc3RhdGUuc3Ryb2tlR3JhZGllbnQp IHsKICAgICAgICAgUUJydXNoIGJydXNoKCptX3N0YXRlLnN0cm9rZUdyYWRpZW50LT5wbGF0Zm9y bUdyYWRpZW50KCkpOwogICAgICAgICBicnVzaC5zZXRUcmFuc2Zvcm0obV9zdGF0ZS5zdHJva2VH cmFkaWVudC0+Z3JhZGllbnRTcGFjZVRyYW5zZm9ybSgpKTsKLSAgICAgICAgcGVuLnNldEJydXNo KGJydXNoKTsKLSAgICAgICAgcC0+c2V0UGVuKHBlbik7Ci0gICAgICAgIHAtPnN0cm9rZVBhdGgo cGxhdGZvcm1QYXRoLCBwZW4pOwotICAgIH0gZWxzZQotICAgICAgICBwLT5zdHJva2VQYXRoKHBs YXRmb3JtUGF0aCwgcGVuKTsKKyAgICAgICAgUVBhaW50ZXJQYXRoIHN0cm9rZSA9IHBhdGhTdHJv a2VyLmNyZWF0ZVN0cm9rZShwbGF0Zm9ybVBhdGgpOworICAgICAgICBwLT5maWxsUGF0aChzdHJv a2UsIGJydXNoKTsKKyAgICB9IGVsc2UgeworICAgICAgICBRUGFpbnRlclBhdGggc3Ryb2tlID0g cGF0aFN0cm9rZXIuY3JlYXRlU3Ryb2tlKHBsYXRmb3JtUGF0aCk7CisgICAgICAgIHAtPmZpbGxQ YXRoKHN0cm9rZSwgcGVuLmJydXNoKCkpOworICAgIH0KIH0KIAogc3RhdGljIGlubGluZSB2b2lk IGRyYXdSZXBlYXRQYXR0ZXJuKFFQYWludGVyKiBwLCBRUGl4bWFwKiBpbWFnZSwgY29uc3QgRmxv YXRSZWN0JiByZWN0LCBjb25zdCBib29sIHJlcGVhdFgsIGNvbnN0IGJvb2wgcmVwZWF0WSkKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpp bmRleCBmODE5NWZjNzNiZGVkMTczZGZiODBjNTIxYjkyNjMxMmFkNDc5Y2JmLi5hNzM0NTc4NDRm YWRjYWUwMjZiNTAxMTkyMGJiM2RhNWJkY2M3Nzg3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIw MTItMDUtMjEgIFJhZmFlbCBCcmFuZGFvICA8cmFmYWVsLmxvYm9Ab3BlbmJvc3NhLm9yZz4KKwor ICAgICAgICBbUXRdIGNhbnZhcy9waGlsaXAvdGVzdHMvMmQucGF0aC5zdHJva2Uub3ZlcmxhcC5o dG1sIGZhaWxzIHdpdGggUXQtNC42LjIgb3IgaGlnaGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDM2MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vcXQvU2tpcHBlZDogVW5za2lwIHRl c3QgYWZ0ZXIgZml4LgorCiAyMDEyLTA1LTIxICBFbWlsIEEgRWtsdW5kICA8ZWFlQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBGaXggYnVnIGluIHBhaW50TmluZVBpZWNlSW1hZ2UgZXhwb3NlZCBi eSBzdWJwaXhlbCBjaGFuZ2UKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1Nr aXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCmluZGV4IDIxMDViYWNiNzRk NWUxYmU2NzJiMjMyOGQwZmVjODFmNGJkMTIyZjguLjE5YzkxYjdjYzI3MGQ3MDRlMzhhMzQwMjUz MmM2ZmYxYTEzOTlkYzYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBw ZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZApAQCAtMjExOSwxMCArMjEx OSw2IEBAIGZhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL2JkaS1kaXItZGVmYXVsdC10by1hdXRvLmh0 bWwKICMgUmVncmVzc2lvbnMgb2NjdXJlZCBhZnRlciBRdCB2ZXJzaW9uIHVwZGF0ZQogIyA9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PSAjCiAKLSMgW1F0XSBjYW52YXMvcGhpbGlwL3Rlc3RzLzJkLnBhdGgu c3Ryb2tlLm92ZXJsYXAuaHRtbCBmYWlscyB3aXRoIFF0LTQuNi4yIG9yIGhpZ2hlcgotIyBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDAzNjIKLWNhbnZhcy9waGlsaXAv dGVzdHMvMmQucGF0aC5zdHJva2Uub3ZlcmxhcC5odG1sCi0KICMgW1F0XSBlZGl0aW5nL2V4ZWND b21tYW5kL21vdmUtc2VsZWN0aW9uLWJhY2stbGluZS5odG1sIGZhaWxzIHdpdGggUXQgPj0gNC43 LjEKICMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwMTQ0CiBlZGl0 aW5nL2V4ZWNDb21tYW5kL21vdmUtc2VsZWN0aW9uLWJhY2stbGluZS5odG1sCg== 143318 2012-05-22 09:56:36 -0700 2012-05-22 10:41:34 -0700 Patch bug-40362-20120522135633.patch text/plain 6518 rafael.lobo U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3OTg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTc2MTMyYjRjZGEzZjI3 NTg1Mzk3YTU4ZmU2YTg3ZTcyNjgxOTA2My4uMTNkNzVhYTJmMjEwYmJiNzU5NzkyN2M0YTYwNjdj ZjZkZDc1ODZlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA1LTIyICBSYWZh ZWwgQnJhbmRhbyAgPHJhZmFlbC5sb2JvQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW1F0XSBj YW52YXMvcGhpbGlwL3Rlc3RzLzJkLnBhdGguc3Ryb2tlLm92ZXJsYXAuaHRtbCBmYWlscyB3aXRo IFF0LTQuNi4yIG9yIGhpZ2hlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NDAzNjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBCZWZvcmUgZHJhd2luZyB0aGUgc3Ryb2tlIGZyb20gYSBjZXJ0YWluIHBhdGgs IGl0IHNob3VsZCBtYWtlIHRoZSB1bmlvbiBvZiB0aGUgc3Ryb2tlIGFyZWFzLgorICAgICAgICBU aGUgcHJldmlvdXMgaW1wbGVtZW50YXRpb24gZGlkbid0IGNvbnNpZGVyIHRoYXQgc28gdGhlIGlu dGVyc2VjdGlvbiB3YXMgcGFpbnRlZCB0d2ljZS4KKyAgICAgICAgQnkgdXNpbmcgUVBhaW50ZXJQ YXRoU3Ryb2tlciwgd2UgY3JlYXRlIGEgUVBhaW50ZXJQYXRoIG9uIHRvcCBvZiB0aGUgcGxhdGZv cm0gcGF0aCwgYW5kCisgICAgICAgIHRoZW4gd2UgZmlsbCBpdCB3aXRoIHRoZSBleHBlY3RlZCBi cnVzaC4gVGhpcyB3YXkgd2UgYXZvaWQgcmVwYWludGluZyBhcmVhcy4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OmZpbGxQYXRoU3Ryb2tlKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29y ZTo6R3JhcGhpY3NDb250ZXh0OjpzdHJva2VQYXRoKToKKwogMjAxMi0wNS0yMiAgRGFuYSBKYW5z ZW5zICA8ZGFuYWtqQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIEV4cGFuZCBk YW1hZ2UgZnJvbSB0aGUgYmFja2dyb3VuZC1ibHVycmVkIGxheWVyIHRvIGVuc3VyZSByZWFkYmFj ayBpcyBvbmx5IGluY2x1ZGluZyBwaXhlbHMgYmVsb3cgdGhhdCBsYXllcgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQu Y3BwCmluZGV4IGI4ZTk1ZjI1ZjgxZDM4OTkxYjUzM2JmODUwMmZjOWIxMGUwNTM2Y2EuLjU5MDRm NTQxN2RkNTdlZDk4MzlmMzkwZGRhMjUyNWU0MzE1MTU2NWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHAK QEAgLTU5LDYgKzU5LDcgQEAKICNpbmNsdWRlIDxRUGFpbnRFbmdpbmU+CiAjaW5jbHVkZSA8UVBh aW50ZXI+CiAjaW5jbHVkZSA8UVBhaW50ZXJQYXRoPgorI2luY2x1ZGUgPFFQYWludGVyUGF0aFN0 cm9rZXI+CiAjaW5jbHVkZSA8UVBpeG1hcD4KICNpbmNsdWRlIDxRUG9seWdvbkY+CiAjaW5jbHVk ZSA8UVN0YWNrPgpAQCAtNTI3LDYgKzUyOCwxMiBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6Zmls bFBhdGgoY29uc3QgUGF0aCYgcGF0aCkKICAgICAgICAgcC0+ZmlsbFBhdGgocGxhdGZvcm1QYXRo LCBwLT5icnVzaCgpKTsKIH0KIAoraW5saW5lIHN0YXRpYyB2b2lkIGZpbGxQYXRoU3Ryb2tlKFFQ YWludGVyKiBwYWludGVyLCBRUGFpbnRlclBhdGhTdHJva2VyJiBwYXRoU3Ryb2tlciwgUVBhaW50 ZXJQYXRoJiBwbGF0Zm9ybVBhdGgsIGNvbnN0IFFCcnVzaCYgYnJ1c2gpCit7CisgICAgUVBhaW50 ZXJQYXRoIHN0cm9rZSA9IHBhdGhTdHJva2VyLmNyZWF0ZVN0cm9rZShwbGF0Zm9ybVBhdGgpOwor ICAgIHBhaW50ZXItPmZpbGxQYXRoKHN0cm9rZSwgYnJ1c2gpOworfQorCiB2b2lkIEdyYXBoaWNz Q29udGV4dDo6c3Ryb2tlUGF0aChjb25zdCBQYXRoJiBwYXRoKQogewogICAgIGlmIChwYWludGlu Z0Rpc2FibGVkKCkpCkBAIC01MzYsNiArNTQzLDEyIEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0Ojpz dHJva2VQYXRoKGNvbnN0IFBhdGgmIHBhdGgpCiAgICAgUVBlbiBwZW4ocC0+cGVuKCkpOwogICAg IFFQYWludGVyUGF0aCBwbGF0Zm9ybVBhdGggPSBwYXRoLnBsYXRmb3JtUGF0aCgpOwogICAgIHBs YXRmb3JtUGF0aC5zZXRGaWxsUnVsZSh0b1F0RmlsbFJ1bGUoZmlsbFJ1bGUoKSkpOworICAgIFFQ YWludGVyUGF0aFN0cm9rZXIgcGF0aFN0cm9rZXI7CisgICAgcGF0aFN0cm9rZXIuc2V0Sm9pblN0 eWxlKHBlbi5qb2luU3R5bGUoKSk7CisgICAgcGF0aFN0cm9rZXIuc2V0RGFzaE9mZnNldChwZW4u ZGFzaE9mZnNldCgpKTsKKyAgICBwYXRoU3Ryb2tlci5zZXRNaXRlckxpbWl0KHBlbi5taXRlckxp bWl0KCkpOworICAgIHBhdGhTdHJva2VyLnNldENhcFN0eWxlKHBlbi5jYXBTdHlsZSgpKTsKKyAg ICBwYXRoU3Ryb2tlci5zZXRXaWR0aChwZW4ud2lkdGhGKCkpOwogCiAgICAgaWYgKGhhc1NoYWRv dygpKSB7CiAgICAgICAgIFNoYWRvd0JsdXIqIHNoYWRvdyA9IHNoYWRvd0JsdXIoKTsKQEAgLTU0 OSwxMiArNTYyLDkgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OnN0cm9rZVBhdGgoY29uc3QgUGF0 aCYgcGF0aCkKICAgICAgICAgICAgICAgICBpZiAobV9zdGF0ZS5zdHJva2VHcmFkaWVudCkgewog ICAgICAgICAgICAgICAgICAgICBRQnJ1c2ggYnJ1c2goKm1fc3RhdGUuc3Ryb2tlR3JhZGllbnQt PnBsYXRmb3JtR3JhZGllbnQoKSk7CiAgICAgICAgICAgICAgICAgICAgIGJydXNoLnNldFRyYW5z Zm9ybShtX3N0YXRlLnN0cm9rZUdyYWRpZW50LT5ncmFkaWVudFNwYWNlVHJhbnNmb3JtKCkpOwot ICAgICAgICAgICAgICAgICAgICBRUGVuIHNoYWRvd1BlbihwZW4pOwotICAgICAgICAgICAgICAg ICAgICBzaGFkb3dQZW4uc2V0QnJ1c2goYnJ1c2gpOwotICAgICAgICAgICAgICAgICAgICBzaGFk b3dQYWludGVyLT5zdHJva2VQYXRoKHBsYXRmb3JtUGF0aCwgc2hhZG93UGVuKTsKLSAgICAgICAg ICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgICAgICBzaGFkb3dQYWludGVyLT5zdHJv a2VQYXRoKHBsYXRmb3JtUGF0aCwgcGVuKTsKLSAgICAgICAgICAgICAgICB9CisgICAgICAgICAg ICAgICAgICAgIGZpbGxQYXRoU3Ryb2tlKHNoYWRvd1BhaW50ZXIsIHBhdGhTdHJva2VyLCBwbGF0 Zm9ybVBhdGgsIGJydXNoKTsKKyAgICAgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgICAg ICAgICAgZmlsbFBhdGhTdHJva2Uoc2hhZG93UGFpbnRlciwgcGF0aFN0cm9rZXIsIHBsYXRmb3Jt UGF0aCwgcGVuLmJydXNoKCkpOwogICAgICAgICAgICAgICAgIHNoYWRvdy0+ZW5kU2hhZG93TGF5 ZXIodGhpcyk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZSB7CkBAIC01NjQsMjQgKzU3 NCwyMSBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6c3Ryb2tlUGF0aChjb25zdCBQYXRoJiBwYXRo KQogICAgICAgICAgICAgc2hhZG93Q29sb3Iuc2V0QWxwaGFGKHNoYWRvd0NvbG9yLmFscGhhRigp ICogcGVuLmNvbG9yKCkuYWxwaGFGKCkpOwogICAgICAgICAgICAgUVBlbiBzaGFkb3dQZW4ocGVu KTsKICAgICAgICAgICAgIHNoYWRvd1Blbi5zZXRDb2xvcihzaGFkb3dDb2xvcik7Ci0gICAgICAg ICAgICBwLT5zdHJva2VQYXRoKHBsYXRmb3JtUGF0aCwgc2hhZG93UGVuKTsKKyAgICAgICAgICAg IGZpbGxQYXRoU3Ryb2tlKHAsIHBhdGhTdHJva2VyLCBwbGF0Zm9ybVBhdGgsIHNoYWRvd1Blbi5i cnVzaCgpKTsKICAgICAgICAgICAgIHAtPnRyYW5zbGF0ZSgtb2Zmc2V0KTsKICAgICAgICAgfQog ICAgIH0KIAogICAgIGlmIChtX3N0YXRlLnN0cm9rZVBhdHRlcm4pIHsKICAgICAgICAgQWZmaW5l VHJhbnNmb3JtIGFmZmluZTsKLSAgICAgICAgcGVuLnNldEJydXNoKFFCcnVzaChtX3N0YXRlLnN0 cm9rZVBhdHRlcm4tPmNyZWF0ZVBsYXRmb3JtUGF0dGVybihhZmZpbmUpKSk7Ci0gICAgICAgIHAt PnNldFBlbihwZW4pOwotICAgICAgICBwLT5zdHJva2VQYXRoKHBsYXRmb3JtUGF0aCwgcGVuKTsK KyAgICAgICAgUUJydXNoIGJydXNoID0gbV9zdGF0ZS5zdHJva2VQYXR0ZXJuLT5jcmVhdGVQbGF0 Zm9ybVBhdHRlcm4oYWZmaW5lKTsKKyAgICAgICAgZmlsbFBhdGhTdHJva2UocCwgcGF0aFN0cm9r ZXIsIHBsYXRmb3JtUGF0aCwgYnJ1c2gpOwogICAgIH0gZWxzZSBpZiAobV9zdGF0ZS5zdHJva2VH cmFkaWVudCkgewogICAgICAgICBRQnJ1c2ggYnJ1c2goKm1fc3RhdGUuc3Ryb2tlR3JhZGllbnQt PnBsYXRmb3JtR3JhZGllbnQoKSk7CiAgICAgICAgIGJydXNoLnNldFRyYW5zZm9ybShtX3N0YXRl LnN0cm9rZUdyYWRpZW50LT5ncmFkaWVudFNwYWNlVHJhbnNmb3JtKCkpOwotICAgICAgICBwZW4u c2V0QnJ1c2goYnJ1c2gpOwotICAgICAgICBwLT5zZXRQZW4ocGVuKTsKLSAgICAgICAgcC0+c3Ry b2tlUGF0aChwbGF0Zm9ybVBhdGgsIHBlbik7CisgICAgICAgIGZpbGxQYXRoU3Ryb2tlKHAsIHBh dGhTdHJva2VyLCBwbGF0Zm9ybVBhdGgsIGJydXNoKTsKICAgICB9IGVsc2UKLSAgICAgICAgcC0+ c3Ryb2tlUGF0aChwbGF0Zm9ybVBhdGgsIHBlbik7CisgICAgICAgIGZpbGxQYXRoU3Ryb2tlKHAs IHBhdGhTdHJva2VyLCBwbGF0Zm9ybVBhdGgsIHBlbi5icnVzaCgpKTsKIH0KIAogc3RhdGljIGlu bGluZSB2b2lkIGRyYXdSZXBlYXRQYXR0ZXJuKFFQYWludGVyKiBwLCBRUGl4bWFwKiBpbWFnZSwg Y29uc3QgRmxvYXRSZWN0JiByZWN0LCBjb25zdCBib29sIHJlcGVhdFgsIGNvbnN0IGJvb2wgcmVw ZWF0WSkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwppbmRleCA2MWJmNGRlODljNWRlYmMxNzRlOTAxYjQwMWZkZDVkZDMyYjk1NTJhLi43 ZmY3OTYzMmVlOTM1OGVlNTJmMjBkNDA0MzUzMGYzMGE3OTU5MTY0IDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTIgQEAKKzIwMTItMDUtMjIgIFJhZmFlbCBCcmFuZGFvICA8cmFmYWVsLmxvYm9Ab3BlbmJvc3Nh Lm9yZz4KKworICAgICAgICBbUXRdIGNhbnZhcy9waGlsaXAvdGVzdHMvMmQucGF0aC5zdHJva2Uu b3ZlcmxhcC5odG1sIGZhaWxzIHdpdGggUXQtNC42LjIgb3IgaGlnaGVyCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDM2MgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vcXQvU2tpcHBlZDog VW5za2lwIHRlc3QgYWZ0ZXIgZml4LgorCiAyMDEyLTA1LTIyICBKb3NodWEgQmVsbCAgPGpzYmVs bEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtXSBTa2lwIGFzc2VydGluZyB0ZXN0 IGluIHdpbiBkZWJ1ZyBmb2xsb3dpbmcgc3VicGl4ZWwgbGF5b3V0IGNoYW5nZXMuCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZv cm0vcXQvU2tpcHBlZAppbmRleCBiZDg5NTVhY2M4NWYxNGJmOTJlYWJlNzc5ZTY0YjRiZDhiOTc1 YzM1Li44MjM2YWRmNjU3MDNkOWFjYWFhZDg5MzIyYzQ3MDQ2NTk3YzcwY2Q0IDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRm b3JtL3F0L1NraXBwZWQKQEAgLTIxMjMsMTAgKzIxMjMsNiBAQCBmYXN0L3RleHQvaW50ZXJuYXRp b25hbC9iZGktZGlyLWRlZmF1bHQtdG8tYXV0by5odG1sCiAjIFJlZ3Jlc3Npb25zIG9jY3VyZWQg YWZ0ZXIgUXQgdmVyc2lvbiB1cGRhdGUKICMgPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0gIwogCi0jIFtR dF0gY2FudmFzL3BoaWxpcC90ZXN0cy8yZC5wYXRoLnN0cm9rZS5vdmVybGFwLmh0bWwgZmFpbHMg d2l0aCBRdC00LjYuMiBvciBoaWdoZXIKLSMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQwMzYyCi1jYW52YXMvcGhpbGlwL3Rlc3RzLzJkLnBhdGguc3Ryb2tlLm92ZXJs YXAuaHRtbAotCiAjIFtRdF0gZWRpdGluZy9leGVjQ29tbWFuZC9tb3ZlLXNlbGVjdGlvbi1iYWNr LWxpbmUuaHRtbCBmYWlscyB3aXRoIFF0ID49IDQuNy4xCiAjIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD01MDE0NAogZWRpdGluZy9leGVjQ29tbWFuZC9tb3ZlLXNlbGVj dGlvbi1iYWNrLWxpbmUuaHRtbAo= 143326 2012-05-22 10:41:41 -0700 2012-05-22 12:22:34 -0700 Patch bug-40362-20120522144139.patch text/plain 6483 rafael.lobo U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3OTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDg2Y2MwMmYxYmZjMmRj OWMyYjdmYzNhYzY4NWMwM2E4MzliYWZkOS4uNzVmMjE3NzRmYjQwZDcxN2M4ZTAyMTQyMGUzNjll MmZiOWYwOGE4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA1LTIyICBSYWZh ZWwgQnJhbmRhbyAgPHJhZmFlbC5sb2JvQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW1F0XSBj YW52YXMvcGhpbGlwL3Rlc3RzLzJkLnBhdGguc3Ryb2tlLm92ZXJsYXAuaHRtbCBmYWlscyB3aXRo IFF0LTQuNi4yIG9yIGhpZ2hlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NDAzNjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBCZWZvcmUgZHJhd2luZyB0aGUgc3Ryb2tlIGZyb20gYSBjZXJ0YWluIHBhdGgs IGl0IHNob3VsZCBtYWtlIHRoZSB1bmlvbiBvZiB0aGUgc3Ryb2tlIGFyZWFzLgorICAgICAgICBU aGUgcHJldmlvdXMgaW1wbGVtZW50YXRpb24gZGlkbid0IGNvbnNpZGVyIHRoYXQgc28gdGhlIGlu dGVyc2VjdGlvbiB3YXMgcGFpbnRlZCB0d2ljZS4KKyAgICAgICAgQnkgdXNpbmcgUVBhaW50ZXJQ YXRoU3Ryb2tlciwgd2UgY3JlYXRlIGEgUVBhaW50ZXJQYXRoIG9uIHRvcCBvZiB0aGUgcGxhdGZv cm0gcGF0aCwgYW5kCisgICAgICAgIHRoZW4gd2UgZmlsbCBpdCB3aXRoIHRoZSBleHBlY3RlZCBi cnVzaC4gVGhpcyB3YXkgd2UgYXZvaWQgcmVwYWludGluZyBhcmVhcy4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OmZpbGxQYXRoU3Ryb2tlKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29y ZTo6R3JhcGhpY3NDb250ZXh0OjpzdHJva2VQYXRoKToKKwogMjAxMi0wNS0yMiAgVnNldm9sb2Qg Vmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBK YXZhU2NyaXB0U291cmNlRnJhbWUgc2hvdWxkIGJlIGJhc2VkIG9uIEphdmFTY3JpcHRTb3VyY2Ug bm90IFVJU291cmNlQ29kZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcAppbmRleCBiOGU5NWYyNWY4MWQzODk5 MWI1MzNiZjg1MDJmYzliMTBlMDUzNmNhLi4xZjMxMzY2Y2I5ZTliNmU4NTgyNmI5Yzk3YzZkYzE5 ZjZiMmM0YTg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9x dC9HcmFwaGljc0NvbnRleHRRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCkBAIC01OSw2ICs1OSw3IEBACiAjaW5jbHVk ZSA8UVBhaW50RW5naW5lPgogI2luY2x1ZGUgPFFQYWludGVyPgogI2luY2x1ZGUgPFFQYWludGVy UGF0aD4KKyNpbmNsdWRlIDxRUGFpbnRlclBhdGhTdHJva2VyPgogI2luY2x1ZGUgPFFQaXhtYXA+ CiAjaW5jbHVkZSA8UVBvbHlnb25GPgogI2luY2x1ZGUgPFFTdGFjaz4KQEAgLTUyNyw2ICs1Mjgs MTIgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmZpbGxQYXRoKGNvbnN0IFBhdGgmIHBhdGgpCiAg ICAgICAgIHAtPmZpbGxQYXRoKHBsYXRmb3JtUGF0aCwgcC0+YnJ1c2goKSk7CiB9CiAKK2lubGlu ZSBzdGF0aWMgdm9pZCBmaWxsUGF0aFN0cm9rZShRUGFpbnRlciogcGFpbnRlciwgUVBhaW50ZXJQ YXRoU3Ryb2tlciYgcGF0aFN0cm9rZXIsIGNvbnN0IFFQYWludGVyUGF0aCYgcGxhdGZvcm1QYXRo LCBjb25zdCBRQnJ1c2gmIGJydXNoKQoreworICAgIFFQYWludGVyUGF0aCBzdHJva2UgPSBwYXRo U3Ryb2tlci5jcmVhdGVTdHJva2UocGxhdGZvcm1QYXRoKTsKKyAgICBwYWludGVyLT5maWxsUGF0 aChzdHJva2UsIGJydXNoKTsKK30KKwogdm9pZCBHcmFwaGljc0NvbnRleHQ6OnN0cm9rZVBhdGgo Y29uc3QgUGF0aCYgcGF0aCkKIHsKICAgICBpZiAocGFpbnRpbmdEaXNhYmxlZCgpKQpAQCAtNTM2 LDYgKzU0MywxMiBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6c3Ryb2tlUGF0aChjb25zdCBQYXRo JiBwYXRoKQogICAgIFFQZW4gcGVuKHAtPnBlbigpKTsKICAgICBRUGFpbnRlclBhdGggcGxhdGZv cm1QYXRoID0gcGF0aC5wbGF0Zm9ybVBhdGgoKTsKICAgICBwbGF0Zm9ybVBhdGguc2V0RmlsbFJ1 bGUodG9RdEZpbGxSdWxlKGZpbGxSdWxlKCkpKTsKKyAgICBRUGFpbnRlclBhdGhTdHJva2VyIHBh dGhTdHJva2VyOworICAgIHBhdGhTdHJva2VyLnNldEpvaW5TdHlsZShwZW4uam9pblN0eWxlKCkp OworICAgIHBhdGhTdHJva2VyLnNldERhc2hPZmZzZXQocGVuLmRhc2hPZmZzZXQoKSk7CisgICAg cGF0aFN0cm9rZXIuc2V0TWl0ZXJMaW1pdChwZW4ubWl0ZXJMaW1pdCgpKTsKKyAgICBwYXRoU3Ry b2tlci5zZXRDYXBTdHlsZShwZW4uY2FwU3R5bGUoKSk7CisgICAgcGF0aFN0cm9rZXIuc2V0V2lk dGgocGVuLndpZHRoRigpKTsKIAogICAgIGlmIChoYXNTaGFkb3coKSkgewogICAgICAgICBTaGFk b3dCbHVyKiBzaGFkb3cgPSBzaGFkb3dCbHVyKCk7CkBAIC01NDksMTIgKzU2Miw5IEBAIHZvaWQg R3JhcGhpY3NDb250ZXh0OjpzdHJva2VQYXRoKGNvbnN0IFBhdGgmIHBhdGgpCiAgICAgICAgICAg ICAgICAgaWYgKG1fc3RhdGUuc3Ryb2tlR3JhZGllbnQpIHsKICAgICAgICAgICAgICAgICAgICAg UUJydXNoIGJydXNoKCptX3N0YXRlLnN0cm9rZUdyYWRpZW50LT5wbGF0Zm9ybUdyYWRpZW50KCkp OwogICAgICAgICAgICAgICAgICAgICBicnVzaC5zZXRUcmFuc2Zvcm0obV9zdGF0ZS5zdHJva2VH cmFkaWVudC0+Z3JhZGllbnRTcGFjZVRyYW5zZm9ybSgpKTsKLSAgICAgICAgICAgICAgICAgICAg UVBlbiBzaGFkb3dQZW4ocGVuKTsKLSAgICAgICAgICAgICAgICAgICAgc2hhZG93UGVuLnNldEJy dXNoKGJydXNoKTsKLSAgICAgICAgICAgICAgICAgICAgc2hhZG93UGFpbnRlci0+c3Ryb2tlUGF0 aChwbGF0Zm9ybVBhdGgsIHNoYWRvd1Blbik7Ci0gICAgICAgICAgICAgICAgfSBlbHNlIHsKLSAg ICAgICAgICAgICAgICAgICAgc2hhZG93UGFpbnRlci0+c3Ryb2tlUGF0aChwbGF0Zm9ybVBhdGgs IHBlbik7Ci0gICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICBmaWxsUGF0aFN0 cm9rZShzaGFkb3dQYWludGVyLCBwYXRoU3Ryb2tlciwgcGxhdGZvcm1QYXRoLCBicnVzaCk7Cisg ICAgICAgICAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAgICAgICAgIGZpbGxQYXRoU3Ryb2tl KHNoYWRvd1BhaW50ZXIsIHBhdGhTdHJva2VyLCBwbGF0Zm9ybVBhdGgsIHBlbi5icnVzaCgpKTsK ICAgICAgICAgICAgICAgICBzaGFkb3ctPmVuZFNoYWRvd0xheWVyKHRoaXMpOwogICAgICAgICAg ICAgfQogICAgICAgICB9IGVsc2UgewpAQCAtNTY0LDI0ICs1NzQsMjEgQEAgdm9pZCBHcmFwaGlj c0NvbnRleHQ6OnN0cm9rZVBhdGgoY29uc3QgUGF0aCYgcGF0aCkKICAgICAgICAgICAgIHNoYWRv d0NvbG9yLnNldEFscGhhRihzaGFkb3dDb2xvci5hbHBoYUYoKSAqIHBlbi5jb2xvcigpLmFscGhh RigpKTsKICAgICAgICAgICAgIFFQZW4gc2hhZG93UGVuKHBlbik7CiAgICAgICAgICAgICBzaGFk b3dQZW4uc2V0Q29sb3Ioc2hhZG93Q29sb3IpOwotICAgICAgICAgICAgcC0+c3Ryb2tlUGF0aChw bGF0Zm9ybVBhdGgsIHNoYWRvd1Blbik7CisgICAgICAgICAgICBmaWxsUGF0aFN0cm9rZShwLCBw YXRoU3Ryb2tlciwgcGxhdGZvcm1QYXRoLCBzaGFkb3dQZW4uYnJ1c2goKSk7CiAgICAgICAgICAg ICBwLT50cmFuc2xhdGUoLW9mZnNldCk7CiAgICAgICAgIH0KICAgICB9CiAKICAgICBpZiAobV9z dGF0ZS5zdHJva2VQYXR0ZXJuKSB7CiAgICAgICAgIEFmZmluZVRyYW5zZm9ybSBhZmZpbmU7Ci0g ICAgICAgIHBlbi5zZXRCcnVzaChRQnJ1c2gobV9zdGF0ZS5zdHJva2VQYXR0ZXJuLT5jcmVhdGVQ bGF0Zm9ybVBhdHRlcm4oYWZmaW5lKSkpOwotICAgICAgICBwLT5zZXRQZW4ocGVuKTsKLSAgICAg ICAgcC0+c3Ryb2tlUGF0aChwbGF0Zm9ybVBhdGgsIHBlbik7CisgICAgICAgIFFCcnVzaCBicnVz aCA9IG1fc3RhdGUuc3Ryb2tlUGF0dGVybi0+Y3JlYXRlUGxhdGZvcm1QYXR0ZXJuKGFmZmluZSk7 CisgICAgICAgIGZpbGxQYXRoU3Ryb2tlKHAsIHBhdGhTdHJva2VyLCBwbGF0Zm9ybVBhdGgsIGJy dXNoKTsKICAgICB9IGVsc2UgaWYgKG1fc3RhdGUuc3Ryb2tlR3JhZGllbnQpIHsKICAgICAgICAg UUJydXNoIGJydXNoKCptX3N0YXRlLnN0cm9rZUdyYWRpZW50LT5wbGF0Zm9ybUdyYWRpZW50KCkp OwogICAgICAgICBicnVzaC5zZXRUcmFuc2Zvcm0obV9zdGF0ZS5zdHJva2VHcmFkaWVudC0+Z3Jh ZGllbnRTcGFjZVRyYW5zZm9ybSgpKTsKLSAgICAgICAgcGVuLnNldEJydXNoKGJydXNoKTsKLSAg ICAgICAgcC0+c2V0UGVuKHBlbik7Ci0gICAgICAgIHAtPnN0cm9rZVBhdGgocGxhdGZvcm1QYXRo LCBwZW4pOworICAgICAgICBmaWxsUGF0aFN0cm9rZShwLCBwYXRoU3Ryb2tlciwgcGxhdGZvcm1Q YXRoLCBicnVzaCk7CiAgICAgfSBlbHNlCi0gICAgICAgIHAtPnN0cm9rZVBhdGgocGxhdGZvcm1Q YXRoLCBwZW4pOworICAgICAgICBmaWxsUGF0aFN0cm9rZShwLCBwYXRoU3Ryb2tlciwgcGxhdGZv cm1QYXRoLCBwZW4uYnJ1c2goKSk7CiB9CiAKIHN0YXRpYyBpbmxpbmUgdm9pZCBkcmF3UmVwZWF0 UGF0dGVybihRUGFpbnRlciogcCwgUVBpeG1hcCogaW1hZ2UsIGNvbnN0IEZsb2F0UmVjdCYgcmVj dCwgY29uc3QgYm9vbCByZXBlYXRYLCBjb25zdCBib29sIHJlcGVhdFkpCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMWY4ZjQ4 NDU1NGRhYWEyM2QwMDMyMTlmNDlhZWU0YTBiYTg3Mzg5ZS4uNTg1OTk5YTMyYjA5MDEzMzEyZDYy NGM4YWVkYjQ3MTFmMTM2NjkyZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisr KyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDEyLTA1LTIyICBS YWZhZWwgQnJhbmRhbyAgPHJhZmFlbC5sb2JvQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW1F0 XSBjYW52YXMvcGhpbGlwL3Rlc3RzLzJkLnBhdGguc3Ryb2tlLm92ZXJsYXAuaHRtbCBmYWlscyB3 aXRoIFF0LTQuNi4yIG9yIGhpZ2hlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDAzNjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIHBsYXRmb3JtL3F0L1NraXBwZWQ6IFVuc2tpcCB0ZXN0IGFmdGVyIGZp eC4KKwogMjAxMi0wNS0yMiAgQ2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50 ZWwuY29tPgogCiAgICAgICAgIEludGVudDo6Y3JlYXRlKCkgdGhyb3dzIGlzIHNlcnZpY2UgaXMg InVybDovL2EgdXJsIgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBl ZCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKaW5kZXggYmQ4OTU1YWNjODVmMTRi ZjkyZWFiZTc3OWU2NGI0YmQ4Yjk3NWMzNS4uODIzNmFkZjY1NzAzZDlhY2FhYWQ4OTMyMmM0NzA0 NjU5N2M3MGNkNCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAor KysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCkBAIC0yMTIzLDEwICsyMTIzLDYg QEAgZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvYmRpLWRpci1kZWZhdWx0LXRvLWF1dG8uaHRtbAog IyBSZWdyZXNzaW9ucyBvY2N1cmVkIGFmdGVyIFF0IHZlcnNpb24gdXBkYXRlCiAjID09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09ICMKIAotIyBbUXRdIGNhbnZhcy9waGlsaXAvdGVzdHMvMmQucGF0aC5zdHJv a2Uub3ZlcmxhcC5odG1sIGZhaWxzIHdpdGggUXQtNC42LjIgb3IgaGlnaGVyCi0jIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDM2MgotY2FudmFzL3BoaWxpcC90ZXN0 cy8yZC5wYXRoLnN0cm9rZS5vdmVybGFwLmh0bWwKLQogIyBbUXRdIGVkaXRpbmcvZXhlY0NvbW1h bmQvbW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLmh0bWwgZmFpbHMgd2l0aCBRdCA+PSA0LjcuMQog IyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTAxNDQKIGVkaXRpbmcv ZXhlY0NvbW1hbmQvbW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLmh0bWwK