Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(769)

Side by Side Diff: Source/core/dom/ElementRareData.cpp

Issue 201153006: Move element flags from ElementRareData to NodeRareData (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebased (another ElementFlag added upstream) Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/dom/ElementRareData.h ('k') | Source/core/dom/NodeRareData.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 19 matching lines...) Expand all
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/dom/ElementRareData.h" 32 #include "core/dom/ElementRareData.h"
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;
41 LayoutSize sizeForResizing; 40 LayoutSize sizeForResizing;
42 IntSize scrollOffset; 41 IntSize scrollOffset;
43 void* pointers[11]; 42 void* pointers[11];
44 }; 43 };
45 44
46 CSSStyleDeclaration& ElementRareData::ensureInlineCSSStyleDeclaration(Element* o wnerElement) 45 CSSStyleDeclaration& ElementRareData::ensureInlineCSSStyleDeclaration(Element* o wnerElement)
47 { 46 {
48 if (!m_cssomWrapper) 47 if (!m_cssomWrapper)
49 m_cssomWrapper = adoptPtr(new InlineCSSStyleDeclaration(ownerElement)); 48 m_cssomWrapper = adoptPtr(new InlineCSSStyleDeclaration(ownerElement));
50 return *m_cssomWrapper; 49 return *m_cssomWrapper;
51 } 50 }
52 51
53 52
54 COMPILE_ASSERT(sizeof(ElementRareData) == sizeof(SameSizeAsElementRareData), Ele mentRareDataShouldStaySmall); 53 COMPILE_ASSERT(sizeof(ElementRareData) == sizeof(SameSizeAsElementRareData), Ele mentRareDataShouldStaySmall);
55 54
56 } // namespace WebCore 55 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/ElementRareData.h ('k') | Source/core/dom/NodeRareData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698