37353 2010-04-09 13:29:58 -0700 [RenderStyle Cleanup] Clean up CursorData, CursorList 2010-04-09 13:44:25 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 hyatt hyatt oldest_to_newest 210881 0 hyatt 2010-04-09 13:29:58 -0700 Style cleanup on the cursor classes used by RenderStyle. 210890 1 52986 hyatt 2010-04-09 13:37:45 -0700 Created attachment 52986 Patch 210893 2 52986 aroben 2010-04-09 13:40:15 -0700 Comment on attachment 52986 Patch > void RenderStyle::addCursor(CachedImage* image, const IntPoint& hotSpot) > { > - CursorData data; > - data.cursorImage = image; > - data.hotSpot = hotSpot; > + CursorData data(image, hotSpot); > if (!inherited.access()->cursorData) > inherited.access()->cursorData = CursorList::create(); > inherited.access()->cursorData->append(data); I don't think you need a local variable here at all. r=me 210898 3 hyatt 2010-04-09 13:44:25 -0700 Fixed in r57358. 52986 2010-04-09 13:37:45 -0700 2010-04-09 13:40:15 -0700 Patch patch.txt text/plain 4453 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzM1NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMTAtMDQtMDkgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzM1MywgY2xlYW4gdXAgY3Vyc29y cyB1c2VkIGJ5IFJlbmRlclN0eWxlcy4KKworICAgICAgICAqIGNzcy9DU1NDb21wdXRlZFN0eWxl RGVjbGFyYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTQ29tcHV0ZWRTdHlsZURlY2xh cmF0aW9uOjpnZXRQcm9wZXJ0eUNTU1ZhbHVlKToKKyAgICAgICAgKiBwYWdlL0V2ZW50SGFuZGxl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OnNlbGVjdEN1cnNvcik6Cisg ICAgICAgICogcmVuZGVyaW5nL3N0eWxlL0N1cnNvckRhdGEuaDoKKyAgICAgICAgKFdlYkNvcmU6 OkN1cnNvckRhdGE6OkN1cnNvckRhdGEpOgorICAgICAgICAoV2ViQ29yZTo6Q3Vyc29yRGF0YTo6 b3BlcmF0b3I9PSk6CisgICAgICAgIChXZWJDb3JlOjpDdXJzb3JEYXRhOjppbWFnZSk6CisgICAg ICAgIChXZWJDb3JlOjpDdXJzb3JEYXRhOjpob3RTcG90KToKKyAgICAgICAgKiByZW5kZXJpbmcv c3R5bGUvUmVuZGVyU3R5bGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OmFk ZEN1cnNvcik6CisKIDIwMTAtMDQtMDkgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gUm9iZW4uCkluZGV4OiBXZWJDb3JlL2Nzcy9DU1ND b21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvY3NzL0NT U0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAJKHJldmlzaW9uIDU3MjkyKQorKysgV2ViQ29y ZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAt ODIwLDcgKzgyMCw3IEBAIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IENTU0NvbXB1dGVkU3R5bGVEZWMK ICAgICAgICAgICAgIGlmIChjdXJzb3JzICYmIGN1cnNvcnMtPnNpemUoKSA+IDApIHsKICAgICAg ICAgICAgICAgICBsaXN0ID0gQ1NTVmFsdWVMaXN0OjpjcmVhdGVDb21tYVNlcGFyYXRlZCgpOwog ICAgICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBjdXJzb3JzLT5zaXplKCk7 ICsraSkKLSAgICAgICAgICAgICAgICAgICAgbGlzdC0+YXBwZW5kKENTU1ByaW1pdGl2ZVZhbHVl OjpjcmVhdGUoKCpjdXJzb3JzKVtpXS5jdXJzb3JJbWFnZS0+dXJsKCksIENTU1ByaW1pdGl2ZVZh bHVlOjpDU1NfVVJJKSk7CisgICAgICAgICAgICAgICAgICAgIGxpc3QtPmFwcGVuZChDU1NQcmlt aXRpdmVWYWx1ZTo6Y3JlYXRlKCgqY3Vyc29ycylbaV0uaW1hZ2UoKS0+dXJsKCksIENTU1ByaW1p dGl2ZVZhbHVlOjpDU1NfVVJJKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBSZWZQdHI8 Q1NTVmFsdWU+IHZhbHVlID0gQ1NTUHJpbWl0aXZlVmFsdWU6OmNyZWF0ZShzdHlsZS0+Y3Vyc29y KCkpOwogICAgICAgICAgICAgaWYgKGxpc3QpIHsKSW5kZXg6IFdlYkNvcmUvcGFnZS9FdmVudEhh bmRsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCShy ZXZpc2lvbiA1NzI5MSkKKysrIFdlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xMDIxLDggKzEwMjEsOCBAQCBDdXJzb3IgRXZlbnRIYW5kbGVyOjpzZWxlY3RD dXJzb3IoY29uc3QgCiAgICAgaWYgKHN0eWxlICYmIHN0eWxlLT5jdXJzb3JzKCkpIHsKICAgICAg ICAgY29uc3QgQ3Vyc29yTGlzdCogY3Vyc29ycyA9IHN0eWxlLT5jdXJzb3JzKCk7CiAgICAgICAg IGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBjdXJzb3JzLT5zaXplKCk7ICsraSkgewotICAgICAg ICAgICAgQ2FjaGVkSW1hZ2UqIGNpbWFnZSA9ICgqY3Vyc29ycylbaV0uY3Vyc29ySW1hZ2UuZ2V0 KCk7Ci0gICAgICAgICAgICBJbnRQb2ludCBob3RTcG90ID0gKCpjdXJzb3JzKVtpXS5ob3RTcG90 OworICAgICAgICAgICAgY29uc3QgQ2FjaGVkSW1hZ2UqIGNpbWFnZSA9ICgqY3Vyc29ycylbaV0u aW1hZ2UoKTsKKyAgICAgICAgICAgIEludFBvaW50IGhvdFNwb3QgPSAoKmN1cnNvcnMpW2ldLmhv dFNwb3QoKTsKICAgICAgICAgICAgIGlmICghY2ltYWdlKQogICAgICAgICAgICAgICAgIGNvbnRp bnVlOwogICAgICAgICAgICAgLy8gTGltaXQgdGhlIHNpemUgb2YgY3Vyc29ycyBzbyB0aGF0IHRo ZXkgY2Fubm90IGJlIHVzZWQgdG8gY292ZXIgVUkgZWxlbWVudHMgaW4gY2hyb21lLgpJbmRleDog V2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvQ3Vyc29yRGF0YS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvcmVuZGVyaW5nL3N0eWxlL0N1cnNvckRhdGEuaAkocmV2aXNpb24gNTcyOTEpCisrKyBXZWJD b3JlL3JlbmRlcmluZy9zdHlsZS9DdXJzb3JEYXRhLmgJKHdvcmtpbmcgY29weSkKQEAgLTMxLDE1 ICszMSwxNyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLXN0cnVjdCBDdXJzb3JEYXRhIHsK LSAgICBDdXJzb3JEYXRhKCkKLSAgICAgICAgOiBjdXJzb3JJbWFnZSgwKQorY2xhc3MgQ3Vyc29y RGF0YSB7CitwdWJsaWM6CisgICAgQ3Vyc29yRGF0YShDYWNoZWRJbWFnZSogaW1hZ2UsIGNvbnN0 IEludFBvaW50JiBob3RTcG90KQorICAgICAgICA6IG1faW1hZ2UoaW1hZ2UpCisgICAgICAgICwg bV9ob3RTcG90KGhvdFNwb3QpCiAgICAgewogICAgIH0KIAogICAgIGJvb2wgb3BlcmF0b3I9PShj b25zdCBDdXJzb3JEYXRhJiBvKSBjb25zdAogICAgIHsKLSAgICAgICAgcmV0dXJuIGhvdFNwb3Qg PT0gby5ob3RTcG90ICYmIGN1cnNvckltYWdlID09IG8uY3Vyc29ySW1hZ2U7CisgICAgICAgIHJl dHVybiBtX2hvdFNwb3QgPT0gby5tX2hvdFNwb3QgJiYgbV9pbWFnZSA9PSBvLm1faW1hZ2U7CiAg ICAgfQogCiAgICAgYm9vbCBvcGVyYXRvciE9KGNvbnN0IEN1cnNvckRhdGEmIG8pIGNvbnN0CkBA IC00Nyw4ICs0OSwxMiBAQCBzdHJ1Y3QgQ3Vyc29yRGF0YSB7CiAgICAgICAgIHJldHVybiAhKCp0 aGlzID09IG8pOwogICAgIH0KIAotICAgIEludFBvaW50IGhvdFNwb3Q7IC8vIGZvciBDU1MzIHN1 cHBvcnQKLSAgICBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRJbWFnZT4gY3Vyc29ySW1hZ2U7 CisgICAgY29uc3QgQ2FjaGVkSW1hZ2UqIGltYWdlKCkgY29uc3QgeyByZXR1cm4gbV9pbWFnZS5n ZXQoKTsgfSAgICAKKyAgICBjb25zdCBJbnRQb2ludCYgaG90U3BvdCgpIGNvbnN0IHsgcmV0dXJu IG1faG90U3BvdDsgfQorICAgIAorcHJpdmF0ZToKKyAgICBDYWNoZWRSZXNvdXJjZUhhbmRsZTxD YWNoZWRJbWFnZT4gbV9pbWFnZTsKKyAgICBJbnRQb2ludCBtX2hvdFNwb3Q7IC8vIGZvciBDU1Mz IHN1cHBvcnQKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFdlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRl cmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAJKHJldmlzaW9uIDU3MzU1KQorKysgV2ViQ29yZS9y ZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NDIsOSAr NTQyLDcgQEAgdm9pZCBSZW5kZXJTdHlsZTo6c2V0Q2xpcChMZW5ndGggdG9wLCBMZQogCiB2b2lk IFJlbmRlclN0eWxlOjphZGRDdXJzb3IoQ2FjaGVkSW1hZ2UqIGltYWdlLCBjb25zdCBJbnRQb2lu dCYgaG90U3BvdCkKIHsKLSAgICBDdXJzb3JEYXRhIGRhdGE7Ci0gICAgZGF0YS5jdXJzb3JJbWFn ZSA9IGltYWdlOwotICAgIGRhdGEuaG90U3BvdCA9IGhvdFNwb3Q7CisgICAgQ3Vyc29yRGF0YSBk YXRhKGltYWdlLCBob3RTcG90KTsKICAgICBpZiAoIWluaGVyaXRlZC5hY2Nlc3MoKS0+Y3Vyc29y RGF0YSkKICAgICAgICAgaW5oZXJpdGVkLmFjY2VzcygpLT5jdXJzb3JEYXRhID0gQ3Vyc29yTGlz dDo6Y3JlYXRlKCk7CiAgICAgaW5oZXJpdGVkLmFjY2VzcygpLT5jdXJzb3JEYXRhLT5hcHBlbmQo ZGF0YSk7Cg==