83631 2012-04-10 15:52:15 -0700 Single ShareableBitmap revision blacks out WebView on Harmattan 2012-04-11 09:59:57 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 83622 0 lauro.neto noam jesus kenneth noam webkit.review.bot oldest_to_newest 599746 0 lauro.neto 2012-04-10 15:52:15 -0700 After building the package with the proposed fix for #83622, the webview is rendered black. 600208 1 noam 2012-04-11 05:22:13 -0700 I have a fix for this, will post later today. 600272 2 136669 noam 2012-04-11 08:09:43 -0700 Created attachment 136669 Patch 600277 3 136669 kenneth 2012-04-11 08:14:30 -0700 Comment on attachment 136669 Patch rs=me 600283 4 136672 noam 2012-04-11 08:25:29 -0700 Created attachment 136672 Patch for landing 600315 5 136676 noam 2012-04-11 09:20:11 -0700 Created attachment 136676 Patch 600346 6 136676 webkit.review.bot 2012-04-11 09:59:52 -0700 Comment on attachment 136676 Patch Clearing flags on attachment: 136676 Committed r113873: <http://trac.webkit.org/changeset/113873> 600347 7 webkit.review.bot 2012-04-11 09:59:57 -0700 All reviewed patches have been landed. Closing bug. 136669 2012-04-11 08:09:43 -0700 2012-04-11 08:25:23 -0700 Patch bug-83631-20120411080941.patch text/plain 5510 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzNzQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGFjN2EyYzMzYTNjNTgz NmJjOTliOWYxODk1NDA5N2RkMjhiMzg1NC4uNDMyMDNhZWZiOTUxOTFiOWE2ZTc3OWY5MWJmMWVj YzU4Y2FiZTliOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA0LTExICBObydh bSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CisKKyAgICAgICAgU2luZ2xl IFNoYXJlYWJsZUJpdG1hcCByZXZpc2lvbiBibGFja3Mgb3V0IFdlYlZpZXcgb24gSGFybWF0dGFu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzYzMQor CisgICAgICAgIFdoZW4gc3dpenpsaW5nIGlzIG5vdCBzdXBwb3J0ZWQgaW4gdGhlIGRyaXZlciwg d2UgbmVlZCB0byBpbml0aWFsaXplIHRoZSB0ZXh0dXJlIGFzIFJHQkEsCisgICAgICAgIGFuZCBt YWtlIHN1cmUgdGhhdCB0aGUgbWFudWFsIHN3aXp6bGluZyBvbmx5IG1vZGlmaWVzIHRoZSBzdWIt aW1hZ2UuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Q292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c3dpenpsZUJH UkFUb1JHQkEpOgorICAgICAgICAoV2ViQ29yZTo6Qml0bWFwVGV4dHVyZUdMOjpkaWRSZXNldCk6 CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OkJpdG1hcFRleHR1cmVHTDo6 dXBkYXRlQ29udGVudHMpOgorCiAyMDEyLTA0LTEwICBObydhbSBSb3NlbnRoYWwgIDxub2FtLnJv c2VudGhhbEBub2tpYS5jb20+CiAKICAgICAgICAgW1F0XVtXSzJdIE1hbmFnZSBncmFwaGljcyBi dWZmZXJzIGluIHRoZSB3ZWIgcHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcAppbmRleCBlMzNl NTY2NDhiYzQ5YWMyNDJiM2Q2YWY0NTA3YTQ0ZDhhM2VkMWIzLi5kZjY4NDczZmZhYzliODljYmYz OWU2MDM1M2QxNTc1YWZjMDNjOGM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcApAQCAtMzg5LDMy ICszODksMTIgQEAgYm9vbCBCaXRtYXBUZXh0dXJlR0w6OmNhblJldXNlV2l0aChjb25zdCBJbnRT aXplJiBjb250ZW50c1NpemUsIEZsYWdzKQogI2RlZmluZSBERUZBVUxUX1RFWFRVUkVfUElYRUxf VFJBTlNGRVJfVFlQRSBHTF9VTlNJR05FRF9CWVRFCiAjZW5kaWYKIAotdm9pZCBCaXRtYXBUZXh0 dXJlR0w6OmRpZFJlc2V0KCkKK3N0YXRpYyB2b2lkIHN3aXp6bGVCR1JBVG9SR0JBKHVpbnQzMl90 KiBkYXRhLCBjb25zdCBJbnRSZWN0JiByZWN0LCBpbnQgc3RyaWRlID0gMCkKIHsKLSAgICBpZiAo IW1faWQpCi0gICAgICAgIEdMX0NNRChnbEdlblRleHR1cmVzKDEsICZtX2lkKSk7Ci0KLSAgICBt X3N1cmZhY2VOZWVkc1Jlc2V0ID0gdHJ1ZTsKLSAgICBpZiAobV90ZXh0dXJlU2l6ZSA9PSBjb250 ZW50U2l6ZSgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBtX3RleHR1cmVTaXplID0gY29udGVu dFNpemUoKTsKLSAgICBHTF9DTUQoZ2xCaW5kVGV4dHVyZShHTF9URVhUVVJFXzJELCBtX2lkKSk7 Ci0gICAgR0xfQ01EKGdsVGV4UGFyYW1ldGVyaShHTF9URVhUVVJFXzJELCBHTF9URVhUVVJFX01J Tl9GSUxURVIsIEdMX0xJTkVBUikpOwotICAgIEdMX0NNRChnbFRleFBhcmFtZXRlcmkoR0xfVEVY VFVSRV8yRCwgR0xfVEVYVFVSRV9NQUdfRklMVEVSLCBHTF9MSU5FQVIpKTsKLSAgICBHTF9DTUQo Z2xUZXhQYXJhbWV0ZXJpKEdMX1RFWFRVUkVfMkQsIEdMX1RFWFRVUkVfV1JBUF9TLCBHTF9DTEFN UF9UT19FREdFKSk7Ci0gICAgR0xfQ01EKGdsVGV4UGFyYW1ldGVyaShHTF9URVhUVVJFXzJELCBH TF9URVhUVVJFX1dSQVBfVCwgR0xfQ0xBTVBfVE9fRURHRSkpOwotICAgIEdMX0NNRChnbFRleElt YWdlMkQoR0xfVEVYVFVSRV8yRCwgMCwgR0xfUkdCQSwgbV90ZXh0dXJlU2l6ZS53aWR0aCgpLCBt X3RleHR1cmVTaXplLmhlaWdodCgpLCAwLCBHTF9CR1JBLCBERUZBVUxUX1RFWFRVUkVfUElYRUxf VFJBTlNGRVJfVFlQRSwgMCkpOwotfQotCi1zdGF0aWMgdm9pZCBzd2l6emxlQkdSQVRvUkdCQSh1 aW50MzJfdCogZGF0YSwgY29uc3QgSW50U2l6ZSYgc2l6ZSwgaW50IHN0cmlkZSA9IDApCi17Ci0g ICAgaW50IHdpZHRoID0gc2l6ZS53aWR0aCgpOwotICAgIGludCBoZWlnaHQgPSBzaXplLmhlaWdo dCgpOwotICAgIHN0cmlkZSA9IHN0cmlkZSB8IHdpZHRoOwotICAgIGZvciAoaW50IHkgPSAwOyB5 IDwgaGVpZ2h0OyArK3kpIHsKKyAgICBzdHJpZGUgPSBzdHJpZGUgPyBzdHJpZGUgOiByZWN0Lndp ZHRoKCk7CisgICAgZm9yIChpbnQgeSA9IHJlY3QueSgpOyB5IDwgcmVjdC5tYXhZKCk7ICsreSkg ewogICAgICAgICB1aW50MzJfdCogcCA9IGRhdGEgKyB5ICogc3RyaWRlOwotICAgICAgICBmb3Ig KGludCB4ID0gMDsgeCA8IHdpZHRoOyArK3gpCisgICAgICAgIGZvciAoaW50IHggPSByZWN0Lngo KTsgeCA8IHJlY3QubWF4WCgpOyArK3gpCiAgICAgICAgICAgICBwW3hdID0gKChwW3hdIDw8IDE2 KSAmIDB4ZmYwMDAwKSB8ICgocFt4XSA+PiAxNikgJiAweGZmKSB8IChwW3hdICYgMHhmZjAwZmYw MCk7CiAgICAgfQogfQpAQCAtNDM5LDYgKzQxOSwyNyBAQCBzdGF0aWMgYm9vbCBkcml2ZXJTdXBw b3J0c1N1YkltYWdlKCkKICNlbmRpZgogfQogCit2b2lkIEJpdG1hcFRleHR1cmVHTDo6ZGlkUmVz ZXQoKQoreworICAgIGlmICghbV9pZCkKKyAgICAgICAgR0xfQ01EKGdsR2VuVGV4dHVyZXMoMSwg Jm1faWQpKTsKKworICAgIG1fc3VyZmFjZU5lZWRzUmVzZXQgPSB0cnVlOworICAgIGlmIChtX3Rl eHR1cmVTaXplID09IGNvbnRlbnRTaXplKCkpCisgICAgICAgIHJldHVybjsKKworICAgIEdMdWlu dCBmb3JtYXQgPSBkcml2ZXJTdXBwb3J0c0JHUkFTd2l6emxpbmcoKSA/IEdMX0JHUkEgOiBHTF9S R0JBOworCisgICAgbV90ZXh0dXJlU2l6ZSA9IGNvbnRlbnRTaXplKCk7CisgICAgR0xfQ01EKGds QmluZFRleHR1cmUoR0xfVEVYVFVSRV8yRCwgbV9pZCkpOworICAgIEdMX0NNRChnbFRleFBhcmFt ZXRlcmkoR0xfVEVYVFVSRV8yRCwgR0xfVEVYVFVSRV9NSU5fRklMVEVSLCBHTF9MSU5FQVIpKTsK KyAgICBHTF9DTUQoZ2xUZXhQYXJhbWV0ZXJpKEdMX1RFWFRVUkVfMkQsIEdMX1RFWFRVUkVfTUFH X0ZJTFRFUiwgR0xfTElORUFSKSk7CisgICAgR0xfQ01EKGdsVGV4UGFyYW1ldGVyaShHTF9URVhU VVJFXzJELCBHTF9URVhUVVJFX1dSQVBfUywgR0xfQ0xBTVBfVE9fRURHRSkpOworICAgIEdMX0NN RChnbFRleFBhcmFtZXRlcmkoR0xfVEVYVFVSRV8yRCwgR0xfVEVYVFVSRV9XUkFQX1QsIEdMX0NM QU1QX1RPX0VER0UpKTsKKyAgICBHTF9DTUQoZ2xUZXhJbWFnZTJEKEdMX1RFWFRVUkVfMkQsIDAs IEdMX1JHQkEsIG1fdGV4dHVyZVNpemUud2lkdGgoKSwgbV90ZXh0dXJlU2l6ZS5oZWlnaHQoKSwg MCwgZm9ybWF0LCBERUZBVUxUX1RFWFRVUkVfUElYRUxfVFJBTlNGRVJfVFlQRSwgMCkpOworfQor CisKIHZvaWQgQml0bWFwVGV4dHVyZUdMOjp1cGRhdGVDb250ZW50cyhjb25zdCB2b2lkKiBkYXRh LCBjb25zdCBJbnRSZWN0JiB0YXJnZXRSZWN0LCBjb25zdCBJbnRQb2ludCYgc291cmNlT2Zmc2V0 LCBpbnQgYnl0ZXNQZXJMaW5lKQogewogICAgIEdMdWludCBnbEZvcm1hdCA9IEdMX1JHQkE7CkBA IC00NDcsNyArNDQ4LDcgQEAgdm9pZCBCaXRtYXBUZXh0dXJlR0w6OnVwZGF0ZUNvbnRlbnRzKGNv bnN0IHZvaWQqIGRhdGEsIGNvbnN0IEludFJlY3QmIHRhcmdldFJlY3QKICAgICBpZiAoZHJpdmVy U3VwcG9ydHNCR1JBU3dpenpsaW5nKCkpCiAgICAgICAgIGdsRm9ybWF0ID0gR0xfQkdSQTsKICAg ICBlbHNlCi0gICAgICAgIHN3aXp6bGVCR1JBVG9SR0JBKHN0YXRpY19jYXN0PHVpbnQzMl90Kj4o Y29uc3RfY2FzdDx2b2lkKj4oZGF0YSkpLCB0YXJnZXRSZWN0LnNpemUoKSwgYnl0ZXNQZXJMaW5l IC8gNCk7CisgICAgICAgIHN3aXp6bGVCR1JBVG9SR0JBKHJlaW50ZXJwcmV0X2Nhc3Q8dWludDMy X3QqPihjb25zdF9jYXN0PHZvaWQqPihkYXRhKSksIEludFJlY3Qoc291cmNlT2Zmc2V0LCB0YXJn ZXRSZWN0LnNpemUoKSksIGJ5dGVzUGVyTGluZSAvIDQpOwogCiAgICAgaWYgKGJ5dGVzUGVyTGlu ZSA9PSB0YXJnZXRSZWN0LndpZHRoKCkgLyA0ICYmIHNvdXJjZU9mZnNldCA9PSBJbnRQb2ludDo6 emVybygpKSB7CiAgICAgICAgIEdMX0NNRChnbFRleFN1YkltYWdlMkQoR0xfVEVYVFVSRV8yRCwg MCwgdGFyZ2V0UmVjdC54KCksIHRhcmdldFJlY3QueSgpLCB0YXJnZXRSZWN0LndpZHRoKCksIHRh cmdldFJlY3QuaGVpZ2h0KCksIGdsRm9ybWF0LCBERUZBVUxUX1RFWFRVUkVfUElYRUxfVFJBTlNG RVJfVFlQRSwgKGNvbnN0IGNoYXIqKWRhdGEpKTsKQEAgLTQ2NCw2ICs0NjUsNyBAQCB2b2lkIEJp dG1hcFRleHR1cmVHTDo6dXBkYXRlQ29udGVudHMoY29uc3Qgdm9pZCogZGF0YSwgY29uc3QgSW50 UmVjdCYgdGFyZ2V0UmVjdAogICAgICAgICByZXR1cm47CiAgICAgfQogCisjaWYgIWRlZmluZWQo VEVYTUFQX09QRU5HTF9FU18yKQogICAgIC8vIFVzZSB0aGUgT3BlbkdMIHN1Yi1pbWFnZSBleHRl bnNpb24sIG5vdyB0aGF0IHdlIGtub3cgaXQncyBhdmFpbGFibGUuCiAgICAgR0xfQ01EKGdsUGl4 ZWxTdG9yZWkoR0xfVU5QQUNLX1JPV19MRU5HVEgsIGJ5dGVzUGVyTGluZSAvIDQpKTsKICAgICBH TF9DTUQoZ2xQaXhlbFN0b3JlaShHTF9VTlBBQ0tfU0tJUF9ST1dTLCBzb3VyY2VPZmZzZXQueSgp KSk7CkBAIC00NzIsNiArNDc0LDcgQEAgdm9pZCBCaXRtYXBUZXh0dXJlR0w6OnVwZGF0ZUNvbnRl bnRzKGNvbnN0IHZvaWQqIGRhdGEsIGNvbnN0IEludFJlY3QmIHRhcmdldFJlY3QKICAgICBHTF9D TUQoZ2xQaXhlbFN0b3JlaShHTF9VTlBBQ0tfUk9XX0xFTkdUSCwgMCkpOwogICAgIEdMX0NNRChn bFBpeGVsU3RvcmVpKEdMX1VOUEFDS19TS0lQX1JPV1MsIDApKTsKICAgICBHTF9DTUQoZ2xQaXhl bFN0b3JlaShHTF9VTlBBQ0tfU0tJUF9QSVhFTFMsIDApKTsKKyNlbmRpZgogfQogCiB2b2lkIEJp dG1hcFRleHR1cmVHTDo6dXBkYXRlQ29udGVudHMoSW1hZ2UqIGltYWdlLCBjb25zdCBJbnRSZWN0 JiB0YXJnZXRSZWN0LCBjb25zdCBJbnRQb2ludCYgb2Zmc2V0KQo= 136672 2012-04-11 08:25:29 -0700 2012-04-11 09:20:11 -0700 Patch for landing bug-83631-20120411082527.patch text/plain 5189 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzODYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGQyMThiY2Q2MWE4NGJl MDE5OWQ4MjFiNzk5MTgwM2JhZDkyODNhMy4uYmQzYWEyOTU4Nzg4N2VhMWFkYmVlZjQ1Mzc0ZTMx Zjk4YmM1NTM3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA0LTExICBObydh bSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CisKKyAgICAgICAgU2luZ2xl IFNoYXJlYWJsZUJpdG1hcCByZXZpc2lvbiBibGFja3Mgb3V0IFdlYlZpZXcgb24gSGFybWF0dGFu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzYzMQor CisgICAgICAgIFdoZW4gc3dpenpsaW5nIGlzIG5vdCBzdXBwb3J0ZWQgaW4gdGhlIGRyaXZlciwg d2UgbmVlZCB0byBpbml0aWFsaXplIHRoZSB0ZXh0dXJlIGFzIFJHQkEsCisgICAgICAgIGFuZCBt YWtlIHN1cmUgdGhhdCB0aGUgbWFudWFsIHN3aXp6bGluZyBvbmx5IG1vZGlmaWVzIHRoZSBzdWIt aW1hZ2UuCisKKyAgICAgICAgUnViYmVyIHN0YW1wZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3Rp YW5zZW4uCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3BwOgorICAgICAgICAo V2ViQ29yZTo6c3dpenpsZUJHUkFUb1JHQkEpOgorICAgICAgICAoV2ViQ29yZTo6Qml0bWFwVGV4 dHVyZUdMOjpkaWRSZXNldCk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6 OkJpdG1hcFRleHR1cmVHTDo6dXBkYXRlQ29udGVudHMpOgorCiAyMDEyLTA0LTExICAgQXJrbyBT YWhhICA8YXJrb0Btb3Rvcm9sYS5jb20+CiAKICAgICAgICAgTWljcm9kYXRhOiBJbXBsZW1lbnQg Y2FjaGUgbWVjaGFuaXNtIGZvciBIVE1MUHJvcGVydGllc0NvbGxlY3Rpb24uCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdM LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFw cGVyR0wuY3BwCmluZGV4IDU5ZmViNzdhNTliMGYwN2QzMzUzOTYzOTgzOTUwMmMzNmZjNmQyYjYu LjMyM2E5MjM0MGY5OTAxYWJmZmI5ZTRlOTM4MDY5YzRlNDRhOWViMTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFw cGVyR0wuY3BwCkBAIC0zOTUsMzIgKzM5NSwxMiBAQCBib29sIEJpdG1hcFRleHR1cmVHTDo6Y2Fu UmV1c2VXaXRoKGNvbnN0IEludFNpemUmIGNvbnRlbnRzU2l6ZSwgRmxhZ3MpCiAjZGVmaW5lIERF RkFVTFRfVEVYVFVSRV9QSVhFTF9UUkFOU0ZFUl9UWVBFIEdMX1VOU0lHTkVEX0JZVEUKICNlbmRp ZgogCi12b2lkIEJpdG1hcFRleHR1cmVHTDo6ZGlkUmVzZXQoKQotewotICAgIGlmICghbV9pZCkK LSAgICAgICAgR0xfQ01EKGdsR2VuVGV4dHVyZXMoMSwgJm1faWQpKTsKLQotICAgIG1fc3VyZmFj ZU5lZWRzUmVzZXQgPSB0cnVlOwotICAgIGlmIChtX3RleHR1cmVTaXplID09IGNvbnRlbnRTaXpl KCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIG1fdGV4dHVyZVNpemUgPSBjb250ZW50U2l6ZSgp OwotICAgIEdMX0NNRChnbEJpbmRUZXh0dXJlKEdMX1RFWFRVUkVfMkQsIG1faWQpKTsKLSAgICBH TF9DTUQoZ2xUZXhQYXJhbWV0ZXJpKEdMX1RFWFRVUkVfMkQsIEdMX1RFWFRVUkVfTUlOX0ZJTFRF UiwgR0xfTElORUFSKSk7Ci0gICAgR0xfQ01EKGdsVGV4UGFyYW1ldGVyaShHTF9URVhUVVJFXzJE LCBHTF9URVhUVVJFX01BR19GSUxURVIsIEdMX0xJTkVBUikpOwotICAgIEdMX0NNRChnbFRleFBh cmFtZXRlcmkoR0xfVEVYVFVSRV8yRCwgR0xfVEVYVFVSRV9XUkFQX1MsIEdMX0NMQU1QX1RPX0VE R0UpKTsKLSAgICBHTF9DTUQoZ2xUZXhQYXJhbWV0ZXJpKEdMX1RFWFRVUkVfMkQsIEdMX1RFWFRV UkVfV1JBUF9ULCBHTF9DTEFNUF9UT19FREdFKSk7Ci0gICAgR0xfQ01EKGdsVGV4SW1hZ2UyRChH TF9URVhUVVJFXzJELCAwLCBHTF9SR0JBLCBtX3RleHR1cmVTaXplLndpZHRoKCksIG1fdGV4dHVy ZVNpemUuaGVpZ2h0KCksIDAsIEdMX0JHUkEsIERFRkFVTFRfVEVYVFVSRV9QSVhFTF9UUkFOU0ZF Ul9UWVBFLCAwKSk7Ci19Ci0KLXN0YXRpYyB2b2lkIHN3aXp6bGVCR1JBVG9SR0JBKHVpbnQzMl90 KiBkYXRhLCBjb25zdCBJbnRTaXplJiBzaXplLCBpbnQgc3RyaWRlID0gMCkKK3N0YXRpYyB2b2lk IHN3aXp6bGVCR1JBVG9SR0JBKHVpbnQzMl90KiBkYXRhLCBjb25zdCBJbnRSZWN0JiByZWN0LCBp bnQgc3RyaWRlID0gMCkKIHsKLSAgICBpbnQgd2lkdGggPSBzaXplLndpZHRoKCk7Ci0gICAgaW50 IGhlaWdodCA9IHNpemUuaGVpZ2h0KCk7Ci0gICAgc3RyaWRlID0gc3RyaWRlIHwgd2lkdGg7Ci0g ICAgZm9yIChpbnQgeSA9IDA7IHkgPCBoZWlnaHQ7ICsreSkgeworICAgIHN0cmlkZSA9IHN0cmlk ZSA/IHN0cmlkZSA6IHJlY3Qud2lkdGgoKTsKKyAgICBmb3IgKGludCB5ID0gcmVjdC55KCk7IHkg PCByZWN0Lm1heFkoKTsgKyt5KSB7CiAgICAgICAgIHVpbnQzMl90KiBwID0gZGF0YSArIHkgKiBz dHJpZGU7Ci0gICAgICAgIGZvciAoaW50IHggPSAwOyB4IDwgd2lkdGg7ICsreCkKKyAgICAgICAg Zm9yIChpbnQgeCA9IHJlY3QueCgpOyB4IDwgcmVjdC5tYXhYKCk7ICsreCkKICAgICAgICAgICAg IHBbeF0gPSAoKHBbeF0gPDwgMTYpICYgMHhmZjAwMDApIHwgKChwW3hdID4+IDE2KSAmIDB4ZmYp IHwgKHBbeF0gJiAweGZmMDBmZjAwKTsKICAgICB9CiB9CkBAIC00NDUsNiArNDI1LDI3IEBAIHN0 YXRpYyBib29sIGRyaXZlclN1cHBvcnRzU3ViSW1hZ2UoKQogI2VuZGlmCiB9CiAKK3ZvaWQgQml0 bWFwVGV4dHVyZUdMOjpkaWRSZXNldCgpCit7CisgICAgaWYgKCFtX2lkKQorICAgICAgICBHTF9D TUQoZ2xHZW5UZXh0dXJlcygxLCAmbV9pZCkpOworCisgICAgbV9zdXJmYWNlTmVlZHNSZXNldCA9 IHRydWU7CisgICAgaWYgKG1fdGV4dHVyZVNpemUgPT0gY29udGVudFNpemUoKSkKKyAgICAgICAg cmV0dXJuOworCisgICAgR0x1aW50IGZvcm1hdCA9IGRyaXZlclN1cHBvcnRzQkdSQVN3aXp6bGlu ZygpID8gR0xfQkdSQSA6IEdMX1JHQkE7CisKKyAgICBtX3RleHR1cmVTaXplID0gY29udGVudFNp emUoKTsKKyAgICBHTF9DTUQoZ2xCaW5kVGV4dHVyZShHTF9URVhUVVJFXzJELCBtX2lkKSk7Cisg ICAgR0xfQ01EKGdsVGV4UGFyYW1ldGVyaShHTF9URVhUVVJFXzJELCBHTF9URVhUVVJFX01JTl9G SUxURVIsIEdMX0xJTkVBUikpOworICAgIEdMX0NNRChnbFRleFBhcmFtZXRlcmkoR0xfVEVYVFVS RV8yRCwgR0xfVEVYVFVSRV9NQUdfRklMVEVSLCBHTF9MSU5FQVIpKTsKKyAgICBHTF9DTUQoZ2xU ZXhQYXJhbWV0ZXJpKEdMX1RFWFRVUkVfMkQsIEdMX1RFWFRVUkVfV1JBUF9TLCBHTF9DTEFNUF9U T19FREdFKSk7CisgICAgR0xfQ01EKGdsVGV4UGFyYW1ldGVyaShHTF9URVhUVVJFXzJELCBHTF9U RVhUVVJFX1dSQVBfVCwgR0xfQ0xBTVBfVE9fRURHRSkpOworICAgIEdMX0NNRChnbFRleEltYWdl MkQoR0xfVEVYVFVSRV8yRCwgMCwgR0xfUkdCQSwgbV90ZXh0dXJlU2l6ZS53aWR0aCgpLCBtX3Rl eHR1cmVTaXplLmhlaWdodCgpLCAwLCBmb3JtYXQsIERFRkFVTFRfVEVYVFVSRV9QSVhFTF9UUkFO U0ZFUl9UWVBFLCAwKSk7Cit9CisKKwogdm9pZCBCaXRtYXBUZXh0dXJlR0w6OnVwZGF0ZUNvbnRl bnRzKGNvbnN0IHZvaWQqIGRhdGEsIGNvbnN0IEludFJlY3QmIHRhcmdldFJlY3QsIGNvbnN0IElu dFBvaW50JiBzb3VyY2VPZmZzZXQsIGludCBieXRlc1BlckxpbmUpCiB7CiAgICAgR0x1aW50IGds Rm9ybWF0ID0gR0xfUkdCQTsKQEAgLTQ1Myw3ICs0NTQsNyBAQCB2b2lkIEJpdG1hcFRleHR1cmVH TDo6dXBkYXRlQ29udGVudHMoY29uc3Qgdm9pZCogZGF0YSwgY29uc3QgSW50UmVjdCYgdGFyZ2V0 UmVjdAogICAgIGlmIChkcml2ZXJTdXBwb3J0c0JHUkFTd2l6emxpbmcoKSkKICAgICAgICAgZ2xG b3JtYXQgPSBHTF9CR1JBOwogICAgIGVsc2UKLSAgICAgICAgc3dpenpsZUJHUkFUb1JHQkEoc3Rh dGljX2Nhc3Q8dWludDMyX3QqPihjb25zdF9jYXN0PHZvaWQqPihkYXRhKSksIHRhcmdldFJlY3Qu c2l6ZSgpLCBieXRlc1BlckxpbmUgLyA0KTsKKyAgICAgICAgc3dpenpsZUJHUkFUb1JHQkEocmVp bnRlcnByZXRfY2FzdDx1aW50MzJfdCo+KGNvbnN0X2Nhc3Q8dm9pZCo+KGRhdGEpKSwgSW50UmVj dChzb3VyY2VPZmZzZXQsIHRhcmdldFJlY3Quc2l6ZSgpKSwgYnl0ZXNQZXJMaW5lIC8gNCk7CiAK ICAgICBpZiAoYnl0ZXNQZXJMaW5lID09IHRhcmdldFJlY3Qud2lkdGgoKSAvIDQgJiYgc291cmNl T2Zmc2V0ID09IEludFBvaW50Ojp6ZXJvKCkpIHsKICAgICAgICAgR0xfQ01EKGdsVGV4U3ViSW1h Z2UyRChHTF9URVhUVVJFXzJELCAwLCB0YXJnZXRSZWN0LngoKSwgdGFyZ2V0UmVjdC55KCksIHRh cmdldFJlY3Qud2lkdGgoKSwgdGFyZ2V0UmVjdC5oZWlnaHQoKSwgZ2xGb3JtYXQsIERFRkFVTFRf VEVYVFVSRV9QSVhFTF9UUkFOU0ZFUl9UWVBFLCAoY29uc3QgY2hhciopZGF0YSkpOwpAQCAtNDcw LDcgKzQ3MSw3IEBAIHZvaWQgQml0bWFwVGV4dHVyZUdMOjp1cGRhdGVDb250ZW50cyhjb25zdCB2 b2lkKiBkYXRhLCBjb25zdCBJbnRSZWN0JiB0YXJnZXRSZWN0CiAgICAgICAgIHJldHVybjsKICAg ICB9CiAKLSNpZiAhZGVmaW5lZChURVhUTUFQX09QRU5HTF9FU18yKQorI2lmICFkZWZpbmVkKFRF WE1BUF9PUEVOR0xfRVNfMikKICAgICAvLyBVc2UgdGhlIE9wZW5HTCBzdWItaW1hZ2UgZXh0ZW5z aW9uLCBub3cgdGhhdCB3ZSBrbm93IGl0J3MgYXZhaWxhYmxlLgogICAgIEdMX0NNRChnbFBpeGVs U3RvcmVpKEdMX1VOUEFDS19ST1dfTEVOR1RILCBieXRlc1BlckxpbmUgLyA0KSk7CiAgICAgR0xf Q01EKGdsUGl4ZWxTdG9yZWkoR0xfVU5QQUNLX1NLSVBfUk9XUywgc291cmNlT2Zmc2V0LnkoKSkp Owo= 136676 2012-04-11 09:20:11 -0700 2012-04-11 09:59:52 -0700 Patch patch.diff text/plain 4781 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzODYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGQyMThiY2Q2MWE4NGJl MDE5OWQ4MjFiNzk5MTgwM2JhZDkyODNhMy4uYmQzYWEyOTU4Nzg4N2VhMWFkYmVlZjQ1Mzc0ZTMx Zjk4YmM1NTM3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA0LTExICBObydh bSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CisKKyAgICAgICAgU2luZ2xl IFNoYXJlYWJsZUJpdG1hcCByZXZpc2lvbiBibGFja3Mgb3V0IFdlYlZpZXcgb24gSGFybWF0dGFu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzYzMQor CisgICAgICAgIFdoZW4gc3dpenpsaW5nIGlzIG5vdCBzdXBwb3J0ZWQgaW4gdGhlIGRyaXZlciwg d2UgbmVlZCB0byBpbml0aWFsaXplIHRoZSB0ZXh0dXJlIGFzIFJHQkEsCisgICAgICAgIGFuZCBt YWtlIHN1cmUgdGhhdCB0aGUgbWFudWFsIHN3aXp6bGluZyBvbmx5IG1vZGlmaWVzIHRoZSBzdWIt aW1hZ2UuCisKKyAgICAgICAgUnViYmVyIHN0YW1wZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3Rp YW5zZW4uCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3BwOgorICAgICAgICAo V2ViQ29yZTo6c3dpenpsZUJHUkFUb1JHQkEpOgorICAgICAgICAoV2ViQ29yZTo6Qml0bWFwVGV4 dHVyZUdMOjpkaWRSZXNldCk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6 OkJpdG1hcFRleHR1cmVHTDo6dXBkYXRlQ29udGVudHMpOgorCiAyMDEyLTA0LTExICAgQXJrbyBT YWhhICA8YXJrb0Btb3Rvcm9sYS5jb20+CiAKICAgICAgICAgTWljcm9kYXRhOiBJbXBsZW1lbnQg Y2FjaGUgbWVjaGFuaXNtIGZvciBIVE1MUHJvcGVydGllc0NvbGxlY3Rpb24uCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdM LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFw cGVyR0wuY3BwCmluZGV4IDU5ZmViNzdhNTliMGYwN2QzMzUzOTYzOTgzOTUwMmMzNmZjNmQyYjYu LjMyM2E5MjM0MGY5OTAxYWJmZmI5ZTRlOTM4MDY5YzRlNDRhOWViMTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFw cGVyR0wuY3BwCkBAIC0zOTUsMzIgKzM5NSwxMiBAQCBib29sIEJpdG1hcFRleHR1cmVHTDo6Y2Fu UmV1c2VXaXRoKGNvbnN0IEludFNpemUmIGNvbnRlbnRzU2l6ZSwgRmxhZ3MpCiAjZGVmaW5lIERF RkFVTFRfVEVYVFVSRV9QSVhFTF9UUkFOU0ZFUl9UWVBFIEdMX1VOU0lHTkVEX0JZVEUKICNlbmRp ZgogCi12b2lkIEJpdG1hcFRleHR1cmVHTDo6ZGlkUmVzZXQoKQotewotICAgIGlmICghbV9pZCkK LSAgICAgICAgR0xfQ01EKGdsR2VuVGV4dHVyZXMoMSwgJm1faWQpKTsKLQotICAgIG1fc3VyZmFj ZU5lZWRzUmVzZXQgPSB0cnVlOwotICAgIGlmIChtX3RleHR1cmVTaXplID09IGNvbnRlbnRTaXpl KCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIG1fdGV4dHVyZVNpemUgPSBjb250ZW50U2l6ZSgp OwotICAgIEdMX0NNRChnbEJpbmRUZXh0dXJlKEdMX1RFWFRVUkVfMkQsIG1faWQpKTsKLSAgICBH TF9DTUQoZ2xUZXhQYXJhbWV0ZXJpKEdMX1RFWFRVUkVfMkQsIEdMX1RFWFRVUkVfTUlOX0ZJTFRF UiwgR0xfTElORUFSKSk7Ci0gICAgR0xfQ01EKGdsVGV4UGFyYW1ldGVyaShHTF9URVhUVVJFXzJE LCBHTF9URVhUVVJFX01BR19GSUxURVIsIEdMX0xJTkVBUikpOwotICAgIEdMX0NNRChnbFRleFBh cmFtZXRlcmkoR0xfVEVYVFVSRV8yRCwgR0xfVEVYVFVSRV9XUkFQX1MsIEdMX0NMQU1QX1RPX0VE R0UpKTsKLSAgICBHTF9DTUQoZ2xUZXhQYXJhbWV0ZXJpKEdMX1RFWFRVUkVfMkQsIEdMX1RFWFRV UkVfV1JBUF9ULCBHTF9DTEFNUF9UT19FREdFKSk7Ci0gICAgR0xfQ01EKGdsVGV4SW1hZ2UyRChH TF9URVhUVVJFXzJELCAwLCBHTF9SR0JBLCBtX3RleHR1cmVTaXplLndpZHRoKCksIG1fdGV4dHVy ZVNpemUuaGVpZ2h0KCksIDAsIEdMX0JHUkEsIERFRkFVTFRfVEVYVFVSRV9QSVhFTF9UUkFOU0ZF Ul9UWVBFLCAwKSk7Ci19Ci0KLXN0YXRpYyB2b2lkIHN3aXp6bGVCR1JBVG9SR0JBKHVpbnQzMl90 KiBkYXRhLCBjb25zdCBJbnRTaXplJiBzaXplLCBpbnQgc3RyaWRlID0gMCkKK3N0YXRpYyB2b2lk IHN3aXp6bGVCR1JBVG9SR0JBKHVpbnQzMl90KiBkYXRhLCBjb25zdCBJbnRSZWN0JiByZWN0LCBp bnQgc3RyaWRlID0gMCkKIHsKLSAgICBpbnQgd2lkdGggPSBzaXplLndpZHRoKCk7Ci0gICAgaW50 IGhlaWdodCA9IHNpemUuaGVpZ2h0KCk7Ci0gICAgc3RyaWRlID0gc3RyaWRlIHwgd2lkdGg7Ci0g ICAgZm9yIChpbnQgeSA9IDA7IHkgPCBoZWlnaHQ7ICsreSkgeworICAgIHN0cmlkZSA9IHN0cmlk ZSA/IHN0cmlkZSA6IHJlY3Qud2lkdGgoKTsKKyAgICBmb3IgKGludCB5ID0gcmVjdC55KCk7IHkg PCByZWN0Lm1heFkoKTsgKyt5KSB7CiAgICAgICAgIHVpbnQzMl90KiBwID0gZGF0YSArIHkgKiBz dHJpZGU7Ci0gICAgICAgIGZvciAoaW50IHggPSAwOyB4IDwgd2lkdGg7ICsreCkKKyAgICAgICAg Zm9yIChpbnQgeCA9IHJlY3QueCgpOyB4IDwgcmVjdC5tYXhYKCk7ICsreCkKICAgICAgICAgICAg IHBbeF0gPSAoKHBbeF0gPDwgMTYpICYgMHhmZjAwMDApIHwgKChwW3hdID4+IDE2KSAmIDB4ZmYp IHwgKHBbeF0gJiAweGZmMDBmZjAwKTsKICAgICB9CiB9CkBAIC00NDUsNiArNDI1LDI3IEBAIHN0 YXRpYyBib29sIGRyaXZlclN1cHBvcnRzU3ViSW1hZ2UoKQogI2VuZGlmCiB9CiAKK3ZvaWQgQml0 bWFwVGV4dHVyZUdMOjpkaWRSZXNldCgpCit7CisgICAgaWYgKCFtX2lkKQorICAgICAgICBHTF9D TUQoZ2xHZW5UZXh0dXJlcygxLCAmbV9pZCkpOworCisgICAgbV9zdXJmYWNlTmVlZHNSZXNldCA9 IHRydWU7CisgICAgaWYgKG1fdGV4dHVyZVNpemUgPT0gY29udGVudFNpemUoKSkKKyAgICAgICAg cmV0dXJuOworCisgICAgR0x1aW50IGZvcm1hdCA9IGRyaXZlclN1cHBvcnRzQkdSQVN3aXp6bGlu ZygpID8gR0xfQkdSQSA6IEdMX1JHQkE7CisKKyAgICBtX3RleHR1cmVTaXplID0gY29udGVudFNp emUoKTsKKyAgICBHTF9DTUQoZ2xCaW5kVGV4dHVyZShHTF9URVhUVVJFXzJELCBtX2lkKSk7Cisg ICAgR0xfQ01EKGdsVGV4UGFyYW1ldGVyaShHTF9URVhUVVJFXzJELCBHTF9URVhUVVJFX01JTl9G SUxURVIsIEdMX0xJTkVBUikpOworICAgIEdMX0NNRChnbFRleFBhcmFtZXRlcmkoR0xfVEVYVFVS RV8yRCwgR0xfVEVYVFVSRV9NQUdfRklMVEVSLCBHTF9MSU5FQVIpKTsKKyAgICBHTF9DTUQoZ2xU ZXhQYXJhbWV0ZXJpKEdMX1RFWFRVUkVfMkQsIEdMX1RFWFRVUkVfV1JBUF9TLCBHTF9DTEFNUF9U T19FREdFKSk7CisgICAgR0xfQ01EKGdsVGV4UGFyYW1ldGVyaShHTF9URVhUVVJFXzJELCBHTF9U RVhUVVJFX1dSQVBfVCwgR0xfQ0xBTVBfVE9fRURHRSkpOworICAgIEdMX0NNRChnbFRleEltYWdl MkQoR0xfVEVYVFVSRV8yRCwgMCwgR0xfUkdCQSwgbV90ZXh0dXJlU2l6ZS53aWR0aCgpLCBtX3Rl eHR1cmVTaXplLmhlaWdodCgpLCAwLCBmb3JtYXQsIERFRkFVTFRfVEVYVFVSRV9QSVhFTF9UUkFO U0ZFUl9UWVBFLCAwKSk7Cit9CisKKwogdm9pZCBCaXRtYXBUZXh0dXJlR0w6OnVwZGF0ZUNvbnRl bnRzKGNvbnN0IHZvaWQqIGRhdGEsIGNvbnN0IEludFJlY3QmIHRhcmdldFJlY3QsIGNvbnN0IElu dFBvaW50JiBzb3VyY2VPZmZzZXQsIGludCBieXRlc1BlckxpbmUpCiB7CiAgICAgR0x1aW50IGds Rm9ybWF0ID0gR0xfUkdCQTsKQEAgLTQ1Myw3ICs0NTQsNyBAQCB2b2lkIEJpdG1hcFRleHR1cmVH TDo6dXBkYXRlQ29udGVudHMoY29uc3Qgdm9pZCogZGF0YSwgY29uc3QgSW50UmVjdCYgdGFyZ2V0 UmVjdAogICAgIGlmIChkcml2ZXJTdXBwb3J0c0JHUkFTd2l6emxpbmcoKSkKICAgICAgICAgZ2xG b3JtYXQgPSBHTF9CR1JBOwogICAgIGVsc2UKLSAgICAgICAgc3dpenpsZUJHUkFUb1JHQkEoc3Rh dGljX2Nhc3Q8dWludDMyX3QqPihjb25zdF9jYXN0PHZvaWQqPihkYXRhKSksIHRhcmdldFJlY3Qu c2l6ZSgpLCBieXRlc1BlckxpbmUgLyA0KTsKKyAgICAgICAgc3dpenpsZUJHUkFUb1JHQkEocmVp bnRlcnByZXRfY2FzdDx1aW50MzJfdCo+KGNvbnN0X2Nhc3Q8dm9pZCo+KGRhdGEpKSwgSW50UmVj dChzb3VyY2VPZmZzZXQsIHRhcmdldFJlY3Quc2l6ZSgpKSwgYnl0ZXNQZXJMaW5lIC8gNCk7CiAK ICAgICBpZiAoYnl0ZXNQZXJMaW5lID09IHRhcmdldFJlY3Qud2lkdGgoKSAvIDQgJiYgc291cmNl T2Zmc2V0ID09IEludFBvaW50Ojp6ZXJvKCkpIHsKICAgICAgICAgR0xfQ01EKGdsVGV4U3ViSW1h Z2UyRChHTF9URVhUVVJFXzJELCAwLCB0YXJnZXRSZWN0LngoKSwgdGFyZ2V0UmVjdC55KCksIHRh cmdldFJlY3Qud2lkdGgoKSwgdGFyZ2V0UmVjdC5oZWlnaHQoKSwgZ2xGb3JtYXQsIERFRkFVTFRf VEVYVFVSRV9QSVhFTF9UUkFOU0ZFUl9UWVBFLCAoY29uc3QgY2hhciopZGF0YSkpOwo=