75221 2011-12-25 21:08:59 -0800 Use OwnPtr to handle lifetime and deletion of FontFace objects 2012-01-08 22:25:39 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 41321 1 darin darin macpherson steveblock webkit.review.bot oldest_to_newest 527128 0 darin 2011-12-25 21:08:59 -0800 Use OwnPtr to handle lifetime and deletion of FontFace objects 527129 1 120523 darin 2011-12-25 21:13:22 -0800 Created attachment 120523 Patch 527757 2 120523 webkit.review.bot 2011-12-28 13:12:40 -0800 Comment on attachment 120523 Patch Clearing flags on attachment: 120523 Committed r103779: <http://trac.webkit.org/changeset/103779> 527758 3 webkit.review.bot 2011-12-28 13:12:44 -0800 All reviewed patches have been landed. Closing bug. 528751 4 steveblock 2012-01-03 06:32:31 -0800 This change removed an ASSERT from CSSFontFaceSource::getFontData() which we were sometimes hitting on Android. Is the removal intentional and if so, was the ASSERT erroneous? Thanks! 531977 5 darin 2012-01-08 22:25:39 -0800 (In reply to comment #4) > This change removed an ASSERT from CSSFontFaceSource::getFontData() which we were sometimes hitting on Android. Is the removal intentional and if so, was the ASSERT erroneous? Thanks! I removed the assertion by accident. I do not know whether the assertion is correct or not. We should probably add it back. 120523 2011-12-25 21:13:22 -0800 2011-12-28 13:12:40 -0800 Patch bug-75221-20111225211320.patch text/plain 6405 darin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMzY3NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDExLTEyLTI1ICBEYXJpbiBB ZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgT3duUHRyIHRvIGhhbmRsZSBs aWZldGltZSBhbmQgZGVsZXRpb24gb2YgRm9udEZhY2Ugb2JqZWN0cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzUyMjEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGNzcy9DU1NGb250RmFjZVNvdXJjZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NGb250RmFjZVNvdXJjZTo6Z2V0Rm9udERhdGEpOiBV c2UgYWRkIGluc3RlYWQgb2YgZ2V0L3NldCB0byByZWFkIGFuZAorICAgICAgICB0aGVuIGxhdGVy IGZpbGwgYSBjYWNoZS4gVXNlIG5ldyB2ZXJzaW9uIG9mIHJlZ2lzdGVyQ3VzdG9tRm9udCB0aGF0 IHRha2VzIFBhc3NPd25QdHIuCisgICAgICAgICogY3NzL0NTU1NlZ21lbnRlZEZvbnRGYWNlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1NlZ21lbnRlZEZvbnRGYWNlOjpnZXRGb250RGF0YSk6 IERpdHRvLgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkRvY3VtZW50OjpyZWdpc3RlckN1c3RvbUZvbnQpOiBUYWtlIGEgUGFzc093blB0ciBpbnN0ZWFk IG9mIHJhdyBwb2ludGVyLgorICAgICAgICAqIGRvbS9Eb2N1bWVudC5oOiBEaXR0by4KKwogMjAx MS0xMi0yNSAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgVXNlIE93 blB0ciBmb3IgQ1NTRm9udEZhY2U6Om1fc291cmNlcwpJbmRleDogU291cmNlL1dlYkNvcmUvY3Nz L0NTU0ZvbnRGYWNlU291cmNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTRm9udEZhY2VTb3VyY2UuY3BwCShyZXZpc2lvbiAxMDM2NjkpCisrKyBTb3VyY2UvV2ViQ29y ZS9jc3MvQ1NTRm9udEZhY2VTb3VyY2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDEsMTEgKzEw MSwxMSBAQCBTaW1wbGVGb250RGF0YSogQ1NTRm9udEZhY2VTb3VyY2U6OmdldEZvCiAgICAgaWYg KCFpc1ZhbGlkKCkpCiAgICAgICAgIHJldHVybiAwOwogCisgICAgaWYgKCFtX2ZvbnQKICNpZiBF TkFCTEUoU1ZHX0ZPTlRTKQotICAgIGlmICghbV9mb250ICYmICFtX3N2Z0ZvbnRGYWNlRWxlbWVu dCkgewotI2Vsc2UKLSAgICBpZiAoIW1fZm9udCkgeworICAgICAgICAgICAgJiYgIW1fc3ZnRm9u dEZhY2VFbGVtZW50CiAjZW5kaWYKKyAgICApIHsKICAgICAgICAgLy8gV2UncmUgbG9jYWwuIEp1 c3QgcmV0dXJuIGEgU2ltcGxlRm9udERhdGEgZnJvbSB0aGUgbm9ybWFsIGNhY2hlLgogICAgICAg ICByZXR1cm4gZm9udENhY2hlKCktPmdldENhY2hlZEZvbnREYXRhKGZvbnREZXNjcmlwdGlvbiwg bV9zdHJpbmcpOwogICAgIH0KQEAgLTExMyw3ICsxMTMsOSBAQCBTaW1wbGVGb250RGF0YSogQ1NT Rm9udEZhY2VTb3VyY2U6OmdldEZvCiAgICAgLy8gU2VlIGlmIHdlIGhhdmUgYSBtYXBwaW5nIGlu IG91ciBGb250RGF0YSBjYWNoZS4KICAgICB1bnNpZ25lZCBoYXNoS2V5ID0gKGZvbnREZXNjcmlw dGlvbi5jb21wdXRlZFBpeGVsU2l6ZSgpICsgMSkgPDwgNiB8IGZvbnREZXNjcmlwdGlvbi53aWR0 aFZhcmlhbnQoKSA8PCA0CiAgICAgICAgICAgICAgICAgICAgICAgIHwgKGZvbnREZXNjcmlwdGlv bi50ZXh0T3JpZW50YXRpb24oKSA9PSBUZXh0T3JpZW50YXRpb25VcHJpZ2h0ID8gOCA6IDApIHwg KGZvbnREZXNjcmlwdGlvbi5vcmllbnRhdGlvbigpID09IFZlcnRpY2FsID8gNCA6IDApIHwgKHN5 bnRoZXRpY0JvbGQgPyAyIDogMCkgfCAoc3ludGhldGljSXRhbGljID8gMSA6IDApOwotICAgIGlm IChTaW1wbGVGb250RGF0YSogY2FjaGVkRGF0YSA9IG1fZm9udERhdGFUYWJsZS5nZXQoaGFzaEtl eSkpCisKKyAgICBTaW1wbGVGb250RGF0YSomIGNhY2hlZERhdGEgPSBtX2ZvbnREYXRhVGFibGUu YWRkKGhhc2hLZXksIDApLmZpcnN0LT5zZWNvbmQ7CisgICAgaWYgKGNhY2hlZERhdGEpCiAgICAg ICAgIHJldHVybiBjYWNoZWREYXRhOwogCiAgICAgT3duUHRyPFNpbXBsZUZvbnREYXRhPiBmb250 RGF0YTsKQEAgLTE4NSwxMyArMTg3LDEyIEBAIFNpbXBsZUZvbnREYXRhKiBDU1NGb250RmFjZVNv dXJjZTo6Z2V0Rm8KICAgICAgICAgZm9udERhdGEgPSBhZG9wdFB0cihuZXcgU2ltcGxlRm9udERh dGEodGVtcG9yYXJ5Rm9udC0+cGxhdGZvcm1EYXRhKCksIHRydWUsIHRydWUpKTsKICAgICB9CiAK LSAgICBTaW1wbGVGb250RGF0YSogZm9udERhdGFSYXdQdHIgPSBmb250RGF0YS5sZWFrUHRyKCk7 Ci0gICAgbV9mb250RGF0YVRhYmxlLnNldChoYXNoS2V5LCBmb250RGF0YVJhd1B0cik7Ci0gICAg QVNTRVJUKGZvbnRTZWxlY3Rvci0+ZG9jdW1lbnQoKSk7Ci0gICAgaWYgKERvY3VtZW50KiBkb2Mg PSBmb250U2VsZWN0b3ItPmRvY3VtZW50KCkpCi0gICAgICAgIGRvYy0+cmVnaXN0ZXJDdXN0b21G b250KGZvbnREYXRhUmF3UHRyKTsKKyAgICBpZiAoRG9jdW1lbnQqIGRvY3VtZW50ID0gZm9udFNl bGVjdG9yLT5kb2N1bWVudCgpKSB7CisgICAgICAgIGNhY2hlZERhdGEgPSBmb250RGF0YS5nZXQo KTsKKyAgICAgICAgZG9jdW1lbnQtPnJlZ2lzdGVyQ3VzdG9tRm9udChmb250RGF0YS5yZWxlYXNl KCkpOworICAgIH0KIAotICAgIHJldHVybiBmb250RGF0YVJhd1B0cjsKKyAgICByZXR1cm4gY2Fj aGVkRGF0YTsKIH0KIAogI2lmIEVOQUJMRShTVkdfRk9OVFMpCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9jc3MvQ1NTU2VnbWVudGVkRm9udEZhY2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2Nzcy9DU1NTZWdtZW50ZWRGb250RmFjZS5jcHAJKHJldmlzaW9uIDEwMzY3NikKKysrIFNv dXJjZS9XZWJDb3JlL2Nzcy9DU1NTZWdtZW50ZWRGb250RmFjZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTg5LDExICs4OSwxMSBAQCBGb250RGF0YSogQ1NTU2VnbWVudGVkRm9udEZhY2U6OmdldEZv bnRECiAgICAgRm9udFRyYWl0c01hc2sgZGVzaXJlZFRyYWl0c01hc2sgPSBmb250RGVzY3JpcHRp b24udHJhaXRzTWFzaygpOwogICAgIHVuc2lnbmVkIGhhc2hLZXkgPSAoKGZvbnREZXNjcmlwdGlv bi5jb21wdXRlZFBpeGVsU2l6ZSgpICsgMSkgPDwgKEZvbnRUcmFpdHNNYXNrV2lkdGggKyAxKSkg fCAoKGZvbnREZXNjcmlwdGlvbi5vcmllbnRhdGlvbigpID09IFZlcnRpY2FsID8gMSA6IDApIDw8 IEZvbnRUcmFpdHNNYXNrV2lkdGgpIHwgZGVzaXJlZFRyYWl0c01hc2s7CiAKLSAgICBTZWdtZW50 ZWRGb250RGF0YSogZm9udERhdGEgPSBtX2ZvbnREYXRhVGFibGUuZ2V0KGhhc2hLZXkpOworICAg IFNlZ21lbnRlZEZvbnREYXRhKiYgZm9udERhdGEgPSBtX2ZvbnREYXRhVGFibGUuYWRkKGhhc2hL ZXksIDApLmZpcnN0LT5zZWNvbmQ7CiAgICAgaWYgKGZvbnREYXRhKQogICAgICAgICByZXR1cm4g Zm9udERhdGE7CiAKLSAgICBmb250RGF0YSA9IG5ldyBTZWdtZW50ZWRGb250RGF0YSgpOworICAg IE93blB0cjxTZWdtZW50ZWRGb250RGF0YT4gbmV3Rm9udERhdGEgPSBhZG9wdFB0cihuZXcgU2Vn bWVudGVkRm9udERhdGEpOwogCiAgICAgdW5zaWduZWQgc2l6ZSA9IG1fZm9udEZhY2VzLnNpemUo KTsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgc2l6ZTsgaSsrKSB7CkBAIC0xMDcsMjEg KzEwNywxOSBAQCBGb250RGF0YSogQ1NTU2VnbWVudGVkRm9udEZhY2U6OmdldEZvbnRECiAgICAg ICAgICAgICBjb25zdCBWZWN0b3I8Q1NTRm9udEZhY2U6OlVuaWNvZGVSYW5nZT4mIHJhbmdlcyA9 IG1fZm9udEZhY2VzW2ldLT5yYW5nZXMoKTsKICAgICAgICAgICAgIHVuc2lnbmVkIG51bVJhbmdl cyA9IHJhbmdlcy5zaXplKCk7CiAgICAgICAgICAgICBpZiAoIW51bVJhbmdlcykKLSAgICAgICAg ICAgICAgICBmb250RGF0YS0+YXBwZW5kUmFuZ2UoRm9udERhdGFSYW5nZSgwLCAweDdGRkZGRkZG LCBmYWNlRm9udERhdGEpKTsKKyAgICAgICAgICAgICAgICBuZXdGb250RGF0YS0+YXBwZW5kUmFu Z2UoRm9udERhdGFSYW5nZSgwLCAweDdGRkZGRkZGLCBmYWNlRm9udERhdGEpKTsKICAgICAgICAg ICAgIGVsc2UgewogICAgICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaiA9IDA7IGogPCBudW1S YW5nZXM7ICsraikKLSAgICAgICAgICAgICAgICAgICAgZm9udERhdGEtPmFwcGVuZFJhbmdlKEZv bnREYXRhUmFuZ2UocmFuZ2VzW2pdLmZyb20oKSwgcmFuZ2VzW2pdLnRvKCksIGZhY2VGb250RGF0 YSkpOworICAgICAgICAgICAgICAgICAgICBuZXdGb250RGF0YS0+YXBwZW5kUmFuZ2UoRm9udERh dGFSYW5nZShyYW5nZXNbal0uZnJvbSgpLCByYW5nZXNbal0udG8oKSwgZmFjZUZvbnREYXRhKSk7 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9Ci0gICAgaWYgKGZvbnREYXRhLT5udW1S YW5nZXMoKSkgewotICAgICAgICBtX2ZvbnREYXRhVGFibGUuc2V0KGhhc2hLZXksIGZvbnREYXRh KTsKKyAgICBpZiAobmV3Rm9udERhdGEtPm51bVJhbmdlcygpKSB7CiAgICAgICAgIEFTU0VSVCht X2ZvbnRTZWxlY3Rvci0+ZG9jdW1lbnQoKSk7Ci0gICAgICAgIGlmIChEb2N1bWVudCogZG9jID0g bV9mb250U2VsZWN0b3ItPmRvY3VtZW50KCkpCi0gICAgICAgICAgICBkb2MtPnJlZ2lzdGVyQ3Vz dG9tRm9udChmb250RGF0YSk7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgZGVsZXRlIGZvbnREYXRh OwotICAgICAgICBmb250RGF0YSA9IDA7CisgICAgICAgIGlmIChEb2N1bWVudCogZG9jdW1lbnQg PSBtX2ZvbnRTZWxlY3Rvci0+ZG9jdW1lbnQoKSkgeworICAgICAgICAgICAgZm9udERhdGEgPSBu ZXdGb250RGF0YS5nZXQoKTsKKyAgICAgICAgICAgIGRvY3VtZW50LT5yZWdpc3RlckN1c3RvbUZv bnQobmV3Rm9udERhdGEucmVsZWFzZSgpKTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIHJldHVy biBmb250RGF0YTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkocmV2aXNpb24gMTAzNjY5 KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTY5OSw5ICsxNjk5LDkgQEAgUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4gRG9jdW1lbnQ6OnN0eWxl RgogICAgIHJldHVybiBzdHlsZS5yZWxlYXNlKCk7CiB9CiAKLXZvaWQgRG9jdW1lbnQ6OnJlZ2lz dGVyQ3VzdG9tRm9udChGb250RGF0YSogZm9udERhdGEpCit2b2lkIERvY3VtZW50OjpyZWdpc3Rl ckN1c3RvbUZvbnQoUGFzc093blB0cjxGb250RGF0YT4gZm9udERhdGEpCiB7Ci0gICAgbV9jdXN0 b21Gb250cy5hcHBlbmQoYWRvcHRQdHIoZm9udERhdGEpKTsKKyAgICBtX2N1c3RvbUZvbnRzLmFw cGVuZChmb250RGF0YSk7CiB9CiAKIHZvaWQgRG9jdW1lbnQ6OmRlbGV0ZUN1c3RvbUZvbnRzKCkK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCShyZXZpc2lvbiAxMDM2NjkpCisrKyBTb3VyY2UvV2Vi Q29yZS9kb20vRG9jdW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtNTU1LDcgKzU1NSw3IEBAIHB1 YmxpYzoKICAgICBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBzdHlsZUZvckVsZW1lbnRJZ25vcmlu Z1BlbmRpbmdTdHlsZXNoZWV0cyhFbGVtZW50Kik7CiAgICAgUGFzc1JlZlB0cjxSZW5kZXJTdHls ZT4gc3R5bGVGb3JQYWdlKGludCBwYWdlSW5kZXgpOwogCi0gICAgdm9pZCByZWdpc3RlckN1c3Rv bUZvbnQoRm9udERhdGEqKTsKKyAgICB2b2lkIHJlZ2lzdGVyQ3VzdG9tRm9udChQYXNzT3duUHRy PEZvbnREYXRhPik7CiAKICAgICAvLyBSZXR1cm5zIHRydWUgaWYgcGFnZSBib3ggKG1hcmdpbiBi b3hlcyBhbmQgcGFnZSBib3JkZXJzKSBpcyB2aXNpYmxlLgogICAgIGJvb2wgaXNQYWdlQm94Vmlz aWJsZShpbnQgcGFnZUluZGV4KTsK