30823 2009-10-27 08:29:54 -0700 Fix alpha handling when using wxWidgets 2.9 2009-11-09 12:37:58 -0800 1 1 1 Unclassified WebKit WebKit wx 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 vz-webkit kevino kevino oldest_to_newest 158197 0 41955 vz-webkit 2009-10-27 08:29:54 -0700 Created attachment 41955 Patch fixing alpha transparency handling for wx port Transparency in PNG images didn't work in wxWebKit because the wxBitmap "has alpha" internal flag was not set before wxGraphicsBitmap was created from it. This flag is set in wxPixelData dtor and, generally speaking, bitmap data can't be accessed at all while it is locked for the raw access via wxPixelData so we must ensure that the local "data" variable is destroyed before using bitmap in any way. This patch does just this: in spite of many apparent changes it simply adds a block around "data" variable to ensure that it is destroyed (this should be more clear if the patch is applied and "diff -b" is done). 158200 1 vz-webkit 2009-10-27 08:32:17 -0700 Sorry, I forgot to mention that this patch was done on top of bug 30822. However even if 30822 is not applied, this one should still be as it fixes a real user-visible bug. Please let me know if I should redo the patch against the base line (OTOH it basically just adds two lines with "{" and "}" so maybe there is no need for this). 158294 2 41955 eric 2009-10-27 11:48:45 -0700 Comment on attachment 41955 Patch fixing alpha transparency handling for wx port Your ChangeLog does not make it clear what this patch does. I believe webkit style is to use spaces around operators: + p.Red() = bytes[i+2]; + p.Green() = bytes[i+1]; + p.Blue() = bytes[i+0]; + p.Alpha() = bytes[i+3]; 158433 3 vz-webkit 2009-10-27 17:28:17 -0700 (In reply to comment #2) > (From update of attachment 41955 [details]) > Your ChangeLog does not make it clear what this patch does. I've tried to make it more precise while still remaining brief. I hope it's more clear now. > I believe webkit style is to use spaces around operators: > + p.Red() = bytes[i+2]; > + p.Green() = bytes[i+1]; > + p.Blue() = bytes[i+0]; > + p.Alpha() = bytes[i+3]; Sorry, I just indented this code, I didn't modify it at all. I've reformatted it now and will attach the new patch in a moment. 158434 4 41997 vz-webkit 2009-10-27 17:29:13 -0700 Created attachment 41997 Patch fixing alpha transparency handling for wx port (v2) 161061 5 kevino 2009-11-05 20:55:17 -0800 Hi Vadim, The patch itself does resolve the problem, but this patch won't apply cleanly because you made the patch on top of a branch that has your changes to NativeImagePtr in it. If you submit a fixed patch against stock trunk sources, I'll be happy to r+ and land it. 161290 6 42682 vz-webkit 2009-11-06 18:35:08 -0800 Created attachment 42682 "Standalone" version of the patch Here is the version of the patch which should apply cleanly. As I wrote, it's completely trivial: it just adds a scope (and also spaces around "+" operator as requested although IMO this shouldn't be applied together with this patch at all as it has nothing to do with it...). 161708 7 kevino 2009-11-09 12:37:58 -0800 Landed in r50677, thanks! Note that the patch didn't conform to WebKit style since the code inside the braces was not indented, but as I wanted to get this landed, I fixed the issue before commit this time. However, most reviewers will r- a patch that doesn't conform, so things will go quicker if you make sure style issues are addressed before submission. 41955 2009-10-27 08:29:54 -0700 2009-10-27 17:29:13 -0700 Patch fixing alpha transparency handling for wx port alpha-fix.diff text/plain 3765 vz-webkit Y29tbWl0IGViZTBiNDM5NTgxMmVhMDc5YmNhNmQ3Y2NhZTQ5YmI3MTUwZmNmOWMKQXV0aG9yOiBW YWRpbSBaZWl0bGluIDx2YWRpbUB3eHdpZGdldHMub3JnPgpEYXRlOiAgIFR1ZSBPY3QgMjcgMTY6 MjU6MzkgMjAwOSArMDEwMAoKICAgIEZpeCBoYW5kbGluZyBvZiBhbHBoYSBjaGFuZ2VzIGluIHd4 IHBvcnQgd2hlbiB1c2luZyAyLjkrLgogICAgCiAgICB3eFBpeGVsRGF0YSBvYmplY3QgdXNlZCBm b3IgcmF3IGFjY2VzcyB0byB0aGUgYml0bWFwIGRhdGEgbXVzdCBiZSBkZXN0cm95ZWQKICAgIGJl Zm9yZSB0aGUgYml0bWFwIGlzIHVzZWQgaW4gYW55IG90aGVyIHdheSwgZmFpbGluZyB0byBkbyB0 aGlzIHJlc3VsdGVkIGluCiAgICBsb3NzIG9mIGFscGhhIHRyYW5zcGFyZW5jeSB3aGVuIHNob3dp bmcgUE5HIGltYWdlcy4KCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUv Q2hhbmdlTG9nCmluZGV4IDYzMWM0MDEuLjdhZGYzNGEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hh bmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTIgQEAKIDIwMDktMTAt MjcgIFZhZGltIFplaXRsaW4gIDx2YWRpbUB3eHdpZGdldHMub3JnPgogCisgICAgICAgIFt3eF0g Rml4IGhhbmRsaW5nIG9mIGFscGhhIGNoYW5uZWwgd2hlbiB1c2luZyB3eFdpZGdldHMgMi45Lgor CisgICAgICAgICogcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvd3gvSW1hZ2VEZWNvZGVyV3guY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UkdCQTMyQnVmZmVyOjphc05ld05hdGl2ZUltYWdlKToKKwor MjAwOS0xMC0yNyAgVmFkaW0gWmVpdGxpbiAgPHZhZGltQHd4d2lkZ2V0cy5vcmc+CisKICAgICAg ICAgRGVmaW5lIE5hdGl2ZUltYWdlUHRyIGFzIHd4W0dyYXBoaWNzXUJpdG1hcCBpbiB3eCBwb3J0 IGluc3RlYWQgb2YKICAgICAgICAgZGVmaW5pbmcgaXQgYXMgYSBwb2ludGVyIHRvIHRoZW0gdG8g YXZvaWQgdW5uZWNlc3NhcnkgaGVhcCBhbGxvY2F0aW9ucy4KIApkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy93eC9JbWFnZURlY29kZXJXeC5jcHAgYi9XZWJDb3Jl L3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3d4L0ltYWdlRGVjb2Rlcld4LmNwcAppbmRleCAzZGRj NjM4Li4xM2MyNTY0IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJz L3d4L0ltYWdlRGVjb2Rlcld4LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29k ZXJzL3d4L0ltYWdlRGVjb2Rlcld4LmNwcApAQCAtNDAsMzUgKzQwLDQxIEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIE5hdGl2ZUltYWdlUHRyIFJHQkEzMkJ1ZmZlcjo6YXNOZXdOYXRpdmVJbWFnZSgp IGNvbnN0CiB7CiAgICAgd3hCaXRtYXAgYm1wKHdpZHRoKCksIGhlaWdodCgpLCAzMik7Ci0gICAg dHlwZWRlZiB3eFBpeGVsRGF0YTx3eEJpdG1hcCwgd3hBbHBoYVBpeGVsRm9ybWF0PiBXeFBpeGVs RGF0YTsKLSAgICBXeFBpeGVsRGF0YSBkYXRhKGJtcCk7Ci0gICAgCi0gICAgLy8gTkI6IEl0IGFw cGVhcnMgdGhhdCB0aGUgZGF0YSBpcyBpbiBCR1JBIGZvcm1hdCBpbnN0ZWFkIG9mIFJHQkEgZm9y bWF0LgotICAgIC8vIFRoaXMgY29kZSB3b3JrcyBwcm9wZXJseSBvbiBib3RoIHBwYyBhbmQgaW50 ZWwsIG1lYW5pbmcgdGhlIGlzc3VlIGlzCi0gICAgLy8gbGlrZWx5IG5vdCBhbiBpc3N1ZSBvZiBi eXRlIG9yZGVyIGdldHRpbmcgbWl4ZWQgdXAgb24gZGlmZmVyZW50IGFyY2hzLiAKLSAgICBjb25z dCB1bnNpZ25lZCBjaGFyKiBieXRlcyA9IChjb25zdCB1bnNpZ25lZCBjaGFyKiltX2J5dGVzLmRh dGEoKTsKLSAgICBpbnQgcm93Q291bnRlciA9IDA7Ci0gICAgbG9uZyBwaXhlbENvdW50ZXIgPSAw OwotICAgIFd4UGl4ZWxEYXRhOjpJdGVyYXRvciBwKGRhdGEpOwotICAgIFd4UGl4ZWxEYXRhOjpJ dGVyYXRvciByb3dTdGFydCA9IHA7IAotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9ieXRl cy5zaXplKCkgKiBzaXplb2YoUGl4ZWxEYXRhKTsgaSArPSBzaXplb2YoUGl4ZWxEYXRhKSkgewot ICAgICAgICBwLlJlZCgpID0gYnl0ZXNbaSsyXTsKLSAgICAgICAgcC5HcmVlbigpID0gYnl0ZXNb aSsxXTsKLSAgICAgICAgcC5CbHVlKCkgPSBieXRlc1tpKzBdOwotICAgICAgICBwLkFscGhhKCkg PSBieXRlc1tpKzNdOworCisgICAgeworICAgICAgICB0eXBlZGVmIHd4UGl4ZWxEYXRhPHd4Qml0 bWFwLCB3eEFscGhhUGl4ZWxGb3JtYXQ+IFd4UGl4ZWxEYXRhOworICAgICAgICBXeFBpeGVsRGF0 YSBkYXRhKGJtcCk7CiAgICAgICAgIAotICAgICAgICBwKys7CisgICAgICAgIC8vIE5COiBJdCBh cHBlYXJzIHRoYXQgdGhlIGRhdGEgaXMgaW4gQkdSQSBmb3JtYXQgaW5zdGVhZCBvZiBSR0JBIGZv cm1hdC4KKyAgICAgICAgLy8gVGhpcyBjb2RlIHdvcmtzIHByb3Blcmx5IG9uIGJvdGggcHBjIGFu ZCBpbnRlbCwgbWVhbmluZyB0aGUgaXNzdWUgaXMKKyAgICAgICAgLy8gbGlrZWx5IG5vdCBhbiBp c3N1ZSBvZiBieXRlIG9yZGVyIGdldHRpbmcgbWl4ZWQgdXAgb24gZGlmZmVyZW50IGFyY2hzLiAK KyAgICAgICAgY29uc3QgdW5zaWduZWQgY2hhciogYnl0ZXMgPSAoY29uc3QgdW5zaWduZWQgY2hh ciopbV9ieXRlcy5kYXRhKCk7CisgICAgICAgIGludCByb3dDb3VudGVyID0gMDsKKyAgICAgICAg bG9uZyBwaXhlbENvdW50ZXIgPSAwOworICAgICAgICBXeFBpeGVsRGF0YTo6SXRlcmF0b3IgcChk YXRhKTsKKyAgICAgICAgV3hQaXhlbERhdGE6Okl0ZXJhdG9yIHJvd1N0YXJ0ID0gcDsgCisgICAg ICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9ieXRlcy5zaXplKCkgKiBzaXplb2YoUGl4ZWxE YXRhKTsgaSArPSBzaXplb2YoUGl4ZWxEYXRhKSkgeworICAgICAgICAgICAgcC5SZWQoKSA9IGJ5 dGVzW2krMl07CisgICAgICAgICAgICBwLkdyZWVuKCkgPSBieXRlc1tpKzFdOworICAgICAgICAg ICAgcC5CbHVlKCkgPSBieXRlc1tpKzBdOworICAgICAgICAgICAgcC5BbHBoYSgpID0gYnl0ZXNb aSszXTsKKyAgICAgICAgICAgIAorICAgICAgICAgICAgcCsrOwogCi0gICAgICAgIHBpeGVsQ291 bnRlcisrOwotICAgICAgICBpZiAoKHBpeGVsQ291bnRlciAlIHdpZHRoKCkpID09IDApIHsKLSAg ICAgICAgICAgIHJvd0NvdW50ZXIrKzsKLSAgICAgICAgICAgIHAgPSByb3dTdGFydDsKLSAgICAg ICAgICAgIHAuTW92ZVRvKGRhdGEsIDAsIHJvd0NvdW50ZXIpOworICAgICAgICAgICAgcGl4ZWxD b3VudGVyKys7CisgICAgICAgICAgICBpZiAoKHBpeGVsQ291bnRlciAlIHdpZHRoKCkpID09IDAp IHsKKyAgICAgICAgICAgICAgICByb3dDb3VudGVyKys7CisgICAgICAgICAgICAgICAgcCA9IHJv d1N0YXJ0OworICAgICAgICAgICAgICAgIHAuTW92ZVRvKGRhdGEsIDAsIHJvd0NvdW50ZXIpOwor ICAgICAgICAgICAgfQogICAgICAgICB9Ci0gICAgfQogI2lmICF3eENIRUNLX1ZFUlNJT04oMiw5 LDApCi0gICAgYm1wLlVzZUFscGhhKCk7CisgICAgICAgIGJtcC5Vc2VBbHBoYSgpOwogI2VuZGlm CisgICAgfSAvLyBlbnN1cmUgdGhhdCBXeFBpeGVsRGF0YSBpcyBkZXN0cm95ZWQgYXMgaXQgdW5s b2NrcyB0aGUgYml0bWFwIGRhdGEgaW4KKyAgICAgIC8vIGl0cyBkdG9yIGFuZCB3ZSBjYW4ndCBh Y2Nlc3MgaXQgKG5vdGFibHkgaW4gQ3JlYXRlQml0bWFwKCkgYmVsb3cpCisgICAgICAvLyBiZWZv cmUgdGhpcyBpcyBkb25lCisKICAgICBBU1NFUlQoYm1wLklzT2soKSk7CiAKICNpZiBVU0UoV1hH QykK 41997 2009-10-27 17:29:13 -0700 2009-11-06 18:35:08 -0800 Patch fixing alpha transparency handling for wx port (v2) alpha-fix-2.diff text/plain 3890 vz-webkit Y29tbWl0IDcwZmU2OThhZGFiNDA1OTMwZjQ2ODVlY2RiYzI1N2M4YmNjZTM3MTkKQXV0aG9yOiBW YWRpbSBaZWl0bGluIDx2YWRpbUB3eHdpZGdldHMub3JnPgpEYXRlOiAgIFR1ZSBPY3QgMjcgMTY6 MjU6MzkgMjAwOSArMDEwMAoKICAgIEZpeCBoYW5kbGluZyBvZiBhbHBoYSBjaGFuZ2VzIGluIHd4 IHBvcnQgd2hlbiB1c2luZyAyLjkrLgogICAgCiAgICB3eFBpeGVsRGF0YSBvYmplY3QgdXNlZCBm b3IgcmF3IGFjY2VzcyB0byB0aGUgYml0bWFwIGRhdGEgbXVzdCBiZSBkZXN0cm95ZWQKICAgIGJl Zm9yZSB0aGUgYml0bWFwIGlzIHVzZWQgaW4gYW55IG90aGVyIHdheSwgZmFpbGluZyB0byBkbyB0 aGlzIHJlc3VsdGVkIGluCiAgICBsb3NzIG9mIGFscGhhIHRyYW5zcGFyZW5jeSB3aGVuIHNob3dp bmcgUE5HIGltYWdlcy4KCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUv Q2hhbmdlTG9nCmluZGV4IDYzMWM0MDEuLjQ5YzM5MmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hh bmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTQgQEAKIDIwMDktMTAt MjcgIFZhZGltIFplaXRsaW4gIDx2YWRpbUB3eHdpZGdldHMub3JnPgogCisgICAgICAgIFt3eF0g Rml4IGhhbmRsaW5nIG9mIGFscGhhIGNoYW5uZWwgd2hlbiB1c2luZyB3eFdpZGdldHMgMi45OiBp dCB3YXMKKyAgICAgICAgc2ltcGx5IGlnbm9yZWQgYmVmb3JlIHJlc3VsdGluZyBpbiB0cmFuc3Bh cmVudCBhcmVhcyBiZWluZyBibGFjayBpbiBQTkcKKyAgICAgICAgaW1hZ2VzIGZvciBleGFtcGxl LgorCisgICAgICAgICogcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvd3gvSW1hZ2VEZWNvZGVyV3gu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UkdCQTMyQnVmZmVyOjphc05ld05hdGl2ZUltYWdlKToK KworMjAwOS0xMC0yNyAgVmFkaW0gWmVpdGxpbiAgPHZhZGltQHd4d2lkZ2V0cy5vcmc+CisKICAg ICAgICAgRGVmaW5lIE5hdGl2ZUltYWdlUHRyIGFzIHd4W0dyYXBoaWNzXUJpdG1hcCBpbiB3eCBw b3J0IGluc3RlYWQgb2YKICAgICAgICAgZGVmaW5pbmcgaXQgYXMgYSBwb2ludGVyIHRvIHRoZW0g dG8gYXZvaWQgdW5uZWNlc3NhcnkgaGVhcCBhbGxvY2F0aW9ucy4KIApkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy93eC9JbWFnZURlY29kZXJXeC5jcHAgYi9XZWJD b3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3d4L0ltYWdlRGVjb2Rlcld4LmNwcAppbmRleCAz ZGRjNjM4Li4wMzRhZjE2IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29k ZXJzL3d4L0ltYWdlRGVjb2Rlcld4LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRl Y29kZXJzL3d4L0ltYWdlRGVjb2Rlcld4LmNwcApAQCAtNDAsMzUgKzQwLDQxIEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIE5hdGl2ZUltYWdlUHRyIFJHQkEzMkJ1ZmZlcjo6YXNOZXdOYXRpdmVJbWFn ZSgpIGNvbnN0CiB7CiAgICAgd3hCaXRtYXAgYm1wKHdpZHRoKCksIGhlaWdodCgpLCAzMik7Ci0g ICAgdHlwZWRlZiB3eFBpeGVsRGF0YTx3eEJpdG1hcCwgd3hBbHBoYVBpeGVsRm9ybWF0PiBXeFBp eGVsRGF0YTsKLSAgICBXeFBpeGVsRGF0YSBkYXRhKGJtcCk7Ci0gICAgCi0gICAgLy8gTkI6IEl0 IGFwcGVhcnMgdGhhdCB0aGUgZGF0YSBpcyBpbiBCR1JBIGZvcm1hdCBpbnN0ZWFkIG9mIFJHQkEg Zm9ybWF0LgotICAgIC8vIFRoaXMgY29kZSB3b3JrcyBwcm9wZXJseSBvbiBib3RoIHBwYyBhbmQg aW50ZWwsIG1lYW5pbmcgdGhlIGlzc3VlIGlzCi0gICAgLy8gbGlrZWx5IG5vdCBhbiBpc3N1ZSBv ZiBieXRlIG9yZGVyIGdldHRpbmcgbWl4ZWQgdXAgb24gZGlmZmVyZW50IGFyY2hzLiAKLSAgICBj b25zdCB1bnNpZ25lZCBjaGFyKiBieXRlcyA9IChjb25zdCB1bnNpZ25lZCBjaGFyKiltX2J5dGVz LmRhdGEoKTsKLSAgICBpbnQgcm93Q291bnRlciA9IDA7Ci0gICAgbG9uZyBwaXhlbENvdW50ZXIg PSAwOwotICAgIFd4UGl4ZWxEYXRhOjpJdGVyYXRvciBwKGRhdGEpOwotICAgIFd4UGl4ZWxEYXRh OjpJdGVyYXRvciByb3dTdGFydCA9IHA7IAotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9i eXRlcy5zaXplKCkgKiBzaXplb2YoUGl4ZWxEYXRhKTsgaSArPSBzaXplb2YoUGl4ZWxEYXRhKSkg ewotICAgICAgICBwLlJlZCgpID0gYnl0ZXNbaSsyXTsKLSAgICAgICAgcC5HcmVlbigpID0gYnl0 ZXNbaSsxXTsKLSAgICAgICAgcC5CbHVlKCkgPSBieXRlc1tpKzBdOwotICAgICAgICBwLkFscGhh KCkgPSBieXRlc1tpKzNdOworCisgICAgeworICAgICAgICB0eXBlZGVmIHd4UGl4ZWxEYXRhPHd4 Qml0bWFwLCB3eEFscGhhUGl4ZWxGb3JtYXQ+IFd4UGl4ZWxEYXRhOworICAgICAgICBXeFBpeGVs RGF0YSBkYXRhKGJtcCk7CiAgICAgICAgIAotICAgICAgICBwKys7CisgICAgICAgIC8vIE5COiBJ dCBhcHBlYXJzIHRoYXQgdGhlIGRhdGEgaXMgaW4gQkdSQSBmb3JtYXQgaW5zdGVhZCBvZiBSR0JB IGZvcm1hdC4KKyAgICAgICAgLy8gVGhpcyBjb2RlIHdvcmtzIHByb3Blcmx5IG9uIGJvdGggcHBj IGFuZCBpbnRlbCwgbWVhbmluZyB0aGUgaXNzdWUgaXMKKyAgICAgICAgLy8gbGlrZWx5IG5vdCBh biBpc3N1ZSBvZiBieXRlIG9yZGVyIGdldHRpbmcgbWl4ZWQgdXAgb24gZGlmZmVyZW50IGFyY2hz LiAKKyAgICAgICAgY29uc3QgdW5zaWduZWQgY2hhciogYnl0ZXMgPSAoY29uc3QgdW5zaWduZWQg Y2hhciopbV9ieXRlcy5kYXRhKCk7CisgICAgICAgIGludCByb3dDb3VudGVyID0gMDsKKyAgICAg ICAgbG9uZyBwaXhlbENvdW50ZXIgPSAwOworICAgICAgICBXeFBpeGVsRGF0YTo6SXRlcmF0b3Ig cChkYXRhKTsKKyAgICAgICAgV3hQaXhlbERhdGE6Okl0ZXJhdG9yIHJvd1N0YXJ0ID0gcDsgCisg ICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9ieXRlcy5zaXplKCkgKiBzaXplb2YoUGl4 ZWxEYXRhKTsgaSArPSBzaXplb2YoUGl4ZWxEYXRhKSkgeworICAgICAgICAgICAgcC5SZWQoKSA9 IGJ5dGVzW2kgKyAyXTsKKyAgICAgICAgICAgIHAuR3JlZW4oKSA9IGJ5dGVzW2kgKyAxXTsKKyAg ICAgICAgICAgIHAuQmx1ZSgpID0gYnl0ZXNbaSArIDBdOworICAgICAgICAgICAgcC5BbHBoYSgp ID0gYnl0ZXNbaSArIDNdOworICAgICAgICAgICAgCisgICAgICAgICAgICBwKys7CiAKLSAgICAg ICAgcGl4ZWxDb3VudGVyKys7Ci0gICAgICAgIGlmICgocGl4ZWxDb3VudGVyICUgd2lkdGgoKSkg PT0gMCkgewotICAgICAgICAgICAgcm93Q291bnRlcisrOwotICAgICAgICAgICAgcCA9IHJvd1N0 YXJ0OwotICAgICAgICAgICAgcC5Nb3ZlVG8oZGF0YSwgMCwgcm93Q291bnRlcik7CisgICAgICAg ICAgICBwaXhlbENvdW50ZXIrKzsKKyAgICAgICAgICAgIGlmICgocGl4ZWxDb3VudGVyICUgd2lk dGgoKSkgPT0gMCkgeworICAgICAgICAgICAgICAgIHJvd0NvdW50ZXIrKzsKKyAgICAgICAgICAg ICAgICBwID0gcm93U3RhcnQ7CisgICAgICAgICAgICAgICAgcC5Nb3ZlVG8oZGF0YSwgMCwgcm93 Q291bnRlcik7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KLSAgICB9CiAjaWYgIXd4Q0hFQ0tf VkVSU0lPTigyLDksMCkKLSAgICBibXAuVXNlQWxwaGEoKTsKKyAgICAgICAgYm1wLlVzZUFscGhh KCk7CiAjZW5kaWYKKyAgICB9IC8vIGVuc3VyZSB0aGF0IFd4UGl4ZWxEYXRhIGlzIGRlc3Ryb3ll ZCBhcyBpdCB1bmxvY2tzIHRoZSBiaXRtYXAgZGF0YSBpbgorICAgICAgLy8gaXRzIGR0b3IgYW5k IHdlIGNhbid0IGFjY2VzcyBpdCAobm90YWJseSBpbiBDcmVhdGVCaXRtYXAoKSBiZWxvdykKKyAg ICAgIC8vIGJlZm9yZSB0aGlzIGlzIGRvbmUKKwogICAgIEFTU0VSVChibXAuSXNPaygpKTsKIAog I2lmIFVTRShXWEdDKQo= 42682 2009-11-06 18:35:08 -0800 2009-11-09 12:35:45 -0800 "Standalone" version of the patch alpha-fix-3.diff text/plain 2057 vz-webkit ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDI3ZTlhYS4uOGYzMDI3YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAwOS0xMS0wNiAgVmFkaW0gWmVpdGxp biAgPHZhZGltQHd4d2lkZ2V0cy5vcmc+CisKKyAgICAgICAgW3d4XSBGaXggaGFuZGxpbmcgb2Yg YWxwaGEgY2hhbm5lbCB3aGVuIHVzaW5nIHd4V2lkZ2V0cyAyLjk6IGl0IHdhcworICAgICAgICBz aW1wbHkgaWdub3JlZCBiZWZvcmUgcmVzdWx0aW5nIGluIHRyYW5zcGFyZW50IGFyZWFzIGJlaW5n IGJsYWNrIGluIFBORworICAgICAgICBpbWFnZXMgZm9yIGV4YW1wbGUuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9pbWFnZS1kZWNvZGVycy93eC9JbWFnZURlY29kZXJXeC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSR0JBMzJCdWZmZXI6OmFzTmV3TmF0aXZlSW1hZ2UpOgorCiAyMDA5LTEwLTE4ICBL ZXZpbiBPbGxpdmllciAgPGtldmlub0B0aGVvbGxpdmllcnMuY29tPgogCiAgICAgICAgIENVUkwg YnVpbGQgZml4LCB1c2UgcHJvcGVyIGhlYWRlciBuYW1lLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9w bGF0Zm9ybS9pbWFnZS1kZWNvZGVycy93eC9JbWFnZURlY29kZXJXeC5jcHAgYi9XZWJDb3JlL3Bs YXRmb3JtL2ltYWdlLWRlY29kZXJzL3d4L0ltYWdlRGVjb2Rlcld4LmNwcAppbmRleCAzY2FkZjFj Li42ZTI1NzI4IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3d4 L0ltYWdlRGVjb2Rlcld4LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJz L3d4L0ltYWdlRGVjb2Rlcld4LmNwcApAQCAtNDAsNiArNDAsOCBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiBOYXRpdmVJbWFnZVB0ciBSR0JBMzJCdWZmZXI6OmFzTmV3TmF0aXZlSW1hZ2UoKSBjb25z dAogewogICAgIHd4Qml0bWFwKiBibXAgPSBuZXcgd3hCaXRtYXAod2lkdGgoKSwgaGVpZ2h0KCks IDMyKTsKKworICAgIHsKICAgICB0eXBlZGVmIHd4UGl4ZWxEYXRhPHd4Qml0bWFwLCB3eEFscGhh UGl4ZWxGb3JtYXQ+IFd4UGl4ZWxEYXRhOwogICAgIFd4UGl4ZWxEYXRhIGRhdGEoKmJtcCk7CiAg ICAgCkBAIC01MiwxMCArNTQsMTAgQEAgTmF0aXZlSW1hZ2VQdHIgUkdCQTMyQnVmZmVyOjphc05l d05hdGl2ZUltYWdlKCkgY29uc3QKICAgICBXeFBpeGVsRGF0YTo6SXRlcmF0b3IgcChkYXRhKTsK ICAgICBXeFBpeGVsRGF0YTo6SXRlcmF0b3Igcm93U3RhcnQgPSBwOyAKICAgICBmb3IgKHNpemVf dCBpID0gMDsgaSA8IG1fYnl0ZXMuc2l6ZSgpICogc2l6ZW9mKFBpeGVsRGF0YSk7IGkgKz0gc2l6 ZW9mKFBpeGVsRGF0YSkpIHsKLSAgICAgICAgcC5SZWQoKSA9IGJ5dGVzW2krMl07Ci0gICAgICAg IHAuR3JlZW4oKSA9IGJ5dGVzW2krMV07Ci0gICAgICAgIHAuQmx1ZSgpID0gYnl0ZXNbaSswXTsK LSAgICAgICAgcC5BbHBoYSgpID0gYnl0ZXNbaSszXTsKKyAgICAgICAgICAgIHAuUmVkKCkgPSBi eXRlc1tpICsgMl07CisgICAgICAgICAgICBwLkdyZWVuKCkgPSBieXRlc1tpICsgMV07CisgICAg ICAgICAgICBwLkJsdWUoKSA9IGJ5dGVzW2kgKyAwXTsKKyAgICAgICAgICAgIHAuQWxwaGEoKSA9 IGJ5dGVzW2kgKyAzXTsKICAgICAgICAgCiAgICAgICAgIHArKzsKIApAQCAtNjksNiArNzEsMTAg QEAgTmF0aXZlSW1hZ2VQdHIgUkdCQTMyQnVmZmVyOjphc05ld05hdGl2ZUltYWdlKCkgY29uc3QK ICNpZiAhd3hDSEVDS19WRVJTSU9OKDIsOSwwKQogICAgIGJtcC0+VXNlQWxwaGEoKTsKICNlbmRp ZgorICAgIH0gLy8gZW5zdXJlIHRoYXQgV3hQaXhlbERhdGEgaXMgZGVzdHJveWVkIGFzIGl0IHVu bG9ja3MgdGhlIGJpdG1hcCBkYXRhIGluCisgICAgICAvLyBpdHMgZHRvciBhbmQgd2UgY2FuJ3Qg YWNjZXNzIGl0IChub3RhYmx5IGluIENyZWF0ZUJpdG1hcCgpIGJlbG93KQorICAgICAgLy8gYmVm b3JlIHRoaXMgaXMgZG9uZQorCiAgICAgQVNTRVJUKGJtcC0+SXNPaygpKTsKIAogI2lmIFVTRShX WEdDKQo=