68358 2011-09-19 07:22:36 -0700 Add fontDataForCombiningCharacterSequence to fix Skia on Mac build 2011-09-19 11:26:46 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 caryclark caryclark mitz webkit.review.bot oldest_to_newest 469376 0 caryclark 2011-09-19 07:22:36 -0700 Add fontDataForCombiningCharacterSequence to fix Skia on Mac build 469378 1 107850 caryclark 2011-09-19 07:26:02 -0700 Created attachment 107850 Patch 469400 2 107850 mitz 2011-09-19 08:18:54 -0700 Comment on attachment 107850 Patch Duplicating this code seems bad. A better solution would be to share it. r- because if you do copy this code, then you must also add the 2011 Apple Inc. copyright to the file. 469407 3 caryclark 2011-09-19 08:31:04 -0700 I'm happy to share the code, but I am unsure where the shared code should reside. Where would you recommend? Alternatively, would you still object to committing the code if the copyright statement was added to FontSkia.cpp? 469425 4 caryclark 2011-09-19 08:53:05 -0700 How about moving the function from FontMac.mm to FontComplexTextMac.cpp. Does that work for you? 469431 5 mitz 2011-09-19 09:04:58 -0700 (In reply to comment #4) > How about moving the function from FontMac.mm to FontComplexTextMac.cpp. That’s a good option 469450 6 107874 caryclark 2011-09-19 09:33:58 -0700 Created attachment 107874 Patch 469555 7 107874 webkit.review.bot 2011-09-19 11:26:42 -0700 Comment on attachment 107874 Patch Clearing flags on attachment: 107874 Committed r95445: <http://trac.webkit.org/changeset/95445> 469556 8 webkit.review.bot 2011-09-19 11:26:46 -0700 All reviewed patches have been landed. Closing bug. 107850 2011-09-19 07:26:02 -0700 2011-09-19 09:33:54 -0700 Patch bug-68358-20110919102602.patch text/plain 2772 caryclark SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1NDEzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDktMTkgIENhcnkgQ2xh cmsgIDxjYXJ5Y2xhcmtAZ29vZ2xlLmNvbT4KKworICAgICAgICBBZGQgZm9udERhdGFGb3JDb21i aW5pbmdDaGFyYWN0ZXJTZXF1ZW5jZSB0byBmaXggU2tpYSBvbiBNYWMgYnVpbGQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MzU4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGlz IHBsYXRmb3JtIGlzIG5vdCBlbmFibGVkLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv c2tpYS9Gb250U2tpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250Ojpmb250RGF0YUZvckNv bWJpbmluZ0NoYXJhY3RlclNlcXVlbmNlKToKKyAgICAgICAgVGhpcyBmdW5jdGlvbiB3YXMgYWRk ZWQgYnkgdGhlIGNhbGxlciBpbiBDb21wbGV4VGV4dENvbnRyb2xsZXIsCisgICAgICAgIGNvZGUg c2hhcmVkIGJ5IHRoZSB2YXJpb3VzIE1hYyBwb3J0cy4gVGhlIGltcGxlbWVudGF0aW9uIGlzIGlu CisgICAgICAgIEZvbnRNYWMubW0sIHdoaWNoIGlzIG5vdCBpbmNsdWRlZCBieSB0aGUgU2tpYSBv biBNYWMgYnVpbGQuCisKIDIwMTEtMDktMTkgIEFkZW1hciBkZSBTb3V6YSBSZWlzIEpyLiAgPGFk ZW1hci5yZWlzQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZDogZG9zMnVuaXgg b24gYmluZGluZ3MvanMvSlNFeGNlcHRpb25CYXNlLmgKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3NraWEvRm9udFNraWEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvRm9udFNraWEuY3BwCShyZXZpc2lvbiA5NTQw NikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvRm9udFNraWEuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xODAsNCArMTgwLDM4IEBAIHZvaWQgRm9udDo6ZHJhd0dseXBo cyhHcmFwaGljc0NvbnRleHQqIGcKICAgICB9CiB9CiAKK2NvbnN0IFNpbXBsZUZvbnREYXRhKiBG b250Ojpmb250RGF0YUZvckNvbWJpbmluZ0NoYXJhY3RlclNlcXVlbmNlKGNvbnN0IFVDaGFyKiBj aGFyYWN0ZXJzLCBzaXplX3QgbGVuZ3RoLCBGb250RGF0YVZhcmlhbnQgdmFyaWFudCkgY29uc3QK K3sKKyAgICBVQ2hhcjMyIGJhc2VDaGFyYWN0ZXI7CisgICAgc2l6ZV90IGJhc2VDaGFyYWN0ZXJM ZW5ndGggPSAwOworICAgIFUxNl9ORVhUKGNoYXJhY3RlcnMsIGJhc2VDaGFyYWN0ZXJMZW5ndGgs IGxlbmd0aCwgYmFzZUNoYXJhY3Rlcik7CisKKyAgICBHbHlwaERhdGEgYmFzZUNoYXJhY3Rlckds eXBoRGF0YSA9IGdseXBoRGF0YUZvckNoYXJhY3RlcihiYXNlQ2hhcmFjdGVyLCBmYWxzZSwgdmFy aWFudCk7CisKKyAgICBpZiAobGVuZ3RoID09IGJhc2VDaGFyYWN0ZXJMZW5ndGgpCisgICAgICAg IHJldHVybiBiYXNlQ2hhcmFjdGVyR2x5cGhEYXRhLmdseXBoID8gYmFzZUNoYXJhY3RlckdseXBo RGF0YS5mb250RGF0YSA6IDA7CisKKyAgICBib29sIHRyaWVkQmFzZUNoYXJhY3RlckZvbnREYXRh ID0gZmFsc2U7CisKKyAgICB1bnNpZ25lZCBpID0gMDsKKyAgICBmb3IgKGNvbnN0IEZvbnREYXRh KiBmb250RGF0YSA9IGZvbnREYXRhQXQoMCk7IGZvbnREYXRhOyBmb250RGF0YSA9IGZvbnREYXRh QXQoKytpKSkgeworICAgICAgICBjb25zdCBTaW1wbGVGb250RGF0YSogc2ltcGxlRm9udERhdGEg PSBmb250RGF0YS0+Zm9udERhdGFGb3JDaGFyYWN0ZXIoYmFzZUNoYXJhY3Rlcik7CisgICAgICAg IGlmICh2YXJpYW50ICE9IE5vcm1hbFZhcmlhbnQpIHsKKyAgICAgICAgICAgIGlmIChjb25zdCBT aW1wbGVGb250RGF0YSogdmFyaWFudEZvbnREYXRhID0gc2ltcGxlRm9udERhdGEtPnZhcmlhbnRG b250RGF0YShtX2ZvbnREZXNjcmlwdGlvbiwgdmFyaWFudCkpCisgICAgICAgICAgICAgICAgc2lt cGxlRm9udERhdGEgPSB2YXJpYW50Rm9udERhdGE7CisgICAgICAgIH0KKworICAgICAgICBpZiAo c2ltcGxlRm9udERhdGEgPT0gYmFzZUNoYXJhY3RlckdseXBoRGF0YS5mb250RGF0YSkKKyAgICAg ICAgICAgIHRyaWVkQmFzZUNoYXJhY3RlckZvbnREYXRhID0gdHJ1ZTsKKworICAgICAgICBpZiAo c2ltcGxlRm9udERhdGEtPmNhblJlbmRlckNvbWJpbmluZ0NoYXJhY3RlclNlcXVlbmNlKGNoYXJh Y3RlcnMsIGxlbmd0aCkpCisgICAgICAgICAgICByZXR1cm4gc2ltcGxlRm9udERhdGE7CisgICAg fQorCisgICAgaWYgKCF0cmllZEJhc2VDaGFyYWN0ZXJGb250RGF0YSAmJiBiYXNlQ2hhcmFjdGVy R2x5cGhEYXRhLmZvbnREYXRhICYmIGJhc2VDaGFyYWN0ZXJHbHlwaERhdGEuZm9udERhdGEtPmNh blJlbmRlckNvbWJpbmluZ0NoYXJhY3RlclNlcXVlbmNlKGNoYXJhY3RlcnMsIGxlbmd0aCkpCisg ICAgICAgIHJldHVybiBiYXNlQ2hhcmFjdGVyR2x5cGhEYXRhLmZvbnREYXRhOworCisgICAgcmV0 dXJuIDA7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 107874 2011-09-19 09:33:58 -0700 2011-09-19 11:26:42 -0700 Patch bug-68358-20110919123359.patch text/plain 4697 caryclark SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1NDEzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDktMTkgIENhcnkgQ2xh cmsgIDxjYXJ5Y2xhcmtAZ29vZ2xlLmNvbT4KKworICAgICAgICBNb3ZlIGZvbnREYXRhRm9yQ29t YmluaW5nQ2hhcmFjdGVyU2VxdWVuY2UgdG8gZml4IFNraWEgb24gTWFjIGJ1aWxkCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02ODM1OAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4KKwor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250TWFjLm1tOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q29tcGxleFRleHRNYWMuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Rm9udDo6Zm9udERhdGFGb3JDb21iaW5pbmdDaGFyYWN0ZXJTZXF1ZW5jZSk6CisgICAg ICAgIFRoaXMgbW92ZXMgdGhlIGltcGxlbWVudGF0aW9uIGZyb20gRm9udE1hYy5tbSB0bworICAg ICAgICBGb250Q29tcGxleFRleHRNYWMuY3BwLCBzbyBpdCBpcyB2aXNpYmxlIHRvIHRoZSBTa2lh IG9uIE1hYworICAgICAgICBwbGF0Zm9ybSBhcyB3ZWxsLgorCiAyMDExLTA5LTE5ICBBZGVtYXIg ZGUgU291emEgUmVpcyBKci4gIDxhZGVtYXIucmVpc0BvcGVuYm9zc2Eub3JnPgogCiAgICAgICAg IFVucmV2aWV3ZWQ6IGRvczJ1bml4IG9uIGJpbmRpbmdzL2pzL0pTRXhjZXB0aW9uQmFzZS5oCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udENvbXBsZXhUZXh0 TWFjLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9t YWMvRm9udENvbXBsZXhUZXh0TWFjLmNwcAkocmV2aXNpb24gOTU0MDYpCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udENvbXBsZXhUZXh0TWFjLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTI1LDQgKzEyNSwzOCBAQCBpbnQgRm9udDo6b2Zmc2V0Rm9yUG9zaXRpb25G b3JDb21wbGV4VGV4CiAgICAgcmV0dXJuIGNvbnRyb2xsZXIub2Zmc2V0Rm9yUG9zaXRpb24oeCwg aW5jbHVkZVBhcnRpYWxHbHlwaHMpOwogfQogCitjb25zdCBTaW1wbGVGb250RGF0YSogRm9udDo6 Zm9udERhdGFGb3JDb21iaW5pbmdDaGFyYWN0ZXJTZXF1ZW5jZShjb25zdCBVQ2hhciogY2hhcmFj dGVycywgc2l6ZV90IGxlbmd0aCwgRm9udERhdGFWYXJpYW50IHZhcmlhbnQpIGNvbnN0Cit7Cisg ICAgVUNoYXIzMiBiYXNlQ2hhcmFjdGVyOworICAgIHNpemVfdCBiYXNlQ2hhcmFjdGVyTGVuZ3Ro ID0gMDsKKyAgICBVMTZfTkVYVChjaGFyYWN0ZXJzLCBiYXNlQ2hhcmFjdGVyTGVuZ3RoLCBsZW5n dGgsIGJhc2VDaGFyYWN0ZXIpOworCisgICAgR2x5cGhEYXRhIGJhc2VDaGFyYWN0ZXJHbHlwaERh dGEgPSBnbHlwaERhdGFGb3JDaGFyYWN0ZXIoYmFzZUNoYXJhY3RlciwgZmFsc2UsIHZhcmlhbnQp OworCisgICAgaWYgKGxlbmd0aCA9PSBiYXNlQ2hhcmFjdGVyTGVuZ3RoKQorICAgICAgICByZXR1 cm4gYmFzZUNoYXJhY3RlckdseXBoRGF0YS5nbHlwaCA/IGJhc2VDaGFyYWN0ZXJHbHlwaERhdGEu Zm9udERhdGEgOiAwOworCisgICAgYm9vbCB0cmllZEJhc2VDaGFyYWN0ZXJGb250RGF0YSA9IGZh bHNlOworCisgICAgdW5zaWduZWQgaSA9IDA7CisgICAgZm9yIChjb25zdCBGb250RGF0YSogZm9u dERhdGEgPSBmb250RGF0YUF0KDApOyBmb250RGF0YTsgZm9udERhdGEgPSBmb250RGF0YUF0KCsr aSkpIHsKKyAgICAgICAgY29uc3QgU2ltcGxlRm9udERhdGEqIHNpbXBsZUZvbnREYXRhID0gZm9u dERhdGEtPmZvbnREYXRhRm9yQ2hhcmFjdGVyKGJhc2VDaGFyYWN0ZXIpOworICAgICAgICBpZiAo dmFyaWFudCAhPSBOb3JtYWxWYXJpYW50KSB7CisgICAgICAgICAgICBpZiAoY29uc3QgU2ltcGxl Rm9udERhdGEqIHZhcmlhbnRGb250RGF0YSA9IHNpbXBsZUZvbnREYXRhLT52YXJpYW50Rm9udERh dGEobV9mb250RGVzY3JpcHRpb24sIHZhcmlhbnQpKQorICAgICAgICAgICAgICAgIHNpbXBsZUZv bnREYXRhID0gdmFyaWFudEZvbnREYXRhOworICAgICAgICB9CisKKyAgICAgICAgaWYgKHNpbXBs ZUZvbnREYXRhID09IGJhc2VDaGFyYWN0ZXJHbHlwaERhdGEuZm9udERhdGEpCisgICAgICAgICAg ICB0cmllZEJhc2VDaGFyYWN0ZXJGb250RGF0YSA9IHRydWU7CisKKyAgICAgICAgaWYgKHNpbXBs ZUZvbnREYXRhLT5jYW5SZW5kZXJDb21iaW5pbmdDaGFyYWN0ZXJTZXF1ZW5jZShjaGFyYWN0ZXJz LCBsZW5ndGgpKQorICAgICAgICAgICAgcmV0dXJuIHNpbXBsZUZvbnREYXRhOworICAgIH0KKwor ICAgIGlmICghdHJpZWRCYXNlQ2hhcmFjdGVyRm9udERhdGEgJiYgYmFzZUNoYXJhY3RlckdseXBo RGF0YS5mb250RGF0YSAmJiBiYXNlQ2hhcmFjdGVyR2x5cGhEYXRhLmZvbnREYXRhLT5jYW5SZW5k ZXJDb21iaW5pbmdDaGFyYWN0ZXJTZXF1ZW5jZShjaGFyYWN0ZXJzLCBsZW5ndGgpKQorICAgICAg ICByZXR1cm4gYmFzZUNoYXJhY3RlckdseXBoRGF0YS5mb250RGF0YTsKKworICAgIHJldHVybiAw OworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9tYWMvRm9udE1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udE1hYy5tbQkocmV2aXNpb24gOTU0MDYpCisrKyBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udE1hYy5tbQkod29ya2luZyBj b3B5KQpAQCAtMjQ5LDM4ICsyNDksNCBAQCB2b2lkIEZvbnQ6OmRyYXdHbHlwaHMoR3JhcGhpY3ND b250ZXh0KiBjCiAgICAgICAgIENHQ29udGV4dFNldFNob3VsZFNtb290aEZvbnRzKGNnQ29udGV4 dCwgb3JpZ2luYWxTaG91bGRVc2VGb250U21vb3RoaW5nKTsKIH0KIAotY29uc3QgU2ltcGxlRm9u dERhdGEqIEZvbnQ6OmZvbnREYXRhRm9yQ29tYmluaW5nQ2hhcmFjdGVyU2VxdWVuY2UoY29uc3Qg VUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBsZW5ndGgsIEZvbnREYXRhVmFyaWFudCB2YXJpYW50 KSBjb25zdAotewotICAgIFVDaGFyMzIgYmFzZUNoYXJhY3RlcjsKLSAgICBzaXplX3QgYmFzZUNo YXJhY3Rlckxlbmd0aCA9IDA7Ci0gICAgVTE2X05FWFQoY2hhcmFjdGVycywgYmFzZUNoYXJhY3Rl ckxlbmd0aCwgbGVuZ3RoLCBiYXNlQ2hhcmFjdGVyKTsKLQotICAgIEdseXBoRGF0YSBiYXNlQ2hh cmFjdGVyR2x5cGhEYXRhID0gZ2x5cGhEYXRhRm9yQ2hhcmFjdGVyKGJhc2VDaGFyYWN0ZXIsIGZh bHNlLCB2YXJpYW50KTsKLQotICAgIGlmIChsZW5ndGggPT0gYmFzZUNoYXJhY3Rlckxlbmd0aCkK LSAgICAgICAgcmV0dXJuIGJhc2VDaGFyYWN0ZXJHbHlwaERhdGEuZ2x5cGggPyBiYXNlQ2hhcmFj dGVyR2x5cGhEYXRhLmZvbnREYXRhIDogMDsKLQotICAgIGJvb2wgdHJpZWRCYXNlQ2hhcmFjdGVy Rm9udERhdGEgPSBmYWxzZTsKLQotICAgIHVuc2lnbmVkIGkgPSAwOwotICAgIGZvciAoY29uc3Qg Rm9udERhdGEqIGZvbnREYXRhID0gZm9udERhdGFBdCgwKTsgZm9udERhdGE7IGZvbnREYXRhID0g Zm9udERhdGFBdCgrK2kpKSB7Ci0gICAgICAgIGNvbnN0IFNpbXBsZUZvbnREYXRhKiBzaW1wbGVG b250RGF0YSA9IGZvbnREYXRhLT5mb250RGF0YUZvckNoYXJhY3RlcihiYXNlQ2hhcmFjdGVyKTsK LSAgICAgICAgaWYgKHZhcmlhbnQgIT0gTm9ybWFsVmFyaWFudCkgewotICAgICAgICAgICAgaWYg KGNvbnN0IFNpbXBsZUZvbnREYXRhKiB2YXJpYW50Rm9udERhdGEgPSBzaW1wbGVGb250RGF0YS0+ dmFyaWFudEZvbnREYXRhKG1fZm9udERlc2NyaXB0aW9uLCB2YXJpYW50KSkKLSAgICAgICAgICAg ICAgICBzaW1wbGVGb250RGF0YSA9IHZhcmlhbnRGb250RGF0YTsKLSAgICAgICAgfQotCi0gICAg ICAgIGlmIChzaW1wbGVGb250RGF0YSA9PSBiYXNlQ2hhcmFjdGVyR2x5cGhEYXRhLmZvbnREYXRh KQotICAgICAgICAgICAgdHJpZWRCYXNlQ2hhcmFjdGVyRm9udERhdGEgPSB0cnVlOwotCi0gICAg ICAgIGlmIChzaW1wbGVGb250RGF0YS0+Y2FuUmVuZGVyQ29tYmluaW5nQ2hhcmFjdGVyU2VxdWVu Y2UoY2hhcmFjdGVycywgbGVuZ3RoKSkKLSAgICAgICAgICAgIHJldHVybiBzaW1wbGVGb250RGF0 YTsKLSAgICB9Ci0KLSAgICBpZiAoIXRyaWVkQmFzZUNoYXJhY3RlckZvbnREYXRhICYmIGJhc2VD aGFyYWN0ZXJHbHlwaERhdGEuZm9udERhdGEgJiYgYmFzZUNoYXJhY3RlckdseXBoRGF0YS5mb250 RGF0YS0+Y2FuUmVuZGVyQ29tYmluaW5nQ2hhcmFjdGVyU2VxdWVuY2UoY2hhcmFjdGVycywgbGVu Z3RoKSkKLSAgICAgICAgcmV0dXJuIGJhc2VDaGFyYWN0ZXJHbHlwaERhdGEuZm9udERhdGE7Ci0K LSAgICByZXR1cm4gMDsKLX0KLQogfQo=