35581 2010-03-02 08:18:25 -0800 [OpenVG] Add support for drawing text to PainterOpenVG 2010-03-12 11:45:30 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Other All RESOLVED FIXED P2 Normal --- 33987 1 jpetsovits webkit-unassigned krit oldest_to_newest 195051 0 jpetsovits 2010-03-02 08:18:25 -0800 Make PainterOpenVG draw text, given a VGFont. This does not include any font management, as the OpenVG graphics backend has no idea where to get its VGFonts from (that's the task of the overall platform, rather than the graphics backend). Includes a bit of code that aligns the given point to device pixels, as that makes fonts look vastly better (for zooms/transformations other than the identity matrix). 195053 1 49806 jpetsovits 2010-03-02 08:20:43 -0800 Created attachment 49806 Patch 197705 2 49806 krit 2010-03-09 11:48:50 -0800 Comment on attachment 49806 Patch A simple style issue:  1034 p = FloatPoint(0, 0); Please use just FloatPoint() here. r=me with the fix above. 199154 3 jpetsovits 2010-03-12 11:45:30 -0800 Committed r55923: <http://trac.webkit.org/changeset/55923> 49806 2010-03-02 08:20:43 -0800 2010-03-09 11:48:50 -0800 Patch bug-35581-20100302112042.patch text/plain 6024 jpetsovits ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzMwMDgxYS4uNmUwMTc1ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0wMy0wMiAgSmFrb2IgUGV0c292 aXRzICA8anBldHNvdml0c0ByaW0uY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtPcGVuVkddIEFkZCBzdXBwb3J0IGZvciBkcmF3aW5nIHRleHQg dG8gUGFpbnRlck9wZW5WRworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MzU1ODEKKworICAgICAgICBEb2Vzbid0IGNvbWUgd2l0aCBhbnkgYWN0dWFsIGZv bnQgY2xhc3NlcywgYXMgT3BlblZHCisgICAgICAgIGJ5IGl0c2VsZiBkb2Vzbid0IHByb3ZpZGUg YW55IGFjY2VzcyB0byBwbGF0Zm9ybSBmb250cworICAgICAgICBidXQganVzdCB0aGUgbWVhbnMg dG8gZHJhdyBnbHlwaHMgdGhhdCBoYXZlIGJlZW4gbG9hZGVkCisgICAgICAgIG1hbnVhbGx5IGJl Zm9yZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL29wZW52Zy9QYWludGVyT3BlblZH LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtUGFpbnRlclN0YXRlOjpQbGF0Zm9ybVBh aW50ZXJTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybVBhaW50ZXJTdGF0ZTo6Y29w eVBhaW50U3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6UGFpbnRlck9wZW5WRzo6dGV4dERyYXdp bmdNb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OlBhaW50ZXJPcGVuVkc6OnNldFRleHREcmF3aW5n TW9kZSk6CisgICAgICAgIChXZWJDb3JlOjpQYWludGVyT3BlblZHOjpkcmF3VGV4dCk6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnZnL1BhaW50ZXJPcGVuVkcuaDoKKwogMjAxMC0w My0wMSAgSmFrb2IgUGV0c292aXRzICA8anBldHNvdml0c0ByaW0uY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IERpcmsgU2NodWx6ZS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3Mvb3BlbnZnL1BhaW50ZXJPcGVuVkcuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9vcGVudmcvUGFpbnRlck9wZW5WRy5jcHAKaW5kZXggZDI0M2M1Ny4uY2MyOWViMSAxMDA2NDQK LS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVudmcvUGFpbnRlck9wZW5WRy5jcHAK KysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVudmcvUGFpbnRlck9wZW5WRy5jcHAK QEAgLTExOCw2ICsxMTgsNyBAQCBzdHJ1Y3QgUGxhdGZvcm1QYWludGVyU3RhdGUgewogICAgIERh c2hBcnJheSBzdHJva2VEYXNoQXJyYXk7CiAgICAgZmxvYXQgc3Ryb2tlRGFzaE9mZnNldDsKIAor ICAgIGludCB0ZXh0RHJhd2luZ01vZGU7CiAgICAgYm9vbCBhbnRpYWxpYXNpbmdFbmFibGVkOwog CiAgICAgUGxhdGZvcm1QYWludGVyU3RhdGUoKQpAQCAtMTMxLDYgKzEzMiw3IEBAIHN0cnVjdCBQ bGF0Zm9ybVBhaW50ZXJTdGF0ZSB7CiAgICAgICAgICwgc3Ryb2tlTGluZUpvaW4oTWl0ZXJKb2lu KQogICAgICAgICAsIHN0cm9rZU1pdGVyTGltaXQoNC4wKQogICAgICAgICAsIHN0cm9rZURhc2hP ZmZzZXQoMC4wKQorICAgICAgICAsIHRleHREcmF3aW5nTW9kZShjVGV4dEZpbGwpCiAgICAgICAg ICwgYW50aWFsaWFzaW5nRW5hYmxlZCh0cnVlKQogICAgIHsKICAgICB9CkBAIC0xNTksNiArMTYx LDcgQEAgc3RydWN0IFBsYXRmb3JtUGFpbnRlclN0YXRlIHsKICAgICAgICAgc3Ryb2tlRGFzaEFy cmF5ID0gb3RoZXItPnN0cm9rZURhc2hBcnJheTsKICAgICAgICAgc3Ryb2tlRGFzaE9mZnNldCA9 IG90aGVyLT5zdHJva2VEYXNoT2Zmc2V0OwogCisgICAgICAgIHRleHREcmF3aW5nTW9kZSA9IG90 aGVyLT50ZXh0RHJhd2luZ01vZGU7CiAgICAgICAgIGFudGlhbGlhc2luZ0VuYWJsZWQgPSBvdGhl ci0+YW50aWFsaWFzaW5nRW5hYmxlZDsKICAgICB9CiAKQEAgLTU5OCw2ICs2MDEsMTggQEAgdm9p ZCBQYWludGVyT3BlblZHOjpzZXRGaWxsQ29sb3IoY29uc3QgQ29sb3ImIGNvbG9yKQogICAgIHNl dFZHU29saWRDb2xvcihWR19GSUxMX1BBVEgsIGNvbG9yKTsKIH0KIAoraW50IFBhaW50ZXJPcGVu Vkc6OnRleHREcmF3aW5nTW9kZSgpIGNvbnN0Cit7CisgICAgQVNTRVJUKG1fc3RhdGUpOworICAg IHJldHVybiBtX3N0YXRlLT50ZXh0RHJhd2luZ01vZGU7Cit9CisKK3ZvaWQgUGFpbnRlck9wZW5W Rzo6c2V0VGV4dERyYXdpbmdNb2RlKGludCBtb2RlKQoreworICAgIEFTU0VSVChtX3N0YXRlKTsK KyAgICBtX3N0YXRlLT50ZXh0RHJhd2luZ01vZGUgPSBtb2RlOworfQorCiBib29sIFBhaW50ZXJP cGVuVkc6OmFudGlhbGlhc2luZ0VuYWJsZWQoKSBjb25zdAogewogICAgIEFTU0VSVChtX3N0YXRl KTsKQEAgLTk4Miw2ICs5OTcsNTggQEAgdm9pZCBQYWludGVyT3BlblZHOjpkcmF3UG9seWdvbihz aXplX3QgbnVtUG9pbnRzLCBjb25zdCBGbG9hdFBvaW50KiBwb2ludHMsIFZHYmkKICAgICBBU1NF UlRfVkdfTk9fRVJST1IoKTsKIH0KIAorI2lmZGVmIE9QRU5WR19WRVJTSU9OXzFfMQordm9pZCBQ YWludGVyT3BlblZHOjpkcmF3VGV4dChWR0ZvbnQgdmdGb250LCBWZWN0b3I8Vkd1aW50PiYgY2hh cmFjdGVycywgVkdmbG9hdCogYWRqdXN0bWVudHNYLCBWR2Zsb2F0KiBhZGp1c3RtZW50c1ksIGNv bnN0IEZsb2F0UG9pbnQmIHBvaW50KQoreworICAgIEFTU0VSVChtX3N0YXRlKTsKKworICAgIFZH Yml0ZmllbGQgcGFpbnRNb2RlcyA9IDA7CisKKyAgICBpZiAobV9zdGF0ZS0+dGV4dERyYXdpbmdN b2RlICYgY1RleHRDbGlwKQorICAgICAgICByZXR1cm47IC8vIHVuc3VwcG9ydGVkIGZvciBldmVy eSBwb3J0IGV4Y2VwdCBDRyBhdCB0aGUgdGltZSBvZiB3cml0aW5nCisgICAgaWYgKG1fc3RhdGUt PnRleHREcmF3aW5nTW9kZSAmIGNUZXh0RmlsbCAmJiAhbV9zdGF0ZS0+ZmlsbERpc2FibGVkKCkp CisgICAgICAgIHBhaW50TW9kZXMgfD0gVkdfRklMTF9QQVRIOworICAgIGlmIChtX3N0YXRlLT50 ZXh0RHJhd2luZ01vZGUgJiBjVGV4dFN0cm9rZSAmJiAhbV9zdGF0ZS0+c3Ryb2tlRGlzYWJsZWQo KSkKKyAgICAgICAgcGFpbnRNb2RlcyB8PSBWR19TVFJPS0VfUEFUSDsKKworICAgIG1fc3VyZmFj ZS0+bWFrZUN1cnJlbnQoKTsKKworICAgIEZsb2F0UG9pbnQgZWZmZWN0aXZlUG9pbnQgPSBtX3N0 YXRlLT5zdXJmYWNlVHJhbnNmb3JtYXRpb24ubWFwUG9pbnQocG9pbnQpOworICAgIEZsb2F0UG9p bnQgcCA9IHBvaW50OworICAgIEFmZmluZVRyYW5zZm9ybSogb3JpZ2luYWxUcmFuc2Zvcm1hdGlv biA9IDA7CisKKyAgICAvLyBJbiBjYXNlIHRoZSBmb250IGlzbid0IGRyYXduIGF0IGEgcGl4ZWwt ZXhhY3QgYmFzZWxpbmUgYW5kIHdlIGNhbiBlYXNpbHkKKyAgICAvLyBmaXggdGhhdCAod2hpY2gg aXMgdGhlIGNhc2UgZm9yIG5vbi1yb3RhdGVkIGFmZmluZSB0cmFuc2Zvcm1zKSwgbGV0J3MKKyAg ICAvLyBhbGlnbiB0aGUgc3RhcnRpbmcgcG9pbnQgdG8gdGhlIHBpeGVsIGJvdW5kYXJ5IGluIG9y ZGVyIHRvIHByZXZlbnQKKyAgICAvLyBmb250IHJlbmRlcmluZyBpc3N1ZXMgc3VjaCBhcyBnbHlw aHMgdGhhdCBhcHBlYXIgb2ZmIGJ5IGEgcGl4ZWwuCisgICAgLy8gVGhpcyBjYXVzZXMgdXMgdG8g aGF2ZSBpbmNvbnNpc3RlbnQgc3BhY2luZyBiZXR3ZWVuIGJhc2VsaW5lcyBpbiBhCisgICAgLy8g bGFyZ2VyIHBhcmFncmFwaCwgYnV0IHRoYXQgc2VlbXMgdG8gYmUgdGhlIGxlYXN0IG9mIGFsbCBl dmlscy4KKyAgICBpZiAoKGZtb2QoZWZmZWN0aXZlUG9pbnQueCgpICsgMC4wMSwgMS4wKSA+IDAu MDIgfHwgZm1vZChlZmZlY3RpdmVQb2ludC55KCkgKyAwLjAxLCAxLjApID4gMC4wMikKKyAgICAg ICAgJiYgaXNOb25Sb3RhdGVkQWZmaW5lVHJhbnNmb3JtYXRpb24obV9zdGF0ZS0+c3VyZmFjZVRy YW5zZm9ybWF0aW9uKSkKKyAgICB7CisgICAgICAgIG9yaWdpbmFsVHJhbnNmb3JtYXRpb24gPSBu ZXcgQWZmaW5lVHJhbnNmb3JtKG1fc3RhdGUtPnN1cmZhY2VUcmFuc2Zvcm1hdGlvbik7CisgICAg ICAgIHNldFRyYW5zZm9ybWF0aW9uKEFmZmluZVRyYW5zZm9ybSgKKyAgICAgICAgICAgIG1fc3Rh dGUtPnN1cmZhY2VUcmFuc2Zvcm1hdGlvbi5hKCksIDAsCisgICAgICAgICAgICAwLCBtX3N0YXRl LT5zdXJmYWNlVHJhbnNmb3JtYXRpb24uZCgpLAorICAgICAgICAgICAgcm91bmRmKGVmZmVjdGl2 ZVBvaW50LngoKSksIHJvdW5kZihlZmZlY3RpdmVQb2ludC55KCkpKSk7CisgICAgICAgIHAgPSBG bG9hdFBvaW50KDAsIDApOworICAgIH0KKworICAgIGNvbnN0IFZHZmxvYXQgdmdQb2ludFsyXSA9 IHsgcC54KCksIHAueSgpIH07CisgICAgdmdTZXRmdihWR19HTFlQSF9PUklHSU4sIDIsIHZnUG9p bnQpOworICAgIEFTU0VSVF9WR19OT19FUlJPUigpOworCisgICAgdmdEcmF3R2x5cGhzKHZnRm9u dCwgY2hhcmFjdGVycy5zaXplKCksIGNoYXJhY3RlcnMuZGF0YSgpLAorICAgICAgICBhZGp1c3Rt ZW50c1gsIGFkanVzdG1lbnRzWSwgcGFpbnRNb2RlcywgVkdfVFJVRSAvKiBhbGxvdyBhdXRvaGlu dGluZyAqLyk7CisgICAgQVNTRVJUX1ZHX05PX0VSUk9SKCk7CisKKyAgICBpZiAob3JpZ2luYWxU cmFuc2Zvcm1hdGlvbikgeworICAgICAgICBzZXRUcmFuc2Zvcm1hdGlvbigqb3JpZ2luYWxUcmFu c2Zvcm1hdGlvbik7CisgICAgICAgIGRlbGV0ZSBvcmlnaW5hbFRyYW5zZm9ybWF0aW9uOworICAg IH0KK30KKyNlbmRpZgorCiB2b2lkIFBhaW50ZXJPcGVuVkc6OnNhdmUoUGFpbnRlck9wZW5WRzo6 U2F2ZU1vZGUgc2F2ZU1vZGUpCiB7CiAgICAgQVNTRVJUKG1fc3RhdGUpOwpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVudmcvUGFpbnRlck9wZW5WRy5oIGIvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVudmcvUGFpbnRlck9wZW5WRy5oCmluZGV4IDYwNzFlZTcu LjE1MmFjNzEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnZnL1Bh aW50ZXJPcGVuVkcuaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW52Zy9QYWlu dGVyT3BlblZHLmgKQEAgLTg1LDYgKzg1LDkgQEAgcHVibGljOgogICAgIENvbG9yIGZpbGxDb2xv cigpIGNvbnN0OwogICAgIHZvaWQgc2V0RmlsbENvbG9yKGNvbnN0IENvbG9yJik7CiAKKyAgICBp bnQgdGV4dERyYXdpbmdNb2RlKCkgY29uc3Q7CisgICAgdm9pZCBzZXRUZXh0RHJhd2luZ01vZGUo aW50IG1vZGUpOworCiAgICAgYm9vbCBhbnRpYWxpYXNpbmdFbmFibGVkKCkgY29uc3Q7CiAgICAg dm9pZCBzZXRBbnRpYWxpYXNpbmdFbmFibGVkKGJvb2wpOwogCkBAIC05NCw2ICs5Nyw5IEBAIHB1 YmxpYzoKICAgICB2b2lkIGRyYXdBcmMoY29uc3QgSW50UmVjdCYgZWxsaXBzZUJvdW5kcywgaW50 IHN0YXJ0QW5nbGUsIGludCBhbmdsZVNwYW4sIFZHYml0ZmllbGQgcGFpbnRNb2RlcyA9IChWR19T VFJPS0VfUEFUSCB8IFZHX0ZJTExfUEFUSCkpOwogICAgIHZvaWQgZHJhd0VsbGlwc2UoY29uc3Qg SW50UmVjdCYgYm91bmRzLCBWR2JpdGZpZWxkIHBhaW50TW9kZXMgPSAoVkdfU1RST0tFX1BBVEgg fCBWR19GSUxMX1BBVEgpKTsKICAgICB2b2lkIGRyYXdQb2x5Z29uKHNpemVfdCBudW1Qb2ludHMs IGNvbnN0IEZsb2F0UG9pbnQqIHBvaW50cywgVkdiaXRmaWVsZCBwYWludE1vZGVzID0gKFZHX1NU Uk9LRV9QQVRIIHwgVkdfRklMTF9QQVRIKSk7CisjaWZkZWYgT1BFTlZHX1ZFUlNJT05fMV8xCisg ICAgdm9pZCBkcmF3VGV4dChWR0ZvbnQsIFZlY3RvcjxWR3VpbnQ+JiBjaGFyYWN0ZXJzLCBWR2Zs b2F0KiBhZGp1c3RtZW50c1gsIFZHZmxvYXQqIGFkanVzdG1lbnRzWSwgY29uc3QgRmxvYXRQb2lu dCYpOworI2VuZGlmCiAKICAgICB2b2lkIHNjYWxlKGNvbnN0IEZsb2F0U2l6ZSYgc2NhbGVGYWN0 b3JzKTsKICAgICB2b2lkIHJvdGF0ZShmbG9hdCByYWRpYW5zKTsK