43858 2010-08-11 09:32:28 -0700 Add support for BGRA pixel formats to GraphicsContext3D 2010-08-12 11:15:09 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 43896 43804 1 senorblanco senorblanco abarth commit-queue dglazkov eric fishd jamesr levin webkit.review.bot oldest_to_newest 263286 0 senorblanco 2010-08-11 09:32:28 -0700 Add support for BGRA pixel formats to GraphicsContext3D 263290 1 64127 senorblanco 2010-08-11 09:36:56 -0700 Created attachment 64127 Patch 263328 2 64127 jamesr 2010-08-11 10:19:49 -0700 Comment on attachment 64127 Patch > + // FIXME: This should be made pure virtual, once the chrome side change > + // has landed. > + virtual bool supportsBGRA() { return true; } Land the chrome side (implementation) first and you won't have to do this. You'll temporarily have an uncallable function definition in chromium land, but that's OK. I think this looks fine. 263494 3 senorblanco 2010-08-11 15:52:33 -0700 (In reply to comment #2) > (From update of attachment 64127 [details]) > > + // FIXME: This should be made pure virtual, once the chrome side change > > + // has landed. > > + virtual bool supportsBGRA() { return true; } > > Land the chrome side (implementation) first and you won't have to do this. You'll temporarily have an uncallable function definition in chromium land, but that's OK. Good idea. Done. 263495 4 64172 senorblanco 2010-08-11 15:54:11 -0700 Created attachment 64172 Patch 263504 5 jamesr 2010-08-11 16:03:43 -0700 I think you need implementations in GraphicsContext3DQt.cpp and GraphicsContext3DMac.mm or the builds on those platforms will break. Otherwise, this looks good to me. 263505 6 senorblanco 2010-08-11 16:08:46 -0700 (In reply to comment #5) > I think you need implementations in GraphicsContext3DQt.cpp and GraphicsContext3DMac.mm or the builds on those platforms will break. Otherwise, this looks good to me. There's an implementation in GraphicsContext3D.cpp for !PLATFORM(CHROMIUM). 263512 7 64172 levin 2010-08-11 16:24:34 -0700 Comment on attachment 64172 Patch r=me (I'm not setting r+ so that the ews bots will still run your patch through them, but consider this to be r+ by me). Please make sure to rev DEPS (WebKit/chromium/DEPS) to pick up the necessary chromium change. > Index: WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp > +bool WebGraphicsContext3DDefaultImpl::supportsBGRA() > +{ > + // Supported since OpenGL 1.2. However, glTexImage2D() must be modified > + // to translate the internalFormat from GL_BGRA to GL_RGBA, since the > + // former is not accepted by desktop GL. Return false until this is done. nit: WebKit uses single spaces after "." 263610 8 64172 jamesr 2010-08-11 22:53:45 -0700 Comment on attachment 64172 Patch Chromium side's landed, flipping cq bit. 263625 9 64172 commit-queue 2010-08-12 00:00:59 -0700 Comment on attachment 64172 Patch Clearing flags on attachment: 64172 Committed r65221: <http://trac.webkit.org/changeset/65221> 263626 10 commit-queue 2010-08-12 00:01:04 -0700 All reviewed patches have been landed. Closing bug. 263630 11 levin 2010-08-12 00:15:09 -0700 This broke the snow leopard release build. Within minutes after it was submitted, this was noticeable. 263636 12 levin 2010-08-12 00:28:46 -0700 (In reply to comment #11) > This broke the snow leopard release build. Within minutes after it was submitted, this was noticeable. As jamesr pointed out, this is due to a missing return value here: 819 #if !PLATFORM(CHROMIUM) 820 GraphicsContext3D::supportsBGRA() Also, please consider fixing: > Index: WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp > +bool WebGraphicsContext3DDefaultImpl::supportsBGRA() > +{ > + // Supported since OpenGL 1.2. However, glTexImage2D() must be modified > + // to translate the internalFormat from GL_BGRA to GL_RGBA, since the > + // former is not accepted by desktop GL. Return false until this is done. nit: WebKit uses single spaces after "." r=me with these addressed (mostly the build break but the spaces issue would be nice). 263828 13 senorblanco 2010-08-12 08:27:18 -0700 Committed r65247: <http://trac.webkit.org/changeset/65247> 263884 14 webkit.review.bot 2010-08-12 11:15:09 -0700 http://trac.webkit.org/changeset/65247 might have broken Leopard Intel Debug (Tests) 64127 2010-08-11 09:36:56 -0700 2010-08-11 15:54:06 -0700 Patch bug-43858-20100811123654.patch text/plain 7264 senorblanco SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NTE1OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjQgQEAKKzIwMTAtMDgtMTEgIFN0ZXBoZW4gV2hpdGUgIDxzZW5vcmJsYW5jb0Bj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQWRkIHN1cHBvcnQgZm9yIEJHUkEgcGl4ZWwgZm9ybWF0IHRvIEdyYXBoaWNzQ29udGV4 dDNELgorCisgICAgICAgIEFsdGhvdWdoIHRoaXMgaGFzIGJlZW4gc3RhbmRhcmQgaW4gZGVza3Rv cCBHTCBzaW5jZSAxLjIsIGl0J3MgYW4gCisgICAgICAgIGV4dGVuc2lvbiBpbiBHTCBFUyAyLjAs IHNvIGEgcXVlcnkgZnVuY3Rpb24gaXMgcHJvdmlkZWQgdG8gY2hlY2sKKyAgICAgICAgZm9yIHN1 cHBvcnQuICBTaW5jZSB0aGV5IGRpZmZlciBvbiBzZW1hbnRpY3MgKEdMIEVTIDIuMCByZXF1aXJl cyAKKyAgICAgICAgVGV4SW1hZ2UyRCgpJ3MgZm9ybWF0IGFuZCBpbnRlcm5hbEZvcm1hdCB0byBt YXRjaCwgd2hpbGUgZGVza3RvcCBHTAorICAgICAgICB3aWxsIG5vdCBhY2NlcHQgQkdSQSBhcyBh biBpbnRlcm5hbEZvcm1hdCksIHRoZSBzdHViIGltcGxlbWVudGF0aW9uCisgICAgICAgIHJldHVy bnMgZmFsc2UgdW50aWwgdGhlc2UgcXVpcmtzIGhhdmUgYmVlbiBpbXBsZW1lbnRlZCBhbmQgdGVz dGVkIG9uCisgICAgICAgIGVhY2ggcG9ydC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L0dyYXBoaWNzQ29udGV4dDNELmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4 dDNEOjpzdXBwb3J0c0JHUkEpOgorICAgICAgICBBZGQgaW1wbGVtZW50YXRpb24gZm9yIG5vbi1j aHJvbWl1bSBwbGF0Zm9ybXMgd2hpY2ggcmV0dXJucyBmYWxzZS4KKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQzRC5oOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhp Y3NDb250ZXh0M0Q6Oik6CisgICAgICAgIEFkZCBxdWVyeSBmdW5jdGlvbiAoc3VwcG9ydHNCR1JB KCkpIGFuZCB0aGUgQkdSQV9FWFQgdG9rZW4uCisKIDIwMTAtMDgtMTEgIElseWEgVGlraG9ub3Zz a3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZl bGRtYW4uCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNE LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29u dGV4dDNELmNwcAkocmV2aXNpb24gNjUxNTgpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0dyYXBoaWNzQ29udGV4dDNELmNwcAkod29ya2luZyBjb3B5KQpAQCAtODE2LDYgKzgxNiwyMSBA QCBib29sIEdyYXBoaWNzQ29udGV4dDNEOjpwYWNrUGl4ZWxzKGNvbnN0CiAgICAgcmV0dXJuIHRy dWU7CiB9CiAKKyNpZiAhUExBVEZPUk0oQ0hST01JVU0pCitHcmFwaGljc0NvbnRleHQzRDo6c3Vw cG9ydHNCR1JBKCkKK3sKKyAgICAvLyBGb3IgT3BlbkdMIEVTMi4wLCB0aGlzIHJlcXVpcmVzIGNo ZWNraW5nIGZvcgorICAgIC8vIEdMX0VYVF90ZXh0dXJlX2Zvcm1hdF9CR1JBODg4OCBhbmQgR0xf RVhUX3JlYWRfZm9ybWF0X2JncmEuCisgICAgLy8gRm9yIGRlc2t0b3AgR0wsIEJHUkEgaGFzIGJl ZW4gc3VwcG9ydGVkIHNpbmNlIE9wZW5HTCAxLjIuCisKKyAgICAvLyBIb3dldmVyLCBub3RlIHRo YXQgdGhlIEdMIEVTMiBleHRlbnNpb24gcmVxdWlyZXMgdGhlIGludGVybmFsRm9ybWF0IHRvCisg ICAgLy8gZ2xUZXhJbWFnZTJEKCkgYmUgR0xfQkdSQSwgd2hpbGUgZGVza3RvcCBHTCB3aWxsIG5v dCBhY2NlcHQgR0xfQkdSQQorICAgIC8vIChtdXN0IGJlIEdMX1JHQkEpLCBzbyB0aGlzIG11c3Qg YmUgY2hlY2tlZCBvbiBlYWNoIHBsYXRmb3JtLgorICAgIC8vIFJldHVybmluZyBmYWxzZSBmb3Ig bm93IHRvIGJlIHNhZmUuCisgICAgcmV0dXJuIGZhbHNlOworfQorI2VuZGlmCisKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIEVOQUJMRSgzRF9DQU5WQVMpCkluZGV4OiBXZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNELmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQzRC5oCShyZXZpc2lvbiA2 NTE1OCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0M0QuaAko d29ya2luZyBjb3B5KQpAQCAtNDAzLDcgKzQwMyw5IEBAIHB1YmxpYzoKIAogICAgICAgICAvLyBX ZWJHTC1zcGVjaWZpYyBlbnVtcwogICAgICAgICBVTlBBQ0tfRkxJUF9ZX1dFQkdMID0gMHg5MjQw LAotICAgICAgICBVTlBBQ0tfUFJFTVVMVElQTFlfQUxQSEFfV0VCR0wgPSAweDkyNDEKKyAgICAg ICAgVU5QQUNLX1BSRU1VTFRJUExZX0FMUEhBX1dFQkdMID0gMHg5MjQxLAorCisgICAgICAgIEJH UkFfRVhUID0gMHg4MEUxCiAgICAgfTsKIAogICAgIC8vIENvbnRleHQgY3JlYXRpb24gYXR0cmli dXRlcy4KQEAgLTc0OCw2ICs3NTAsOCBAQCBwdWJsaWM6CiAgICAgLy8gZ2V0RXJyb3IgaW4gdGhl IG9yZGVyIHRoZXkgd2VyZSBhZGRlZC4KICAgICB2b2lkIHN5bnRoZXNpemVHTEVycm9yKHVuc2ln bmVkIGxvbmcgZXJyb3IpOwogCisgICAgYm9vbCBzdXBwb3J0c0JHUkEoKTsKKwogICBwcml2YXRl OgogICAgIEdyYXBoaWNzQ29udGV4dDNEKEF0dHJpYnV0ZXMgYXR0cnMsIEhvc3RXaW5kb3cqIGhv c3RXaW5kb3cpOwogCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDY1MTU4KQorKysgV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDEw LTA4LTExICBTdGVwaGVuIFdoaXRlICA8c2Vub3JibGFuY29AY2hyb21pdW0ub3JnPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBzdXBwb3J0IGZv ciBCR1JBIHBpeGVsIGZvcm1hdCB0byBHcmFwaGljc0NvbnRleHQzRC4KKworICAgICAgICBBbHRo b3VnaCB0aGlzIGhhcyBiZWVuIHN0YW5kYXJkIGluIGRlc2t0b3AgR0wgc2luY2UgMS4yLCBpdCdz IGFuIAorICAgICAgICBleHRlbnNpb24gaW4gR0wgRVMgMi4wLCBzbyBhIHF1ZXJ5IGZ1bmN0aW9u IGlzIHByb3ZpZGVkIHRvIGNoZWNrCisgICAgICAgIGZvciBzdXBwb3J0LiAgVGhlIERlZmF1bHRJ bXBsIHJldHVybnMgZmFsc2UsIHNpbmNlIGl0IGRvZXMgbm90IHlldAorICAgICAgICBpbXBsZW1l bnQgdGhlIFRleEltYWdlMkQgaW50ZXJuYWxGb3JtYXQgcXVpcmtzLiAgVGhlIGJhc2UgY2xhc3MK KyAgICAgICAgcmV0dXJucyB0cnVlLCB1bnRpbCBhIGNocm9tZS1zaWRlIGNoYW5nZSBjYW4gaW1w bGVtZW50IHByb3BlciAKKyAgICAgICAgZXh0ZW5zaW9uIGNoZWNraW5nLgorCisgICAgICAgICog cHVibGljL1dlYkdyYXBoaWNzQ29udGV4dDNELmg6CisgICAgICAgIChXZWJLaXQ6OldlYkdyYXBo aWNzQ29udGV4dDNEOjpzdXBwb3J0c0JHUkEpOgorICAgICAgICAqIHNyYy9HcmFwaGljc0NvbnRl eHQzRC5jcHA6CisgICAgICAgICogc3JjL1dlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGwu Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsOjpz dXBwb3J0c0JHUkEpOgorICAgICAgICAqIHNyYy9XZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJ bXBsLmg6CisKIDIwMTAtMDgtMTEgIEV2YW4gU3RhZGUgIDxlc3RhZGVAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIExldmluLgpJbmRleDogV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJHcmFwaGljc0NvbnRleHQzRC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViR3JhcGhpY3NDb250ZXh0M0QuaAkocmV2aXNpb24gNjUxNTgpCisrKyBX ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkdyYXBoaWNzQ29udGV4dDNELmgJKHdvcmtpbmcgY29w eSkKQEAgLTEyOSw2ICsxMjksMTAgQEAgcHVibGljOgogICAgIC8vIGdldEVycm9yIGluIHRoZSBv cmRlciB0aGV5IHdlcmUgYWRkZWQuCiAgICAgdmlydHVhbCB2b2lkIHN5bnRoZXNpemVHTEVycm9y KHVuc2lnbmVkIGxvbmcgZXJyb3IpID0gMDsKIAorICAgIC8vIEZJWE1FOiAgVGhpcyBzaG91bGQg YmUgbWFkZSBwdXJlIHZpcnR1YWwsIG9uY2UgdGhlIGNocm9tZSBzaWRlIGNoYW5nZQorICAgIC8v IGhhcyBsYW5kZWQuCisgICAgdmlydHVhbCBib29sIHN1cHBvcnRzQkdSQSgpIHsgcmV0dXJuIHRy dWU7IH0KKwogICAgIC8vIFRoZSBlbnRyeSBwb2ludHMgYmVsb3cgbWFwIGRpcmVjdGx5IHRvIHRo ZSBPcGVuR0wgRVMgMi4wIEFQSS4KICAgICAvLyBTZWU6IGh0dHA6Ly93d3cua2hyb25vcy5vcmcv cmVnaXN0cnkvZ2xlcy8KICAgICAvLyBhbmQ6IGh0dHA6Ly93d3cua2hyb25vcy5vcmcvb3Blbmds ZXMvc2RrL2RvY3MvbWFuLwpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9HcmFwaGljc0NvbnRl eHQzRC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9HcmFwaGljc0NvbnRl eHQzRC5jcHAJKHJldmlzaW9uIDY1MTU4KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9HcmFwaGlj c0NvbnRleHQzRC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5Nyw2ICsyOTcsNyBAQCBwdWJsaWM6 CiAgICAgdm9pZCBkZWxldGVUZXh0dXJlKHVuc2lnbmVkKTsKIAogICAgIHZvaWQgc3ludGhlc2l6 ZUdMRXJyb3IodW5zaWduZWQgbG9uZyBlcnJvcik7CisgICAgYm9vbCBzdXBwb3J0c0JHUkEoKTsK IAogcHJpdmF0ZToKICAgICBPd25QdHI8V2ViS2l0OjpXZWJHcmFwaGljc0NvbnRleHQzRD4gbV9p bXBsOwpAQCAtOTA3LDYgKzkwOCw3IEBAIERFTEVHQVRFX1RPX0lNUExfMShkZWxldGVTaGFkZXIs IHVuc2lnbmUKIERFTEVHQVRFX1RPX0lNUExfMShkZWxldGVUZXh0dXJlLCB1bnNpZ25lZCkKIAog REVMRUdBVEVfVE9fSU1QTF8xKHN5bnRoZXNpemVHTEVycm9yLCB1bnNpZ25lZCBsb25nKQorREVM RUdBVEVfVE9fSU1QTF9SKHN1cHBvcnRzQkdSQSwgYm9vbCkKIAogLy8tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAv LyBHcmFwaGljc0NvbnRleHQzRApAQCAtMTI0MSw2ICsxMjQzLDcgQEAgREVMRUdBVEVfVE9fSU5U RVJOQUxfMShkZWxldGVTaGFkZXIsIHVucwogREVMRUdBVEVfVE9fSU5URVJOQUxfMShkZWxldGVU ZXh0dXJlLCB1bnNpZ25lZCkKIAogREVMRUdBVEVfVE9fSU5URVJOQUxfMShzeW50aGVzaXplR0xF cnJvciwgdW5zaWduZWQgbG9uZykKK0RFTEVHQVRFX1RPX0lOVEVSTkFMX1Ioc3VwcG9ydHNCR1JB LCBib29sKQogCiBib29sIEdyYXBoaWNzQ29udGV4dDNEOjppc0dMRVMyQ29tcGxpYW50KCkgY29u c3QKIHsKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViR3JhcGhpY3NDb250ZXh0M0REZWZh dWx0SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJHcmFwaGlj c0NvbnRleHQzRERlZmF1bHRJbXBsLmNwcAkocmV2aXNpb24gNjUxNTgpCisrKyBXZWJLaXQvY2hy b21pdW0vc3JjL1dlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGwuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC00NDUsNiArNDQ1LDE0IEBAIHZvaWQgV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0 SW1wbDo6c3kKICAgICBtX3N5bnRoZXRpY0Vycm9ycy5hZGQoZXJyb3IpOwogfQogCitib29sIFdl YkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGw6OnN1cHBvcnRzQkdSQSgpCit7CisgICAgLy8g U3VwcG9ydGVkIHNpbmNlIE9wZW5HTCAxLjIuICBIb3dldmVyLCBnbFRleEltYWdlMkQoKSBtdXN0 IGJlIG1vZGlmaWVkCisgICAgLy8gdG8gdHJhbnNsYXRlIHRoZSBpbnRlcm5hbEZvcm1hdCBmcm9t IEdMX0JHUkEgdG8gR0xfUkdCQSwgc2luY2UgdGhlCisgICAgLy8gZm9ybWVyIGlzIG5vdCBhY2Nl cHRlZCBieSBkZXNrdG9wIEdMLiAgUmV0dXJuIGZhbHNlIHVudGlsIHRoaXMgaXMgZG9uZS4KKyAg ICByZXR1cm4gZmFsc2U7Cit9CisKIC8vIEhlbHBlciBtYWNyb3MgdG8gcmVkdWNlIHRoZSBhbW91 bnQgb2YgY29kZS4KIAogI2RlZmluZSBERUxFR0FURV9UT19HTChuYW1lLCBnbG5hbWUpICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKSW5kZXg6IFdlYktpdC9jaHJv bWl1bS9zcmMvV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbC5oCShy ZXZpc2lvbiA2NTE1OCkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViR3JhcGhpY3NDb250ZXh0 M0REZWZhdWx0SW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC03Nyw2ICs3Nyw3IEBAIHB1YmxpYzoK ICAgICB2aXJ0dWFsIHZvaWQgcHJlcGFyZVRleHR1cmUoKTsKIAogICAgIHZpcnR1YWwgdm9pZCBz eW50aGVzaXplR0xFcnJvcih1bnNpZ25lZCBsb25nIGVycm9yKTsKKyAgICB2aXJ0dWFsIGJvb2wg c3VwcG9ydHNCR1JBKCk7CiAKICAgICB2aXJ0dWFsIHZvaWQgYWN0aXZlVGV4dHVyZSh1bnNpZ25l ZCBsb25nIHRleHR1cmUpOwogICAgIHZpcnR1YWwgdm9pZCBhdHRhY2hTaGFkZXIoV2ViR0xJZCBw cm9ncmFtLCBXZWJHTElkIHNoYWRlcik7Cg== 64172 2010-08-11 15:54:11 -0700 2010-08-12 00:00:59 -0700 Patch bug-43858-20100811185409.patch text/plain 7146 senorblanco SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NTE1OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTAtMDgtMTEgIFN0ZXBoZW4gV2hpdGUgIDxzZW5vcmJsYW5jb0Bj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQWRkIHN1cHBvcnQgZm9yIEJHUkEgcGl4ZWwgZm9ybWF0IHRvIEdyYXBoaWNzQ29udGV4 dDNELgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDM4 NTgKKworICAgICAgICBBbHRob3VnaCB0aGlzIGhhcyBiZWVuIHN0YW5kYXJkIGluIGRlc2t0b3Ag R0wgc2luY2UgMS4yLCBpdCdzIGFuIAorICAgICAgICBleHRlbnNpb24gaW4gR0wgRVMgMi4wLCBz byBhIHF1ZXJ5IGZ1bmN0aW9uIGlzIHByb3ZpZGVkIHRvIGNoZWNrCisgICAgICAgIGZvciBzdXBw b3J0LiAgU2luY2UgdGhleSBkaWZmZXIgb24gc2VtYW50aWNzIChHTCBFUyAyLjAgcmVxdWlyZXMg CisgICAgICAgIFRleEltYWdlMkQoKSdzIGZvcm1hdCBhbmQgaW50ZXJuYWxGb3JtYXQgdG8gbWF0 Y2gsIHdoaWxlIGRlc2t0b3AgR0wKKyAgICAgICAgd2lsbCBub3QgYWNjZXB0IEJHUkEgYXMgYW4g aW50ZXJuYWxGb3JtYXQpLCB0aGUgc3R1YiBpbXBsZW1lbnRhdGlvbgorICAgICAgICByZXR1cm5z IGZhbHNlIHVudGlsIHRoZXNlIHF1aXJrcyBoYXZlIGJlZW4gaW1wbGVtZW50ZWQgYW5kIHRlc3Rl ZCBvbgorICAgICAgICBlYWNoIHBvcnQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0NvbnRleHQzRC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQz RDo6c3VwcG9ydHNCR1JBKToKKyAgICAgICAgQWRkIGltcGxlbWVudGF0aW9uIGZvciBub24tY2hy b21pdW0gcGxhdGZvcm1zIHdoaWNoIHJldHVybnMgZmFsc2UuCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0M0QuaDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNz Q29udGV4dDNEOjopOgorICAgICAgICBBZGQgcXVlcnkgZnVuY3Rpb24gKHN1cHBvcnRzQkdSQSgp KSBhbmQgdGhlIEJHUkFfRVhUIHRva2VuLgorCiAyMDEwLTA4LTExICBJbHlhIFRpa2hvbm92c2t5 ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxk bWFuLgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQzRC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRl eHQzRC5jcHAJKHJldmlzaW9uIDY1MTU4KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0NvbnRleHQzRC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgxNiw2ICs4MTYsMjEgQEAg Ym9vbCBHcmFwaGljc0NvbnRleHQzRDo6cGFja1BpeGVscyhjb25zdAogICAgIHJldHVybiB0cnVl OwogfQogCisjaWYgIVBMQVRGT1JNKENIUk9NSVVNKQorR3JhcGhpY3NDb250ZXh0M0Q6OnN1cHBv cnRzQkdSQSgpCit7CisgICAgLy8gRm9yIE9wZW5HTCBFUzIuMCwgdGhpcyByZXF1aXJlcyBjaGVj a2luZyBmb3IKKyAgICAvLyBHTF9FWFRfdGV4dHVyZV9mb3JtYXRfQkdSQTg4ODggYW5kIEdMX0VY VF9yZWFkX2Zvcm1hdF9iZ3JhLgorICAgIC8vIEZvciBkZXNrdG9wIEdMLCBCR1JBIGhhcyBiZWVu IHN1cHBvcnRlZCBzaW5jZSBPcGVuR0wgMS4yLgorCisgICAgLy8gSG93ZXZlciwgbm90ZSB0aGF0 IHRoZSBHTCBFUzIgZXh0ZW5zaW9uIHJlcXVpcmVzIHRoZSBpbnRlcm5hbEZvcm1hdCB0bworICAg IC8vIGdsVGV4SW1hZ2UyRCgpIGJlIEdMX0JHUkEsIHdoaWxlIGRlc2t0b3AgR0wgd2lsbCBub3Qg YWNjZXB0IEdMX0JHUkEKKyAgICAvLyAobXVzdCBiZSBHTF9SR0JBKSwgc28gdGhpcyBtdXN0IGJl IGNoZWNrZWQgb24gZWFjaCBwbGF0Zm9ybS4KKyAgICAvLyBSZXR1cm5pbmcgZmFsc2UgZm9yIG5v dyB0byBiZSBzYWZlLgorICAgIHJldHVybiBmYWxzZTsKK30KKyNlbmRpZgorCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBFTkFCTEUoM0RfQ0FOVkFTKQpJbmRleDogV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQzRC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0M0QuaAkocmV2aXNpb24gNjUx NTgpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNELmgJKHdv cmtpbmcgY29weSkKQEAgLTQwMyw3ICs0MDMsOSBAQCBwdWJsaWM6CiAKICAgICAgICAgLy8gV2Vi R0wtc3BlY2lmaWMgZW51bXMKICAgICAgICAgVU5QQUNLX0ZMSVBfWV9XRUJHTCA9IDB4OTI0MCwK LSAgICAgICAgVU5QQUNLX1BSRU1VTFRJUExZX0FMUEhBX1dFQkdMID0gMHg5MjQxCisgICAgICAg IFVOUEFDS19QUkVNVUxUSVBMWV9BTFBIQV9XRUJHTCA9IDB4OTI0MSwKKworICAgICAgICBCR1JB X0VYVCA9IDB4ODBFMQogICAgIH07CiAKICAgICAvLyBDb250ZXh0IGNyZWF0aW9uIGF0dHJpYnV0 ZXMuCkBAIC03NDgsNiArNzUwLDggQEAgcHVibGljOgogICAgIC8vIGdldEVycm9yIGluIHRoZSBv cmRlciB0aGV5IHdlcmUgYWRkZWQuCiAgICAgdm9pZCBzeW50aGVzaXplR0xFcnJvcih1bnNpZ25l ZCBsb25nIGVycm9yKTsKIAorICAgIGJvb2wgc3VwcG9ydHNCR1JBKCk7CisKICAgcHJpdmF0ZToK ICAgICBHcmFwaGljc0NvbnRleHQzRChBdHRyaWJ1dGVzIGF0dHJzLCBIb3N0V2luZG93KiBob3N0 V2luZG93KTsKIApJbmRleDogV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA2NTE1OCkKKysrIFdlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0w OC0xMSAgU3RlcGhlbiBXaGl0ZSAgPHNlbm9yYmxhbmNvQGNocm9taXVtLm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgc3VwcG9ydCBmb3Ig QkdSQSBwaXhlbCBmb3JtYXQgdG8gR3JhcGhpY3NDb250ZXh0M0QuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Mzg1OAorCisgICAgICAgIEFsdGhvdWdo IHRoaXMgaGFzIGJlZW4gc3RhbmRhcmQgaW4gZGVza3RvcCBHTCBzaW5jZSAxLjIsIGl0J3MgYW4g CisgICAgICAgIGV4dGVuc2lvbiBpbiBHTCBFUyAyLjAsIHNvIGEgcXVlcnkgZnVuY3Rpb24gaXMg cHJvdmlkZWQgdG8gY2hlY2sKKyAgICAgICAgZm9yIHN1cHBvcnQuICBUaGUgRGVmYXVsdEltcGwg cmV0dXJucyBmYWxzZSwgc2luY2UgaXQgZG9lcyBub3QgeWV0CisgICAgICAgIGltcGxlbWVudCB0 aGUgVGV4SW1hZ2UyRCBpbnRlcm5hbEZvcm1hdCBxdWlya3MuCisKKyAgICAgICAgKiBwdWJsaWMv V2ViR3JhcGhpY3NDb250ZXh0M0QuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViR3JhcGhpY3NDb250 ZXh0M0Q6OnN1cHBvcnRzQkdSQSk6CisgICAgICAgICogc3JjL0dyYXBoaWNzQ29udGV4dDNELmNw cDoKKyAgICAgICAgKiBzcmMvV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGw6OnN1cHBvcnRz QkdSQSk6CisgICAgICAgICogc3JjL1dlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGwuaDoK KwogMjAxMC0wOC0xMSAgRXZhbiBTdGFkZSAgPGVzdGFkZUBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYkdyYXBoaWNzQ29udGV4dDNELmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJHcmFwaGljc0NvbnRleHQzRC5oCShyZXZpc2lvbiA2NTE1OCkKKysrIFdlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViR3JhcGhpY3NDb250ZXh0M0QuaAkod29ya2luZyBjb3B5KQpAQCAt MTI5LDYgKzEyOSw4IEBAIHB1YmxpYzoKICAgICAvLyBnZXRFcnJvciBpbiB0aGUgb3JkZXIgdGhl eSB3ZXJlIGFkZGVkLgogICAgIHZpcnR1YWwgdm9pZCBzeW50aGVzaXplR0xFcnJvcih1bnNpZ25l ZCBsb25nIGVycm9yKSA9IDA7CiAKKyAgICB2aXJ0dWFsIGJvb2wgc3VwcG9ydHNCR1JBKCkgPSAw OworCiAgICAgLy8gVGhlIGVudHJ5IHBvaW50cyBiZWxvdyBtYXAgZGlyZWN0bHkgdG8gdGhlIE9w ZW5HTCBFUyAyLjAgQVBJLgogICAgIC8vIFNlZTogaHR0cDovL3d3dy5raHJvbm9zLm9yZy9yZWdp c3RyeS9nbGVzLwogICAgIC8vIGFuZDogaHR0cDovL3d3dy5raHJvbm9zLm9yZy9vcGVuZ2xlcy9z ZGsvZG9jcy9tYW4vCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL0dyYXBoaWNzQ29udGV4dDNE LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL0dyYXBoaWNzQ29udGV4dDNE LmNwcAkocmV2aXNpb24gNjUxNTgpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL0dyYXBoaWNzQ29u dGV4dDNELmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjk3LDYgKzI5Nyw3IEBAIHB1YmxpYzoKICAg ICB2b2lkIGRlbGV0ZVRleHR1cmUodW5zaWduZWQpOwogCiAgICAgdm9pZCBzeW50aGVzaXplR0xF cnJvcih1bnNpZ25lZCBsb25nIGVycm9yKTsKKyAgICBib29sIHN1cHBvcnRzQkdSQSgpOwogCiBw cml2YXRlOgogICAgIE93blB0cjxXZWJLaXQ6OldlYkdyYXBoaWNzQ29udGV4dDNEPiBtX2ltcGw7 CkBAIC05MDcsNiArOTA4LDcgQEAgREVMRUdBVEVfVE9fSU1QTF8xKGRlbGV0ZVNoYWRlciwgdW5z aWduZQogREVMRUdBVEVfVE9fSU1QTF8xKGRlbGV0ZVRleHR1cmUsIHVuc2lnbmVkKQogCiBERUxF R0FURV9UT19JTVBMXzEoc3ludGhlc2l6ZUdMRXJyb3IsIHVuc2lnbmVkIGxvbmcpCitERUxFR0FU RV9UT19JTVBMX1Ioc3VwcG9ydHNCR1JBLCBib29sKQogCiAvLy0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIC8vIEdy YXBoaWNzQ29udGV4dDNECkBAIC0xMjQxLDYgKzEyNDMsNyBAQCBERUxFR0FURV9UT19JTlRFUk5B TF8xKGRlbGV0ZVNoYWRlciwgdW5zCiBERUxFR0FURV9UT19JTlRFUk5BTF8xKGRlbGV0ZVRleHR1 cmUsIHVuc2lnbmVkKQogCiBERUxFR0FURV9UT19JTlRFUk5BTF8xKHN5bnRoZXNpemVHTEVycm9y LCB1bnNpZ25lZCBsb25nKQorREVMRUdBVEVfVE9fSU5URVJOQUxfUihzdXBwb3J0c0JHUkEsIGJv b2wpCiAKIGJvb2wgR3JhcGhpY3NDb250ZXh0M0Q6OmlzR0xFUzJDb21wbGlhbnQoKSBjb25zdAog ewpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJ bXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYkdyYXBoaWNzQ29u dGV4dDNERGVmYXVsdEltcGwuY3BwCShyZXZpc2lvbiA2NTE1OCkKKysrIFdlYktpdC9jaHJvbWl1 bS9zcmMvV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTQ0NSw2ICs0NDUsMTQgQEAgdm9pZCBXZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBs OjpzeQogICAgIG1fc3ludGhldGljRXJyb3JzLmFkZChlcnJvcik7CiB9CiAKK2Jvb2wgV2ViR3Jh cGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbDo6c3VwcG9ydHNCR1JBKCkKK3sKKyAgICAvLyBTdXBw b3J0ZWQgc2luY2UgT3BlbkdMIDEuMi4gIEhvd2V2ZXIsIGdsVGV4SW1hZ2UyRCgpIG11c3QgYmUg bW9kaWZpZWQKKyAgICAvLyB0byB0cmFuc2xhdGUgdGhlIGludGVybmFsRm9ybWF0IGZyb20gR0xf QkdSQSB0byBHTF9SR0JBLCBzaW5jZSB0aGUKKyAgICAvLyBmb3JtZXIgaXMgbm90IGFjY2VwdGVk IGJ5IGRlc2t0b3AgR0wuICBSZXR1cm4gZmFsc2UgdW50aWwgdGhpcyBpcyBkb25lLgorICAgIHJl dHVybiBmYWxzZTsKK30KKwogLy8gSGVscGVyIG1hY3JvcyB0byByZWR1Y2UgdGhlIGFtb3VudCBv ZiBjb2RlLgogCiAjZGVmaW5lIERFTEVHQVRFX1RPX0dMKG5hbWUsIGdsbmFtZSkgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXApJbmRleDogV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsLmgJKHJldmlz aW9uIDY1MTU4KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJHcmFwaGljc0NvbnRleHQzRERl ZmF1bHRJbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTc3LDYgKzc3LDcgQEAgcHVibGljOgogICAg IHZpcnR1YWwgdm9pZCBwcmVwYXJlVGV4dHVyZSgpOwogCiAgICAgdmlydHVhbCB2b2lkIHN5bnRo ZXNpemVHTEVycm9yKHVuc2lnbmVkIGxvbmcgZXJyb3IpOworICAgIHZpcnR1YWwgYm9vbCBzdXBw b3J0c0JHUkEoKTsKIAogICAgIHZpcnR1YWwgdm9pZCBhY3RpdmVUZXh0dXJlKHVuc2lnbmVkIGxv bmcgdGV4dHVyZSk7CiAgICAgdmlydHVhbCB2b2lkIGF0dGFjaFNoYWRlcihXZWJHTElkIHByb2dy YW0sIFdlYkdMSWQgc2hhZGVyKTsK