23855 2009-02-09 14:39:09 -0800 Fix TransformationMatrixSkia.cpp and GraphicsContextSkia.cpp bustage 2009-02-10 00:13:18 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fishd fishd brettw oldest_to_newest 109034 0 fishd 2009-02-09 14:39:09 -0800 Fix TransformationMatrixSkia.cpp and GraphicsContextSkia.cpp bustage Resulting from: http://trac.webkit.org/changeset/40761 109037 1 27495 fishd 2009-02-09 15:06:11 -0800 Created attachment 27495 v1 patch Brett reviewed this upstream: http://codereview.chromium.org/21184 109042 2 27495 eric 2009-02-09 15:17:40 -0800 Comment on attachment 27495 v1 patch Looks fine. 109092 3 fishd 2009-02-10 00:13:18 -0800 http://trac.webkit.org/changeset/40809 27495 2009-02-09 15:06:11 -0800 2009-02-09 15:17:40 -0800 v1 patch xf_1.txt text/plain 7212 fishd SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDQwNzk3 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDIt MDkgIERhcmluIEZpc2hlciAgPGRhcmluQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjM4NTUKKyAgICAgICAgRml4IFRyYW5zZm9ybWF0aW9uTWF0cml4U2tp YS5jcHAgYW5kIEdyYXBoaWNzQ29udGV4dFNraWEuY3BwIGJ1c3RhZ2UKKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmdldENUTSk6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3Mvc2tpYS9UcmFuc2Zvcm1hdGlvbk1hdHJpeFNraWEuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6VHJhbnNmb3JtYXRpb25NYXRyaXg6Om9wZXJhdG9yIFNrTWF0cml4KToKKwogMjAwOS0wMi0w NiAgRGFyaW4gRmlzaGVyICA8ZGFyaW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEVyaWMgU2VpZGVsLgpJbmRleDogcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGljc0Nv bnRleHRTa2lhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBo aWNzQ29udGV4dFNraWEuY3BwCShyZXZpc2lvbiA0MDc5NykKKysrIHBsYXRmb3JtL2dyYXBoaWNz L3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc5MSw3ICs3 OTEsMTMgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmZpbGxSb3VuZGVkUmVjdChjbwogCiBUcmFu c2Zvcm1hdGlvbk1hdHJpeCBHcmFwaGljc0NvbnRleHQ6OmdldENUTSgpIGNvbnN0CiB7Ci0gICAg cmV0dXJuIHBsYXRmb3JtQ29udGV4dCgpLT5jYW52YXMoKS0+Z2V0VG90YWxNYXRyaXgoKTsKKyAg ICBjb25zdCBTa01hdHJpeCYgbSA9IHBsYXRmb3JtQ29udGV4dCgpLT5jYW52YXMoKS0+Z2V0VG90 YWxNYXRyaXgoKTsKKyAgICByZXR1cm4gVHJhbnNmb3JtYXRpb25NYXRyaXgoU2tTY2FsYXJUb0Rv dWJsZShtLmdldFNjYWxlWCgpKSwgICAgICAvLyBhCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFNrU2NhbGFyVG9Eb3VibGUobS5nZXRTa2V3WSgpKSwgICAgICAgLy8gYgorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBTa1NjYWxhclRvRG91YmxlKG0uZ2V0U2tld1goKSks ICAgICAgIC8vIGMKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgU2tTY2FsYXJUb0Rv dWJsZShtLmdldFNjYWxlWSgpKSwgICAgICAvLyBkCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFNrU2NhbGFyVG9Eb3VibGUobS5nZXRUcmFuc2xhdGVYKCkpLCAgLy8gZQorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBTa1NjYWxhclRvRG91YmxlKG0uZ2V0VHJhbnNsYXRl WSgpKSk7IC8vIGYKIH0KIAogRmxvYXRSZWN0IEdyYXBoaWNzQ29udGV4dDo6cm91bmRUb0Rldmlj ZVBpeGVscyhjb25zdCBGbG9hdFJlY3QmIHJlY3QpCkluZGV4OiBwbGF0Zm9ybS9ncmFwaGljcy9z a2lhL1RyYW5zZm9ybWF0aW9uTWF0cml4U2tpYS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcGxhdGZvcm0v Z3JhcGhpY3Mvc2tpYS9UcmFuc2Zvcm1hdGlvbk1hdHJpeFNraWEuY3BwCShyZXZpc2lvbiA0MDc5 NykKKysrIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvVHJhbnNmb3JtYXRpb25NYXRyaXhTa2lhLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMzAsMTkzICszMCwyNiBAQAogI2luY2x1ZGUgImNvbmZpZy5o IgogI2luY2x1ZGUgIlRyYW5zZm9ybWF0aW9uTWF0cml4LmgiCiAKLSNpbmNsdWRlICJGbG9hdFJl Y3QuaCIKLSNpbmNsdWRlICJJbnRSZWN0LmgiCi0KICNpbmNsdWRlICJTa2lhVXRpbHMuaCIKIAog bmFtZXNwYWNlIFdlYkNvcmUgewogCi1UcmFuc2Zvcm1hdGlvbk1hdHJpeDo6VHJhbnNmb3JtYXRp b25NYXRyaXgoKQotewotICAgIG1fdHJhbnNmb3JtLnJlc2V0KCk7Ci19Ci0KLVRyYW5zZm9ybWF0 aW9uTWF0cml4OjpUcmFuc2Zvcm1hdGlvbk1hdHJpeChkb3VibGUgYSwgZG91YmxlIGIsIGRvdWJs ZSBjLCBkb3VibGUgZCwgZG91YmxlIGUsIGRvdWJsZSBmKQotewotICAgIHNldE1hdHJpeChhLCBi LCBjLCBkLCBlLCBmKTsKLX0KLQotVHJhbnNmb3JtYXRpb25NYXRyaXg6OlRyYW5zZm9ybWF0aW9u TWF0cml4KGNvbnN0IFNrTWF0cml4JiBtYXRyaXgpCi0gICAgOiBtX3RyYW5zZm9ybShtYXRyaXgp Ci17Ci19Ci0KLXZvaWQgVHJhbnNmb3JtYXRpb25NYXRyaXg6OnNldE1hdHJpeChkb3VibGUgYSwg ZG91YmxlIGIsIGRvdWJsZSBjLCBkb3VibGUgZCwgZG91YmxlIGUsIGRvdWJsZSBmKQotewotICAg IG1fdHJhbnNmb3JtLnJlc2V0KCk7Ci0KLSAgICBtX3RyYW5zZm9ybS5zZXRTY2FsZVgoV2ViQ29y ZURvdWJsZVRvU2tTY2FsYXIoYSkpOwotICAgIG1fdHJhbnNmb3JtLnNldFNrZXdYKFdlYkNvcmVE b3VibGVUb1NrU2NhbGFyKGMpKTsKLSAgICBtX3RyYW5zZm9ybS5zZXRUcmFuc2xhdGVYKFdlYkNv cmVEb3VibGVUb1NrU2NhbGFyKGUpKTsKLQotICAgIG1fdHJhbnNmb3JtLnNldFNjYWxlWShXZWJD b3JlRG91YmxlVG9Ta1NjYWxhcihkKSk7Ci0gICAgbV90cmFuc2Zvcm0uc2V0U2tld1koV2ViQ29y ZURvdWJsZVRvU2tTY2FsYXIoYikpOwotICAgIG1fdHJhbnNmb3JtLnNldFRyYW5zbGF0ZVkoV2Vi Q29yZURvdWJsZVRvU2tTY2FsYXIoZikpOwotfQotCi12b2lkIFRyYW5zZm9ybWF0aW9uTWF0cml4 OjptYXAoZG91YmxlIHgsIGRvdWJsZSB5LCBkb3VibGUqIHgyLCBkb3VibGUqIHkyKSBjb25zdAot ewotICAgIFNrUG9pbnQgc3JjLCBkc3Q7Ci0gICAgc3JjLnNldChXZWJDb3JlRG91YmxlVG9Ta1Nj YWxhcih4KSwgV2ViQ29yZURvdWJsZVRvU2tTY2FsYXIoeSkpOwotICAgIG1fdHJhbnNmb3JtLm1h cFBvaW50cygmZHN0LCAmc3JjLCAxKTsKLQotICAgICp4MiA9IFNrU2NhbGFyVG9Eb3VibGUoZHN0 LmZYKTsKLSAgICAqeTIgPSBTa1NjYWxhclRvRG91YmxlKGRzdC5mWSk7Ci19Ci0KLUludFJlY3Qg VHJhbnNmb3JtYXRpb25NYXRyaXg6Om1hcFJlY3QoY29uc3QgSW50UmVjdCYgc3JjKSBjb25zdAot ewotICAgIFNrUmVjdCBkc3Q7Ci0gICAgbV90cmFuc2Zvcm0ubWFwUmVjdCgmZHN0LCBzcmMpOwot ICAgIHJldHVybiBlbmNsb3NpbmdJbnRSZWN0KGRzdCk7Ci19Ci0KLUZsb2F0UmVjdCBUcmFuc2Zv cm1hdGlvbk1hdHJpeDo6bWFwUmVjdChjb25zdCBGbG9hdFJlY3QmIHNyYykgY29uc3QKLXsKLSAg ICBTa1JlY3QgZHN0OwotICAgIG1fdHJhbnNmb3JtLm1hcFJlY3QoJmRzdCwgc3JjKTsKLSAgICBy ZXR1cm4gZHN0OwotfQotCi1ib29sIFRyYW5zZm9ybWF0aW9uTWF0cml4Ojppc0lkZW50aXR5KCkg Y29uc3QKLXsKLSAgICByZXR1cm4gbV90cmFuc2Zvcm0uaXNJZGVudGl0eSgpOwotfQotCi12b2lk IFRyYW5zZm9ybWF0aW9uTWF0cml4OjpyZXNldCgpCi17Ci0gICAgbV90cmFuc2Zvcm0ucmVzZXQo KTsKLX0KLQotVHJhbnNmb3JtYXRpb25NYXRyaXggJlRyYW5zZm9ybWF0aW9uTWF0cml4OjpzY2Fs ZShkb3VibGUgc3gsIGRvdWJsZSBzeSkKLXsKLSAgICBtX3RyYW5zZm9ybS5wcmVTY2FsZShXZWJD b3JlRG91YmxlVG9Ta1NjYWxhcihzeCksIFdlYkNvcmVEb3VibGVUb1NrU2NhbGFyKHN5KSwgMCwg MCk7Ci0gICAgcmV0dXJuICp0aGlzOwotfQotCi1UcmFuc2Zvcm1hdGlvbk1hdHJpeCAmVHJhbnNm b3JtYXRpb25NYXRyaXg6OnJvdGF0ZShkb3VibGUgZCkKLXsKLSAgICBtX3RyYW5zZm9ybS5wcmVS b3RhdGUoV2ViQ29yZURvdWJsZVRvU2tTY2FsYXIoZCksIDAsIDApOwotICAgIHJldHVybiAqdGhp czsKLX0KLQotVHJhbnNmb3JtYXRpb25NYXRyaXggJlRyYW5zZm9ybWF0aW9uTWF0cml4Ojp0cmFu c2xhdGUoZG91YmxlIHR4LCBkb3VibGUgdHkpCi17Ci0gICAgbV90cmFuc2Zvcm0ucHJlVHJhbnNs YXRlKFdlYkNvcmVEb3VibGVUb1NrU2NhbGFyKHR4KSwgV2ViQ29yZURvdWJsZVRvU2tTY2FsYXIo dHkpKTsKLSAgICByZXR1cm4gKnRoaXM7Ci19Ci0KLVRyYW5zZm9ybWF0aW9uTWF0cml4ICZUcmFu c2Zvcm1hdGlvbk1hdHJpeDo6c2hlYXIoZG91YmxlIHN4LCBkb3VibGUgc3kpCi17Ci0gICAgbV90 cmFuc2Zvcm0ucHJlU2tldyhXZWJDb3JlRG91YmxlVG9Ta1NjYWxhcihzeCksIFdlYkNvcmVEb3Vi bGVUb1NrU2NhbGFyKHN5KSwgMCwgMCk7Ci0gICAgcmV0dXJuICp0aGlzOwotfQotCi1kb3VibGUg VHJhbnNmb3JtYXRpb25NYXRyaXg6OmRldCgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIFNrU2NhbGFy VG9Eb3VibGUobV90cmFuc2Zvcm0uZ2V0U2NhbGVYKCkpICogU2tTY2FsYXJUb0RvdWJsZShtX3Ry YW5zZm9ybS5nZXRTY2FsZVkoKSkgLQotICAgICAgICAgICBTa1NjYWxhclRvRG91YmxlKG1fdHJh bnNmb3JtLmdldFNrZXdZKCkpICogU2tTY2FsYXJUb0RvdWJsZShtX3RyYW5zZm9ybS5nZXRTa2V3 WCgpKTsKLX0KLQotVHJhbnNmb3JtYXRpb25NYXRyaXggVHJhbnNmb3JtYXRpb25NYXRyaXg6Omlu dmVyc2UoKSBjb25zdAotewotICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IGludmVyc2U7Ci0gICAg bV90cmFuc2Zvcm0uaW52ZXJ0KCZpbnZlcnNlLm1fdHJhbnNmb3JtKTsKLSAgICByZXR1cm4gaW52 ZXJzZTsKLX0KLQogVHJhbnNmb3JtYXRpb25NYXRyaXg6Om9wZXJhdG9yIFNrTWF0cml4KCkgY29u c3QKIHsKLSAgICByZXR1cm4gbV90cmFuc2Zvcm07Ci19Ci0KLWJvb2wgVHJhbnNmb3JtYXRpb25N YXRyaXg6Om9wZXJhdG9yPT0oY29uc3QgVHJhbnNmb3JtYXRpb25NYXRyaXgmIG0yKSBjb25zdAot ewotICAgIHJldHVybiBtX3RyYW5zZm9ybSA9PSBtMi5tX3RyYW5zZm9ybTsKLX0KLQotVHJhbnNm b3JtYXRpb25NYXRyaXggJlRyYW5zZm9ybWF0aW9uTWF0cml4OjpvcGVyYXRvcio9KGNvbnN0IFRy YW5zZm9ybWF0aW9uTWF0cml4JiBtMikKLXsKLSAgICBtX3RyYW5zZm9ybS5zZXRDb25jYXQobTIu bV90cmFuc2Zvcm0sIG1fdHJhbnNmb3JtKTsKLSAgICByZXR1cm4gKnRoaXM7Ci19Ci0KLVRyYW5z Zm9ybWF0aW9uTWF0cml4IFRyYW5zZm9ybWF0aW9uTWF0cml4OjpvcGVyYXRvciooY29uc3QgVHJh bnNmb3JtYXRpb25NYXRyaXgmIG0yKQotewotICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IGNhdDsK LSAgICBjYXQubV90cmFuc2Zvcm0uc2V0Q29uY2F0KG0yLm1fdHJhbnNmb3JtLCBtX3RyYW5zZm9y bSk7Ci0gICAgcmV0dXJuIGNhdDsKLX0KLQotZG91YmxlIFRyYW5zZm9ybWF0aW9uTWF0cml4Ojph KCkgY29uc3QKLXsKLSAgICByZXR1cm4gU2tTY2FsYXJUb0RvdWJsZShtX3RyYW5zZm9ybS5nZXRT Y2FsZVgoKSk7Ci19Ci0KLXZvaWQgVHJhbnNmb3JtYXRpb25NYXRyaXg6OnNldEEoZG91YmxlIGEp Ci17Ci0gICAgbV90cmFuc2Zvcm0uc2V0U2NhbGVYKFdlYkNvcmVEb3VibGVUb1NrU2NhbGFyKGEp KTsKLX0KLQotZG91YmxlIFRyYW5zZm9ybWF0aW9uTWF0cml4OjpiKCkgY29uc3QKLXsKLSAgICBy ZXR1cm4gU2tTY2FsYXJUb0RvdWJsZShtX3RyYW5zZm9ybS5nZXRTa2V3WSgpKTsKLX0KLQotdm9p ZCBUcmFuc2Zvcm1hdGlvbk1hdHJpeDo6c2V0Qihkb3VibGUgYikKLXsKLSAgICBtX3RyYW5zZm9y bS5zZXRTa2V3WShXZWJDb3JlRG91YmxlVG9Ta1NjYWxhcihiKSk7Ci19Ci0KLWRvdWJsZSBUcmFu c2Zvcm1hdGlvbk1hdHJpeDo6YygpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIFNrU2NhbGFyVG9Eb3Vi bGUobV90cmFuc2Zvcm0uZ2V0U2tld1goKSk7Ci19Ci0KLXZvaWQgVHJhbnNmb3JtYXRpb25NYXRy aXg6OnNldEMoZG91YmxlIGMpCi17Ci0gICAgbV90cmFuc2Zvcm0uc2V0U2tld1goV2ViQ29yZURv dWJsZVRvU2tTY2FsYXIoYykpOwotfQotCi1kb3VibGUgVHJhbnNmb3JtYXRpb25NYXRyaXg6OmQo KSBjb25zdAotewotICAgIHJldHVybiBTa1NjYWxhclRvRG91YmxlKG1fdHJhbnNmb3JtLmdldFNj YWxlWSgpKTsKLX0KKyAgICBTa01hdHJpeCByZXN1bHQ7CiAKLXZvaWQgVHJhbnNmb3JtYXRpb25N YXRyaXg6OnNldEQoZG91YmxlIGQpCi17Ci0gICAgbV90cmFuc2Zvcm0uc2V0U2NhbGVZKFdlYkNv cmVEb3VibGVUb1NrU2NhbGFyKGQpKTsKLX0KKyAgICByZXN1bHQuc2V0U2NhbGVYKFdlYkNvcmVE b3VibGVUb1NrU2NhbGFyKGEoKSkpOworICAgIHJlc3VsdC5zZXRTa2V3WChXZWJDb3JlRG91Ymxl VG9Ta1NjYWxhcihjKCkpKTsKKyAgICByZXN1bHQuc2V0VHJhbnNsYXRlWChXZWJDb3JlRG91Ymxl VG9Ta1NjYWxhcihlKCkpKTsKIAotZG91YmxlIFRyYW5zZm9ybWF0aW9uTWF0cml4OjplKCkgY29u c3QKLXsKLSAgICByZXR1cm4gU2tTY2FsYXJUb0RvdWJsZShtX3RyYW5zZm9ybS5nZXRUcmFuc2xh dGVYKCkpOwotfQorICAgIHJlc3VsdC5zZXRTY2FsZVkoV2ViQ29yZURvdWJsZVRvU2tTY2FsYXIo ZCgpKSk7CisgICAgcmVzdWx0LnNldFNrZXdZKFdlYkNvcmVEb3VibGVUb1NrU2NhbGFyKGIoKSkp OworICAgIHJlc3VsdC5zZXRUcmFuc2xhdGVZKFdlYkNvcmVEb3VibGVUb1NrU2NhbGFyKGYoKSkp OwogCi12b2lkIFRyYW5zZm9ybWF0aW9uTWF0cml4OjpzZXRFKGRvdWJsZSBlKQotewotICAgIG1f dHJhbnNmb3JtLnNldFRyYW5zbGF0ZVgoV2ViQ29yZURvdWJsZVRvU2tTY2FsYXIoZSkpOwotfQor ICAgIHJlc3VsdC5zZXRQZXJzcFgoMCk7CisgICAgcmVzdWx0LnNldFBlcnNwWSgwKTsKIAotZG91 YmxlIFRyYW5zZm9ybWF0aW9uTWF0cml4OjpmKCkgY29uc3QKLXsKLSAgICByZXR1cm4gU2tTY2Fs YXJUb0RvdWJsZShtX3RyYW5zZm9ybS5nZXRUcmFuc2xhdGVZKCkpOwotfQotCi12b2lkIFRyYW5z Zm9ybWF0aW9uTWF0cml4OjpzZXRGKGRvdWJsZSBmKQotewotICAgIG1fdHJhbnNmb3JtLnNldFRy YW5zbGF0ZVkoV2ViQ29yZURvdWJsZVRvU2tTY2FsYXIoZikpOworICAgIHJldHVybiByZXN1bHQ7 CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK