115768 2013-05-07 16:32:26 -0700 Store the quotes in the same allocation as the QuotesData object 2013-05-08 00:06:35 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue darin esprehn+autocc glenn oldest_to_newest 886033 0 andersca 2013-05-07 16:32:26 -0700 Store the quotes in the same allocation as the QuotesData object 886034 1 200992 andersca 2013-05-07 16:35:18 -0700 Created attachment 200992 Patch 886043 2 200992 kling 2013-05-07 16:52:30 -0700 Comment on attachment 200992 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=200992&action=review r=me!!! > Source/WebCore/rendering/style/QuotesData.h:35 > +#if COMPILER(MSVC) > +#pragma warning(push) > +#pragma warning(disable: 4200) // Disable "zero-sized array in struct/union" warning > +#endif Maybe we should just do this globally. > Source/WebCore/rendering/style/QuotesData.h:51 > + unsigned m_numQuotes; m_numFoo doesn't sound very WebKitty. How about m_quoteCount? 886094 3 andersca 2013-05-07 18:47:09 -0700 Committed r149707: <http://trac.webkit.org/changeset/149707> 886177 4 darin 2013-05-08 00:06:35 -0700 Anders, I have a fix for the regression here in my upcoming patch. 200992 2013-05-07 16:35:18 -0700 2013-05-07 16:52:29 -0700 Patch bug-115768-20130507163424.patch text/plain 5489 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5NzAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzFmMTFmODY2NTE0ZDJi YzVhODNkYmEwZDBhYjdlMWE0ZmEwNjZmZS4uNGJmMDM2NWVlODk1OWUyYzViYjA0YjE0OTVlNTNh ZDM0NGJmYTIyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM5IEBACiAyMDEzLTA1LTA3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgU3RvcmUgdGhlIHF1 b3RlcyBpbiB0aGUgc2FtZSBhbGxvY2F0aW9uIGFzIHRoZSBRdW90ZXNEYXRhIG9iamVjdAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE1NzY4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2luY2UgdGhlIFF1 b3Rlc0RhdGEgb2JqZWN0IGlzIGltbXV0YWJsZSB3ZSBkb24ndCBuZWVkIGEgVmVjdG9yIHRvIHN0 b3JlIHRoZSBxdW90ZSBwYWlycywKKyAgICAgICAgdGhleSBjYW4ganVzdCBiZSBzdG9yZWQgYWZ0 ZXIgdGhlIGNsYXNzIGRhdGEuCisKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUXVvdGVzRGF0 YS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzaXplRm9yUXVvdGVzRGF0YVdpdGhRdW90ZUNvdW50 KToKKyAgICAgICAgSGVscGVyIGZ1bmN0aW9uIGZvciBjb21wdXRpbmcgdGhlIGFsbG9jYXRpb24g c2l6ZS4KKworICAgICAgICAoV2ViQ29yZTo6UXVvdGVzRGF0YTo6Y3JlYXRlKToKKyAgICAgICAg VXNlIGZhc3RNYWxsb2MgKyBwbGFjZW1lbnQgbmV3LgorCisgICAgICAgIChXZWJDb3JlOjpRdW90 ZXNEYXRhOjpRdW90ZXNEYXRhKToKKyAgICAgICAgVXNlIHBsYWNlbWVudCBuZXcgdG8gYWxsb2Nh dGUgdGhlIHF1b3RlIHBhaXJzLgorCisgICAgICAgIChXZWJDb3JlOjpRdW90ZXNEYXRhOjp+UXVv dGVzRGF0YSk6CisgICAgICAgIERlc3Ryb3kgdGhlIHF1b3RlIHBhaXJzLgorCisgICAgICAgIChX ZWJDb3JlOjpRdW90ZXNEYXRhOjpvcGVuUXVvdGUpOgorICAgICAgICBTdG9wIHVzaW5nIFZlY3Rv ci4KKyAgICAgICAgCisgICAgICAgIChXZWJDb3JlOjpRdW90ZXNEYXRhOjpjbG9zZVF1b3RlKToK KyAgICAgICAgRGl0dG8uCisgICAgICAgIAorICAgICAgICAoV2ViQ29yZTo6b3BlcmF0b3I9PSk6 CisgICAgICAgIERpdHRvLgorICAgICAgICAKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUXVv dGVzRGF0YS5oOgorCisyMDEzLTA1LTA3ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBs ZS5jb20+CisKICAgICAgICAgQmVnaW4gdW5yYXZlbGluZyB0aGUgbWVzcyB0aGF0IGlzIFF1b3Rl c0RhdGEKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEx NTc2NQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUXVvdGVz RGF0YS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUXVvdGVzRGF0YS5jcHAK aW5kZXggNzU2ZGE4NGJlMDkxMGM1NzFlMGQxOGIzYmY5NzdhNTQ4MmY2YmI5My4uZmIwNjI0MTZk YTlhMGE0MzA3OTFkZmJjMzAxNTVlNGU3YTA5OGU0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N0eWxlL1F1b3Rlc0RhdGEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdHlsZS9RdW90ZXNEYXRhLmNwcApAQCAtMjQsNiArMjQsMTEgQEAKIAogbmFtZXNw YWNlIFdlYkNvcmUgewogCitzdGF0aWMgc2l6ZV90IHNpemVGb3JRdW90ZXNEYXRhV2l0aFF1b3Rl Q291bnQodW5zaWduZWQgY291bnQpCit7CisgICAgcmV0dXJuIHNpemVvZihRdW90ZXNEYXRhKSAr IHNpemVvZihzdGQ6OnBhaXI8U3RyaW5nLCBTdHJpbmc+KSAqIGNvdW50OworfQorCiBQYXNzUmVm UHRyPFF1b3Rlc0RhdGE+IFF1b3Rlc0RhdGE6OmNyZWF0ZShjb25zdCBTdHJpbmcmIG9wZW4xLCBj b25zdCBTdHJpbmcmIGNsb3NlMSwgY29uc3QgU3RyaW5nJiBvcGVuMiwgY29uc3QgU3RyaW5nJiBj bG9zZTIpCiB7CiAgICAgVmVjdG9yPHN0ZDo6cGFpcjxTdHJpbmcsIFN0cmluZz4gPiBxdW90ZXM7 CkBAIC0zNiwzNyArNDEsNTYgQEAgUGFzc1JlZlB0cjxRdW90ZXNEYXRhPiBRdW90ZXNEYXRhOjpj cmVhdGUoY29uc3QgU3RyaW5nJiBvcGVuMSwgY29uc3QgU3RyaW5nJiBjbG8KIAogUGFzc1JlZlB0 cjxRdW90ZXNEYXRhPiBRdW90ZXNEYXRhOjpjcmVhdGUoY29uc3QgVmVjdG9yPHN0ZDo6cGFpcjxT dHJpbmcsIFN0cmluZz4gPiYgcXVvdGVzKQogewotICAgIFJlZlB0cjxRdW90ZXNEYXRhPiBxdW90 ZXNEYXRhID0gYWRvcHRSZWYobmV3IFF1b3Rlc0RhdGEpOwotICAgIHF1b3Rlc0RhdGEtPm1fcXVv dGVQYWlycyA9IHF1b3RlczsKKyAgICB2b2lkKiBzbG90ID0gZmFzdE1hbGxvYyhzaXplRm9yUXVv dGVzRGF0YVdpdGhRdW90ZUNvdW50KHF1b3Rlcy5zaXplKCkpKTsKKyAgICByZXR1cm4gYWRvcHRS ZWYobmV3IChOb3ROdWxsLCBzbG90KSBRdW90ZXNEYXRhKHF1b3RlcykpOworfQorCitRdW90ZXNE YXRhOjpRdW90ZXNEYXRhKGNvbnN0IFZlY3RvcjxzdGQ6OnBhaXI8U3RyaW5nLCBTdHJpbmc+ID4m IHF1b3RlcykKKyAgICA6IG1fbnVtUXVvdGVzKHF1b3Rlcy5zaXplKCkpCit7CisgICAgZm9yICh1 bnNpZ25lZCBpID0gMDsgaSA8IG1fbnVtUXVvdGVzOyArK2kpCisgICAgICAgIG5ldyAoTm90TnVs bCwgJm1fcXVvdGVQYWlyc1tpXSkgc3RkOjpwYWlyPFN0cmluZywgU3RyaW5nPihxdW90ZXNbaV0p OworfQogCi0gICAgcmV0dXJuIHF1b3Rlc0RhdGEucmVsZWFzZSgpOworUXVvdGVzRGF0YTo6flF1 b3Rlc0RhdGEoKQoreworICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBtX251bVF1b3Rlczsg KytpKQorICAgICAgICBtX3F1b3RlUGFpcnNbaV0ufnBhaXI8U3RyaW5nLCBTdHJpbmc+KCk7CiB9 CiAKIGNvbnN0IFN0cmluZyYgUXVvdGVzRGF0YTo6b3BlblF1b3RlKHVuc2lnbmVkIGluZGV4KSBj b25zdAogewotICAgIGlmICghbV9xdW90ZVBhaXJzLmlzRW1wdHkoKSkKKyAgICBpZiAoIW1fbnVt UXVvdGVzKQogICAgICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKIAotICAgIGlmIChpbmRleCA+ PSBtX3F1b3RlUGFpcnMuc2l6ZSgpKQotICAgICAgICByZXR1cm4gbV9xdW90ZVBhaXJzLmxhc3Qo KS5maXJzdDsKKyAgICBpZiAoaW5kZXggPj0gbV9udW1RdW90ZXMpCisgICAgICAgIHJldHVybiBt X3F1b3RlUGFpcnNbbV9udW1RdW90ZXMgLSAxXS5maXJzdDsKIAogICAgIHJldHVybiBtX3F1b3Rl UGFpcnNbaW5kZXhdLmZpcnN0OwogfQogCiBjb25zdCBTdHJpbmcmIFF1b3Rlc0RhdGE6OmNsb3Nl UXVvdGUodW5zaWduZWQgaW5kZXgpIGNvbnN0CiB7Ci0gICAgaWYgKG1fcXVvdGVQYWlycy5pc0Vt cHR5KCkpCisgICAgaWYgKCFtX251bVF1b3RlcykKICAgICAgICAgcmV0dXJuIGVtcHR5U3RyaW5n KCk7CiAKLSAgICBpZiAoaW5kZXggPj0gbV9xdW90ZVBhaXJzLnNpemUoKSkKLSAgICAgICAgcmV0 dXJuIG1fcXVvdGVQYWlycy5sYXN0KCkuc2Vjb25kOworICAgIGlmIChpbmRleCA+PSBtX251bVF1 b3RlcykKKyAgICAgICAgcmV0dXJuIG1fcXVvdGVQYWlyc1ttX251bVF1b3RlcyAtIDFdLnNlY29u ZDsKIAotICAgIHJldHVybiBtX3F1b3RlUGFpcnMuYXQoaW5kZXgpLnNlY29uZDsKKyAgICByZXR1 cm4gbV9xdW90ZVBhaXJzW2luZGV4XS5zZWNvbmQ7CiB9CiAKIGJvb2wgb3BlcmF0b3I9PShjb25z dCBRdW90ZXNEYXRhJiBhLCBjb25zdCBRdW90ZXNEYXRhJiBiKQogewotICAgIHJldHVybiBhLm1f cXVvdGVQYWlycyA9PSBiLm1fcXVvdGVQYWlyczsKKyAgICBpZiAoYS5tX251bVF1b3RlcyAhPSBi Lm1fbnVtUXVvdGVzKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBmb3IgKHVuc2lnbmVk IGkgPSAwOyBpIDwgYS5tX251bVF1b3RlczsgKytpKSB7CisgICAgICAgIGlmIChhLm1fcXVvdGVQ YWlyc1tpXSAhPSBiLm1fcXVvdGVQYWlyc1tpXSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICB9CisKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1F1b3Rlc0RhdGEuaCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9RdW90ZXNEYXRhLmgKaW5kZXggODI1NjRl Zjg4OWFjOGRmNTYxZmE0NzZlNWNhNzMwNmNkNzY5NzkyMy4uN2FjMGNkZjNhZWY3OWM3NmRkOTJl NzZkMGMxZGUwYWYxNmYzMDVmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3N0eWxlL1F1b3Rlc0RhdGEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv UXVvdGVzRGF0YS5oCkBAIC0yOSwxMCArMjksMTYgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewog CisjaWYgQ09NUElMRVIoTVNWQykKKyNwcmFnbWEgd2FybmluZyhwdXNoKQorI3ByYWdtYSB3YXJu aW5nKGRpc2FibGU6IDQyMDApIC8vIERpc2FibGUgInplcm8tc2l6ZWQgYXJyYXkgaW4gc3RydWN0 L3VuaW9uIiB3YXJuaW5nCisjZW5kaWYKKwogY2xhc3MgUXVvdGVzRGF0YSA6IHB1YmxpYyBSZWZD b3VudGVkPFF1b3Rlc0RhdGE+IHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxRdW90 ZXNEYXRhPiBjcmVhdGUoY29uc3QgU3RyaW5nJiBvcGVuMSwgY29uc3QgU3RyaW5nJiBjbG9zZTEs IGNvbnN0IFN0cmluZyYgb3BlbjIsIGNvbnN0IFN0cmluZyYgY2xvc2UyKTsKICAgICBzdGF0aWMg UGFzc1JlZlB0cjxRdW90ZXNEYXRhPiBjcmVhdGUoY29uc3QgVmVjdG9yPHN0ZDo6cGFpcjxTdHJp bmcsIFN0cmluZz4gPiYgcXVvdGVzKTsKKyAgICB+UXVvdGVzRGF0YSgpOwogCiAgICAgZnJpZW5k IGJvb2wgb3BlcmF0b3I9PShjb25zdCBRdW90ZXNEYXRhJiwgY29uc3QgUXVvdGVzRGF0YSYpOwog CkBAIC00MCwxMSArNDYsMTYgQEAgcHVibGljOgogICAgIGNvbnN0IFN0cmluZyYgY2xvc2VRdW90 ZSh1bnNpZ25lZCBpbmRleCkgY29uc3Q7CiAKIHByaXZhdGU6Ci0gICAgUXVvdGVzRGF0YSgpIHsg fQorICAgIGV4cGxpY2l0IFF1b3Rlc0RhdGEoY29uc3QgVmVjdG9yPHN0ZDo6cGFpcjxTdHJpbmcs IFN0cmluZz4gPiYgcXVvdGVzKTsKIAotICAgIFZlY3RvcjxzdGQ6OnBhaXI8U3RyaW5nLCBTdHJp bmc+ID4gbV9xdW90ZVBhaXJzOworICAgIHVuc2lnbmVkIG1fbnVtUXVvdGVzOworICAgIHN0ZDo6 cGFpcjxTdHJpbmcsIFN0cmluZz4gbV9xdW90ZVBhaXJzWzBdOwogfTsKIAorI2lmIENPTVBJTEVS KE1TVkMpCisjcHJhZ21hIHdhcm5pbmcocG9wKQorI2VuZGlmCisKIGlubGluZSBib29sIG9wZXJh dG9yIT0oY29uc3QgUXVvdGVzRGF0YSYgYSwgY29uc3QgUXVvdGVzRGF0YSYgYikKIHsKICAgICBy ZXR1cm4gIShhID09IGIpOwo=