63272 2011-06-23 12:26:09 -0700 [Qt] Unbreak simple font fast-path after QRawFont API changes. 2011-06-23 13:04:38 -0700 1 1 1 Unclassified WebKit Text 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 kling kling webkit.review.bot oldest_to_newest 426356 0 kling 2011-06-23 12:26:09 -0700 The APIs in Qt 4.8 have changed a little bit, we need to update WebKit. 426358 1 98380 kling 2011-06-23 12:27:50 -0700 Created attachment 98380 Proposed patch 426387 2 98380 webkit.review.bot 2011-06-23 13:04:34 -0700 Comment on attachment 98380 Proposed patch Clearing flags on attachment: 98380 Committed r89606: <http://trac.webkit.org/changeset/89606> 426388 3 webkit.review.bot 2011-06-23 13:04:38 -0700 All reviewed patches have been landed. Closing bug. 98380 2011-06-23 12:27:50 -0700 2011-06-23 13:04:34 -0700 Proposed patch bug-63272.diff text/plain 3544 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmNzhhMDE3Li42ZmJjOWU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTEtMDYtMjMgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gVW5icmVhayBz aW1wbGUgZm9udCBmYXN0LXBhdGggYWZ0ZXIgUVJhd0ZvbnQgQVBJIGNoYW5nZXMuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzI3MgorCisgICAgICAg IEluIHRoZSBRdCA0LjggYnJhbmNoLCB0aGUgUUdseXBocyBjbGFzcyBoYXMgYmVlbiByZW5hbWVk IHRvCisgICAgICAgIFFHbHlwaFJ1biwgYW5kIHNvbWUgb3RoZXIgc21hbGwgdGhpbmdzIGhhdmUg YmVlbiB0d2Vha2VkLgorCisgICAgICAgICogV2ViQ29yZS5wcm86CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvcXQvRm9udENhY2hlUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cmF3Rm9u dEZvckNoYXJhY3RlcnMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L0ZvbnRRdC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpGb250OjpkcmF3R2x5cGhzKToKKwogMjAxMS0wNi0yMyAg VG9tbXkgV2lkZW5mbHljaHQgIDx0b21teXdAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBUb255IEdlbnRpbGNvcmUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9xdC9Gb250Q2FjaGVRdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9xdC9Gb250Q2FjaGVRdC5jcHAKaW5kZXggMjdkNjI5MC4uNzFjZjNlYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udENhY2hlUXQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ZvbnRDYWNoZVF0LmNw cApAQCAtNTgsMTcgKzU4LDE3IEBAIHN0YXRpYyBRUmF3Rm9udCByYXdGb250Rm9yQ2hhcmFjdGVy cyhjb25zdCBRU3RyaW5nJiBzdHJpbmcsIGNvbnN0IFFGb250JiByZXF1ZXN0CiAgICAgbGF5b3V0 LmNyZWF0ZUxpbmUoKTsKICAgICBsYXlvdXQuZW5kTGF5b3V0KCk7CiAKLSAgICBRTGlzdDxRR2x5 cGhzPiBnbHlwaExpc3QgPSBsYXlvdXQuZ2x5cGhzKCk7CisgICAgUUxpc3Q8UUdseXBoUnVuPiBn bHlwaExpc3QgPSBsYXlvdXQuZ2x5cGhSdW5zKCk7CiAKICAgICBBU1NFUlQoZ2x5cGhMaXN0LnNp emUoKSA9PSAxKTsKIAotICAgIGNvbnN0IFFHbHlwaHMmIGdseXBocyhnbHlwaExpc3QuYXQoMCkp OworICAgIGNvbnN0IFFHbHlwaFJ1biYgZ2x5cGhzKGdseXBoTGlzdC5hdCgwKSk7CiAgICAgUVZl Y3RvcjxxdWludDMyPiBnbHlwaEluZGV4ZXMgPSBnbHlwaHMuZ2x5cGhJbmRleGVzKCk7CiAKICAg ICBpZiAoZ2x5cGhJbmRleGVzLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIFFSYXdGb250KCk7 CiAKLSAgICByZXR1cm4gZ2x5cGhzLmZvbnQoKTsKKyAgICByZXR1cm4gZ2x5cGhzLnJhd0ZvbnQo KTsKIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9xdC9Gb250UXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQv Rm9udFF0LmNwcAppbmRleCBhMWE1MzlkLi5hNWExNmUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250UXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ZvbnRRdC5jcHAKQEAgLTM1MywxMCArMzUzLDEwIEBAIHZv aWQgRm9udDo6ZHJhd0dseXBocyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IFNpbXBs ZUZvbnREYXRhKiBmb250RGF0YSwKIAogICAgIFFSYXdGb250IHJhd0ZvbnQoZm9udERhdGEtPnBs YXRmb3JtRGF0YSgpLnJhd0ZvbnQoKSk7CiAKLSAgICBRR2x5cGhzIHF0R2x5cGhzOworICAgIFFH bHlwaFJ1biBxdEdseXBoczsKICAgICBxdEdseXBocy5zZXRHbHlwaEluZGV4ZXMoZ2x5cGhJbmRl eGVzKTsKICAgICBxdEdseXBocy5zZXRQb3NpdGlvbnMocG9zaXRpb25zKTsKLSAgICBxdEdseXBo cy5zZXRGb250KHJhd0ZvbnQpOworICAgIHF0R2x5cGhzLnNldFJhd0ZvbnQocmF3Rm9udCk7CiAK ICAgICBRUGFpbnRlciogcGFpbnRlciA9IGNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpOwogCkBA IC0zNjYsNyArMzY2LDcgQEAgdm9pZCBGb250OjpkcmF3R2x5cGhzKEdyYXBoaWNzQ29udGV4dCog Y29udGV4dCwgY29uc3QgU2ltcGxlRm9udERhdGEqIGZvbnREYXRhLAogICAgICAgICBRUGVuIHBy ZXZpb3VzUGVuID0gcGFpbnRlci0+cGVuKCk7CiAgICAgICAgIHBhaW50ZXItPnNldFBlbihzaGFk b3ctPm1fY29sb3IpOwogICAgICAgICBwYWludGVyLT50cmFuc2xhdGUoc2hhZG93LT5vZmZzZXQo KSk7Ci0gICAgICAgIHBhaW50ZXItPmRyYXdHbHlwaHMocG9pbnQsIHF0R2x5cGhzKTsKKyAgICAg ICAgcGFpbnRlci0+ZHJhd0dseXBoUnVuKHBvaW50LCBxdEdseXBocyk7CiAgICAgICAgIHBhaW50 ZXItPnRyYW5zbGF0ZSgtc2hhZG93LT5vZmZzZXQoKSk7CiAgICAgICAgIHBhaW50ZXItPnNldFBl bihwcmV2aW91c1Blbik7CiAgICAgICAgIGJyZWFrOwpAQCAtMzc3LDcgKzM3Nyw3IEBAIHZvaWQg Rm9udDo6ZHJhd0dseXBocyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IFNpbXBsZUZv bnREYXRhKiBmb250RGF0YSwKICAgICAgICAgUVBhaW50ZXIqIHNoYWRvd1BhaW50ZXIgPSBzaGFk b3ctPmJlZ2luU2hhZG93TGF5ZXIoY29udGV4dCwgYm91bmRpbmdSZWN0KTsKICAgICAgICAgaWYg KHNoYWRvd1BhaW50ZXIpIHsKICAgICAgICAgICAgIHNoYWRvd1BhaW50ZXItPnNldFBlbihzaGFk b3ctPm1fY29sb3IpOwotICAgICAgICAgICAgc2hhZG93UGFpbnRlci0+ZHJhd0dseXBocyhwb2lu dCwgcXRHbHlwaHMpOworICAgICAgICAgICAgc2hhZG93UGFpbnRlci0+ZHJhd0dseXBoUnVuKHBv aW50LCBxdEdseXBocyk7CiAgICAgICAgICAgICBzaGFkb3ctPmVuZFNoYWRvd0xheWVyKGNvbnRl eHQpOwogICAgICAgICB9CiAgICAgICAgIGJyZWFrOwpAQCAtMzkxLDcgKzM5MSw3IEBAIHZvaWQg Rm9udDo6ZHJhd0dseXBocyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IFNpbXBsZUZv bnREYXRhKiBmb250RGF0YSwKIAogICAgIFFQZW4gcHJldmlvdXNQZW4gPSBwYWludGVyLT5wZW4o KTsKICAgICBwYWludGVyLT5zZXRQZW4oZmlsbFBlbkZvckNvbnRleHQoY29udGV4dCkpOwotICAg IHBhaW50ZXItPmRyYXdHbHlwaHMocG9pbnQsIHF0R2x5cGhzKTsKKyAgICBwYWludGVyLT5kcmF3 R2x5cGhSdW4ocG9pbnQsIHF0R2x5cGhzKTsKICAgICBwYWludGVyLT5zZXRQZW4ocHJldmlvdXNQ ZW4pOwogfQogCg==