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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp

Issue 1993943002: Move m_lineBoxes and its getters down to LayoutBlockFlow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 #include "core/paint/PaintInfo.h" 56 #include "core/paint/PaintInfo.h"
57 #include "core/paint/PaintLayer.h" 57 #include "core/paint/PaintLayer.h"
58 #include "platform/RuntimeEnabledFeatures.h" 58 #include "platform/RuntimeEnabledFeatures.h"
59 #include "platform/geometry/TransformState.h" 59 #include "platform/geometry/TransformState.h"
60 #include "platform/text/BidiTextRun.h" 60 #include "platform/text/BidiTextRun.h"
61 61
62 namespace blink { 62 namespace blink {
63 63
64 bool LayoutBlockFlow::s_canPropagateFloatIntoSibling = false; 64 bool LayoutBlockFlow::s_canPropagateFloatIntoSibling = false;
65 65
66 struct SameSizeAsLayoutBlockFlow : public LayoutBlock {
67 LineBoxList lineBoxes;
68 LayoutUnit m_paintInvalidationLogicalTopAndBottom[2];
69 void* pointers[2];
70 };
71
72 static_assert(sizeof(LayoutBlockFlow) == sizeof(SameSizeAsLayoutBlockFlow), "Lay outBlockFlow should stay small");
73
66 struct SameSizeAsMarginInfo { 74 struct SameSizeAsMarginInfo {
67 uint16_t bitfields; 75 uint16_t bitfields;
68 LayoutUnit margins[2]; 76 LayoutUnit margins[2];
69 }; 77 };
70 78
71 static_assert(sizeof(LayoutBlockFlow::MarginValues) == sizeof(LayoutUnit[4]), "M arginValues should stay small"); 79 static_assert(sizeof(LayoutBlockFlow::MarginValues) == sizeof(LayoutUnit[4]), "M arginValues should stay small");
72 80
73 // Caches all our current margin collapsing state. 81 // Caches all our current margin collapsing state.
74 class MarginInfo { 82 class MarginInfo {
75 // Collapsing flags for whether we can collapse our margins with our childre n's margins. 83 // Collapsing flags for whether we can collapse our margins with our childre n's margins.
(...skipping 3770 matching lines...) Expand 10 before | Expand all | Expand 10 after
3846 if (!rect.isEmpty()) 3854 if (!rect.isEmpty())
3847 rects.append(rect); 3855 rects.append(rect);
3848 } 3856 }
3849 } 3857 }
3850 3858
3851 if (inlineElementContinuation) 3859 if (inlineElementContinuation)
3852 inlineElementContinuation->addOutlineRects(rects, additionalOffset + (in lineElementContinuation->containingBlock()->location() - location()), includeBlo ckOverflows); 3860 inlineElementContinuation->addOutlineRects(rects, additionalOffset + (in lineElementContinuation->containingBlock()->location() - location()), includeBlo ckOverflows);
3853 } 3861 }
3854 3862
3855 } // namespace blink 3863 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlockFlow.h ('k') | third_party/WebKit/Source/core/layout/LayoutText.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698