116337 2013-05-17 11:33:44 -0700 Add a compile assert for the size of RootInlineBox and InlineTextbox 2013-05-20 06:36:15 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 lamarque webkit-unassigned bruno.abinader commit-queue esprehn+autocc glenn oldest_to_newest 890543 0 lamarque 2013-05-17 11:33:44 -0700 Add ompile asserts for the size of RootInlineBox and InlineTextbox as suggested in https://bugs.webkit.org/show_bug.cgi?id=116108#c10 890547 1 202128 lamarque 2013-05-17 11:39:14 -0700 Created attachment 202128 Patch Proposed patch. 890596 2 202128 darin 2013-05-17 12:45:53 -0700 Comment on attachment 202128 Patch OK. 891178 3 202128 bruno.abinader 2013-05-20 06:29:01 -0700 Comment on attachment 202128 Patch >Subversion Revision: 150274 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index c3462a41eeba42daea64b3dd52e1cd5a2921f833..87f3a4d71cf3831575bdb44b62523b863aa2747c 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,19 @@ >+2013-05-17 Lamarque V. Souza <Lamarque.Souza@basyskom.com> >+ >+ Add compile asserts for the size of RootInlineBox and InlineTextbox >+ https://bugs.webkit.org/show_bug.cgi?id=116337 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Add compile asserts to ensure RootInlineBox and InlineTextbox stay small. >+ >+ * rendering/InlineTextBox.cpp: >+ (SameSizeAsInlineTextBox): >+ (WebCore): >+ * rendering/RootInlineBox.cpp: >+ (SameSizeAsRootInlineBox): >+ (WebCore): >+ > 2013-05-17 Darin Adler <darin@apple.com> > > [EFL] Move EFL port off legacy clipboard >diff --git a/Source/WebCore/rendering/InlineTextBox.cpp b/Source/WebCore/rendering/InlineTextBox.cpp >index 26e84ff73d1ac40a3bca1c9b359a617e1fe957db..365d02eb6e68766a59ed3cc3ae0270531188223e 100644 >--- a/Source/WebCore/rendering/InlineTextBox.cpp >+++ b/Source/WebCore/rendering/InlineTextBox.cpp >@@ -53,6 +53,14 @@ using namespace std; > > namespace WebCore { > >+struct SameSizeAsInlineTextBox : public InlineBox { >+ unsigned variables[1]; >+ unsigned short variables2[2]; >+ void* pointers[2]; >+}; >+ >+COMPILE_ASSERT(sizeof(InlineTextBox) == sizeof(SameSizeAsInlineTextBox), InlineTextBox_should_stay_small); >+ > typedef WTF::HashMap<const InlineTextBox*, LayoutRect> InlineTextBoxOverflowMap; > static InlineTextBoxOverflowMap* gTextBoxesWithOverflow; > >diff --git a/Source/WebCore/rendering/RootInlineBox.cpp b/Source/WebCore/rendering/RootInlineBox.cpp >index 626c8864a2769cda388ce82a42fb44e04c3e5d62..a83855d23b385222284140c0b83e24f5f32048c9 100644 >--- a/Source/WebCore/rendering/RootInlineBox.cpp >+++ b/Source/WebCore/rendering/RootInlineBox.cpp >@@ -43,6 +43,13 @@ using namespace std; > > namespace WebCore { > >+struct SameSizeAsRootInlineBox : public InlineFlowBox { >+ unsigned variables[5]; >+ void* pointers[4]; >+}; >+ >+COMPILE_ASSERT(sizeof(RootInlineBox) == sizeof(SameSizeAsRootInlineBox), RootInlineBox_should_stay_small); >+ > typedef WTF::HashMap<const RootInlineBox*, EllipsisBox*> EllipsisBoxMap; > static EllipsisBoxMap* gEllipsisBoxMap = 0; > 891181 4 202128 commit-queue 2013-05-20 06:36:13 -0700 Comment on attachment 202128 Patch Clearing flags on attachment: 202128 Committed r150365: <http://trac.webkit.org/changeset/150365> 891182 5 commit-queue 2013-05-20 06:36:15 -0700 All reviewed patches have been landed. Closing bug. 202128 2013-05-17 11:39:14 -0700 2013-05-20 06:36:13 -0700 Patch bug-116337-20130517153806.patch text/plain 2349 lamarque U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwMjc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzM0NjJhNDFlZWJhNDJk YWVhNjRiM2RkNTJlMWNkNWEyOTIxZjgzMy4uODdmM2E0ZDcxY2YzODMxNTc1YmRiNDRiNjI1MjNi ODYzYWEyNzQ3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTA1LTE3ICBMYW1h cnF1ZSBWLiBTb3V6YSAgPExhbWFycXVlLlNvdXphQGJhc3lza29tLmNvbT4KKworICAgICAgICBB ZGQgY29tcGlsZSBhc3NlcnRzIGZvciB0aGUgc2l6ZSBvZiBSb290SW5saW5lQm94IGFuZCBJbmxp bmVUZXh0Ym94CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTYzMzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgY29tcGlsZSBhc3NlcnRzIHRvIGVuc3VyZSBSb290SW5saW5lQm94IGFuZCBJbmxpbmVU ZXh0Ym94IHN0YXkgc21hbGwuCisKKyAgICAgICAgKiByZW5kZXJpbmcvSW5saW5lVGV4dEJveC5j cHA6CisgICAgICAgIChTYW1lU2l6ZUFzSW5saW5lVGV4dEJveCk6CisgICAgICAgIChXZWJDb3Jl KToKKyAgICAgICAgKiByZW5kZXJpbmcvUm9vdElubGluZUJveC5jcHA6CisgICAgICAgIChTYW1l U2l6ZUFzUm9vdElubGluZUJveCk6CisgICAgICAgIChXZWJDb3JlKToKKwogMjAxMy0wNS0xNyAg RGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0VGTF0gTW92ZSBFRkwg cG9ydCBvZmYgbGVnYWN5IGNsaXBib2FyZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0lubGluZVRleHRCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGlu ZVRleHRCb3guY3BwCmluZGV4IDI2ZTg0ZmY3M2QxYWM0MGEzYmNhMWM5YjM1OWE2MTdlMWZlOTU3 ZGIuLjM2NWQwMmViNmU2ODc2NmE1OWVkM2NjM2FlMDI3MDUzMTE4ODIyM2UgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAKQEAgLTUzLDYgKzUzLDE0IEBAIHVz aW5nIG5hbWVzcGFjZSBzdGQ7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorc3RydWN0IFNhbWVT aXplQXNJbmxpbmVUZXh0Qm94IDogcHVibGljIElubGluZUJveCB7CisgICAgdW5zaWduZWQgdmFy aWFibGVzWzFdOworICAgIHVuc2lnbmVkIHNob3J0IHZhcmlhYmxlczJbMl07CisgICAgdm9pZCog cG9pbnRlcnNbMl07Cit9OworCitDT01QSUxFX0FTU0VSVChzaXplb2YoSW5saW5lVGV4dEJveCkg PT0gc2l6ZW9mKFNhbWVTaXplQXNJbmxpbmVUZXh0Qm94KSwgSW5saW5lVGV4dEJveF9zaG91bGRf c3RheV9zbWFsbCk7CisKIHR5cGVkZWYgV1RGOjpIYXNoTWFwPGNvbnN0IElubGluZVRleHRCb3gq LCBMYXlvdXRSZWN0PiBJbmxpbmVUZXh0Qm94T3ZlcmZsb3dNYXA7CiBzdGF0aWMgSW5saW5lVGV4 dEJveE92ZXJmbG93TWFwKiBnVGV4dEJveGVzV2l0aE92ZXJmbG93OwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUm9vdElubGluZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUm9vdElubGluZUJveC5jcHAKaW5kZXggNjI2Yzg4NjRhMjc2OWNkYTM4OGNl ODJhNDJmYjQ0ZTA0YzNlNWQ2Mi4uYTgzODU1ZDIzYjM4NTIyMjI4NDE0MGMwYjgzZTI0ZjVmMzIw NDhjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jvb3RJbmxpbmVCb3gu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Sb290SW5saW5lQm94LmNwcApAQCAt NDMsNiArNDMsMTMgQEAgdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAogbmFtZXNwYWNlIFdlYkNvcmUg ewogICAgIAorc3RydWN0IFNhbWVTaXplQXNSb290SW5saW5lQm94IDogcHVibGljIElubGluZUZs b3dCb3ggeworICAgIHVuc2lnbmVkIHZhcmlhYmxlc1s1XTsKKyAgICB2b2lkKiBwb2ludGVyc1s0 XTsKK307CisKK0NPTVBJTEVfQVNTRVJUKHNpemVvZihSb290SW5saW5lQm94KSA9PSBzaXplb2Yo U2FtZVNpemVBc1Jvb3RJbmxpbmVCb3gpLCBSb290SW5saW5lQm94X3Nob3VsZF9zdGF5X3NtYWxs KTsKKwogdHlwZWRlZiBXVEY6Okhhc2hNYXA8Y29uc3QgUm9vdElubGluZUJveCosIEVsbGlwc2lz Qm94Kj4gRWxsaXBzaXNCb3hNYXA7CiBzdGF0aWMgRWxsaXBzaXNCb3hNYXAqIGdFbGxpcHNpc0Jv eE1hcCA9IDA7CiAK