OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 22 matching lines...) Expand all Loading... |
33 | 33 |
34 #include "core/rendering/style/RenderStyle.h" | 34 #include "core/rendering/style/RenderStyle.h" |
35 | 35 |
36 namespace WebCore { | 36 namespace WebCore { |
37 | 37 |
38 struct SameSizeAsElementRareData : NodeRareData { | 38 struct SameSizeAsElementRareData : NodeRareData { |
39 short indices[2]; | 39 short indices[2]; |
40 unsigned bitfields; | 40 unsigned bitfields; |
41 LayoutSize sizeForResizing; | 41 LayoutSize sizeForResizing; |
42 IntSize scrollOffset; | 42 IntSize scrollOffset; |
43 void* pointers[12]; | 43 void* pointers[11]; |
| 44 OwnPtrWillBePersistent<InlineCSSStyleDeclaration> cssomWrapper; |
44 }; | 45 }; |
45 | 46 |
46 CSSStyleDeclaration& ElementRareData::ensureInlineCSSStyleDeclaration(Element* o
wnerElement) | 47 CSSStyleDeclaration& ElementRareData::ensureInlineCSSStyleDeclaration(Element* o
wnerElement) |
47 { | 48 { |
48 if (!m_cssomWrapper) | 49 if (!m_cssomWrapper) |
49 m_cssomWrapper = adoptPtr(new InlineCSSStyleDeclaration(ownerElement)); | 50 m_cssomWrapper = adoptPtrWillBeNoop(new InlineCSSStyleDeclaration(ownerE
lement)); |
50 return *m_cssomWrapper; | 51 return *m_cssomWrapper; |
51 } | 52 } |
52 | 53 |
53 | 54 |
54 COMPILE_ASSERT(sizeof(ElementRareData) == sizeof(SameSizeAsElementRareData), Ele
mentRareDataShouldStaySmall); | 55 COMPILE_ASSERT(sizeof(ElementRareData) == sizeof(SameSizeAsElementRareData), Ele
mentRareDataShouldStaySmall); |
55 | 56 |
56 } // namespace WebCore | 57 } // namespace WebCore |
OLD | NEW |