23354 2009-01-15 13:14:36 -0800 Fix up graphics/chromium files to account for Uniscribe scrubbing 2009-01-28 11:44:05 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Minor --- 1 dglazkov webkit-unassigned oldest_to_newest 105953 0 dglazkov 2009-01-15 13:14:36 -0800 I accidentally omitted two files from http://trac.webkit.org/changeset/39941. These files were changed as a result of scrubbing Uniscribe files. 105958 1 26770 dglazkov 2009-01-15 13:18:40 -0800 Created attachment 26770 patch v1 WebCore/ChangeLog | 16 +++++++++++++++ .../platform/graphics/chromium/FontChromiumWin.cpp | 21 +++++++++---------- .../chromium/GlyphPageTreeNodeChromiumWin.cpp | 4 +- 3 files changed, 28 insertions(+), 13 deletions(-) 105959 2 26770 darin 2009-01-15 13:25:52 -0800 Comment on attachment 26770 patch v1 r=me 105963 3 dglazkov 2009-01-15 13:33:32 -0800 Committed in http://trac.webkit.org/changeset/39944. 26770 2009-01-15 13:18:40 -0800 2009-01-15 13:25:52 -0800 patch v1 patch-v1.patch text/plain 5074 dglazkov N2FjYWRkYWZmZWFiMWNiYzBmZDFiODM0OGQ0MmRhNWM4MmE2YTk3MgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxYmE4NDZjLi4zMTVlYWFh IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSw1ICsxLDIxIEBACiAyMDA5LTAxLTE1ICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xhemtvdkBj aHJvbWl1bS5vcmc+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzU0CisgICAg ICAgIEZpeCB1cCBncmFwaGljcy9jaHJvbWl1bSBmaWxlcyB0byBhY2NvdW50IGZvciBVbmlzY3Jp YmUgc3R5bGUgc2NydWJiaW5nLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vRm9udENocm9taXVtV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OndpbmRvd3NDYW5IYW5k bGVUZXh0RHJhd2luZyk6CisgICAgICAgIChXZWJDb3JlOjpGb250OjpzZWxlY3Rpb25SZWN0Rm9y Q29tcGxleFRleHQpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udDo6ZHJhd0NvbXBsZXhUZXh0KToK KyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OmZsb2F0V2lkdGhGb3JDb21wbGV4VGV4dCk6CisgICAg ICAgIChXZWJDb3JlOjpGb250OjpvZmZzZXRGb3JQb3NpdGlvbkZvckNvbXBsZXhUZXh0KToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HbHlwaFBhZ2VUcmVlTm9kZUNocm9t aXVtV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmZpbGxOb25CTVBHbHlwaHMpOgorCisyMDA5 LTAxLTE1ICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xhemtvdkBjaHJvbWl1bS5vcmc+CisKICAgICAg ICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzQwCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDaHJvbWl1bVdpbi5jcHAgYi9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDaHJvbWl1bVdpbi5jcHAKaW5kZXggMWNiZTY1NS4uM2Nm MThhNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250 Q2hyb21pdW1XaW4uY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Rm9udENocm9taXVtV2luLmNwcApAQCAtNTcsOCArNTcsNyBAQCBzdGF0aWMgYm9vbCB3aW5kb3dz Q2FuSGFuZGxlVGV4dERyYXdpbmcoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0KQogICAgIC8vIHdo aWNoIGxvb2sgd2VpcmQuIEFsbCBlbHNlIGJlaW5nIGVxdWFsLCBpdCdzIGJldHRlciB0byB1c2Ug V2luZG93cycgdGV4dAogICAgIC8vIGRyYXdpbmcsIHNvIHdlIGRvbid0IGNoZWNrIGZvciB6b29t cy4KICAgICBjb25zdCBUcmFuc2Zvcm1hdGlvbk1hdHJpeCYgbWF0cml4ID0gY29udGV4dC0+Z2V0 Q1RNKCk7Ci0gICAgaWYgKG1hdHJpeC5iKCkgIT0gMCB8fCAgLy8gWSBza2V3Ci0gICAgICAgIG1h dHJpeC5jKCkgIT0gMCkgICAgLy8gWCBza2V3CisgICAgaWYgKG1hdHJpeC5iKCkgIT0gMCB8fCBt YXRyaXguYygpICE9IDApICAvLyBDaGVjayBmb3Igc2tldy4KICAgICAgICAgcmV0dXJuIGZhbHNl OwogCiAgICAgLy8gQ2hlY2sgZm9yIHN0cm9rZSBlZmZlY3RzLgpAQCAtMjYzLDEyICsyNjIsMTIg QEAgRmxvYXRSZWN0IEZvbnQ6OnNlbGVjdGlvblJlY3RGb3JDb21wbGV4VGV4dChjb25zdCBUZXh0 UnVuJiBydW4sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlu dCB0bykgY29uc3QKIHsKICAgICBVbmlzY3JpYmVIZWxwZXJUZXh0UnVuIHN0YXRlKHJ1biwgKnRo aXMpOwotICAgIGZsb2F0IGxlZnQgPSBzdGF0aWNfY2FzdDxmbG9hdD4ocG9pbnQueCgpICsgc3Rh dGUuQ2hhcmFjdGVyVG9YKGZyb20pKTsKLSAgICBmbG9hdCByaWdodCA9IHN0YXRpY19jYXN0PGZs b2F0Pihwb2ludC54KCkgKyBzdGF0ZS5DaGFyYWN0ZXJUb1godG8pKTsKKyAgICBmbG9hdCBsZWZ0 ID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KHBvaW50LngoKSArIHN0YXRlLmNoYXJhY3RlclRvWChmcm9t KSk7CisgICAgZmxvYXQgcmlnaHQgPSBzdGF0aWNfY2FzdDxmbG9hdD4ocG9pbnQueCgpICsgc3Rh dGUuY2hhcmFjdGVyVG9YKHRvKSk7CiAKICAgICAvLyBJZiB0aGUgdGV4dCBpcyBSVEwsIGxlZnQg d2lsbCBhY3R1YWxseSBiZSBhZnRlciByaWdodC4KICAgICBpZiAobGVmdCA8IHJpZ2h0KQotICAg ICAgcmV0dXJuIEZsb2F0UmVjdChsZWZ0LCBzdGF0aWNfY2FzdDxmbG9hdD4ocG9pbnQueSgpKSwK KyAgICAgICAgcmV0dXJuIEZsb2F0UmVjdChsZWZ0LCBzdGF0aWNfY2FzdDxmbG9hdD4ocG9pbnQu eSgpKSwKICAgICAgICAgICAgICAgICAgICAgICAgcmlnaHQgLSBsZWZ0LCBzdGF0aWNfY2FzdDxm bG9hdD4oaCkpOwogCiAgICAgcmV0dXJuIEZsb2F0UmVjdChyaWdodCwgc3RhdGljX2Nhc3Q8Zmxv YXQ+KHBvaW50LnkoKSksCkBAIC0zMDAsMTQgKzI5OSwxNCBAQCB2b2lkIEZvbnQ6OmRyYXdDb21w bGV4VGV4dChHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNzQ29udGV4dCwKIAogICAgIC8vIFVuaXNj cmliZSBjb3VudHMgdGhlIGNvb3JkaW5hdGVzIGZyb20gdGhlIHVwcGVyIGxlZnQsIHdoaWxlIFdl YktpdCB1c2VzCiAgICAgLy8gdGhlIGJhc2VsaW5lLCBzbyB3ZSBoYXZlIHRvIHN1YnRyYWN0IG9m ZiB0aGUgYXNjZW50LgotICAgIHN0YXRlLkRyYXcoaGRjLCBzdGF0aWNfY2FzdDxpbnQ+KHBvaW50 LngoKSksIHN0YXRpY19jYXN0PGludD4ocG9pbnQueSgpIC0gYXNjZW50KCkpLCBmcm9tLCB0byk7 CisgICAgc3RhdGUuZHJhdyhoZGMsIHN0YXRpY19jYXN0PGludD4ocG9pbnQueCgpKSwgc3RhdGlj X2Nhc3Q8aW50Pihwb2ludC55KCkgLSBhc2NlbnQoKSksIGZyb20sIHRvKTsKICAgICBjb250ZXh0 LT5jYW52YXMoKS0+ZW5kUGxhdGZvcm1QYWludCgpOwogfQogCiBmbG9hdCBGb250OjpmbG9hdFdp ZHRoRm9yQ29tcGxleFRleHQoY29uc3QgVGV4dFJ1biYgcnVuKSBjb25zdAogewogICAgIFVuaXNj cmliZUhlbHBlclRleHRSdW4gc3RhdGUocnVuLCAqdGhpcyk7Ci0gICAgcmV0dXJuIHN0YXRpY19j YXN0PGZsb2F0PihzdGF0ZS5XaWR0aCgpKTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8ZmxvYXQ+ KHN0YXRlLndpZHRoKCkpOwogfQogCiBpbnQgRm9udDo6b2Zmc2V0Rm9yUG9zaXRpb25Gb3JDb21w bGV4VGV4dChjb25zdCBUZXh0UnVuJiBydW4sIGludCB4LApAQCAtMzE2LDEzICszMTUsMTMgQEAg aW50IEZvbnQ6Om9mZnNldEZvclBvc2l0aW9uRm9yQ29tcGxleFRleHQoY29uc3QgVGV4dFJ1biYg cnVuLCBpbnQgeCwKICAgICAvLyBNYWMgY29kZSBpZ25vcmVzIGluY2x1ZGVQYXJ0aWFsR2x5cGhz LCBhbmQgdGhleSBkb24ndCBrbm93IHdoYXQgaXQncwogICAgIC8vIHN1cHBvc2VkIHRvIGRvLCBz byB3ZSBqdXN0IGlnbm9yZSBpdCBhcyB3ZWxsLgogICAgIFVuaXNjcmliZUhlbHBlclRleHRSdW4g c3RhdGUocnVuLCAqdGhpcyk7Ci0gICAgaW50IGNoYXJfaW5kZXggPSBzdGF0ZS5YVG9DaGFyYWN0 ZXIoeCk7CisgICAgaW50IGNoYXJJbmRleCA9IHN0YXRlLnhUb0NoYXJhY3Rlcih4KTsKIAogICAg IC8vIFhUb0NoYXJhY3RlciB3aWxsIHJldHVybiAtMSBpZiB0aGUgcG9zaXRpb24gaXMgYmVmb3Jl IHRoZSBmaXJzdAogICAgIC8vIGNoYXJhY3RlciAod2UgZ2V0IGNhbGxlZCBsaWtlIHRoaXMgc29t ZXRpbWVzKS4KLSAgICBpZiAoY2hhcl9pbmRleCA8IDApCi0gICAgICBjaGFyX2luZGV4ID0gMDsK LSAgICByZXR1cm4gY2hhcl9pbmRleDsKKyAgICBpZiAoY2hhckluZGV4IDwgMCkKKyAgICAgICAg Y2hhckluZGV4ID0gMDsKKyAgICByZXR1cm4gY2hhckluZGV4OwogfQogCiB9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0dseXBoUGFnZVRyZWVOb2RlQ2hyb21pdW1XaW4uY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9HbHlwaFBhZ2VUcmVlTm9kZUNocm9taXVtV2luLmNwcAppbmRleCAxMjNi MWM1Li40YzVjZjdiIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0dseXBoUGFnZVRyZWVOb2RlQ2hyb21pdW1XaW4uY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vR2x5cGhQYWdlVHJlZU5vZGVDaHJvbWl1bVdpbi5jcHAKQEAg LTIwNSwxMyArMjA1LDEzIEBAIHN0YXRpYyBib29sIGZpbGxOb25CTVBHbHlwaHModW5zaWduZWQg b2Zmc2V0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZm9udERhdGEtPm1fZm9u dC5zY3JpcHRDYWNoZSgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZm9udERh dGEtPm1fZm9udC5zY3JpcHRGb250UHJvcGVydGllcygpKTsKICAgICBzdGF0ZS5zZXRJbmhpYml0 TGlnYXRlKHRydWUpOwotICAgIHN0YXRlLkluaXQoKTsKKyAgICBzdGF0ZS5pbml0KCk7CiAKICAg ICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbGVuZ3RoOyBpKyspIHsKICAgICAgICAgLy8gRWFj aCBjaGFyYWN0ZXIgaW4gdGhpcyBpbnB1dCBidWZmZXIgaXMgYSBzdXJyb2dhdGUgcGFpciwgd2hp Y2gKICAgICAgICAgLy8gY29uc2lzdHMgb2YgdHdvIFVDaGFycy4gU28sIHRoZSBvZmZzZXQgZm9y IGl0cyBpLXRoIGNoYXJhY3RlciBpcwogICAgICAgICAvLyAoaSAqIDIpLgotICAgICAgICBXT1JE IGdseXBoID0gc3RhdGUuRmlyc3RHbHlwaEZvckNoYXJhY3RlcihpICogMik7CisgICAgICAgIFdP UkQgZ2x5cGggPSBzdGF0ZS5maXJzdEdseXBoRm9yQ2hhcmFjdGVyKGkgKiAyKTsKICAgICAgICAg aWYgKGdseXBoKSB7CiAgICAgICAgICAgICBoYXZlR2x5cGhzID0gdHJ1ZTsKICAgICAgICAgICAg IHBhZ2UtPnNldEdseXBoRGF0YUZvckluZGV4KG9mZnNldCArIGksIGdseXBoLCBmb250RGF0YSk7 Cg==