53857 2011-02-05 12:08:28 -0800 [Chromium] Layout Test canvas/philip/tests/2d.composite.globalAlpha.fill.html with --accelerated-2d-canvas. 2011-02-10 22:38:59 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 honten honten abarth commit-queue darin eric excors honten hyatt jamesr kbr senorblanco oldest_to_newest 346171 0 honten 2011-02-05 12:08:28 -0800 [Chromium] Layout Test canvas/philip/tests/2d.composite.globalAlpha.fill.html with --accelerated-2d-canvas. 346173 1 81369 honten 2011-02-05 12:12:26 -0800 Created attachment 81369 Patch 346175 2 honten 2011-02-05 12:14:31 -0800 Please review my patch. 346888 3 81369 kbr 2011-02-07 15:21:33 -0800 Comment on attachment 81369 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=81369&action=review > Source/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:103 > +#if PLATFORM(SKIA) > + int a = SkAlphaMul(c.alpha(), s); > +#else > + int a = (c.alpha() * s) >> 8; > +#endif The Skia-specific code path is not really necessary here. I'd just remove it. > Source/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:104 > + return Color((c.rgb() & 0x00FFFFFF) | (a << 24)); I think you should avoid relying on Color's internal representation. You could write this portably as return Color(c.red(), c.green(), c.blue(), a); 347071 4 81581 honten 2011-02-07 21:28:09 -0800 Created attachment 81581 Patch 347072 5 81581 honten 2011-02-07 21:28:33 -0800 Comment on attachment 81581 Patch Please review it. 347077 6 jamesr 2011-02-07 21:39:57 -0800 We probably need this for fillPath() as well. 347149 7 honten 2011-02-07 23:22:05 -0800 So do you mean I have to fix at the same time? Or do I have to make another bug entry? (In reply to comment #6) > We probably need this for fillPath() as well. 347152 8 81581 eric 2011-02-07 23:25:22 -0800 Comment on attachment 81581 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=81581&action=review > Source/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:90 > + Color applyAlpha(const Color& c) So this is just premultiplying? Should this be a member on Color instead? 347169 9 honten 2011-02-07 23:35:33 -0800 Can I add the function into the Color.h? Because Color class is very primitive, so I think we need to be careful. As I wrote in the comment, applyAlpha() is almost the same as PlatformContextSkia::State::applyAlpha(). But the type is difference. If PlatformContextSkia::State::applyAlpha() were in SkColor, I would include the function into Color.h. What do you think? (In reply to comment #8) > (From update of attachment 81581 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=81581&action=review > > > Source/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:90 > > + Color applyAlpha(const Color& c) > > So this is just premultiplying? Should this be a member on Color instead? 347174 10 eric 2011-02-07 23:41:21 -0800 I'm not familiar with PlatformContextSkia::State::applyAlpha. What's the purpose? 347189 11 honten 2011-02-07 23:51:27 -0800 The purpose is to multiply globalAlpha() to fillStyle alpha. So if only software rendering is used, applyAlpha() is correctly applied. But if hardware is used, applyAlpha() is not called, and globalAlpha() is not applied(). That is the problem here. (In reply to comment #10) > I'm not familiar with PlatformContextSkia::State::applyAlpha. What's the purpose? 347195 12 eric 2011-02-07 23:57:43 -0800 Ah yes, I misread things. This has nothing to do with the Color class as you correctly stated. 347209 13 honten 2011-02-08 00:20:55 -0800 James, You are right, I confirmed the bug with my new test case. So how should I treat the bug? Should I make another entry? (In reply to comment #7) > So do you mean I have to fix at the same time? > > Or do I have to make another bug entry? > > (In reply to comment #6) > > We probably need this for fillPath() as well. 347221 14 jamesr 2011-02-08 00:53:30 -0800 Just add another patch to this bug that fixes both issues and updates the ChangeLog. Thanks! 347596 15 honten 2011-02-08 12:26:03 -0800 Also I will add another test related to fillPaht() problem. (In reply to comment #14) > Just add another patch to this bug that fixes both issues and updates the ChangeLog. Thanks! 347887 16 81729 honten 2011-02-08 19:00:51 -0800 Created attachment 81729 Patch 347888 17 81729 honten 2011-02-08 19:01:19 -0800 Comment on attachment 81729 Patch Please review. 347890 18 jamesr 2011-02-08 19:04:00 -0800 The canvas/philip/ directory contains an imported test suite from Philip Taylor. Instead of modifying that directory, you should ask him to add your test to the suite or add the new test in some other directory. Otherwise it'll be difficult to update our copy of the suite in the future. 347901 19 honten 2011-02-08 19:33:53 -0800 I see. I didn't know the policy how to add a test. Thank you for letting me know. (In reply to comment #18) > The canvas/philip/ directory contains an imported test suite from Philip Taylor. Instead of modifying that directory, you should ask him to add your test to the suite or add the new test in some other directory. Otherwise it'll be difficult to update our copy of the suite in the future. 347903 20 honten 2011-02-08 19:37:02 -0800 Taylor, Can I add my test case as my upload patch? The new test is canvas/philip/tests/2d.composite.globalAlpha.fillPath.html In the patch, I fixed fillRect() but also fillPath(). My new test case is for fillPath(). Thanks, 348786 21 honten 2011-02-09 20:18:41 -0800 James, It looks like hard to contact Taylor. If he doesn't like to include my test case, which directory is the good place to go? Do you have any idea? Thanks, (In reply to comment #18) > The canvas/philip/ directory contains an imported test suite from Philip Taylor. Instead of modifying that directory, you should ask him to add your test to the suite or add the new test in some other directory. Otherwise it'll be difficult to update our copy of the suite in the future. 349328 22 jamesr 2011-02-10 13:33:01 -0800 In the meantime, this test could go in fast/canvas/ 349351 23 honten 2011-02-10 13:54:37 -0800 Ok, I'll do that. (In reply to comment #22) > In the meantime, this test could go in fast/canvas/ 349594 24 82095 honten 2011-02-10 20:37:35 -0800 Created attachment 82095 Patch 349595 25 82095 honten 2011-02-10 20:38:35 -0800 Comment on attachment 82095 Patch According to Jame's suggestion, I move my test, and change some checking routine. 349596 26 82095 honten 2011-02-10 20:38:56 -0800 Comment on attachment 82095 Patch Could you reivew? 349602 27 82095 jamesr 2011-02-10 20:46:56 -0800 Comment on attachment 82095 Patch R=me. Thanks! 349649 28 82095 commit-queue 2011-02-10 22:38:52 -0800 Comment on attachment 82095 Patch Clearing flags on attachment: 82095 Committed r78315: <http://trac.webkit.org/changeset/78315> 349650 29 commit-queue 2011-02-10 22:38:59 -0800 All reviewed patches have been landed. Closing bug. 81369 2011-02-05 12:12:26 -0800 2011-02-07 21:28:05 -0800 Patch bug-53857-20110205121224.patch text/plain 2691 honten ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjMWE4OWUxNzQzZTgzMGFiODAyNjEyNGNkNGI1NjEwYTUyZjlmODIxLi5j ZDY1YWZhZTU2NjFlZmQ0NGIxMTdhYmU3OWVmZTdiZjllMWE2MWUyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTYgQEAKKzIwMTEtMDItMDUgIE5hb2tpIFRha2FubyAgPHRha2Fuby5uYW9raUBnbWFp bC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg W0Nocm9taXVtXSBMYXlvdXQgVGVzdCBjYW52YXMvcGhpbGlwL3Rlc3RzLzJkLmNvbXBvc2l0ZS5n bG9iYWxBbHBoYS5maWxsLmh0bWwgd2l0aCAtLWFjY2VsZXJhdGVkLTJkLWNhbnZhcy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUzODU3CisKKyAgICAg ICAgVGhpcyBmaXggaXMgZm9yIDJkLmNvbXBvc2l0ZS5nbG9iYWxBbHBoYS5maWxsLmh0bWwgd2l0 aCAtLWFjY2VsZXJhdGVkLTJkLWNhbnZhcy4gTm8gbmV3IHRlc3RzLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR0xFUzJDYW52YXMuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6R0xFUzJDYW52YXM6OlN0YXRlOjphcHBseUFscGhhKTogQXBwZW5kIG5ldyBmdW5jdGlvbiB0 byBhcHBseSBnbG9iYWwgYWxwaGEgd2hlbiBmaWxsUmVjdCgpIGlzIGNhbGxlZC4KKyAgICAgICAg KFdlYkNvcmU6OkdMRVMyQ2FudmFzOjpmaWxsUmVjdCk6IEdsb2JhbCBhbHBoYSBpcyBhcHBsaWVk IHRvIG1fZmlsbENvbG9yLgorCiAyMDExLTAyLTAyICBCZXRoIERha2luICA8YmRha2luQGFwcGxl LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYXJrIFJvd2UuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HTEVTMkNhbnZhcy5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HTEVTMkNhbnZhcy5jcHAK aW5kZXggOTBlNzA0MTNiZjg4MWY1YjAwNTljNjQyYzBmNzVjNDYzMDg5NzRhZS4uNDI1OTkyMjRh NzU1MjU4OTRiNjRjOWM1YjlhZTFlNWU5ODIxMTE3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR0xFUzJDYW52YXMuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dMRVMyQ2FudmFzLmNwcApAQCAt NDIsNiArNDIsNyBAQAogI2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCiAjaW5jbHVkZSAiU2hh cmVkR3JhcGhpY3NDb250ZXh0M0QuaCIKICNpZiBQTEFURk9STShTS0lBKQorI2luY2x1ZGUgIlNr Q29sb3JQcml2LmgiCiAjaW5jbHVkZSAiU2tQYXRoLmgiCiAjZW5kaWYKICNpbmNsdWRlICJUZXh0 dXJlLmgiCkBAIC04Myw2ICs4NCwyNiBAQCBzdHJ1Y3QgR0xFUzJDYW52YXM6OlN0YXRlIHsKICAg ICBBZmZpbmVUcmFuc2Zvcm0gbV9jdG07CiAgICAgV1RGOjpWZWN0b3I8UGF0aD4gbV9jbGlwcGlu Z1BhdGhzOwogICAgIGJvb2wgbV9jbGlwcGluZ0VuYWJsZWQ7CisKKyAgICAvLyBIZWxwZXIgZnVu Y3Rpb24gZm9yIGFwcGx5aW5nIHRoZSBzdGF0ZSdzIGFscGhhIHZhbHVlIHRvIHRoZSBnaXZlbiBp bnB1dAorICAgIC8vIGNvbG9yIHRvIHByb2R1Y2UgYSBuZXcgb3V0cHV0IGNvbG9yLiBUaGUgbG9n aWMgaXMgdGhlIHNhbWUgYXMKKyAgICAvLyBQbGF0Zm9ybUNvbnRleHRTa2lhOjpTdGF0ZTo6YXBw bHlBbHBoYSgpLCBidXQgdGhlIHR5cGUgaXMgZGlmZmVyZW50LgorICAgIENvbG9yIGFwcGx5QWxw aGEoY29uc3QgQ29sb3ImIGMpCisgICAgeworICAgICAgICBpbnQgcyA9IHJvdW5kZihtX2FscGhh ICogMjU2KTsKKyAgICAgICAgaWYgKHMgPj0gMjU2KQorICAgICAgICAgICAgcmV0dXJuIGM7Cisg ICAgICAgIGlmIChzIDwgMCkKKyAgICAgICAgICAgIHJldHVybiBDb2xvcigpOworCisjaWYgUExB VEZPUk0oU0tJQSkKKyAgICAgICAgaW50IGEgPSBTa0FscGhhTXVsKGMuYWxwaGEoKSwgcyk7Cisj ZWxzZQorICAgICAgICBpbnQgYSA9IChjLmFscGhhKCkgKiBzKSA+PiA4OworI2VuZGlmCisgICAg ICAgIHJldHVybiBDb2xvcigoYy5yZ2IoKSAmIDB4MDBGRkZGRkYpIHwgKGEgPDwgMjQpKTsKKyAg ICB9CisKIH07CiAKIHN0YXRpYyBpbmxpbmUgRmxvYXRQb2ludCBvcGVyYXRvciooY29uc3QgRmxv YXRQb2ludCYgZiwgZmxvYXQgc2NhbGUpCkBAIC0yMTQsNyArMjM1LDcgQEAgdm9pZCBHTEVTMkNh bnZhczo6ZmlsbFJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0LCBjb25zdCBDb2xvciYgY29sb3Is IENvbG9yU3BhY2UKIAogdm9pZCBHTEVTMkNhbnZhczo6ZmlsbFJlY3QoY29uc3QgRmxvYXRSZWN0 JiByZWN0KQogewotICAgIGZpbGxSZWN0KHJlY3QsIG1fc3RhdGUtPm1fZmlsbENvbG9yLCBDb2xv clNwYWNlRGV2aWNlUkdCKTsKKyAgICBmaWxsUmVjdChyZWN0LCBtX3N0YXRlLT5hcHBseUFscGhh KG1fc3RhdGUtPm1fZmlsbENvbG9yKSwgQ29sb3JTcGFjZURldmljZVJHQik7CiB9CiAKIHZvaWQg R0xFUzJDYW52YXM6OnNldEZpbGxDb2xvcihjb25zdCBDb2xvciYgY29sb3IsIENvbG9yU3BhY2Ug Y29sb3JTcGFjZSkK 81581 2011-02-07 21:28:09 -0800 2011-02-08 22:13:19 -0800 Patch bug-53857-20110207212807.patch text/plain 2463 honten ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1ZTcwODNkYzVkZTZiNjA0YjE0MjVhZjBmNDVjN2JhNzhlOGIzZjlkLi43 Mjg5NGVjMzlmNzU1MTJlNWI1ZTM2ZGM5NTg5NjIwODBkOGIxNWY2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTYgQEAKKzIwMTEtMDItMDcgIE5hb2tpIFRha2FubyAgPHRha2Fuby5uYW9raUBnbWFp bC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg W0Nocm9taXVtXSBMYXlvdXQgVGVzdCBjYW52YXMvcGhpbGlwL3Rlc3RzLzJkLmNvbXBvc2l0ZS5n bG9iYWxBbHBoYS5maWxsLmh0bWwgd2l0aCAtLWFjY2VsZXJhdGVkLTJkLWNhbnZhcy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUzODU3CisKKyAgICAg ICAgVGhpcyBmaXggaXMgZm9yIDJkLmNvbXBvc2l0ZS5nbG9iYWxBbHBoYS5maWxsLmh0bWwgd2l0 aCAtLWFjY2VsZXJhdGVkLTJkLWNhbnZhcy4gTm8gbmV3IHRlc3RzLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR0xFUzJDYW52YXMuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6R0xFUzJDYW52YXM6OlN0YXRlOjphcHBseUFscGhhKTogQXBwZW5kIG5ldyBmdW5jdGlvbiB0 byBhcHBseSBnbG9iYWwgYWxwaGEgd2hlbiBmaWxsUmVjdCgpIGlzIGNhbGxlZC4KKyAgICAgICAg KFdlYkNvcmU6OkdMRVMyQ2FudmFzOjpmaWxsUmVjdCk6IEdsb2JhbCBhbHBoYSBpcyBhcHBsaWVk IHRvIG1fZmlsbENvbG9yLgorCiAyMDExLTAyLTA0ICBKZXJlbXkgT3Jsb3cgIDxqb3Jsb3dAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFJldmVydCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTM3OTUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0dMRVMyQ2FudmFzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0dMRVMyQ2FudmFzLmNwcAppbmRleCA5MGU3MDQxM2JmODgxZjVi MDA1OWM2NDJjMGY3NWM0NjMwODk3NGFlLi5kMTFkMWI4NmRmOWI1N2Q2MDAzYjA4YTFlMDRjYTMz MDg5NjQ5ZmUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9HTEVTMkNhbnZhcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vR0xFUzJDYW52YXMuY3BwCkBAIC04Myw2ICs4MywyMiBAQCBzdHJ1Y3Qg R0xFUzJDYW52YXM6OlN0YXRlIHsKICAgICBBZmZpbmVUcmFuc2Zvcm0gbV9jdG07CiAgICAgV1RG OjpWZWN0b3I8UGF0aD4gbV9jbGlwcGluZ1BhdGhzOwogICAgIGJvb2wgbV9jbGlwcGluZ0VuYWJs ZWQ7CisKKyAgICAvLyBIZWxwZXIgZnVuY3Rpb24gZm9yIGFwcGx5aW5nIHRoZSBzdGF0ZSdzIGFs cGhhIHZhbHVlIHRvIHRoZSBnaXZlbiBpbnB1dAorICAgIC8vIGNvbG9yIHRvIHByb2R1Y2UgYSBu ZXcgb3V0cHV0IGNvbG9yLiBUaGUgbG9naWMgaXMgdGhlIHNhbWUgYXMKKyAgICAvLyBQbGF0Zm9y bUNvbnRleHRTa2lhOjpTdGF0ZTo6YXBwbHlBbHBoYSgpLCBidXQgdGhlIHR5cGUgaXMgZGlmZmVy ZW50LgorICAgIENvbG9yIGFwcGx5QWxwaGEoY29uc3QgQ29sb3ImIGMpCisgICAgeworICAgICAg ICBpbnQgcyA9IHJvdW5kZihtX2FscGhhICogMjU2KTsKKyAgICAgICAgaWYgKHMgPj0gMjU2KQor ICAgICAgICAgICAgcmV0dXJuIGM7CisgICAgICAgIGlmIChzIDwgMCkKKyAgICAgICAgICAgIHJl dHVybiBDb2xvcigpOworCisgICAgICAgIGludCBhID0gKGMuYWxwaGEoKSAqIHMpID4+IDg7Cisg ICAgICAgIHJldHVybiBDb2xvcihjLnJlZCgpLCBjLmdyZWVuKCksIGMuYmx1ZSgpLCBhKTsKKyAg ICB9CisKIH07CiAKIHN0YXRpYyBpbmxpbmUgRmxvYXRQb2ludCBvcGVyYXRvciooY29uc3QgRmxv YXRQb2ludCYgZiwgZmxvYXQgc2NhbGUpCkBAIC0yMTQsNyArMjMwLDcgQEAgdm9pZCBHTEVTMkNh bnZhczo6ZmlsbFJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0LCBjb25zdCBDb2xvciYgY29sb3Is IENvbG9yU3BhY2UKIAogdm9pZCBHTEVTMkNhbnZhczo6ZmlsbFJlY3QoY29uc3QgRmxvYXRSZWN0 JiByZWN0KQogewotICAgIGZpbGxSZWN0KHJlY3QsIG1fc3RhdGUtPm1fZmlsbENvbG9yLCBDb2xv clNwYWNlRGV2aWNlUkdCKTsKKyAgICBmaWxsUmVjdChyZWN0LCBtX3N0YXRlLT5hcHBseUFscGhh KG1fc3RhdGUtPm1fZmlsbENvbG9yKSwgQ29sb3JTcGFjZURldmljZVJHQik7CiB9CiAKIHZvaWQg R0xFUzJDYW52YXM6OnNldEZpbGxDb2xvcihjb25zdCBDb2xvciYgY29sb3IsIENvbG9yU3BhY2Ug Y29sb3JTcGFjZSkK 81729 2011-02-08 19:00:51 -0800 2011-02-10 20:37:31 -0800 Patch bug-53857-20110208190051.patch text/plain 4705 honten ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NhbnZhcy9waGlsaXAvdGVzdHMvMmQuY29tcG9zaXRl Lmdsb2JhbEFscGhhLmZpbGxQYXRoLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2NhbnZhcy9w aGlsaXAvdGVzdHMvMmQuY29tcG9zaXRlLmdsb2JhbEFscGhhLmZpbGxQYXRoLWV4cGVjdGVkLnR4 dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi44NjMzMzlmYjhjZWQ2M2NjZDgxMmFhOWFkMGU3YmE5NWJmODMwNjAwCi0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY2FudmFzL3BoaWxpcC90ZXN0cy8yZC5jb21w b3NpdGUuZ2xvYmFsQWxwaGEuZmlsbFBhdGgtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEgQEAKK1Bh c3NlZApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY2FudmFzL3BoaWxpcC90ZXN0cy8yZC5jb21w b3NpdGUuZ2xvYmFsQWxwaGEuZmlsbFBhdGguaHRtbCBiL0xheW91dFRlc3RzL2NhbnZhcy9waGls aXAvdGVzdHMvMmQuY29tcG9zaXRlLmdsb2JhbEFscGhhLmZpbGxQYXRoLmh0bWwKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uYTg0ZjU0ODk3YjM0NDM2ZjMxMjVhYWM2ZTk3ZDcwY2MxYWYyNDllZAotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL2NhbnZhcy9waGlsaXAvdGVzdHMvMmQuY29tcG9zaXRlLmdsb2Jh bEFscGhhLmZpbGxQYXRoLmh0bWwKQEAgLTAsMCArMSwyNyBAQAorPCFET0NUWVBFIGh0bWw+Cis8 dGl0bGU+Q2FudmFzIHRlc3Q6IDJkLmNvbXBvc2l0ZS5nbG9iYWxBbHBoYS5maWxsUGF0aDwvdGl0 bGU+Cis8c2NyaXB0IHNyYz0iLi4vdGVzdHMuanMiPjwvc2NyaXB0PgorPGxpbmsgcmVsPSJzdHls ZXNoZWV0IiBocmVmPSIuLi90ZXN0cy5jc3MiPgorPGJvZHk+Cis8cCBpZD0icGFzc3RleHQiPlBh c3M8L3A+Cis8cCBpZD0iZmFpbHRleHQiPkZhaWw8L3A+Cis8cCBjbGFzcz0ib3V0cHV0Ij5UaGVz ZSBpbWFnZXMgc2hvdWxkIGJlIGlkZW50aWNhbDo8L3A+Cis8Y2FudmFzIGlkPSJjIiBjbGFzcz0i b3V0cHV0IiB3aWR0aD0iMTAwIiBoZWlnaHQ9IjUwIj48cCBjbGFzcz0iZmFsbGJhY2siPkZBSUwg KGZhbGxiYWNrIGNvbnRlbnQpPC9wPjwvY2FudmFzPgorPHAgY2xhc3M9Im91dHB1dCBleHBlY3Rl ZHRleHQiPkV4cGVjdGVkIG91dHB1dDo8cD48aW1nIHNyYz0iZ3JlZW4tMTAweDUwLnBuZyIgY2xh c3M9Im91dHB1dCBleHBlY3RlZCIgaWQ9ImV4cGVjdGVkIiBhbHQ9IiI+Cis8dWwgaWQ9ImQiPjwv dWw+Cis8c2NyaXB0PgorX2FkZFRlc3QoZnVuY3Rpb24oY2FudmFzLCBjdHgpIHsKKworY3R4LmZp bGxTdHlsZSA9ICcjMGYwJzsKK2N0eC5maWxsUmVjdCgwLCAwLCAxMDAsIDUwKTsKK2N0eC5nbG9i YWxBbHBoYSA9IDAuMDE7IC8vIGF2b2lkIGFueSBwb3RlbnRpYWwgYWxwaGE9MCBvcHRpbWlzYXRp b25zCitjdHguYmVnaW5QYXRoKCk7CitjdHguZmlsbFN0eWxlID0gJyNmMDAnOworY3R4LnJlY3Qo MCwgMCwgMTAwLCA1MCk7CitjdHguZmlsbCgpOworX2Fzc2VydFBpeGVsQXBwcm94KGNhbnZhcywg NTAsMjUsIDIsMjUzLDAsMjU1LCAiNTAsMjUiLCAiMiwyNTMsMCwyNTUiLCAyKTsKKworCit9KTsK Kzwvc2NyaXB0PgorCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWU3MDgzZGM1ZGU2YjYwNGIxNDI1YWYwZjQ1Yzdi YTc4ZThiM2Y5ZC4uZGRkN2E0MTU1MzI5OTQ5NDdkMjUxMDE5MTFjNTkxZDFjNjAxNzBhMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDExLTAyLTA4ICBOYW9raSBUYWthbm8gIDx0YWth bm8ubmFva2lAZ21haWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFtDaHJvbWl1bV0gTGF5b3V0IFRlc3QgY2FudmFzL3BoaWxpcC90ZXN0cy8y ZC5jb21wb3NpdGUuZ2xvYmFsQWxwaGEuZmlsbC5odG1sIHdpdGggLS1hY2NlbGVyYXRlZC0yZC1j YW52YXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 Mzg1NworCisgICAgICAgIFRoaXMgZml4IGlzIGZvciAyZC5jb21wb3NpdGUuZ2xvYmFsQWxwaGEu ZmlsbC5odG1sIHdpdGggLS1hY2NlbGVyYXRlZC0yZC1jYW52YXMuIEFkZCBMYXlvdXRUZXN0cy9j YW52YXMvcGhpbGlwL3Rlc3RzLzJkLmNvbXBvc2l0ZS5nbG9iYWxBbHBoYS5maWxsUGF0aC5odG1s IGFzIGEgbmV3IHRlc3QgZm9yIGZpbGxQYXRoKCkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9HTEVTMkNhbnZhcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHTEVTMkNh bnZhczo6U3RhdGU6OmFwcGx5QWxwaGEpOiBBcHBlbmQgbmV3IGZ1bmN0aW9uIHRvIGFwcGx5IGds b2JhbCBhbHBoYSB3aGVuIGZpbGxSZWN0KCkgYW5kIGZpbGxQYXRoKCkgYXJlIGNhbGxlZC4KKyAg ICAgICAgKFdlYkNvcmU6OkdMRVMyQ2FudmFzOjpmaWxsUmVjdCk6IEdsb2JhbCBhbHBoYSBpcyBh cHBsaWVkIHRvIG1fZmlsbENvbG9yLgorICAgICAgICAoV2ViQ29yZTo6R0xFUzJDYW52YXM6OmZp bGxQYXRoKTogR2xvYmFsIGFscGhhIGlzIGFwcGxpZWQgdG8gbV9maWxsQ29sb3IuCisKIDIwMTEt MDItMDQgIEplcmVteSBPcmxvdyAgPGpvcmxvd0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2 ZXJ0IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Mzc5NQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR0xFUzJDYW52 YXMuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR0xFUzJD YW52YXMuY3BwCmluZGV4IDkwZTcwNDEzYmY4ODFmNWIwMDU5YzY0MmMwZjc1YzQ2MzA4OTc0YWUu Ljk1M2VlMmYyOWJkOGY0MmNhZGIxODYzZmVhYjI5NzU0ODQxYzc1MTAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dMRVMyQ2FudmFzLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HTEVTMkNhbnZh cy5jcHAKQEAgLTgzLDYgKzgzLDIyIEBAIHN0cnVjdCBHTEVTMkNhbnZhczo6U3RhdGUgewogICAg IEFmZmluZVRyYW5zZm9ybSBtX2N0bTsKICAgICBXVEY6OlZlY3RvcjxQYXRoPiBtX2NsaXBwaW5n UGF0aHM7CiAgICAgYm9vbCBtX2NsaXBwaW5nRW5hYmxlZDsKKworICAgIC8vIEhlbHBlciBmdW5j dGlvbiBmb3IgYXBwbHlpbmcgdGhlIHN0YXRlJ3MgYWxwaGEgdmFsdWUgdG8gdGhlIGdpdmVuIGlu cHV0CisgICAgLy8gY29sb3IgdG8gcHJvZHVjZSBhIG5ldyBvdXRwdXQgY29sb3IuIFRoZSBsb2dp YyBpcyB0aGUgc2FtZSBhcworICAgIC8vIFBsYXRmb3JtQ29udGV4dFNraWE6OlN0YXRlOjphcHBs eUFscGhhKCksIGJ1dCB0aGUgdHlwZSBpcyBkaWZmZXJlbnQuCisgICAgQ29sb3IgYXBwbHlBbHBo YShjb25zdCBDb2xvciYgYykKKyAgICB7CisgICAgICAgIGludCBzID0gcm91bmRmKG1fYWxwaGEg KiAyNTYpOworICAgICAgICBpZiAocyA+PSAyNTYpCisgICAgICAgICAgICByZXR1cm4gYzsKKyAg ICAgICAgaWYgKHMgPCAwKQorICAgICAgICAgICAgcmV0dXJuIENvbG9yKCk7CisKKyAgICAgICAg aW50IGEgPSAoYy5hbHBoYSgpICogcykgPj4gODsKKyAgICAgICAgcmV0dXJuIENvbG9yKGMucmVk KCksIGMuZ3JlZW4oKSwgYy5ibHVlKCksIGEpOworICAgIH0KKwogfTsKIAogc3RhdGljIGlubGlu ZSBGbG9hdFBvaW50IG9wZXJhdG9yKihjb25zdCBGbG9hdFBvaW50JiBmLCBmbG9hdCBzY2FsZSkK QEAgLTE5Miw3ICsyMDgsNyBAQCB2b2lkIEdMRVMyQ2FudmFzOjpmaWxsUGF0aChjb25zdCBQYXRo JiBwYXRoKQogewogICAgIG1fY29udGV4dC0+YXBwbHlDb21wb3NpdGVPcGVyYXRvcihtX3N0YXRl LT5tX2NvbXBvc2l0ZU9wKTsKICAgICBhcHBseUNsaXBwaW5nKG1fc3RhdGUtPm1fY2xpcHBpbmdF bmFibGVkKTsKLSAgICBmaWxsUGF0aChwYXRoLCBtX3N0YXRlLT5tX2ZpbGxDb2xvcik7CisgICAg ZmlsbFBhdGgocGF0aCwgbV9zdGF0ZS0+YXBwbHlBbHBoYShtX3N0YXRlLT5tX2ZpbGxDb2xvcikp OwogfQogCiB2b2lkIEdMRVMyQ2FudmFzOjpmaWxsUmVjdChjb25zdCBGbG9hdFJlY3QmIHJlY3Qs IGNvbnN0IENvbG9yJiBjb2xvciwgQ29sb3JTcGFjZSBjb2xvclNwYWNlKQpAQCAtMjE0LDcgKzIz MCw3IEBAIHZvaWQgR0xFUzJDYW52YXM6OmZpbGxSZWN0KGNvbnN0IEZsb2F0UmVjdCYgcmVjdCwg Y29uc3QgQ29sb3ImIGNvbG9yLCBDb2xvclNwYWNlCiAKIHZvaWQgR0xFUzJDYW52YXM6OmZpbGxS ZWN0KGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKIHsKLSAgICBmaWxsUmVjdChyZWN0LCBtX3N0YXRl LT5tX2ZpbGxDb2xvciwgQ29sb3JTcGFjZURldmljZVJHQik7CisgICAgZmlsbFJlY3QocmVjdCwg bV9zdGF0ZS0+YXBwbHlBbHBoYShtX3N0YXRlLT5tX2ZpbGxDb2xvciksIENvbG9yU3BhY2VEZXZp Y2VSR0IpOwogfQogCiB2b2lkIEdMRVMyQ2FudmFzOjpzZXRGaWxsQ29sb3IoY29uc3QgQ29sb3Im IGNvbG9yLCBDb2xvclNwYWNlIGNvbG9yU3BhY2UpCg== 82095 2011-02-10 20:37:35 -0800 2011-02-10 22:38:51 -0800 Patch bug-53857-20110210203734.patch text/plain 6359 honten ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhODM5ZGM5NmUxNTNmYWVkZmIxYWM0ODEwZTBmYTFjOWIxNTQ2NDhiLi4zOWQ2MzY0 NTEwYzYwOWI5ZTEwNTBlMWRlMDY3ZWJlNGJhYmEzYjg5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTEtMDItMTAgIE5hb2tpIFRha2FubyAgPHRha2Fuby5uYW9raUBnbWFpbC5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0Nocm9taXVtXSBM YXlvdXQgVGVzdCBjYW52YXMvcGhpbGlwL3Rlc3RzLzJkLmNvbXBvc2l0ZS5nbG9iYWxBbHBoYS5m aWxsLmh0bWwgd2l0aCAtLWFjY2VsZXJhdGVkLTJkLWNhbnZhcy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUzODU3CisKKyAgICAgICAgVGhpcyBmaXgg aXMgZm9yIDJkLmNvbXBvc2l0ZS5nbG9iYWxBbHBoYS5maWxsLmh0bWwgd2l0aCAtLWFjY2VsZXJh dGVkLTJkLWNhbnZhcy4gQWRkIDJkLmNvbXBvc2l0ZS5nbG9iYWxBbHBoYS5maWxsUGF0aC5odG1s IGFzIGEgbmV3IHRlc3QgZm9yIHRoZSBjb21iaW5hdGlvbiB3aXRoIGdsb2JhbEFscGhhIGFuZCBm aWxsUGF0aCgpLgorCisgICAgICAgICogZmFzdC9jYW52YXMvMmQuY29tcG9zaXRlLmdsb2JhbEFs cGhhLmZpbGxQYXRoLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9jYW52YXMv MmQuY29tcG9zaXRlLmdsb2JhbEFscGhhLmZpbGxQYXRoLmh0bWw6IEFkZGVkLgorCiAyMDExLTAy LTEwICBTaGluaWNoaXJvIEhhbWFqaSAgPGhhbWFqaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg Q2hyb21pdW0gZXhwZWN0YXRpb25zIHVwZGF0ZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvY2FudmFzLzJkLmNvbXBvc2l0ZS5nbG9iYWxBbHBoYS5maWxsUGF0aC1leHBlY3RlZC50eHQg Yi9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy8yZC5jb21wb3NpdGUuZ2xvYmFsQWxwaGEuZmlsbFBh dGgtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmJhMDI4MDQ5ZDAzOWY2MTZlOWU0Y2FhZjY3ZTQ4 MGEwYmU3M2Y0MTMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy8y ZC5jb21wb3NpdGUuZ2xvYmFsQWxwaGEuZmlsbFBhdGgtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEs MTAgQEAKK1RoZSB0ZXN0IHRvIGVuc3VyZSBjb3JyZWN0IHN5bmMgYmVoYXZpb3VyIHdpdGggZ2xv YmFsQWxwaGEgYW5kIGZpbGxQYXRoKCkgaW4gYWNjZWxlcmF0ZWQtMmQtY2FudmFzIG1vZGUuCisK K09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZv bGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitQQVNTIGZhbHNlIGlzIGZhbHNlCitQQVNT IHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvMmQuY29tcG9zaXRlLmdsb2JhbEFscGhhLmZpbGxQ YXRoLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy8yZC5jb21wb3NpdGUuZ2xvYmFsQWxw aGEuZmlsbFBhdGguaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xOTEwZmRjZTljMjRjZDhhNjZmMDM2M2FmYWM0 NzdkNzc1NDllODVhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMv MmQuY29tcG9zaXRlLmdsb2JhbEFscGhhLmZpbGxQYXRoLmh0bWwKQEAgLTAsMCArMSw0MSBAQAor IDwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vSUVURi8vRFREIEhUTUwvL0VOIj4KKzwhLS0gVGVz dCBiYXNlZCBvbiB0aGF0IGZvdW5kIGF0CisgICAgIGh0dHA6Ly9odHRwOi8vcGhpbGlwLmh0bWw1 Lm9yZy90ZXN0cy9jYW52YXMvc3VpdGUvdGVzdHMvaW5kZXguMmQuY29tcG9zaXRlLmdsb2JhbEFs cGhhLmh0bWwKKyAgLS0+Cis8aHRtbD4KKzxoZWFkPgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBo cmVmPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdCBzcmM9Ii4u L2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4K KzxwIGlkPSJkZXNjcmlwdGlvbiI+PC9wPgorPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+Cis8Y2Fu dmFzIGlkPSJjYW52YXMiIHdpZHRoPSIxMDAiIGhlaWdodD0iMTAwIj48L2NhbnZhcz4KKzxzY3Jp cHQ+CisKK2Z1bmN0aW9uIGFzc2VydFBpeGVsQXBwcm94KGN0eCwgeCx5LCByLGcsYixhLCBwb3Ms IGNvbG91ciwgdG9sZXJhbmNlKQoreworICAgIHZhciBpbWdkYXRhID0gY3R4LmdldEltYWdlRGF0 YSh4LCB5LCAxLCAxKTsKKyAgICB2YXIgZGlmZiA9IE1hdGgubWF4KE1hdGguYWJzKHItaW1nZGF0 YS5kYXRhWzBdKSwgTWF0aC5hYnMoZy1pbWdkYXRhLmRhdGFbMV0pLCBNYXRoLmFicyhiLWltZ2Rh dGEuZGF0YVsyXSksIE1hdGguYWJzKGEtaW1nZGF0YS5kYXRhWzNdKSk7CisgICAgc2hvdWxkQmVG YWxzZSgoZGlmZiA+IHRvbGVyYW5jZSkudG9TdHJpbmcoKSk7Cit9CisKK2Rlc2NyaXB0aW9uKCJU aGUgdGVzdCB0byBlbnN1cmUgY29ycmVjdCBzeW5jIGJlaGF2aW91ciB3aXRoIGdsb2JhbEFscGhh IGFuZCBmaWxsUGF0aCgpIGluIGFjY2VsZXJhdGVkLTJkLWNhbnZhcyBtb2RlLiIpOwordmFyIGN0 eCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdjYW52YXMnKS5nZXRDb250ZXh0KCcyZCcpOwor CitjdHguZmlsbFN0eWxlID0gJyMwZjAnOworY3R4LmZpbGxSZWN0KDAsIDAsIDEwMCwgMTAwKTsK K2N0eC5nbG9iYWxBbHBoYSA9IDAuMDE7IC8vIGF2b2lkIGFueSBwb3RlbnRpYWwgYWxwaGE9MCBv cHRpbWlzYXRpb25zCitjdHguYmVnaW5QYXRoKCk7CitjdHguZmlsbFN0eWxlID0gJyNmMDAnOwor Y3R4LnJlY3QoMCwgMCwgMTAwLCAxMDApOworY3R4LmZpbGwoKTsKK2Fzc2VydFBpeGVsQXBwcm94 KGN0eCwgNTAsMjUsIDIsMjUzLDAsMjU1LCAiNTAsMjUiLCAiMiwyNTMsMCwyNTUiLCAyKTsKKwor dmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7CisKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9 Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9o dG1sPgorCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKaW5kZXggZTRkMjI2MjdjZThlMmRiZWZhYmVhOTgwNjI5YTJhNDI2YmI2 ZjQ0ZC4uZDJiZGRmMjdiN2JkMGY2Zjc4ZTA5NWRmMzc3ZDY2Njg1MTA0MjlhNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE5IEBACisyMDExLTAyLTEwICBOYW9raSBUYWthbm8gIDx0YWthbm8ubmFv a2lAZ21haWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtDaHJvbWl1bV0gTGF5b3V0IFRlc3QgY2FudmFzL3BoaWxpcC90ZXN0cy8yZC5jb21w b3NpdGUuZ2xvYmFsQWxwaGEuZmlsbC5odG1sIHdpdGggLS1hY2NlbGVyYXRlZC0yZC1jYW52YXMu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Mzg1Nwor CisgICAgICAgIGdsb2JhbEFscGhhIGlzIG5vdCBhcHBsaWVkIHRvIGZpbGxQYXRoKCkgYW5kIGZp bGxSZWN0KCkuCisKKyAgICAgICAgVGVzdDogZmFzdC9jYW52YXMvMmQuY29tcG9zaXRlLmdsb2Jh bEFscGhhLmZpbGxQYXRoLmh0bWwgYW5kIGNhbnZhcy9waGlsaXAvdGVzdHMvMmQuY29tcG9zaXRl Lmdsb2JhbEFscGhhLmZpbGwuaHRtbCB3aXRoIC0tYWNjZWxlcmF0ZWQtMmQtY2FudmFzLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR0xFUzJDYW52YXMuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6R0xFUzJDYW52YXM6OlN0YXRlOjphcHBseUFscGhhKTogQXBwZW5kIGEg bmV3IGZ1bmN0aW9uIHRvIGFwcGx5IGdsb2JhbCBhbHBoYSB3aGVuIGZpbGxSZWN0KCkgYW5kIGZp bGxQYXRoKCkgYXJlIGNhbGxlZC4KKyAgICAgICAgKFdlYkNvcmU6OkdMRVMyQ2FudmFzOjpmaWxs UmVjdCk6IEdsb2JhbCBhbHBoYSBpcyBhcHBsaWVkIHRvIG1fZmlsbENvbG9yLgorICAgICAgICAo V2ViQ29yZTo6R0xFUzJDYW52YXM6OmZpbGxQYXRoKTogR2xvYmFsIGFscGhhIGlzIGFwcGxpZWQg dG8gbV9maWxsQ29sb3IuCisKIDIwMTEtMDItMDkgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNl ckBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dMRVMyQ2Fu dmFzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dMRVMy Q2FudmFzLmNwcAppbmRleCA5MGU3MDQxM2JmODgxZjViMDA1OWM2NDJjMGY3NWM0NjMwODk3NGFl Li45NTNlZTJmMjliZDhmNDJjYWRiMTg2M2ZlYWIyOTc1NDg0MWM3NTEwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HTEVTMkNhbnZhcy5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR0xFUzJDYW52 YXMuY3BwCkBAIC04Myw2ICs4MywyMiBAQCBzdHJ1Y3QgR0xFUzJDYW52YXM6OlN0YXRlIHsKICAg ICBBZmZpbmVUcmFuc2Zvcm0gbV9jdG07CiAgICAgV1RGOjpWZWN0b3I8UGF0aD4gbV9jbGlwcGlu Z1BhdGhzOwogICAgIGJvb2wgbV9jbGlwcGluZ0VuYWJsZWQ7CisKKyAgICAvLyBIZWxwZXIgZnVu Y3Rpb24gZm9yIGFwcGx5aW5nIHRoZSBzdGF0ZSdzIGFscGhhIHZhbHVlIHRvIHRoZSBnaXZlbiBp bnB1dAorICAgIC8vIGNvbG9yIHRvIHByb2R1Y2UgYSBuZXcgb3V0cHV0IGNvbG9yLiBUaGUgbG9n aWMgaXMgdGhlIHNhbWUgYXMKKyAgICAvLyBQbGF0Zm9ybUNvbnRleHRTa2lhOjpTdGF0ZTo6YXBw bHlBbHBoYSgpLCBidXQgdGhlIHR5cGUgaXMgZGlmZmVyZW50LgorICAgIENvbG9yIGFwcGx5QWxw aGEoY29uc3QgQ29sb3ImIGMpCisgICAgeworICAgICAgICBpbnQgcyA9IHJvdW5kZihtX2FscGhh ICogMjU2KTsKKyAgICAgICAgaWYgKHMgPj0gMjU2KQorICAgICAgICAgICAgcmV0dXJuIGM7Cisg ICAgICAgIGlmIChzIDwgMCkKKyAgICAgICAgICAgIHJldHVybiBDb2xvcigpOworCisgICAgICAg IGludCBhID0gKGMuYWxwaGEoKSAqIHMpID4+IDg7CisgICAgICAgIHJldHVybiBDb2xvcihjLnJl ZCgpLCBjLmdyZWVuKCksIGMuYmx1ZSgpLCBhKTsKKyAgICB9CisKIH07CiAKIHN0YXRpYyBpbmxp bmUgRmxvYXRQb2ludCBvcGVyYXRvciooY29uc3QgRmxvYXRQb2ludCYgZiwgZmxvYXQgc2NhbGUp CkBAIC0xOTIsNyArMjA4LDcgQEAgdm9pZCBHTEVTMkNhbnZhczo6ZmlsbFBhdGgoY29uc3QgUGF0 aCYgcGF0aCkKIHsKICAgICBtX2NvbnRleHQtPmFwcGx5Q29tcG9zaXRlT3BlcmF0b3IobV9zdGF0 ZS0+bV9jb21wb3NpdGVPcCk7CiAgICAgYXBwbHlDbGlwcGluZyhtX3N0YXRlLT5tX2NsaXBwaW5n RW5hYmxlZCk7Ci0gICAgZmlsbFBhdGgocGF0aCwgbV9zdGF0ZS0+bV9maWxsQ29sb3IpOworICAg IGZpbGxQYXRoKHBhdGgsIG1fc3RhdGUtPmFwcGx5QWxwaGEobV9zdGF0ZS0+bV9maWxsQ29sb3Ip KTsKIH0KIAogdm9pZCBHTEVTMkNhbnZhczo6ZmlsbFJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0 LCBjb25zdCBDb2xvciYgY29sb3IsIENvbG9yU3BhY2UgY29sb3JTcGFjZSkKQEAgLTIxNCw3ICsy MzAsNyBAQCB2b2lkIEdMRVMyQ2FudmFzOjpmaWxsUmVjdChjb25zdCBGbG9hdFJlY3QmIHJlY3Qs IGNvbnN0IENvbG9yJiBjb2xvciwgQ29sb3JTcGFjZQogCiB2b2lkIEdMRVMyQ2FudmFzOjpmaWxs UmVjdChjb25zdCBGbG9hdFJlY3QmIHJlY3QpCiB7Ci0gICAgZmlsbFJlY3QocmVjdCwgbV9zdGF0 ZS0+bV9maWxsQ29sb3IsIENvbG9yU3BhY2VEZXZpY2VSR0IpOworICAgIGZpbGxSZWN0KHJlY3Qs IG1fc3RhdGUtPmFwcGx5QWxwaGEobV9zdGF0ZS0+bV9maWxsQ29sb3IpLCBDb2xvclNwYWNlRGV2 aWNlUkdCKTsKIH0KIAogdm9pZCBHTEVTMkNhbnZhczo6c2V0RmlsbENvbG9yKGNvbnN0IENvbG9y JiBjb2xvciwgQ29sb3JTcGFjZSBjb2xvclNwYWNlKQo=