23332 2009-01-14 14:55:45 -0800 Fix some skia pattern creation issues 2009-01-14 16:55:28 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC Linux RESOLVED FIXED http://codereview.chromium.org/17365 P2 Normal --- 0 mmoss webkit-unassigned oldest_to_newest 105801 0 mmoss 2009-01-14 14:55:45 -0800 Upstreaming a Chromium fix. Workaround a skia limitation on repeated patterns, and remove extra transformations applied to pattern. 105802 1 26732 mmoss 2009-01-14 15:00:46 -0800 Created attachment 26732 PatternSkia fix 105813 2 26732 eric 2009-01-14 16:05:29 -0800 Comment on attachment 26732 PatternSkia fix WebKit style doesn't put {} around single-line if clauses. However in this case, it seems an early-return would be more appropriate. if normal repeating case can early-return a shader, and then no else is needed after the return for the more complicated case (thus not indenting an extra 4 spaces). Also, WebKit uses FIXME instead of TODO with no username attribution. WebKit also doesn't wrap to 80cols like Google does. I'm surprised bm2.eraseARGB(0x00, 0x00, 0x00, 0x00); doesn't take a color argument instead. WebKit's style is a bit strange (probably less so than Google's though), but at least it's documented: http://webkit.org/coding/coding-style.html r- for the style issues. Otherwise looks fine. 105817 3 26737 mmoss 2009-01-14 16:44:01 -0800 Created attachment 26737 restyled fix 105818 4 26737 eric 2009-01-14 16:49:04 -0800 Comment on attachment 26737 restyled fix No need to hold the shader in a local variable. The changelog should also have a link back to this bug. I'll fix when landing. 105819 5 eric 2009-01-14 16:55:28 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/platform/graphics/skia/PatternSkia.cpp Committed r39921 26732 2009-01-14 15:00:46 -0800 2009-01-14 16:44:01 -0800 PatternSkia fix patternskia.patch text/plain 3629 mmoss SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzOTkxMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMDktMDEtMTQgIE1pY2hhZWwgTW9zcyAgPG1tb3NzQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBX b3JrYXJvdW5kIGEgc2tpYSBsaW1pdGF0aW9uIG9uIHJlcGVhdGVkIHBhdHRlcm5zLCBhbmQgcmVt b3ZlIGV4dHJhCisgICAgICAgIHRyYW5zZm9ybWF0aW9ucyBhcHBsaWVkIHRvIHBhdHRlcm4uCisK KyAgICAgICAgRml4ZXM6CisgICAgICAgIExheW91dFRlc3RzL2Zhc3QvY2FudmFzL3BhdHRlcm5m aWxsLXJlcGVhdC5odG1sCisgICAgICAgIExheW91dFRlc3RzL3N2Zy9XM0MtU1ZHLTEuMS9wc2Vy dmVycy1ncmFkLTA2LWIuc3ZnCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL1Bh dHRlcm5Ta2lhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhdHRlcm46OmNyZWF0ZVBsYXRmb3Jt UGF0dGVybik6CisKIDIwMDktMDEtMTQgIEplcmVteSBNb3Nrb3ZpY2ggIDxqZXJlbXlAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpJbmRleDogV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BhdHRlcm5Ta2lhLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGF0dGVyblNraWEuY3BwCShyZXZpc2lvbiAz OTkxMykKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QYXR0ZXJuU2tpYS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTM0LDIxICszNCw1MiBAQAogI2luY2x1ZGUgIlRyYW5zZm9ybWF0 aW9uTWF0cml4LmgiCiAKICNpbmNsdWRlICJTa1NoYWRlci5oIgorI2luY2x1ZGUgIlNrQ2FudmFz LmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotc3RhdGljIGlubGluZSBTa1NoYWRlcjo6VGls ZU1vZGUgc2hhZGVyUnVsZShib29sIHNob3VsZFJlcGVhdCkKLXsKLSAgICAvLyBGSVhNRTogU2tp YSBkb2VzIG5vdCBoYXZlIGEgImRyYXcgdGhlIHRpbGUgb25seSBvbmNlIiBvcHRpb24KLSAgICAv LyBDbGFtcCBkcmF3cyB0aGUgbGFzdCBsaW5lIG9mIHRoZSBpbWFnZSBhZnRlciBzdG9wcGluZyBy ZXBlYXRpbmcKLSAgICByZXR1cm4gc2hvdWxkUmVwZWF0ID8gU2tTaGFkZXI6OmtSZXBlYXRfVGls ZU1vZGUgOiBTa1NoYWRlcjo6a0NsYW1wX1RpbGVNb2RlOwotfQotCiBQbGF0Zm9ybVBhdHRlcm5Q dHIgUGF0dGVybjo6Y3JlYXRlUGxhdGZvcm1QYXR0ZXJuKGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0 cml4JiBwYXR0ZXJuVHJhbnNmb3JtKSBjb25zdAogeworICAgIC8vIE5vdGU6IHBhdHRlcm5UcmFu c2Zvcm0gaXMgaWdub3JlZCBzaW5jZSBpdCBzZWVtcyB0byBiZSBhcHBsaWVkCisgICAgLy8gZWxz ZXdoZXJlICh3aGVuIHRoZSBwYXR0ZXJuIGlzIHVzZWQ/KS4gQXBwbHlpbmcgaXQgdG8gdGhlIHBh dHRlcm4gKGkuZS4KKyAgICAvLyBzaGFkZXItPnNldExvY2FsTWF0cml4KSByZXN1bHRzIGluIGEg ZG91YmxlIHRyYW5zZm9ybWF0aW9uLiBUaGlzIGNhbiBiZQorICAgIC8vIHNlZW4sIGZvciBpbnN0 YW5jZSwgYXMgYW4gZXh0cmEgb2Zmc2V0IGluOgorICAgIC8vIExheW91dFRlc3RzL2Zhc3QvY2Fu dmFzL3BhdHRlcm5maWxsLXJlcGVhdC5odG1sCisgICAgLy8gYW5kIGV4cGFuZGVkIHNjYWxlIGFu ZCBza2V3IGluOgorICAgIC8vIExheW91dFRlc3RzL3N2Zy9XM0MtU1ZHLTEuMS9wc2VydmVycy1n cmFkLTA2LWIuc3ZnCisKKyAgICBTa1NoYWRlciogc2hhZGVyOwogICAgIFNrQml0bWFwKiBibSA9 IG1fdGlsZUltYWdlLT5uYXRpdmVJbWFnZUZvckN1cnJlbnRGcmFtZSgpOwotICAgIFNrU2hhZGVy KiBzaGFkZXIgPSBTa1NoYWRlcjo6Q3JlYXRlQml0bWFwU2hhZGVyKCpibSwgc2hhZGVyUnVsZSht X3JlcGVhdFgpLCBzaGFkZXJSdWxlKG1fcmVwZWF0WSkpOwotICAgIHNoYWRlci0+c2V0TG9jYWxN YXRyaXgocGF0dGVyblRyYW5zZm9ybSk7CisgICAgaWYgKG1fcmVwZWF0WCAmJiBtX3JlcGVhdFkp IHsKKyAgICAgIHNoYWRlciA9IFNrU2hhZGVyOjpDcmVhdGVCaXRtYXBTaGFkZXIoKmJtLCBTa1No YWRlcjo6a1JlcGVhdF9UaWxlTW9kZSwKKyAgICAgICAgICBTa1NoYWRlcjo6a1JlcGVhdF9UaWxl TW9kZSk7CisgICAgfSBlbHNlIHsKKyAgICAgIC8vIFNraWEgZG9lcyBub3QgaGF2ZSBhICJkcmF3 IHRoZSB0aWxlIG9ubHkgb25jZSIgb3B0aW9uLiBDbGFtcF9UaWxlTW9kZQorICAgICAgLy8gcmVw ZWF0cyB0aGUgbGFzdCBsaW5lIG9mIHRoZSBpbWFnZSBhZnRlciBkcmF3aW5nIG9uZSB0aWxlLiBU byBhdm9pZAorICAgICAgLy8gZmlsbGluZyB0aGUgc3BhY2Ugd2l0aCBhcmJpdHJhcnkgcGl4ZWxz LCB0aGlzIHdvcmthcm91bmQgZm9yY2VzIHRoZQorICAgICAgLy8gaW1hZ2UgdG8gaGF2ZSBhIGxp bmUgb2YgdHJhbnNwYXJlbnQgcGl4ZWxzIG9uIHRoZSAicmVwZWF0ZWQiIGVkZ2UocyksCisgICAg ICAvLyB0aHVzIGNhdXNpbmcgZXh0cmEgc3BhY2UgdG8gYmUgdHJhbnNwYXJlbnQgZmlsbGVkLgor ICAgICAgU2tTaGFkZXI6OlRpbGVNb2RlIHRpbGVNb2RlWCA9IG1fcmVwZWF0WCA/IFNrU2hhZGVy OjprUmVwZWF0X1RpbGVNb2RlIDoKKyAgICAgICAgICBTa1NoYWRlcjo6a0NsYW1wX1RpbGVNb2Rl OworICAgICAgU2tTaGFkZXI6OlRpbGVNb2RlIHRpbGVNb2RlWSA9IG1fcmVwZWF0WSA/IFNrU2hh ZGVyOjprUmVwZWF0X1RpbGVNb2RlIDoKKyAgICAgICAgICBTa1NoYWRlcjo6a0NsYW1wX1RpbGVN b2RlOworICAgICAgaW50IGV4cGFuZFcgPSBtX3JlcGVhdFggPyAwIDogMTsKKyAgICAgIGludCBl eHBhbmRIID0gbV9yZXBlYXRZID8gMCA6IDE7CisKKyAgICAgIC8vIENyZWF0ZSBhIHRyYW5zcGFy ZW50IGJpdG1hcCAxIHBpeGVsIHdpZGVyIGFuZC9vciB0YWxsZXIgdGhhbiB0aGUKKyAgICAgIC8v IG9yaWdpbmFsLCB0aGVuIGNvcHkgdGhlIG9yaWduYWwgaW50byBpdC4KKyAgICAgIC8vIFRPRE8o bW1vc3MpOiBJcyB0aGVyZSBhIGJldHRlciB3YXkgdG8gcGFkIChub3Qgc2NhbGUpIGFuIGltYWdl IGluCisgICAgICAvLyBza2lhPworICAgICAgU2tCaXRtYXAgYm0yOworICAgICAgYm0yLnNldENv bmZpZyhibS0+Y29uZmlnKCksIGJtLT53aWR0aCgpICsgZXhwYW5kVywKKyAgICAgICAgICBibS0+ aGVpZ2h0KCkgKyBleHBhbmRIKTsKKyAgICAgIGJtMi5hbGxvY1BpeGVscygpOworICAgICAgYm0y LmVyYXNlQVJHQigweDAwLCAweDAwLCAweDAwLCAweDAwKTsKKyAgICAgIFNrQ2FudmFzIGNhbnZh cyhibTIpOworICAgICAgY2FudmFzLmRyYXdCaXRtYXAoKmJtLCAwLCAwKTsKKyAgICAgIHNoYWRl ciA9IFNrU2hhZGVyOjpDcmVhdGVCaXRtYXBTaGFkZXIoYm0yLCB0aWxlTW9kZVgsIHRpbGVNb2Rl WSk7CisgICAgfQorCiAgICAgcmV0dXJuIHNoYWRlcjsKIH0KIAo= 26737 2009-01-14 16:44:01 -0800 2009-01-14 16:49:04 -0800 restyled fix patternskia.patch.2 text/plain 3539 mmoss SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzOTkxMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMDktMDEtMTQgIE1pY2hhZWwgTW9zcyAgPG1tb3NzQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBX b3JrYXJvdW5kIGEgc2tpYSBsaW1pdGF0aW9uIG9uIHJlcGVhdGVkIHBhdHRlcm5zLCBhbmQgcmVt b3ZlIGV4dHJhCisgICAgICAgIHRyYW5zZm9ybWF0aW9ucyBhcHBsaWVkIHRvIHBhdHRlcm4uCisK KyAgICAgICAgRml4ZXM6CisgICAgICAgIExheW91dFRlc3RzL2Zhc3QvY2FudmFzL3BhdHRlcm5m aWxsLXJlcGVhdC5odG1sCisgICAgICAgIExheW91dFRlc3RzL3N2Zy9XM0MtU1ZHLTEuMS9wc2Vy dmVycy1ncmFkLTA2LWIuc3ZnCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL1Bh dHRlcm5Ta2lhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhdHRlcm46OmNyZWF0ZVBsYXRmb3Jt UGF0dGVybik6CisKIDIwMDktMDEtMTQgIEplcmVteSBNb3Nrb3ZpY2ggIDxqZXJlbXlAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpJbmRleDogV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BhdHRlcm5Ta2lhLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGF0dGVyblNraWEuY3BwCShyZXZpc2lvbiAz OTkxMykKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QYXR0ZXJuU2tpYS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTM0LDIxICszNCw0NyBAQAogI2luY2x1ZGUgIlRyYW5zZm9ybWF0 aW9uTWF0cml4LmgiCiAKICNpbmNsdWRlICJTa1NoYWRlci5oIgorI2luY2x1ZGUgIlNrQ2FudmFz LmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotc3RhdGljIGlubGluZSBTa1NoYWRlcjo6VGls ZU1vZGUgc2hhZGVyUnVsZShib29sIHNob3VsZFJlcGVhdCkKLXsKLSAgICAvLyBGSVhNRTogU2tp YSBkb2VzIG5vdCBoYXZlIGEgImRyYXcgdGhlIHRpbGUgb25seSBvbmNlIiBvcHRpb24KLSAgICAv LyBDbGFtcCBkcmF3cyB0aGUgbGFzdCBsaW5lIG9mIHRoZSBpbWFnZSBhZnRlciBzdG9wcGluZyBy ZXBlYXRpbmcKLSAgICByZXR1cm4gc2hvdWxkUmVwZWF0ID8gU2tTaGFkZXI6OmtSZXBlYXRfVGls ZU1vZGUgOiBTa1NoYWRlcjo6a0NsYW1wX1RpbGVNb2RlOwotfQotCiBQbGF0Zm9ybVBhdHRlcm5Q dHIgUGF0dGVybjo6Y3JlYXRlUGxhdGZvcm1QYXR0ZXJuKGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0 cml4JiBwYXR0ZXJuVHJhbnNmb3JtKSBjb25zdAogeworICAgIC8vIE5vdGU6IHBhdHRlcm5UcmFu c2Zvcm0gaXMgaWdub3JlZCBzaW5jZSBpdCBzZWVtcyB0byBiZSBhcHBsaWVkIGVsc2V3aGVyZQor ICAgIC8vICh3aGVuIHRoZSBwYXR0ZXJuIGlzIHVzZWQ/KS4gQXBwbHlpbmcgaXQgdG8gdGhlIHBh dHRlcm4gKGkuZS4KKyAgICAvLyBzaGFkZXItPnNldExvY2FsTWF0cml4KSByZXN1bHRzIGluIGEg ZG91YmxlIHRyYW5zZm9ybWF0aW9uLiBUaGlzIGNhbiBiZQorICAgIC8vIHNlZW4sIGZvciBpbnN0 YW5jZSwgYXMgYW4gZXh0cmEgb2Zmc2V0IGluOgorICAgIC8vIExheW91dFRlc3RzL2Zhc3QvY2Fu dmFzL3BhdHRlcm5maWxsLXJlcGVhdC5odG1sCisgICAgLy8gYW5kIGV4cGFuZGVkIHNjYWxlIGFu ZCBza2V3IGluOgorICAgIC8vIExheW91dFRlc3RzL3N2Zy9XM0MtU1ZHLTEuMS9wc2VydmVycy1n cmFkLTA2LWIuc3ZnCisKKyAgICBTa1NoYWRlciogc2hhZGVyOwogICAgIFNrQml0bWFwKiBibSA9 IG1fdGlsZUltYWdlLT5uYXRpdmVJbWFnZUZvckN1cnJlbnRGcmFtZSgpOwotICAgIFNrU2hhZGVy KiBzaGFkZXIgPSBTa1NoYWRlcjo6Q3JlYXRlQml0bWFwU2hhZGVyKCpibSwgc2hhZGVyUnVsZSht X3JlcGVhdFgpLCBzaGFkZXJSdWxlKG1fcmVwZWF0WSkpOwotICAgIHNoYWRlci0+c2V0TG9jYWxN YXRyaXgocGF0dGVyblRyYW5zZm9ybSk7CisgICAgaWYgKG1fcmVwZWF0WCAmJiBtX3JlcGVhdFkp IHsKKyAgICAgIHNoYWRlciA9IFNrU2hhZGVyOjpDcmVhdGVCaXRtYXBTaGFkZXIoKmJtLCBTa1No YWRlcjo6a1JlcGVhdF9UaWxlTW9kZSwgU2tTaGFkZXI6OmtSZXBlYXRfVGlsZU1vZGUpOworICAg ICAgcmV0dXJuIHNoYWRlcjsKKyAgICB9CisKKyAgICAvLyBTa2lhIGRvZXMgbm90IGhhdmUgYSAi ZHJhdyB0aGUgdGlsZSBvbmx5IG9uY2UiIG9wdGlvbi4gQ2xhbXBfVGlsZU1vZGUKKyAgICAvLyBy ZXBlYXRzIHRoZSBsYXN0IGxpbmUgb2YgdGhlIGltYWdlIGFmdGVyIGRyYXdpbmcgb25lIHRpbGUu IFRvIGF2b2lkCisgICAgLy8gZmlsbGluZyB0aGUgc3BhY2Ugd2l0aCBhcmJpdHJhcnkgcGl4ZWxz LCB0aGlzIHdvcmthcm91bmQgZm9yY2VzIHRoZQorICAgIC8vIGltYWdlIHRvIGhhdmUgYSBsaW5l IG9mIHRyYW5zcGFyZW50IHBpeGVscyBvbiB0aGUgInJlcGVhdGVkIiBlZGdlKHMpLAorICAgIC8v IHRodXMgY2F1c2luZyBleHRyYSBzcGFjZSB0byBiZSB0cmFuc3BhcmVudCBmaWxsZWQuCisgICAg U2tTaGFkZXI6OlRpbGVNb2RlIHRpbGVNb2RlWCA9IG1fcmVwZWF0WCA/IFNrU2hhZGVyOjprUmVw ZWF0X1RpbGVNb2RlIDogU2tTaGFkZXI6OmtDbGFtcF9UaWxlTW9kZTsKKyAgICBTa1NoYWRlcjo6 VGlsZU1vZGUgdGlsZU1vZGVZID0gbV9yZXBlYXRZID8gU2tTaGFkZXI6OmtSZXBlYXRfVGlsZU1v ZGUgOiBTa1NoYWRlcjo6a0NsYW1wX1RpbGVNb2RlOworICAgIGludCBleHBhbmRXID0gbV9yZXBl YXRYID8gMCA6IDE7CisgICAgaW50IGV4cGFuZEggPSBtX3JlcGVhdFkgPyAwIDogMTsKKworICAg IC8vIENyZWF0ZSBhIHRyYW5zcGFyZW50IGJpdG1hcCAxIHBpeGVsIHdpZGVyIGFuZC9vciB0YWxs ZXIgdGhhbiB0aGUKKyAgICAvLyBvcmlnaW5hbCwgdGhlbiBjb3B5IHRoZSBvcmlnbmFsIGludG8g aXQuCisgICAgLy8gRklYTUU6IElzIHRoZXJlIGEgYmV0dGVyIHdheSB0byBwYWQgKG5vdCBzY2Fs ZSkgYW4gaW1hZ2UgaW4gc2tpYT8KKyAgICBTa0JpdG1hcCBibTI7CisgICAgYm0yLnNldENvbmZp ZyhibS0+Y29uZmlnKCksIGJtLT53aWR0aCgpICsgZXhwYW5kVywgYm0tPmhlaWdodCgpICsgZXhw YW5kSCk7CisgICAgYm0yLmFsbG9jUGl4ZWxzKCk7CisgICAgYm0yLmVyYXNlQVJHQigweDAwLCAw eDAwLCAweDAwLCAweDAwKTsKKyAgICBTa0NhbnZhcyBjYW52YXMoYm0yKTsKKyAgICBjYW52YXMu ZHJhd0JpdG1hcCgqYm0sIDAsIDApOworICAgIHNoYWRlciA9IFNrU2hhZGVyOjpDcmVhdGVCaXRt YXBTaGFkZXIoYm0yLCB0aWxlTW9kZVgsIHRpbGVNb2RlWSk7CiAgICAgcmV0dXJuIHNoYWRlcjsK IH0KIAo=