25705 2009-05-11 14:10:51 -0700 Need changes for new Skia API 2009-05-12 13:36:55 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 1 senorblanco senorblanco dglazkov senorblanco oldest_to_newest 120723 0 senorblanco 2009-05-11 14:10:51 -0700 There are some slight API changes in the new version of skia which require changes to WebKit. Only affects Chromium. 120724 1 30203 senorblanco 2009-05-11 14:13:05 -0700 Created attachment 30203 Changes for new Skia API. 120872 2 30203 dglazkov 2009-05-12 09:14:17 -0700 Comment on attachment 30203 Changes for new Skia API. Don't forget the URL of the bug in the ChangeLog entry next time. 120909 3 30245 senorblanco 2009-05-12 11:33:07 -0700 Created attachment 30245 Take two, compatible with both versions of skia. 120911 4 senorblanco 2009-05-12 11:33:47 -0700 On second thought, better to hide these changes behind an #ifdef for now, so we don't kill the canary. :) 120915 5 30245 dglazkov 2009-05-12 12:11:16 -0700 Comment on attachment 30245 Take two, compatible with both versions of skia. even betterer. 120917 6 dglazkov 2009-05-12 12:12:11 -0700 Oh -- one thing. Can you replace TODO(senorblanco) with FIXME, to match WebKit style? 120918 7 dglazkov 2009-05-12 12:13:07 -0700 And please add me to cc of bugs. Asking for review is like a one-time shot -- it doesn't let the reviewer to listen in on the conversation on the bug (if any). 120925 8 30246 senorblanco 2009-05-12 13:23:33 -0700 Created attachment 30246 Take three: FIXME instead of TODO(senorblanco) 120926 9 30246 dglazkov 2009-05-12 13:24:33 -0700 Comment on attachment 30246 Take three: FIXME instead of TODO(senorblanco) Great! 120927 10 senorblanco 2009-05-12 13:27:27 -0700 (In reply to comment #7) > And please add me to cc of bugs. Asking for review is like a one-time shot -- > it doesn't let the reviewer to listen in on the conversation on the bug (if > any). > Will do. (I assume you mean "in the future, I did it this time" since I see your name in the CC list already). 120928 11 dglazkov 2009-05-12 13:32:16 -0700 I added myself :) 120929 12 dglazkov 2009-05-12 13:36:55 -0700 Landed as http://trac.webkit.org/changeset/43584. 30203 2009-05-11 14:13:05 -0700 2009-05-12 11:33:46 -0700 Changes for new Skia API. webkit_new_skia_changes.patch text/plain 3394 senorblanco SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MzUxMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMDktMDUtMTEgIFN0ZXBoZW4gV2hpdGUgIDxzZW5vcmJsYW5jb0Bj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgRml4ZXMgdG8gYnVpbGQgd2l0aCBsYXRlc3Qgc2tpYTogIFNrVHlwZWZhY2U6OkNyZWF0 ZSgpIGlzIG5vdworICAgICAgICBTa1R5cGVmYWNlOjpDcmVhdGVGcm9tTmFtZSgpOyBjb21wdXRl Qm91bmRzKCkgaGFzIGJlZW4gcmV3b3JrZWQKKyAgICAgICAgYXMgZ2V0Qm91bmRzKCkuCisKKyAg ICAgICAgV0FSTklORzogIFRoaXMgY2hhbmdlIGlzIG11dHVhbGx5IGRlcGVuZGVudCB1cG9uCisg ICAgICAgIGNvZGVyZXZpZXcuY2hyb21pdW0ub3JnLzY1MDEyIChhcHByb3ZlZCkuICBJZiBlaXRo ZXIgb25lCisgICAgICAgIGlzIHJvbGxlZCBiYWNrLCBib3RoIG11c3QgYmUgcm9sbGVkIGJhY2su CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250Q2FjaGVMaW51eC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEp OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGF0aFNraWEuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UGF0aDo6Ym91bmRpbmdSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OmJvdW5k aW5nQm94Rm9yQ3VycmVudFN0cm9rZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvc2tp YS9Ta2lhVXRpbHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2tQYXRoQ29udGFpbnNQb2ludCk6 CisKIDIwMDktMDUtMTEgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAg ICAgICBGaXggdHlwbyAiQVBQTElDQVRJT05fQ0FIRV9EWU5BTUlDX0VOVFJJRVMiIHRvICJBUFBM SUNBVElPTl9DQUNIRV9EWU5BTUlDX0VOVFJJRVMiCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0ZvbnRDYWNoZUxpbnV4LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDYWNoZUxpbnV4LmNwcAkocmV2aXNpb24g NDM1MTApCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDYWNoZUxp bnV4LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ2LDcgKzE0Niw3IEBAIEZvbnRQbGF0Zm9ybURh dGEqIEZvbnRDYWNoZTo6Y3JlYXRlRm9udFAKICAgICBpZiAoZm9udERlc2NyaXB0aW9uLml0YWxp YygpKQogICAgICAgICBzdHlsZSB8PSBTa1R5cGVmYWNlOjprSXRhbGljOwogCi0gICAgU2tUeXBl ZmFjZSogdGYgPSBTa1R5cGVmYWNlOjpDcmVhdGUobmFtZSwgc3RhdGljX2Nhc3Q8U2tUeXBlZmFj ZTo6U3R5bGU+KHN0eWxlKSk7CisgICAgU2tUeXBlZmFjZSogdGYgPSBTa1R5cGVmYWNlOjpDcmVh dGVGcm9tTmFtZShuYW1lLCBzdGF0aWNfY2FzdDxTa1R5cGVmYWNlOjpTdHlsZT4oc3R5bGUpKTsK ICAgICBpZiAoIXRmKQogICAgICAgICByZXR1cm4gMDsKIApJbmRleDogV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9za2lhL1BhdGhTa2lhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3NraWEvUGF0aFNraWEuY3BwCShyZXZpc2lvbiA0MzUxMCkKKysrIFdlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QYXRoU2tpYS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTgxLDkgKzgxLDcgQEAgdm9pZCBQYXRoOjp0cmFuc2xhdGUoY29uc3QgRmxvYXRTaXplJiBzaQog CiBGbG9hdFJlY3QgUGF0aDo6Ym91bmRpbmdSZWN0KCkgY29uc3QKIHsKLSAgICBTa1JlY3QgcmVj dDsKLSAgICBtX3BhdGgtPmNvbXB1dGVCb3VuZHMoJnJlY3QsIFNrUGF0aDo6a0V4YWN0X0JvdW5k c1R5cGUpOwotICAgIHJldHVybiByZWN0OworICAgIHJldHVybiBtX3BhdGgtPmdldEJvdW5kcygp OwogfQogCiB2b2lkIFBhdGg6Om1vdmVUbyhjb25zdCBGbG9hdFBvaW50JiBwb2ludCkKQEAgLTI3 NSw5ICsyNzMsNyBAQCBzdGF0aWMgRmxvYXRSZWN0IGJvdW5kaW5nQm94Rm9yQ3VycmVudFN0CiAg ICAgY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCktPnNldHVwUGFpbnRGb3JTdHJva2luZygmcGFp bnQsIDAsIDApOwogICAgIFNrUGF0aCBib3VuZGluZ1BhdGg7CiAgICAgcGFpbnQuZ2V0RmlsbFBh dGgoY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCktPmN1cnJlbnRQYXRoSW5Mb2NhbENvb3JkaW5h dGVzKCksICZib3VuZGluZ1BhdGgpOwotICAgIFNrUmVjdCByOwotICAgIGJvdW5kaW5nUGF0aC5j b21wdXRlQm91bmRzKCZyLCBTa1BhdGg6OmtFeGFjdF9Cb3VuZHNUeXBlKTsKLSAgICByZXR1cm4g cjsKKyAgICByZXR1cm4gYm91bmRpbmdQYXRoLmdldEJvdW5kcygpOwogfQogCiBGbG9hdFJlY3Qg UGF0aDo6c3Ryb2tlQm91bmRpbmdSZWN0KFN0cm9rZVN0eWxlQXBwbGllciogYXBwbGllcikKSW5k ZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Ta2lhVXRpbHMuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Ta2lhVXRpbHMuY3BwCShyZXZp c2lvbiA0MzUxMCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Ta2lhVXRpbHMu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTAsOCArMTUwLDcgQEAgYm9vbCBTa1BhdGhDb250YWlu c1BvaW50KFNrUGF0aCogb3JpZ2luYQogICAgIFNrUGF0aCBzY2FsZWRQYXRoOwogICAgIGludCBz Y2FsZSA9IDE7CiAKLSAgICBTa1JlY3QgYm91bmRzOwotICAgIG9yaWdpbmFsUGF0aC0+Y29tcHV0 ZUJvdW5kcygmYm91bmRzLCBTa1BhdGg6OmtGYXN0X0JvdW5kc1R5cGUpOworICAgIFNrUmVjdCBi b3VuZHMgPSBvcmlnaW5hbFBhdGgtPmdldEJvdW5kcygpOwogCiAgICAgLy8gV2UgY2FuIGltbWVk aWF0ZWx5IHJldHVybiBmYWxzZSBpZiB0aGUgcG9pbnQgaXMgb3V0c2lkZSB0aGUgYm91bmRpbmcg cmVjdAogICAgIGlmICghYm91bmRzLmNvbnRhaW5zKFNrRmxvYXRUb1NjYWxhcihwb2ludC54KCkp LCBTa0Zsb2F0VG9TY2FsYXIocG9pbnQueSgpKSkpCg== 30245 2009-05-12 11:33:07 -0700 2009-05-12 13:24:23 -0700 Take two, compatible with both versions of skia. webkit_new_skia_changes.patch text/plain 4175 senorblanco SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDQzNTcy KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMDktMDUt MTIgIFN0ZXBoZW4gV2hpdGUgIDxzZW5vcmJsYW5jb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4ZXMgdG8gYnVpbGQgd2l0 aCBsYXRlc3Qgc2tpYTogIFNrVHlwZWZhY2U6OkNyZWF0ZSgpIGlzIG5vdworICAgICAgICBTa1R5 cGVmYWNlOjpDcmVhdGVGcm9tTmFtZSgpOyBjb21wdXRlQm91bmRzKCkgaGFzIGJlZW4gcmV3b3Jr ZWQKKyAgICAgICAgYXMgZ2V0Qm91bmRzKCkuICBUaGUgY2hhbmdlcyBhcmUgcGxhY2VkIGJlaGlu ZCBhbiAjaWZkZWYgZm9yIG5vdywKKyAgICAgICAgc28gdGhhdCB3ZSBjYW4gcm9sbCBiYWNrIHRo ZSBza2lhIHZlcnNpb24gaW4gQ2hyb21pdW0gaWYgbmVjZXNzYXJ5CisgICAgICAgIHdpdGhvdXQg aGF2aW5nIHRvIHJvbGwgYmFjayB0aGlzIGNoYW5nZS4KKworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjU3MDUKKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0ZvbnRDYWNoZUxpbnV4LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZv bnRDYWNoZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YSk6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3Mvc2tpYS9QYXRoU2tpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYXRoOjpib3VuZGlu Z1JlY3QpOgorICAgICAgICAoV2ViQ29yZTo6Ym91bmRpbmdCb3hGb3JDdXJyZW50U3Ryb2tlKToK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL1NraWFVdGlscy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTa1BhdGhDb250YWluc1BvaW50KToKKwogMjAwOS0wNS0xMiAgQWxleGV5IFBy b3NrdXJ5YWtvdiAgPGFwQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4g QWRsZXIuCkluZGV4OiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250Q2FjaGVMaW51eC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udENhY2hlTGlu dXguY3BwCShyZXZpc2lvbiA0MzU3MSkKKysrIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0Zv bnRDYWNoZUxpbnV4LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ2LDcgKzE0NiwxNCBAQCBGb250 UGxhdGZvcm1EYXRhKiBGb250Q2FjaGU6OmNyZWF0ZUZvbnRQCiAgICAgaWYgKGZvbnREZXNjcmlw dGlvbi5pdGFsaWMoKSkKICAgICAgICAgc3R5bGUgfD0gU2tUeXBlZmFjZTo6a0l0YWxpYzsKIAor ICAgIC8vIFRPRE8oc2Vub3JibGFuY28pOiAgVGhpcyAjaWZkZWYgY2FuIGdvIGF3YXkgb25jZSB3 ZSdyZSBmaXJtbHkgdXNpbmcgdGhlCisgICAgLy8gbmV3IFNraWEuICBEdXJpbmcgdGhlIHRyYW5z aXRpb24sIHRoaXMgbWFrZXMgdGhlIGNvZGUgY29tcGF0aWJsZSB3aXRoCisgICAgLy8gYm90aCB2 ZXJzaW9ucy4KKyNpZmRlZiBTS19VU0VfT0xEXzI1NV9UT18yNTYKKyAgICBTa1R5cGVmYWNlKiB0 ZiA9IFNrVHlwZWZhY2U6OkNyZWF0ZUZyb21OYW1lKG5hbWUsIHN0YXRpY19jYXN0PFNrVHlwZWZh Y2U6OlN0eWxlPihzdHlsZSkpOworI2Vsc2UKICAgICBTa1R5cGVmYWNlKiB0ZiA9IFNrVHlwZWZh Y2U6OkNyZWF0ZShuYW1lLCBzdGF0aWNfY2FzdDxTa1R5cGVmYWNlOjpTdHlsZT4oc3R5bGUpKTsK KyNlbmRpZgogICAgIGlmICghdGYpCiAgICAgICAgIHJldHVybiAwOwogCkluZGV4OiBwbGF0Zm9y bS9ncmFwaGljcy9za2lhL1BhdGhTa2lhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBwbGF0Zm9ybS9ncmFw aGljcy9za2lhL1BhdGhTa2lhLmNwcAkocmV2aXNpb24gNDM1NzEpCisrKyBwbGF0Zm9ybS9ncmFw aGljcy9za2lhL1BhdGhTa2lhLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODEsOSArODEsMTYgQEAg dm9pZCBQYXRoOjp0cmFuc2xhdGUoY29uc3QgRmxvYXRTaXplJiBzaQogCiBGbG9hdFJlY3QgUGF0 aDo6Ym91bmRpbmdSZWN0KCkgY29uc3QKIHsKKyAgICAvLyBUT0RPKHNlbm9yYmxhbmNvKTogIFRo aXMgI2lmZGVmIGNhbiBnbyBhd2F5IG9uY2Ugd2UncmUgZmlybWx5IHVzaW5nIHRoZQorICAgIC8v IG5ldyBTa2lhLiAgRHVyaW5nIHRoZSB0cmFuc2l0aW9uLCB0aGlzIG1ha2VzIHRoZSBjb2RlIGNv bXBhdGlibGUgd2l0aAorICAgIC8vIGJvdGggdmVyc2lvbnMuCisjaWZkZWYgU0tfVVNFX09MRF8y NTVfVE9fMjU2CisgICAgcmV0dXJuIG1fcGF0aC0+Z2V0Qm91bmRzKCk7CisjZWxzZQogICAgIFNr UmVjdCByZWN0OwogICAgIG1fcGF0aC0+Y29tcHV0ZUJvdW5kcygmcmVjdCwgU2tQYXRoOjprRXhh Y3RfQm91bmRzVHlwZSk7CiAgICAgcmV0dXJuIHJlY3Q7CisjZW5kaWYKIH0KIAogdm9pZCBQYXRo Ojptb3ZlVG8oY29uc3QgRmxvYXRQb2ludCYgcG9pbnQpCkBAIC0yNzUsOSArMjgyLDE2IEBAIHN0 YXRpYyBGbG9hdFJlY3QgYm91bmRpbmdCb3hGb3JDdXJyZW50U3QKICAgICBjb250ZXh0LT5wbGF0 Zm9ybUNvbnRleHQoKS0+c2V0dXBQYWludEZvclN0cm9raW5nKCZwYWludCwgMCwgMCk7CiAgICAg U2tQYXRoIGJvdW5kaW5nUGF0aDsKICAgICBwYWludC5nZXRGaWxsUGF0aChjb250ZXh0LT5wbGF0 Zm9ybUNvbnRleHQoKS0+Y3VycmVudFBhdGhJbkxvY2FsQ29vcmRpbmF0ZXMoKSwgJmJvdW5kaW5n UGF0aCk7CisgICAgLy8gVE9ETyhzZW5vcmJsYW5jbyk6ICBUaGlzICNpZmRlZiBjYW4gZ28gYXdh eSBvbmNlIHdlJ3JlIGZpcm1seSB1c2luZyB0aGUKKyAgICAvLyBuZXcgU2tpYS4gIER1cmluZyB0 aGUgdHJhbnNpdGlvbiwgdGhpcyBtYWtlcyB0aGUgY29kZSBjb21wYXRpYmxlIHdpdGgKKyAgICAv LyBib3RoIHZlcnNpb25zLgorI2lmZGVmIFNLX1VTRV9PTERfMjU1X1RPXzI1NgorICAgIHJldHVy biBib3VuZGluZ1BhdGguZ2V0Qm91bmRzKCk7CisjZWxzZQogICAgIFNrUmVjdCByOwogICAgIGJv dW5kaW5nUGF0aC5jb21wdXRlQm91bmRzKCZyLCBTa1BhdGg6OmtFeGFjdF9Cb3VuZHNUeXBlKTsK ICAgICByZXR1cm4gcjsKKyNlbmRpZgogfQogCiBGbG9hdFJlY3QgUGF0aDo6c3Ryb2tlQm91bmRp bmdSZWN0KFN0cm9rZVN0eWxlQXBwbGllciogYXBwbGllcikKSW5kZXg6IHBsYXRmb3JtL2dyYXBo aWNzL3NraWEvU2tpYVV0aWxzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBwbGF0Zm9ybS9ncmFwaGljcy9z a2lhL1NraWFVdGlscy5jcHAJKHJldmlzaW9uIDQzNTcxKQorKysgcGxhdGZvcm0vZ3JhcGhpY3Mv c2tpYS9Ta2lhVXRpbHMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTEsNyArMTUxLDE0IEBAIGJv b2wgU2tQYXRoQ29udGFpbnNQb2ludChTa1BhdGgqIG9yaWdpbmEKICAgICBpbnQgc2NhbGUgPSAx OwogCiAgICAgU2tSZWN0IGJvdW5kczsKKyAgICAvLyBUT0RPKHNlbm9yYmxhbmNvKTogIFRoaXMg I2lmZGVmIGNhbiBnbyBhd2F5IG9uY2Ugd2UncmUgZmlybWx5IHVzaW5nIHRoZQorICAgIC8vIG5l dyBTa2lhLiAgRHVyaW5nIHRoZSB0cmFuc2l0aW9uLCB0aGlzIG1ha2VzIHRoZSBjb2RlIGNvbXBh dGlibGUgd2l0aAorICAgIC8vIGJvdGggdmVyc2lvbnMuCisjaWZkZWYgU0tfVVNFX09MRF8yNTVf VE9fMjU2CisgICAgYm91bmRzID0gb3JpZ2luYWxQYXRoLT5nZXRCb3VuZHMoKTsKKyNlbHNlCiAg ICAgb3JpZ2luYWxQYXRoLT5jb21wdXRlQm91bmRzKCZib3VuZHMsIFNrUGF0aDo6a0Zhc3RfQm91 bmRzVHlwZSk7CisjZW5kaWYKIAogICAgIC8vIFdlIGNhbiBpbW1lZGlhdGVseSByZXR1cm4gZmFs c2UgaWYgdGhlIHBvaW50IGlzIG91dHNpZGUgdGhlIGJvdW5kaW5nIHJlY3QKICAgICBpZiAoIWJv dW5kcy5jb250YWlucyhTa0Zsb2F0VG9TY2FsYXIocG9pbnQueCgpKSwgU2tGbG9hdFRvU2NhbGFy KHBvaW50LnkoKSkpKQo= 30246 2009-05-12 13:23:33 -0700 2009-05-12 13:24:33 -0700 Take three: FIXME instead of TODO(senorblanco) webkit_new_skia_changes.patch text/plain 4187 senorblanco SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MzU3MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMDktMDUtMTIgIFN0ZXBoZW4gV2hpdGUgIDxzZW5vcmJsYW5jb0Bj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgRml4ZXMgdG8gYnVpbGQgd2l0aCBsYXRlc3Qgc2tpYTogIFNrVHlwZWZhY2U6OkNyZWF0 ZSgpIGlzIG5vdworICAgICAgICBTa1R5cGVmYWNlOjpDcmVhdGVGcm9tTmFtZSgpOyBjb21wdXRl Qm91bmRzKCkgaGFzIGJlZW4gcmV3b3JrZWQKKyAgICAgICAgYXMgZ2V0Qm91bmRzKCkuICBUaGUg Y2hhbmdlcyBhcmUgcGxhY2VkIGJlaGluZCBhbiAjaWZkZWYgZm9yIG5vdywKKyAgICAgICAgc28g dGhhdCB3ZSBjYW4gcm9sbCBiYWNrIHRoZSBza2lhIHZlcnNpb24gaW4gQ2hyb21pdW0gaWYgbmVj ZXNzYXJ5CisgICAgICAgIHdpdGhvdXQgaGF2aW5nIHRvIHJvbGwgYmFjayB0aGlzIGNoYW5nZS4K KworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjU3MDUK KworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDYWNoZUxpbnV4LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRDYWNoZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YSk6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QYXRoU2tpYS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpQYXRoOjpib3VuZGluZ1JlY3QpOgorICAgICAgICAoV2ViQ29yZTo6Ym91bmRp bmdCb3hGb3JDdXJyZW50U3Ryb2tlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lh L1NraWFVdGlscy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTa1BhdGhDb250YWluc1BvaW50KToK KwogMjAwOS0wNS0xMiAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0ZvbnRDYWNoZUxpbnV4LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDYWNoZUxpbnV4LmNwcAkocmV2aXNpb24g NDM1NzEpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDYWNoZUxp bnV4LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ2LDcgKzE0NiwxMyBAQCBGb250UGxhdGZvcm1E YXRhKiBGb250Q2FjaGU6OmNyZWF0ZUZvbnRQCiAgICAgaWYgKGZvbnREZXNjcmlwdGlvbi5pdGFs aWMoKSkKICAgICAgICAgc3R5bGUgfD0gU2tUeXBlZmFjZTo6a0l0YWxpYzsKIAorICAgIC8vIEZJ WE1FOiAgVGhpcyAjaWZkZWYgY2FuIGdvIGF3YXkgb25jZSB3ZSdyZSBmaXJtbHkgdXNpbmcgdGhl IG5ldyBTa2lhLgorICAgIC8vIER1cmluZyB0aGUgdHJhbnNpdGlvbiwgdGhpcyBtYWtlcyB0aGUg Y29kZSBjb21wYXRpYmxlIHdpdGggYm90aCB2ZXJzaW9ucy4KKyNpZmRlZiBTS19VU0VfT0xEXzI1 NV9UT18yNTYKKyAgICBTa1R5cGVmYWNlKiB0ZiA9IFNrVHlwZWZhY2U6OkNyZWF0ZUZyb21OYW1l KG5hbWUsIHN0YXRpY19jYXN0PFNrVHlwZWZhY2U6OlN0eWxlPihzdHlsZSkpOworI2Vsc2UKICAg ICBTa1R5cGVmYWNlKiB0ZiA9IFNrVHlwZWZhY2U6OkNyZWF0ZShuYW1lLCBzdGF0aWNfY2FzdDxT a1R5cGVmYWNlOjpTdHlsZT4oc3R5bGUpKTsKKyNlbmRpZgogICAgIGlmICghdGYpCiAgICAgICAg IHJldHVybiAwOwogCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGF0aFNr aWEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QYXRo U2tpYS5jcHAJKHJldmlzaW9uIDQzNTcxKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9z a2lhL1BhdGhTa2lhLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODEsOSArODEsMTUgQEAgdm9pZCBQ YXRoOjp0cmFuc2xhdGUoY29uc3QgRmxvYXRTaXplJiBzaQogCiBGbG9hdFJlY3QgUGF0aDo6Ym91 bmRpbmdSZWN0KCkgY29uc3QKIHsKKyAgICAvLyBGSVhNRTogIFRoaXMgI2lmZGVmIGNhbiBnbyBh d2F5IG9uY2Ugd2UncmUgZmlybWx5IHVzaW5nIHRoZSBuZXcgU2tpYS4KKyAgICAvLyBEdXJpbmcg dGhlIHRyYW5zaXRpb24sIHRoaXMgbWFrZXMgdGhlIGNvZGUgY29tcGF0aWJsZSB3aXRoIGJvdGgg dmVyc2lvbnMuCisjaWZkZWYgU0tfVVNFX09MRF8yNTVfVE9fMjU2CisgICAgcmV0dXJuIG1fcGF0 aC0+Z2V0Qm91bmRzKCk7CisjZWxzZQogICAgIFNrUmVjdCByZWN0OwogICAgIG1fcGF0aC0+Y29t cHV0ZUJvdW5kcygmcmVjdCwgU2tQYXRoOjprRXhhY3RfQm91bmRzVHlwZSk7CiAgICAgcmV0dXJu IHJlY3Q7CisjZW5kaWYKIH0KIAogdm9pZCBQYXRoOjptb3ZlVG8oY29uc3QgRmxvYXRQb2ludCYg cG9pbnQpCkBAIC0yNzUsOSArMjgxLDE1IEBAIHN0YXRpYyBGbG9hdFJlY3QgYm91bmRpbmdCb3hG b3JDdXJyZW50U3QKICAgICBjb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKS0+c2V0dXBQYWludEZv clN0cm9raW5nKCZwYWludCwgMCwgMCk7CiAgICAgU2tQYXRoIGJvdW5kaW5nUGF0aDsKICAgICBw YWludC5nZXRGaWxsUGF0aChjb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKS0+Y3VycmVudFBhdGhJ bkxvY2FsQ29vcmRpbmF0ZXMoKSwgJmJvdW5kaW5nUGF0aCk7CisgICAgLy8gRklYTUU6ICBUaGlz ICNpZmRlZiBjYW4gZ28gYXdheSBvbmNlIHdlJ3JlIGZpcm1seSB1c2luZyB0aGUgbmV3IFNraWEu CisgICAgLy8gRHVyaW5nIHRoZSB0cmFuc2l0aW9uLCB0aGlzIG1ha2VzIHRoZSBjb2RlIGNvbXBh dGlibGUgd2l0aCBib3RoIHZlcnNpb25zLgorI2lmZGVmIFNLX1VTRV9PTERfMjU1X1RPXzI1Ngor ICAgIHJldHVybiBib3VuZGluZ1BhdGguZ2V0Qm91bmRzKCk7CisjZWxzZQogICAgIFNrUmVjdCBy OwogICAgIGJvdW5kaW5nUGF0aC5jb21wdXRlQm91bmRzKCZyLCBTa1BhdGg6OmtFeGFjdF9Cb3Vu ZHNUeXBlKTsKICAgICByZXR1cm4gcjsKKyNlbmRpZgogfQogCiBGbG9hdFJlY3QgUGF0aDo6c3Ry b2tlQm91bmRpbmdSZWN0KFN0cm9rZVN0eWxlQXBwbGllciogYXBwbGllcikKSW5kZXg6IFdlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Ta2lhVXRpbHMuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Ta2lhVXRpbHMuY3BwCShyZXZpc2lvbiA0MzU3 MSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Ta2lhVXRpbHMuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xNTEsNyArMTUxLDEzIEBAIGJvb2wgU2tQYXRoQ29udGFpbnNQb2ludChT a1BhdGgqIG9yaWdpbmEKICAgICBpbnQgc2NhbGUgPSAxOwogCiAgICAgU2tSZWN0IGJvdW5kczsK KyAgICAvLyBGSVhNRTogIFRoaXMgI2lmZGVmIGNhbiBnbyBhd2F5IG9uY2Ugd2UncmUgZmlybWx5 IHVzaW5nIHRoZSBuZXcgU2tpYS4KKyAgICAvLyBEdXJpbmcgdGhlIHRyYW5zaXRpb24sIHRoaXMg bWFrZXMgdGhlIGNvZGUgY29tcGF0aWJsZSB3aXRoIGJvdGggdmVyc2lvbnMuCisjaWZkZWYgU0tf VVNFX09MRF8yNTVfVE9fMjU2CisgICAgYm91bmRzID0gb3JpZ2luYWxQYXRoLT5nZXRCb3VuZHMo KTsKKyNlbHNlCiAgICAgb3JpZ2luYWxQYXRoLT5jb21wdXRlQm91bmRzKCZib3VuZHMsIFNrUGF0 aDo6a0Zhc3RfQm91bmRzVHlwZSk7CisjZW5kaWYKIAogICAgIC8vIFdlIGNhbiBpbW1lZGlhdGVs eSByZXR1cm4gZmFsc2UgaWYgdGhlIHBvaW50IGlzIG91dHNpZGUgdGhlIGJvdW5kaW5nIHJlY3QK ICAgICBpZiAoIWJvdW5kcy5jb250YWlucyhTa0Zsb2F0VG9TY2FsYXIocG9pbnQueCgpKSwgU2tG bG9hdFRvU2NhbGFyKHBvaW50LnkoKSkpKQo=