39225 2010-05-17 09:50:33 -0700 [Qt] Repeat pattern should start from origin 2010-06-16 21:15:22 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC Linux RESOLVED FIXED Qt P3 Normal --- 1 qi.2.zhang qi.2.zhang commit-queue cshu laszlo.gombos webkit.review.bot oldest_to_newest 226792 0 qi.2.zhang 2010-05-17 09:50:33 -0700 Failed on: http://philip.html5.org/tests/canvas/suite/tests/2d.pattern.paint.norepeat.coord3.html http://philip.html5.org/tests/canvas/suite/tests/2d.pattern.paint.repeaty.coord1.html Based on spec: Patterns must be painted so that the top left of the first image is anchored at the origin of the coordinate space, and images are then repeated horizontally to the left and right (if the repeat-x string was specified) or vertically up and down (if the repeat-y string was specified) or in all four directions all over the canvas (if the repeat string was specified). Current implementation is start from top left of the rect instead of the origin of the coordinate. 226799 1 56247 qi.2.zhang 2010-05-17 10:19:07 -0700 Created attachment 56247 patch Paint repeat pattern directly instead of using brush. QtBrush always paint pattern from top left of the rectangle. We need to paint pattern from origin, but only paint the part inside of the rectangle. 226800 2 webkit.review.bot 2010-05-17 10:22:38 -0700 Attachment 56247 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebCore/ChangeLog:7: Line contains tab character. [whitespace/tab] [5] WebCore/ChangeLog:9: Line contains tab character. [whitespace/tab] [5] WebCore/ChangeLog:10: Line contains tab character. [whitespace/tab] [5] WebCore/ChangeLog:11: Line contains tab character. [whitespace/tab] [5] WebCore/ChangeLog:12: Line contains tab character. [whitespace/tab] [5] WebCore/ChangeLog:13: Line contains tab character. [whitespace/tab] [5] Total errors found: 6 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 226801 3 56247 kenneth 2010-05-17 10:25:01 -0700 Comment on attachment 56247 patch > + Patterns must be painted so that the top left of the first image > + is anchored at the origin of the coordinate space, and images are > + then repeated horizontally to the left and right (if the repeat-x > + string was specified) or vertically up and down (if the repeat-y > + string was specified) or in all four directions all over the canvas > + (if the repeat string was specified). There is something wrong with the indentation of the above. Missing test. r- for the above. 226805 4 56248 qi.2.zhang 2010-05-17 10:26:55 -0700 Created attachment 56248 patch2 fix style check issue 228241 5 56248 eric 2010-05-20 00:57:31 -0700 Comment on attachment 56248 patch2 I would have put this new code in a new function. Maybe a static inline if I was concerned about performance. 235780 6 58245 qi.2.zhang 2010-06-09 07:41:04 -0700 Created attachment 58245 patch3 1. Created a new function for draw repeat pattern 2. Remove 3 test cases from Skipped. 239176 7 58245 laszlo.gombos 2010-06-16 18:54:31 -0700 Comment on attachment 58245 patch3 lgtm, r+. 239200 8 58245 commit-queue 2010-06-16 21:15:17 -0700 Comment on attachment 58245 patch3 Clearing flags on attachment: 58245 Committed r61303: <http://trac.webkit.org/changeset/61303> 239201 9 commit-queue 2010-06-16 21:15:22 -0700 All reviewed patches have been landed. Closing bug. 56247 2010-05-17 10:19:07 -0700 2010-06-09 07:41:04 -0700 patch bug39225.patch text/plain 3882 qi.2.zhang SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1OTYxMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDUtMTcgIFFpIFpoYW5nICA8cWkuMi56aGFuZ0Bub2tpYS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0 XSBSZXBlYXQgcGF0dGVybiBzaG91bGQgc3RhcnQgZnJvbSBvcmlnaW4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5MjI1CisJCisgICAgICAgIFBhdHRl cm5zIG11c3QgYmUgcGFpbnRlZCBzbyB0aGF0IHRoZSB0b3AgbGVmdCBvZiB0aGUgZmlyc3QgaW1h Z2UgCisJaXMgYW5jaG9yZWQgYXQgdGhlIG9yaWdpbiBvZiB0aGUgY29vcmRpbmF0ZSBzcGFjZSwg YW5kIGltYWdlcyBhcmUgCisJdGhlbiByZXBlYXRlZCBob3Jpem9udGFsbHkgdG8gdGhlIGxlZnQg YW5kIHJpZ2h0IChpZiB0aGUgcmVwZWF0LXggCisJc3RyaW5nIHdhcyBzcGVjaWZpZWQpIG9yIHZl cnRpY2FsbHkgdXAgYW5kIGRvd24gKGlmIHRoZSByZXBlYXQteSAKKwlzdHJpbmcgd2FzIHNwZWNp ZmllZCkgb3IgaW4gYWxsIGZvdXIgZGlyZWN0aW9ucyBhbGwgb3ZlciB0aGUgY2FudmFzIAorCShp ZiB0aGUgcmVwZWF0IHN0cmluZyB3YXMgc3BlY2lmaWVkKS4KKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzQ29udGV4dDo6ZmlsbFJlY3QpOgorCiAyMDEwLTA1LTE3ICBBbnR0aSBLb2l2aXN0byAg PGtvaXZpc3RvQGlraS5maT4KIAogICAgICAgICBUaGlzIHdhcyBtaXNzaW5nIGZyb20gcHJldmlv dXMgY29tbWl0LgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0Nv bnRleHRRdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9H cmFwaGljc0NvbnRleHRRdC5jcHAJKHJldmlzaW9uIDU5NTM5KQorKysgV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYy NCwxMiArNjI0LDM2IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpmaWxsUmVjdChjb25zdCBGbG8K ICAgICAgICAgICAgIFFCcnVzaCBicnVzaChtX2NvbW1vbi0+c3RhdGUuZmlsbFBhdHRlcm4tPmNy ZWF0ZVBsYXRmb3JtUGF0dGVybihhZmZpbmUpKTsKICAgICAgICAgICAgIFFQaXhtYXAqIGltYWdl ID0gbV9jb21tb24tPnN0YXRlLmZpbGxQYXR0ZXJuLT50aWxlSW1hZ2UoKS0+bmF0aXZlSW1hZ2VG b3JDdXJyZW50RnJhbWUoKTsKIAotICAgICAgICAgICAgaWYgKCFtX2NvbW1vbi0+c3RhdGUuZmls bFBhdHRlcm4tPnJlcGVhdFgoKSAmJiBpbWFnZSkKLSAgICAgICAgICAgICAgICByZWN0TS5zZXRX aWR0aChpbWFnZS0+d2lkdGgoKSk7Ci0gICAgICAgICAgICBpZiAoIW1fY29tbW9uLT5zdGF0ZS5m aWxsUGF0dGVybi0+cmVwZWF0WSgpICYmIGltYWdlKQotICAgICAgICAgICAgICAgIHJlY3RNLnNl dEhlaWdodChpbWFnZS0+aGVpZ2h0KCkpOwotICAgICAgICAgICAgcC0+ZmlsbFJlY3QocmVjdE0s IGJydXNoKTsKLQorICAgICAgICAgICAgLy8gUGF0dGVybnMgbXVzdCBiZSBwYWludGVkIHNvIHRo YXQgdGhlIHRvcCBsZWZ0IG9mIHRoZSBmaXJzdCBpbWFnZSBpcyBhbmNob3JlZCBhdAorICAgICAg ICAgICAgLy8gdGhlIG9yaWdpbiBvZiB0aGUgY29vcmRpbmF0ZSBzcGFjZQorICAgICAgICAgICAg aWYgKGltYWdlKSB7CisgICAgICAgICAgICAgICAgaW50IHcgPSBpbWFnZS0+d2lkdGgoKTsKKyAg ICAgICAgICAgICAgICBpbnQgaCA9IGltYWdlLT5oZWlnaHQoKTsKKyAgICAgICAgICAgICAgICBp bnQgc3RhcnRYID0gc3RhdGljX2Nhc3Q8aW50PihyZWN0LngoKSk7CisgICAgICAgICAgICAgICAg aW50IHN0YXJ0WSA9IHN0YXRpY19jYXN0PGludD4ocmVjdC55KCkpOworICAgICAgICAgICAgICAg IGludCBzb3VyY2VYID0gc3RhdGljX2Nhc3Q8aW50PihyZWN0LngoKSkgJSB3OworICAgICAgICAg ICAgICAgIGludCBzb3VyY2VZID0gc3RhdGljX2Nhc3Q8aW50PihyZWN0LnkoKSkgJSBoOworICAg ICAgICAgICAgICAgIGludCBzb3VyY2VXaWR0aCA9IHFNaW4odyAtIHNvdXJjZVgsIHN0YXRpY19j YXN0PGludD4ocmVjdC54KCkgKyByZWN0LndpZHRoKCkgLSBzdGFydFgpKTsKKyAgICAgICAgICAg ICAgICBpbnQgc291cmNlSGVpZ2h0ID0gcU1pbihoIC0gc291cmNlWSwgc3RhdGljX2Nhc3Q8aW50 PihyZWN0LnkoKSArIHJlY3QuaGVpZ2h0KCkgLSBzdGFydFkpKTsKKyAgICAgICAgICAgICAgICBk byB7CisgICAgICAgICAgICAgICAgICAgIC8vIHJlcGVhdCBZCisgICAgICAgICAgICAgICAgICAg IGRvIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIC8vIHJlcGVhdCBYCisgICAgICAgICAgICAg ICAgICAgICAgICBRUG9pbnQgZGVzdFN0YXJ0KHN0YXJ0WCwgc3RhcnRZKTsKKyAgICAgICAgICAg ICAgICAgICAgICAgIFFSZWN0ICBzb3VyY2VSZWN0KHNvdXJjZVgsIHNvdXJjZVksIHNvdXJjZVdp ZHRoLCBzb3VyY2VIZWlnaHQpOworICAgICAgICAgICAgICAgICAgICAgICAgcC0+ZHJhd1BpeG1h cChkZXN0U3RhcnQsICppbWFnZSwgc291cmNlUmVjdCk7CisgICAgICAgICAgICAgICAgICAgICAg ICBzb3VyY2VYID0gMDsKKyAgICAgICAgICAgICAgICAgICAgICAgIHN0YXJ0WCArPSBzb3VyY2VX aWR0aDsKKyAgICAgICAgICAgICAgICAgICAgICAgIHNvdXJjZVdpZHRoID0gcU1pbih3IC0gc291 cmNlWCwgc3RhdGljX2Nhc3Q8aW50PihyZWN0LngoKSArIHJlY3Qud2lkdGgoKSAtIHN0YXJ0WCkp OworICAgICAgICAgICAgICAgICAgICB9IHdoaWxlIChtX2NvbW1vbi0+c3RhdGUuZmlsbFBhdHRl cm4tPnJlcGVhdFgoKSAmJiBzdGFydFggPCByZWN0LngoKSArIHJlY3Qud2lkdGgoKSk7CisgICAg ICAgICAgICAgICAgICAgIHNvdXJjZVggPSBzdGF0aWNfY2FzdDxpbnQ+KHJlY3QueCgpKSAlIHc7 CisgICAgICAgICAgICAgICAgICAgIHNvdXJjZVkgPSAwOworICAgICAgICAgICAgICAgICAgICBz dGFydFggPSBzdGF0aWNfY2FzdDxpbnQ+KHJlY3QueCgpKTsKKyAgICAgICAgICAgICAgICAgICAg c3RhcnRZICs9IHNvdXJjZUhlaWdodDsKKyAgICAgICAgICAgICAgICAgICAgc291cmNlV2lkdGgg PSBxTWluKHcgLSBzb3VyY2VYLCBzdGF0aWNfY2FzdDxpbnQ+KHJlY3QueCgpICsgcmVjdC53aWR0 aCgpIC0gc3RhcnRYKSk7CisgICAgICAgICAgICAgICAgICAgIHNvdXJjZUhlaWdodCA9IHFNaW4o aCAtIHNvdXJjZVksIHN0YXRpY19jYXN0PGludD4ocmVjdC55KCkgKyByZWN0LmhlaWdodCgpIC0g c3RhcnRZKSk7CisgICAgICAgICAgICAgICAgfSB3aGlsZSAobV9jb21tb24tPnN0YXRlLmZpbGxQ YXR0ZXJuLT5yZXBlYXRZKCkgJiYgc3RhcnRZIDwgcmVjdC55KCkgKyByZWN0LmhlaWdodCgpKTsK KyAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNlIGlmIChtX2NvbW1vbi0+c3RhdGUuZmlsbEdy YWRpZW50KSB7CiAgICAgICAgICAgICBRQnJ1c2ggYnJ1c2goKm1fY29tbW9uLT5zdGF0ZS5maWxs R3JhZGllbnQtPnBsYXRmb3JtR3JhZGllbnQoKSk7CiAgICAgICAgICAgICBicnVzaC5zZXRUcmFu c2Zvcm0obV9jb21tb24tPnN0YXRlLmZpbGxHcmFkaWVudC0+Z3JhZGllbnRTcGFjZVRyYW5zZm9y bSgpKTsK 56248 2010-05-17 10:26:55 -0700 2010-06-09 07:41:04 -0700 patch2 bug39225.patch text/plain 3916 qi.2.zhang SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1OTYxMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDUtMTcgIFFpIFpoYW5nICA8cWkuMi56aGFuZ0Bub2tpYS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0 XSBSZXBlYXQgcGF0dGVybiBzaG91bGQgc3RhcnQgZnJvbSBvcmlnaW4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5MjI1CisKKyAgICAgICAgUGF0dGVy bnMgbXVzdCBiZSBwYWludGVkIHNvIHRoYXQgdGhlIHRvcCBsZWZ0IG9mIHRoZSBmaXJzdCBpbWFn ZSAKKyAgICAgICAgaXMgYW5jaG9yZWQgYXQgdGhlIG9yaWdpbiBvZiB0aGUgY29vcmRpbmF0ZSBz cGFjZSwgYW5kIGltYWdlcyBhcmUgCisgICAgICAgIHRoZW4gcmVwZWF0ZWQgaG9yaXpvbnRhbGx5 IHRvIHRoZSBsZWZ0IGFuZCByaWdodCAoaWYgdGhlIHJlcGVhdC14IAorICAgICAgICBzdHJpbmcg d2FzIHNwZWNpZmllZCkgb3IgdmVydGljYWxseSB1cCBhbmQgZG93biAoaWYgdGhlIHJlcGVhdC15 IAorICAgICAgICBzdHJpbmcgd2FzIHNwZWNpZmllZCkgb3IgaW4gYWxsIGZvdXIgZGlyZWN0aW9u cyBhbGwgb3ZlciB0aGUgY2FudmFzIAorICAgICAgICAoaWYgdGhlIHJlcGVhdCBzdHJpbmcgd2Fz IHNwZWNpZmllZCkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0Nv bnRleHRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmZpbGxSZWN0 KToKKwogMjAxMC0wNS0xNyAgQW50dGkgS29pdmlzdG8gIDxrb2l2aXN0b0Bpa2kuZmk+CiAKICAg ICAgICAgVGhpcyB3YXMgbWlzc2luZyBmcm9tIHByZXZpb3VzIGNvbW1pdC4KSW5kZXg6IFdlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCShy ZXZpc2lvbiA1OTUzOSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3ND b250ZXh0UXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02MjQsMTIgKzYyNCwzNiBAQCB2b2lkIEdy YXBoaWNzQ29udGV4dDo6ZmlsbFJlY3QoY29uc3QgRmxvCiAgICAgICAgICAgICBRQnJ1c2ggYnJ1 c2gobV9jb21tb24tPnN0YXRlLmZpbGxQYXR0ZXJuLT5jcmVhdGVQbGF0Zm9ybVBhdHRlcm4oYWZm aW5lKSk7CiAgICAgICAgICAgICBRUGl4bWFwKiBpbWFnZSA9IG1fY29tbW9uLT5zdGF0ZS5maWxs UGF0dGVybi0+dGlsZUltYWdlKCktPm5hdGl2ZUltYWdlRm9yQ3VycmVudEZyYW1lKCk7CiAKLSAg ICAgICAgICAgIGlmICghbV9jb21tb24tPnN0YXRlLmZpbGxQYXR0ZXJuLT5yZXBlYXRYKCkgJiYg aW1hZ2UpCi0gICAgICAgICAgICAgICAgcmVjdE0uc2V0V2lkdGgoaW1hZ2UtPndpZHRoKCkpOwot ICAgICAgICAgICAgaWYgKCFtX2NvbW1vbi0+c3RhdGUuZmlsbFBhdHRlcm4tPnJlcGVhdFkoKSAm JiBpbWFnZSkKLSAgICAgICAgICAgICAgICByZWN0TS5zZXRIZWlnaHQoaW1hZ2UtPmhlaWdodCgp KTsKLSAgICAgICAgICAgIHAtPmZpbGxSZWN0KHJlY3RNLCBicnVzaCk7Ci0KKyAgICAgICAgICAg IC8vIFBhdHRlcm5zIG11c3QgYmUgcGFpbnRlZCBzbyB0aGF0IHRoZSB0b3AgbGVmdCBvZiB0aGUg Zmlyc3QgaW1hZ2UgaXMgYW5jaG9yZWQgYXQKKyAgICAgICAgICAgIC8vIHRoZSBvcmlnaW4gb2Yg dGhlIGNvb3JkaW5hdGUgc3BhY2UKKyAgICAgICAgICAgIGlmIChpbWFnZSkgeworICAgICAgICAg ICAgICAgIGludCB3ID0gaW1hZ2UtPndpZHRoKCk7CisgICAgICAgICAgICAgICAgaW50IGggPSBp bWFnZS0+aGVpZ2h0KCk7CisgICAgICAgICAgICAgICAgaW50IHN0YXJ0WCA9IHN0YXRpY19jYXN0 PGludD4ocmVjdC54KCkpOworICAgICAgICAgICAgICAgIGludCBzdGFydFkgPSBzdGF0aWNfY2Fz dDxpbnQ+KHJlY3QueSgpKTsKKyAgICAgICAgICAgICAgICBpbnQgc291cmNlWCA9IHN0YXRpY19j YXN0PGludD4ocmVjdC54KCkpICUgdzsKKyAgICAgICAgICAgICAgICBpbnQgc291cmNlWSA9IHN0 YXRpY19jYXN0PGludD4ocmVjdC55KCkpICUgaDsKKyAgICAgICAgICAgICAgICBpbnQgc291cmNl V2lkdGggPSBxTWluKHcgLSBzb3VyY2VYLCBzdGF0aWNfY2FzdDxpbnQ+KHJlY3QueCgpICsgcmVj dC53aWR0aCgpIC0gc3RhcnRYKSk7CisgICAgICAgICAgICAgICAgaW50IHNvdXJjZUhlaWdodCA9 IHFNaW4oaCAtIHNvdXJjZVksIHN0YXRpY19jYXN0PGludD4ocmVjdC55KCkgKyByZWN0LmhlaWdo dCgpIC0gc3RhcnRZKSk7CisgICAgICAgICAgICAgICAgZG8geworICAgICAgICAgICAgICAgICAg ICAvLyByZXBlYXQgWQorICAgICAgICAgICAgICAgICAgICBkbyB7CisgICAgICAgICAgICAgICAg ICAgICAgICAvLyByZXBlYXQgWAorICAgICAgICAgICAgICAgICAgICAgICAgUVBvaW50IGRlc3RT dGFydChzdGFydFgsIHN0YXJ0WSk7CisgICAgICAgICAgICAgICAgICAgICAgICBRUmVjdCAgc291 cmNlUmVjdChzb3VyY2VYLCBzb3VyY2VZLCBzb3VyY2VXaWR0aCwgc291cmNlSGVpZ2h0KTsKKyAg ICAgICAgICAgICAgICAgICAgICAgIHAtPmRyYXdQaXhtYXAoZGVzdFN0YXJ0LCAqaW1hZ2UsIHNv dXJjZVJlY3QpOworICAgICAgICAgICAgICAgICAgICAgICAgc291cmNlWCA9IDA7CisgICAgICAg ICAgICAgICAgICAgICAgICBzdGFydFggKz0gc291cmNlV2lkdGg7CisgICAgICAgICAgICAgICAg ICAgICAgICBzb3VyY2VXaWR0aCA9IHFNaW4odyAtIHNvdXJjZVgsIHN0YXRpY19jYXN0PGludD4o cmVjdC54KCkgKyByZWN0LndpZHRoKCkgLSBzdGFydFgpKTsKKyAgICAgICAgICAgICAgICAgICAg fSB3aGlsZSAobV9jb21tb24tPnN0YXRlLmZpbGxQYXR0ZXJuLT5yZXBlYXRYKCkgJiYgc3RhcnRY IDwgcmVjdC54KCkgKyByZWN0LndpZHRoKCkpOworICAgICAgICAgICAgICAgICAgICBzb3VyY2VY ID0gc3RhdGljX2Nhc3Q8aW50PihyZWN0LngoKSkgJSB3OworICAgICAgICAgICAgICAgICAgICBz b3VyY2VZID0gMDsKKyAgICAgICAgICAgICAgICAgICAgc3RhcnRYID0gc3RhdGljX2Nhc3Q8aW50 PihyZWN0LngoKSk7CisgICAgICAgICAgICAgICAgICAgIHN0YXJ0WSArPSBzb3VyY2VIZWlnaHQ7 CisgICAgICAgICAgICAgICAgICAgIHNvdXJjZVdpZHRoID0gcU1pbih3IC0gc291cmNlWCwgc3Rh dGljX2Nhc3Q8aW50PihyZWN0LngoKSArIHJlY3Qud2lkdGgoKSAtIHN0YXJ0WCkpOworICAgICAg ICAgICAgICAgICAgICBzb3VyY2VIZWlnaHQgPSBxTWluKGggLSBzb3VyY2VZLCBzdGF0aWNfY2Fz dDxpbnQ+KHJlY3QueSgpICsgcmVjdC5oZWlnaHQoKSAtIHN0YXJ0WSkpOworICAgICAgICAgICAg ICAgIH0gd2hpbGUgKG1fY29tbW9uLT5zdGF0ZS5maWxsUGF0dGVybi0+cmVwZWF0WSgpICYmIHN0 YXJ0WSA8IHJlY3QueSgpICsgcmVjdC5oZWlnaHQoKSk7CisgICAgICAgICAgICB9CiAgICAgICAg IH0gZWxzZSBpZiAobV9jb21tb24tPnN0YXRlLmZpbGxHcmFkaWVudCkgewogICAgICAgICAgICAg UUJydXNoIGJydXNoKCptX2NvbW1vbi0+c3RhdGUuZmlsbEdyYWRpZW50LT5wbGF0Zm9ybUdyYWRp ZW50KCkpOwogICAgICAgICAgICAgYnJ1c2guc2V0VHJhbnNmb3JtKG1fY29tbW9uLT5zdGF0ZS5m aWxsR3JhZGllbnQtPmdyYWRpZW50U3BhY2VUcmFuc2Zvcm0oKSk7Cg== 58245 2010-06-09 07:41:04 -0700 2010-06-16 21:15:17 -0700 patch3 bug39225_3.patch text/plain 6534 qi.2.zhang SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MDg4OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDYtMDkgIFFpIFpoYW5nICA8cWkuMi56aGFuZ0Bub2tpYS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgIFtR dF0gUmVwZWF0IHBhdHRlcm4gc2hvdWxkIHN0YXJ0IGZyb20gb3JpZ2luCisgICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzkyMjUKKworICAgICAgICAgUGF0 dGVybnMgbXVzdCBiZSBwYWludGVkIHNvIHRoYXQgdGhlIHRvcCBsZWZ0IG9mIHRoZSBmaXJzdCBp bWFnZSAKKyAgICAgICAgIGlzIGFuY2hvcmVkIGF0IHRoZSBvcmlnaW4gb2YgdGhlIGNvb3JkaW5h dGUgc3BhY2UuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRl eHRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpkcmF3UmVwZWF0UGF0dGVybik6CisgICAgICAg IChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmZpbGxSZWN0KToKKwogMjAxMC0wNi0wNyAgSWx5 YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgUGF2ZWwgRmVsZG1hbi4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3Jh cGhpY3NDb250ZXh0UXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCShyZXZpc2lvbiA2MDg0MSkKKysrIFdlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC02MjgsNiArNjI4LDczIEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBkcmF3Qm9yZGVybGVzc1Jl Y3RTaGEKICAgICB9CiB9CiAKK3N0YXRpYyBpbmxpbmUgdm9pZCBkcmF3UmVwZWF0UGF0dGVybihR UGFpbnRlciogcCwgUVBpeG1hcCogaW1hZ2UsIGNvbnN0IEZsb2F0UmVjdCYgcmVjdCwgY29uc3Qg Ym9vbCByZXBlYXRYLCBjb25zdCBib29sIHJlcGVhdFkpCit7CisgICAgLy8gUGF0dGVybnMgbXVz dCBiZSBwYWludGVkIHNvIHRoYXQgdGhlIHRvcCBsZWZ0IG9mIHRoZSBmaXJzdCBpbWFnZSBpcyBh bmNob3JlZCBhdAorICAgIC8vIHRoZSBvcmlnaW4gb2YgdGhlIGNvb3JkaW5hdGUgc3BhY2UKKyAg ICBpZiAoaW1hZ2UpIHsKKyAgICAgICAgaW50IHcgPSBpbWFnZS0+d2lkdGgoKTsKKyAgICAgICAg aW50IGggPSBpbWFnZS0+aGVpZ2h0KCk7CisgICAgICAgIGludCBzdGFydFgsIHN0YXJ0WTsKKyAg ICAgICAgUVJlY3QgcihzdGF0aWNfY2FzdDxpbnQ+KHJlY3QueCgpKSwgc3RhdGljX2Nhc3Q8aW50 PihyZWN0LnkoKSksIHN0YXRpY19jYXN0PGludD4ocmVjdC53aWR0aCgpKSwgc3RhdGljX2Nhc3Q8 aW50PihyZWN0LmhlaWdodCgpKSk7CisKKyAgICAgICAgLy8gc3RhcnRYLCBzdGFydFkgaXMgdGhl IGNvb3JkaW5hdGUgb2YgdGhlIGZpcnN0IGltYWdlIHdlIG5lZWQgdG8gcHV0IG9uIHRoZSBsZWZ0 LXRvcCBvZiB0aGUgcmVjdAorICAgICAgICBpZiAocmVwZWF0WCAmJiByZXBlYXRZKSB7CisgICAg ICAgICAgICAvLyByZXBlYXQKKyAgICAgICAgICAgIC8vIHN0YXJ0WCwgc3RhcnRZIGlzIGF0IHRo ZSBsZWZ0IHRvcCBzaWRlIG9mIHRoZSBsZWZ0LXRvcCBvZiB0aGUgcmVjdAorICAgICAgICAgICAg c3RhcnRYID0gci54KCkgPj0wID8gci54KCkgLSAoci54KCkgJSB3KSA6IHIueCgpIC0gKHcgLSBx QWJzKHIueCgpKSAlIHcpOworICAgICAgICAgICAgc3RhcnRZID0gci55KCkgPj0wID8gci55KCkg LSAoci55KCkgJSBoKSA6IHIueSgpIC0gKGggLSBxQWJzKHIueSgpKSAlIGgpOworICAgICAgICB9 IGVsc2UgeworICAgICAgICAgICBpZiAoIXJlcGVhdFggJiYgIXJlcGVhdFkpIHsKKyAgICAgICAg ICAgICAgIC8vIG5vLXJlcGVhdAorICAgICAgICAgICAgICAgLy8gb25seSBkcmF3IHRoZSBpbWFn ZSBvbmNlIGF0IG9yZ2luIG9uY2UsIGNoZWNrIGlmIG5lZWQgdG8gZHJhdworICAgICAgICAgICAg ICAgUVJlY3QgaW1hZ2VSZWN0KDAsIDAsIHcsIGgpOworICAgICAgICAgICAgICAgaWYgKGltYWdl UmVjdC5pbnRlcnNlY3RzKHIpKSB7CisgICAgICAgICAgICAgICAgICAgc3RhcnRYID0gMDsKKyAg ICAgICAgICAgICAgICAgICBzdGFydFkgPSAwOworICAgICAgICAgICAgICAgfSBlbHNlCisgICAg ICAgICAgICAgICAgICAgcmV0dXJuOyAgIAorICAgICAgICAgICB9IGVsc2UgaWYgKHJlcGVhdFgg JiYgIXJlcGVhdFkpIHsKKyAgICAgICAgICAgICAgIC8vIHJlcGVhdC14CisgICAgICAgICAgICAg ICAvLyBzdGFydFkgaXMgZml4ZWQsIGJ1dCBzdGFydFggY2hhbmdlIGJhc2VkIG9uIHRoZSBsZWZ0 LXRvcCBvZiB0aGUgcmVjdAorICAgICAgICAgICAgICAgUVJlY3QgaW1hZ2VSZWN0KHIueCgpLCAw LCByLndpZHRoKCksIGgpOworICAgICAgICAgICAgICAgaWYgKGltYWdlUmVjdC5pbnRlcnNlY3Rz KHIpKSB7CisgICAgICAgICAgICAgICAgICAgc3RhcnRYID0gci54KCkgPj0wID8gci54KCkgLSAo ci54KCkgJSB3KSA6IHIueCgpIC0gKHcgLSBxQWJzKHIueCgpKSAlIHcpOworICAgICAgICAgICAg ICAgICAgIHN0YXJ0WSA9IDA7CisgICAgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgICAg ICAgICByZXR1cm47CisgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAvLyByZXBl YXQteQorICAgICAgICAgICAgICAgLy8gc3RhcnRYIGlzIGZpeGVkLCBidXQgc3RhcnRZIGNoYW5n ZSBiYXNlZCBvbiB0aGUgbGVmdC10b3Agb2YgdGhlIHJlY3QKKyAgICAgICAgICAgICAgIFFSZWN0 IGltYWdlUmVjdCgwLCByLnkoKSwgdywgci5oZWlnaHQoKSk7CisgICAgICAgICAgICAgICBpZiAo aW1hZ2VSZWN0LmludGVyc2VjdHMocikpIHsKKyAgICAgICAgICAgICAgICAgICBzdGFydFggPSAw OworICAgICAgICAgICAgICAgICAgIHN0YXJ0WSA9IHIueSgpID49MCA/IHIueSgpIC0gKHIueSgp ICUgaCkgOiByLnkoKSAtIChoIC0gcUFicyhyLnkoKSkgJSBoKTsKKyAgICAgICAgICAgICAgIH0g ZWxzZQorICAgICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgfQorICAgICAgICB9 CisKKyAgICAgICAgaW50IHggPSBzdGFydFg7CisgICAgICAgIGludCB5ID0gc3RhcnRZOyAKKyAg ICAgICAgZG8geworICAgICAgICAgICAgLy8gcmVwZWF0IFkKKyAgICAgICAgICAgIGRvIHsKKyAg ICAgICAgICAgICAgICAvLyByZXBlYXQgWAorICAgICAgICAgICAgICAgIFFSZWN0ICAgaW1hZ2VS ZWN0KHgsIHksIHcsIGgpOworICAgICAgICAgICAgICAgIFFSZWN0ICAgaW50ZXJzZWN0UmVjdCA9 IGltYWdlUmVjdC5pbnRlcnNlY3RlZChyKTsKKyAgICAgICAgICAgICAgICBRUG9pbnQgIGRlc3RT dGFydChpbnRlcnNlY3RSZWN0LngoKSwgaW50ZXJzZWN0UmVjdC55KCkpOworICAgICAgICAgICAg ICAgIFFSZWN0ICAgc291cmNlUmVjdChpbnRlcnNlY3RSZWN0LngoKSAtIGltYWdlUmVjdC54KCks IGludGVyc2VjdFJlY3QueSgpIC0gaW1hZ2VSZWN0LnkoKSwgaW50ZXJzZWN0UmVjdC53aWR0aCgp LCBpbnRlcnNlY3RSZWN0LmhlaWdodCgpKTsKKworICAgICAgICAgICAgICAgIHAtPmRyYXdQaXht YXAoZGVzdFN0YXJ0LCAqaW1hZ2UsIHNvdXJjZVJlY3QpOworICAgICAgICAgICAgICAgIHggKz0g dzsKKyAgICAgICAgICAgIH0gd2hpbGUgKHJlcGVhdFggJiYgeCA8IHIueCgpICsgci53aWR0aCgp KTsKKyAgICAgICAgICAgIHggPSBzdGFydFg7CisgICAgICAgICAgICB5ICs9IGg7CisgICAgICAg IH0gd2hpbGUgKHJlcGVhdFkgJiYgeSA8IHIueSgpICsgci5oZWlnaHQoKSk7CisgICAgfQorfQor CiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZmlsbFJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0KQog ewogICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkpCkBAIC02NDQsMTIgKzcxMSw3IEBAIHZvaWQg R3JhcGhpY3NDb250ZXh0OjpmaWxsUmVjdChjb25zdCBGbG8KICAgICAgICAgICAgIFFCcnVzaCBi cnVzaChtX2NvbW1vbi0+c3RhdGUuZmlsbFBhdHRlcm4tPmNyZWF0ZVBsYXRmb3JtUGF0dGVybihh ZmZpbmUpKTsKICAgICAgICAgICAgIFFQaXhtYXAqIGltYWdlID0gbV9jb21tb24tPnN0YXRlLmZp bGxQYXR0ZXJuLT50aWxlSW1hZ2UoKS0+bmF0aXZlSW1hZ2VGb3JDdXJyZW50RnJhbWUoKTsKIAot ICAgICAgICAgICAgaWYgKCFtX2NvbW1vbi0+c3RhdGUuZmlsbFBhdHRlcm4tPnJlcGVhdFgoKSAm JiBpbWFnZSkKLSAgICAgICAgICAgICAgICByZWN0TS5zZXRXaWR0aChpbWFnZS0+d2lkdGgoKSk7 Ci0gICAgICAgICAgICBpZiAoIW1fY29tbW9uLT5zdGF0ZS5maWxsUGF0dGVybi0+cmVwZWF0WSgp ICYmIGltYWdlKQotICAgICAgICAgICAgICAgIHJlY3RNLnNldEhlaWdodChpbWFnZS0+aGVpZ2h0 KCkpOwotICAgICAgICAgICAgcC0+ZmlsbFJlY3QocmVjdE0sIGJydXNoKTsKLQorICAgICAgICAg ICAgZHJhd1JlcGVhdFBhdHRlcm4ocCwgaW1hZ2UsIHJlY3QsIG1fY29tbW9uLT5zdGF0ZS5maWxs UGF0dGVybi0+cmVwZWF0WCgpLCBtX2NvbW1vbi0+c3RhdGUuZmlsbFBhdHRlcm4tPnJlcGVhdFko KSk7CiAgICAgICAgIH0gZWxzZSBpZiAobV9jb21tb24tPnN0YXRlLmZpbGxHcmFkaWVudCkgewog ICAgICAgICAgICAgUUJydXNoIGJydXNoKCptX2NvbW1vbi0+c3RhdGUuZmlsbEdyYWRpZW50LT5w bGF0Zm9ybUdyYWRpZW50KCkpOwogICAgICAgICAgICAgYnJ1c2guc2V0VHJhbnNmb3JtKG1fY29t bW9uLT5zdGF0ZS5maWxsR3JhZGllbnQtPmdyYWRpZW50U3BhY2VUcmFuc2Zvcm0oKSk7CkluZGV4 OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCShyZXZpc2lvbiA2MDg4OSkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBj b3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEwLTA2LTA5ICBRaSBaaGFuZyAgPHFpLjIuemhhbmdA bm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFtRdF0gUmVwZWF0IHBhdHRlcm4gc2hvdWxkIHN0YXJ0IGZyb20gb3JpZ2luCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zOTIyNQorCisgICAgICAg IFJlbW92ZSB0aGUgZm9sbG93aW5nIHRlc3QgY2FzZSBmcm9tIFNraXBwZWQ6CisgICAgICAgIGNh bnZhcy9waGlsaXAvdGVzdHMvMmQucGF0dGVybi5wYWludC5ub3JlcGVhdC5jb29yZDMuaHRtbAor ICAgICAgICBjYW52YXMvcGhpbGlwL3Rlc3RzLzJkLnBhdHRlcm4ucGFpbnQucmVwZWF0eC5jb29y ZDEuaHRtbAorICAgICAgICBjYW52YXMvcGhpbGlwL3Rlc3RzLzJkLnBhdHRlcm4ucGFpbnQucmVw ZWF0eS5jb29yZDEuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vcXQvU2tpcHBlZDoKKwogMjAx MC0wNi0wOSAgU3RlcGhlbiBXaGl0ZSAgPHNlbm9yYmxhbmNvQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBVbnJldmlld2VkOyBleHBlY3RhdGlvbnMgZml4LgpJbmRleDogTGF5b3V0VGVzdHMvcGxh dGZvcm0vcXQvU2tpcHBlZAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9T a2lwcGVkCShyZXZpc2lvbiA2MDg0MSkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBw ZWQJKHdvcmtpbmcgY29weSkKQEAgLTUzMDgsOSArNTMwOCw2IEBAIGNhbnZhcy9waGlsaXAvdGVz dHMvMmQucGF0dGVybi5pbWFnZS5pbmMKIGNhbnZhcy9waGlsaXAvdGVzdHMvMmQucGF0dGVybi5p bWFnZS5udWxsLmh0bWwKIGNhbnZhcy9waGlsaXAvdGVzdHMvMmQucGF0dGVybi5pbWFnZS5zdHJp bmcuaHRtbAogY2FudmFzL3BoaWxpcC90ZXN0cy8yZC5wYXR0ZXJuLmltYWdlLnVuZGVmaW5lZC5o dG1sCi1jYW52YXMvcGhpbGlwL3Rlc3RzLzJkLnBhdHRlcm4ucGFpbnQubm9yZXBlYXQuY29vcmQz Lmh0bWwKLWNhbnZhcy9waGlsaXAvdGVzdHMvMmQucGF0dGVybi5wYWludC5yZXBlYXR4LmNvb3Jk MS5odG1sCi1jYW52YXMvcGhpbGlwL3Rlc3RzLzJkLnBhdHRlcm4ucGFpbnQucmVwZWF0eS5jb29y ZDEuaHRtbAogY2FudmFzL3BoaWxpcC90ZXN0cy8yZC5zaGFkb3cuYWxwaGEuNS5odG1sCiBjYW52 YXMvcGhpbGlwL3Rlc3RzLzJkLnNoYWRvdy5jYW52YXMuYWxwaGEuaHRtbAogY2FudmFzL3BoaWxp cC90ZXN0cy8yZC5zaGFkb3cuY2FudmFzLmJhc2ljLmh0bWwK