23700 2009-02-02 20:38:03 -0800 Upstream local changes to GlyphPageTreeNodeChromiumWin.cpp 2009-02-04 11:07:55 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dglazkov dglazkov jshin oldest_to_newest 108078 0 dglazkov 2009-02-02 20:38:03 -0800 The change in fillBMPGlyphs is due to unforking of SimpleFontData and the change in fillNonBMPGlyphs is to address http://code.google.com/p/chromium/issues/detail?id=6303 108080 1 27274 dglazkov 2009-02-02 20:40:35 -0800 Created attachment 27274 Upstream local changes to due to unforking, bug fixes. WebCore/ChangeLog | 11 +++++++++++ .../chromium/GlyphPageTreeNodeChromiumWin.cpp | 15 +++------------ 2 files changed, 14 insertions(+), 12 deletions(-) 108089 2 27274 eric 2009-02-02 23:35:30 -0800 Comment on attachment 27274 Upstream local changes to due to unforking, bug fixes. It would be useful to know what these changes are for? Otherwise the change looks fine... if you update the ChangeLog to point to the chromium bugs fixed (or at least the commits) that would be helpful. 108124 3 27274 darin 2009-02-03 09:28:32 -0800 Comment on attachment 27274 Upstream local changes to due to unforking, bug fixes. rs=me 108130 4 jshin 2009-02-03 11:17:01 -0800 Dimitiri, this patch overlaps with what I put up for bug 23602. setDisableFontFallback bit relies on that patch. Can you remove that part from the patch here or merge two patches (for bug 23602 and this bug)? Eric, can you review the patch for bug 23602? 108135 5 dglazkov 2009-02-03 11:38:13 -0800 Oops -- I will remove your modification, Jungshik. Didn't mean to step on your toes. 108301 6 dglazkov 2009-02-04 11:07:55 -0800 Landed as http://trac.webkit.org/changeset/40619 27274 2009-02-02 20:40:35 -0800 2009-02-03 09:28:32 -0800 Upstream local changes to due to unforking, bug fixes. Upstream-local-changes-to-due-to-unforking-bug-fixes..patch text/plain 2778 dglazkov YTIwYjQ2MTY5ZjlhNjdmZTQ4MzdkNjZhOWZhNzg4ODk2MmM1ZmY5MQpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmM2QxN2RiLi5jNjc0ZWI3 IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE0IEBACisyMDA5LTAyLTAyICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xhemtvdkBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNzAwCisgICAg ICAgIFVwc3RyZWFtIGxvY2FsIGNoYW5nZXMgdG8gZHVlIHRvIHVuZm9ya2luZywgYnVnIGZpeGVz LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR2x5cGhQYWdlVHJlZU5v ZGVDaHJvbWl1bVdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpmaWxsQk1QR2x5cGhzKToKKyAg ICAgICAgKFdlYkNvcmU6OmZpbGxOb25CTVBHbHlwaHMpOgorCiAyMDA5LTAyLTAyICBEbWl0cnkg VGl0b3YgIDxkaW1pY2hAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmlu IEFkbGVyLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9H bHlwaFBhZ2VUcmVlTm9kZUNocm9taXVtV2luLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vR2x5cGhQYWdlVHJlZU5vZGVDaHJvbWl1bVdpbi5jcHAKaW5kZXggNGM1Y2Y3 Yi4uMzFjNTI1NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9HbHlwaFBhZ2VUcmVlTm9kZUNocm9taXVtV2luLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0dseXBoUGFnZVRyZWVOb2RlQ2hyb21pdW1XaW4uY3BwCkBAIC0x NDcsMjcgKzE0NywxNyBAQCBzdGF0aWMgYm9vbCBmaWxsQk1QR2x5cGhzKHVuc2lnbmVkIG9mZnNl dCwKICAgICAgICAgLy8gV2hlbiB0aGlzIGNoYXJhY3RlciBzaG91bGQgYmUgYSBzcGFjZSwgd2Ug aWdub3JlIHdoYXRldmVyIHRoZSBmb250CiAgICAgICAgIC8vIHNheXMgYW5kIHVzZSBhIHNwYWNl LiBPdGhlcndpc2UsIGlmIGZvbnRzIGRvbid0IG1hcCBvbmUgb2YgdGhlc2UKICAgICAgICAgLy8g c3BhY2Ugb3IgemVybyB3aWR0aCBnbHlwaHMsIHdlIHdpbGwgZ2V0IGEgYm94LgotICAgICAgICBp ZiAoRm9udDo6dHJlYXRBc1NwYWNlKGMpKQorICAgICAgICBpZiAoRm9udDo6dHJlYXRBc1NwYWNl KGMpKSB7CiAgICAgICAgICAgICAvLyBIYXJkIGNvZGUgdGhlIGdseXBoIGluZGljZXMgZm9yIGNo YXJhY3RlcnMgdGhhdCBzaG91bGQgYmUKICAgICAgICAgICAgIC8vIHRyZWF0ZWQgbGlrZSBzcGFj ZXMuCiAgICAgICAgICAgICBnbHlwaCA9IGluaXRTcGFjZUdseXBoKGRjLCAmc3BhY2VHbHlwaCk7 Ci0gICAgICAgIGVsc2UgaWYgKEZvbnQ6OnRyZWF0QXNaZXJvV2lkdGhTcGFjZShjKSB8fCBjID09 IDB4MjAwQikgewotICAgICAgICAgICAgLy8gRklYTUU6IGNoYW5nZSBGb250Ojp0cmVhdEFzWmVy b1dpZHRoU3BhY2UgdG8gdXNlCi0gICAgICAgICAgICAvLyB1X2hhc0JpbmFyeVByb3BlcnR5LCBw ZXIganVuZ3NoaWsncyBjb21tZW50IGhlcmU6Ci0gICAgICAgICAgICAvLyBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAyMzcjYzYuCi0gICAgICAgICAgICAvLyBUaGVu IHRoZSBhZGRpdGlvbmFsIE9SIGFib3ZlIHdvbid0IGJlIG5lY2Vzc2FyeS4KLSAgICAgICAgICAg IGdseXBoID0gaW5pdFNwYWNlR2x5cGgoZGMsICZzcGFjZUdseXBoKTsKLSAgICAgICAgICAgIGds eXBoRm9udERhdGEgPSBmb250RGF0YS0+emVyb1dpZHRoRm9udERhdGEoKTsKICAgICAgICAgfSBl bHNlIGlmIChnbHlwaCA9PSBpbnZhbGlkR2x5cGgpIHsKICAgICAgICAgICAgIC8vIFdlYktpdCBl eHBlY3RzIGJvdGggdGhlIGdseXBoIGluZGV4IGFuZCBGb250RGF0YQogICAgICAgICAgICAgLy8g cG9pbnRlciB0byBiZSAwIGlmIHRoZSBnbHlwaCBpcyBub3QgcHJlc2VudAogICAgICAgICAgICAg Z2x5cGggPSAwOwogICAgICAgICAgICAgZ2x5cGhGb250RGF0YSA9IDA7Ci0gICAgICAgIH0gZWxz ZSB7Ci0gICAgICAgICAgICBpZiAoU2ltcGxlRm9udERhdGE6OmlzQ0pLQ29kZVBvaW50KGMpKQot ICAgICAgICAgICAgICAgIGdseXBoRm9udERhdGEgPSBmb250RGF0YS0+Y2prV2lkdGhGb250RGF0 YSgpOworICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIGhhdmVHbHlwaHMgPSB0cnVlOwotICAg ICAgICB9CiAgICAgICAgIHBhZ2UtPnNldEdseXBoRGF0YUZvckNoYXJhY3RlcihvZmZzZXQgKyBp LCBnbHlwaCwgZ2x5cGhGb250RGF0YSk7CiAgICAgfQogCkBAIC0yMDUsNiArMTk1LDcgQEAgc3Rh dGljIGJvb2wgZmlsbE5vbkJNUEdseXBocyh1bnNpZ25lZCBvZmZzZXQsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBmb250RGF0YS0+bV9mb250LnNjcmlwdENhY2hlKCksCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmb250RGF0YS0+bV9mb250LnNjcmlwdEZvbnRQ cm9wZXJ0aWVzKCkpOwogICAgIHN0YXRlLnNldEluaGliaXRMaWdhdGUodHJ1ZSk7CisgICAgc3Rh dGUuc2V0RGlzYWJsZUZvbnRGYWxsYmFjayh0cnVlKTsKICAgICBzdGF0ZS5pbml0KCk7CiAKICAg ICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbGVuZ3RoOyBpKyspIHsK