89112 2012-06-14 10:43:16 -0700 Fix bit packing of StyleRareInheritedData on Windows 2012-06-14 15:33:42 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tony tony eric rniwa webkit.review.bot oldest_to_newest 649288 0 tony 2012-06-14 10:43:16 -0700 Fix bit packing of StyleRareInheritedData on Windows 649289 1 147614 tony 2012-06-14 10:44:27 -0700 Created attachment 147614 Patch 649300 2 147614 rniwa 2012-06-14 10:56:10 -0700 Comment on attachment 147614 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=147614&action=review > Source/WebCore/rendering/style/StyleRareInheritedData.cpp:44 > + unsigned m_bitfields[2]; > + > + Color colors[6]; > + float floats[2]; > + void* ownPtrs[1]; > + AtomicString atomicStrings[5]; > + void* refPtrs[2]; > + Length lengths[1]; > + short pagedMediaShorts[2]; > + unsigned unsigneds[1]; > + short hyphenationShorts[3]; I would be very careful with the order in which these things appear. e.g. unsigned a; void* b; unsigned c; and unsigned a; unsigned b; void* c will consume a different size on a 64-bit architecture. 649349 3 tony 2012-06-14 11:51:23 -0700 (In reply to comment #2) > (From update of attachment 147614 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=147614&action=review > > > Source/WebCore/rendering/style/StyleRareInheritedData.cpp:44 > > + unsigned m_bitfields[2]; > > + > > + Color colors[6]; > > + float floats[2]; > > + void* ownPtrs[1]; > > + AtomicString atomicStrings[5]; > > + void* refPtrs[2]; > > + Length lengths[1]; > > + short pagedMediaShorts[2]; > > + unsigned unsigneds[1]; > > + short hyphenationShorts[3]; > > I would be very careful with the order in which these things appear. > e.g. > unsigned a; > void* b; > unsigned c; > and > unsigned a; > unsigned b; > void* c > will consume a different size on a 64-bit architecture. Hmm, you're right. I think it's an accident that these match. I'm going to reorder the test values. I bet we can save some memory by reordering some values, but I'll do that in a follow up patch. 649354 4 147625 tony 2012-06-14 11:56:40 -0700 Created attachment 147625 Patch for landing 649545 5 147625 webkit.review.bot 2012-06-14 15:33:38 -0700 Comment on attachment 147625 Patch for landing Clearing flags on attachment: 147625 Committed r120366: <http://trac.webkit.org/changeset/120366> 649546 6 webkit.review.bot 2012-06-14 15:33:42 -0700 All reviewed patches have been landed. Closing bug. 147614 2012-06-14 10:44:27 -0700 2012-06-14 11:56:37 -0700 Patch bug-89112-20120614104430.patch text/plain 3008 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMzMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmViNmVhZjI4Y2UzMTVm OGU4ZjJlYjlmMzI2NzczNDFmM2Y0YTIxNC4uNjI5N2I5OTg3OWNlYzEzZjRmMWM0NjdlMzMxOTI3 YjZlZmRiN2Q4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA2LTE0ICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgRml4IGJpdCBwYWNraW5nIG9m IFN0eWxlUmFyZUluaGVyaXRlZERhdGEgb24gV2luZG93cworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkxMTIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPbiBteSBtYWNoaW5lICg2NCBiaXQgQ2hyb21pdW0g TGludXgpLCBTdHlsZVJhcmVJbmhlcml0ZWREYXRhIGlzIDE2OCBieXRlcy4KKworICAgICAgICBO byBuZXcgdGVzdHMsIGFkZGVkIGEgY29tcGlsZSBhc3NlcnQgdG8gZW5zdXJlIGNvcnJlY3RuZXNz IGdvaW5nIGZvcndhcmQuCisKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlSW5o ZXJpdGVkRGF0YS5jcHA6CisgICAgICAgIChTYW1lU2l6ZUFzU3R5bGVSYXJlSW5oZXJpdGVkRGF0 YSk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvU3R5bGVS YXJlSW5oZXJpdGVkRGF0YS5oOgorICAgICAgICAoU3R5bGVSYXJlSW5oZXJpdGVkRGF0YSk6CisK IDIwMTItMDYtMTMgIE1hcmsgSGFobmVuYmVyZyAgPG1oYWhuZW5iZXJnQGFwcGxlLmNvbT4KIAog ICAgICAgICBXb3JrZXIgdGVhci1kb3duIGNhbiByZS1lbnRlciBKU0MgZHVyaW5nIEdDIGZpbmFs aXphdGlvbiBwdC4gMgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxl L1N0eWxlUmFyZUluaGVyaXRlZERhdGEuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0 eWxlL1N0eWxlUmFyZUluaGVyaXRlZERhdGEuY3BwCmluZGV4IGNhNjUyZDZlZDk3MzkzNGRiNzA0 YzRlZmI4ZDRjZGJlZDVkNGI2NWQuLmE4MTU5OTUzNDk2OGZjYzgwMjU2NzY1MTg0YjU2ZjU3NzUx ZTdlYWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZVJh cmVJbmhlcml0ZWREYXRhLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv U3R5bGVSYXJlSW5oZXJpdGVkRGF0YS5jcHAKQEAgLTMwLDYgKzMwLDM0IEBACiAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIAorc3RydWN0IFNhbWVTaXplQXNTdHlsZVJhcmVJbmhlcml0ZWREYXRhIDog cHVibGljIFJlZkNvdW50ZWQ8U2FtZVNpemVBc1N0eWxlUmFyZUluaGVyaXRlZERhdGE+IHsKKyAg ICB1bnNpZ25lZCBtX2JpdGZpZWxkc1syXTsKKworICAgIENvbG9yIGNvbG9yc1s2XTsKKyAgICBm bG9hdCBmbG9hdHNbMl07CisgICAgdm9pZCogb3duUHRyc1sxXTsKKyAgICBBdG9taWNTdHJpbmcg YXRvbWljU3RyaW5nc1s1XTsKKyAgICB2b2lkKiByZWZQdHJzWzJdOworICAgIExlbmd0aCBsZW5n dGhzWzFdOworICAgIHNob3J0IHBhZ2VkTWVkaWFTaG9ydHNbMl07CisgICAgdW5zaWduZWQgdW5z aWduZWRzWzFdOworICAgIHNob3J0IGh5cGhlbmF0aW9uU2hvcnRzWzNdOworCisjaWYgRU5BQkxF KENTU19JTUFHRV9SRVNPTFVUSU9OKQorICAgIGZsb2F0IGltYWdlUmVzb2x1dGlvbkZsb2F0czsK KyNlbmRpZgorCisjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykKKyAgICBDb2xvciB0b3VjaENvbG9y czsKKyNlbmRpZgorCisjaWYgRU5BQkxFKENTU19WQVJJQUJMRVMpCisgICAgdm9pZCogdmFyaWFi bGVEYXRhUmVmc1sxXTsKKyNlbmRpZgorfTsKKworQ09NUElMRV9BU1NFUlQoc2l6ZW9mKFN0eWxl UmFyZUluaGVyaXRlZERhdGEpID09IHNpemVvZihTYW1lU2l6ZUFzU3R5bGVSYXJlSW5oZXJpdGVk RGF0YSksIFN0eWxlUmFyZUluaGVyaXRlZERhdGFfc2hvdWxkX2JpdF9wYWNrKTsKKwogU3R5bGVS YXJlSW5oZXJpdGVkRGF0YTo6U3R5bGVSYXJlSW5oZXJpdGVkRGF0YSgpCiAgICAgOiB0ZXh0U3Ry b2tlV2lkdGgoUmVuZGVyU3R5bGU6OmluaXRpYWxUZXh0U3Ryb2tlV2lkdGgoKSkKICAgICAsIGlu ZGVudChSZW5kZXJTdHlsZTo6aW5pdGlhbFRleHRJbmRlbnQoKSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVJbmhlcml0ZWREYXRhLmggYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlSW5oZXJpdGVkRGF0YS5oCmluZGV4 IDM0MWYzZDk4MDBlYTYzMTgzMmVmOTFkNWYwY2RmYjYwNjEzNmU1ZWIuLmIzMjllOGJmZDljNzhj NDdjNjc4NjU2ZjY1NmJkYzFjNWQwMTg5MzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdHlsZS9TdHlsZVJhcmVJbmhlcml0ZWREYXRhLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFyZUluaGVyaXRlZERhdGEuaApAQCAtODQsNyArODQs NyBAQCBwdWJsaWM6CiAgICAgdW5zaWduZWQgd29yZFdyYXAgOiAxOyAvLyBFV29yZFdyYXAgCiAg ICAgdW5zaWduZWQgbmJzcE1vZGUgOiAxOyAvLyBFTkJTUE1vZGUKICAgICB1bnNpZ25lZCBraHRt bExpbmVCcmVhayA6IDE7IC8vIEVLSFRNTExpbmVCcmVhawotICAgIGJvb2wgdGV4dFNpemVBZGp1 c3QgOiAxOyAvLyBBbiBBcHBsZSBleHRlbnNpb24uCisgICAgdW5zaWduZWQgdGV4dFNpemVBZGp1 c3QgOiAxOyAvLyBBbiBBcHBsZSBleHRlbnNpb24uCiAgICAgdW5zaWduZWQgcmVzaXplIDogMjsg Ly8gRVJlc2l6ZQogICAgIHVuc2lnbmVkIHVzZXJTZWxlY3QgOiAxOyAgLy8gRVVzZXJTZWxlY3QK ICAgICB1bnNpZ25lZCBjb2xvclNwYWNlIDogMTsgLy8gQ29sb3JTcGFjZQo= 147625 2012-06-14 11:56:40 -0700 2012-06-14 15:33:38 -0700 Patch for landing bug-89112-20120614115644.patch text/plain 3052 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMzMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmViNmVhZjI4Y2UzMTVm OGU4ZjJlYjlmMzI2NzczNDFmM2Y0YTIxNC4uNjg3NTRmOGUzMGQyMjBhZmQ1MjY3NmZkYTFlYThj OTA0YjZmNjU1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA2LTE0ICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgRml4IGJpdCBwYWNraW5nIG9m IFN0eWxlUmFyZUluaGVyaXRlZERhdGEgb24gV2luZG93cworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkxMTIKKworICAgICAgICBSZXZpZXdlZCBieSBS eW9zdWtlIE5pd2EuCisKKyAgICAgICAgT24gbXkgbWFjaGluZSAoNjQgYml0IENocm9taXVtIExp bnV4KSwgU3R5bGVSYXJlSW5oZXJpdGVkRGF0YSBpcyAxNjggYnl0ZXMuCisKKyAgICAgICAgTm8g bmV3IHRlc3RzLCBhZGRlZCBhIGNvbXBpbGUgYXNzZXJ0IHRvIGVuc3VyZSBjb3JyZWN0bmVzcyBn b2luZyBmb3J3YXJkLgorCisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFyZUluaGVy aXRlZERhdGEuY3BwOgorICAgICAgICAoU2FtZVNpemVBc1N0eWxlUmFyZUluaGVyaXRlZERhdGEp OgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFy ZUluaGVyaXRlZERhdGEuaDoKKyAgICAgICAgKFN0eWxlUmFyZUluaGVyaXRlZERhdGEpOgorCiAy MDEyLTA2LTEzICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CiAKICAg ICAgICAgV29ya2VyIHRlYXItZG93biBjYW4gcmUtZW50ZXIgSlNDIGR1cmluZyBHQyBmaW5hbGl6 YXRpb24gcHQuIDIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9T dHlsZVJhcmVJbmhlcml0ZWREYXRhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHls ZS9TdHlsZVJhcmVJbmhlcml0ZWREYXRhLmNwcAppbmRleCBjYTY1MmQ2ZWQ5NzM5MzRkYjcwNGM0 ZWZiOGQ0Y2RiZWQ1ZDRiNjVkLi4zNWE1MmU1NDU3ZGU4OTMzYTljYTg5YmJiYzgzYzdiMjExYWU4 ZGQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJl SW5oZXJpdGVkRGF0YS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0 eWxlUmFyZUluaGVyaXRlZERhdGEuY3BwCkBAIC0zMCw2ICszMCwzNSBAQAogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKK3N0cnVjdCBTYW1lU2l6ZUFzU3R5bGVSYXJlSW5oZXJpdGVkRGF0YSA6IHB1 YmxpYyBSZWZDb3VudGVkPFNhbWVTaXplQXNTdHlsZVJhcmVJbmhlcml0ZWREYXRhPiB7CisgICAg Q29sb3IgZmlyc3RDb2xvcjsKKyAgICBmbG9hdCBmaXJzdEZsb2F0OworICAgIENvbG9yIGNvbG9y c1s1XTsKKyAgICB2b2lkKiBvd25QdHJzWzFdOworICAgIEF0b21pY1N0cmluZyBhdG9taWNTdHJp bmdzWzVdOworICAgIHZvaWQqIHJlZlB0cnNbMl07CisgICAgTGVuZ3RoIGxlbmd0aHNbMV07Cisg ICAgZmxvYXQgc2Vjb25kRmxvYXQ7CisgICAgdW5zaWduZWQgbV9iaXRmaWVsZHNbMl07CisgICAg c2hvcnQgcGFnZWRNZWRpYVNob3J0c1syXTsKKyAgICB1bnNpZ25lZCB1bnNpZ25lZHNbMV07Cisg ICAgc2hvcnQgaHlwaGVuYXRpb25TaG9ydHNbM107CisKKyNpZiBFTkFCTEUoQ1NTX0lNQUdFX1JF U09MVVRJT04pCisgICAgZmxvYXQgaW1hZ2VSZXNvbHV0aW9uRmxvYXRzOworI2VuZGlmCisKKyNp ZiBFTkFCTEUoVE9VQ0hfRVZFTlRTKQorICAgIENvbG9yIHRvdWNoQ29sb3JzOworI2VuZGlmCisK KyNpZiBFTkFCTEUoQ1NTX1ZBUklBQkxFUykKKyAgICB2b2lkKiB2YXJpYWJsZURhdGFSZWZzWzFd OworI2VuZGlmCit9OworCitDT01QSUxFX0FTU0VSVChzaXplb2YoU3R5bGVSYXJlSW5oZXJpdGVk RGF0YSkgPT0gc2l6ZW9mKFNhbWVTaXplQXNTdHlsZVJhcmVJbmhlcml0ZWREYXRhKSwgU3R5bGVS YXJlSW5oZXJpdGVkRGF0YV9zaG91bGRfYml0X3BhY2spOworCiBTdHlsZVJhcmVJbmhlcml0ZWRE YXRhOjpTdHlsZVJhcmVJbmhlcml0ZWREYXRhKCkKICAgICA6IHRleHRTdHJva2VXaWR0aChSZW5k ZXJTdHlsZTo6aW5pdGlhbFRleHRTdHJva2VXaWR0aCgpKQogICAgICwgaW5kZW50KFJlbmRlclN0 eWxlOjppbml0aWFsVGV4dEluZGVudCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL1N0eWxlUmFyZUluaGVyaXRlZERhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdHlsZS9TdHlsZVJhcmVJbmhlcml0ZWREYXRhLmgKaW5kZXggMzQxZjNkOTgwMGVh NjMxODMyZWY5MWQ1ZjBjZGZiNjA2MTM2ZTVlYi4uYjMyOWU4YmZkOWM3OGM0N2M2Nzg2NTZmNjU2 YmRjMWM1ZDAxODkzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxl L1N0eWxlUmFyZUluaGVyaXRlZERhdGEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3R5bGUvU3R5bGVSYXJlSW5oZXJpdGVkRGF0YS5oCkBAIC04NCw3ICs4NCw3IEBAIHB1YmxpYzoK ICAgICB1bnNpZ25lZCB3b3JkV3JhcCA6IDE7IC8vIEVXb3JkV3JhcCAKICAgICB1bnNpZ25lZCBu YnNwTW9kZSA6IDE7IC8vIEVOQlNQTW9kZQogICAgIHVuc2lnbmVkIGtodG1sTGluZUJyZWFrIDog MTsgLy8gRUtIVE1MTGluZUJyZWFrCi0gICAgYm9vbCB0ZXh0U2l6ZUFkanVzdCA6IDE7IC8vIEFu IEFwcGxlIGV4dGVuc2lvbi4KKyAgICB1bnNpZ25lZCB0ZXh0U2l6ZUFkanVzdCA6IDE7IC8vIEFu IEFwcGxlIGV4dGVuc2lvbi4KICAgICB1bnNpZ25lZCByZXNpemUgOiAyOyAvLyBFUmVzaXplCiAg ICAgdW5zaWduZWQgdXNlclNlbGVjdCA6IDE7ICAvLyBFVXNlclNlbGVjdAogICAgIHVuc2lnbmVk IGNvbG9yU3BhY2UgOiAxOyAvLyBDb2xvclNwYWNlCg==