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

Side by Side Diff: Source/core/layout/line/InlineFlowBox.cpp

Issue 1317143005: [WIP] do something :-) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 3 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/layout/line/InlineBox.cpp ('k') | Source/core/layout/line/InlineTextBox.cpp » ('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) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 21 matching lines...) Expand all
32 #include "core/layout/LayoutRubyText.h" 32 #include "core/layout/LayoutRubyText.h"
33 #include "core/layout/LayoutView.h" 33 #include "core/layout/LayoutView.h"
34 #include "core/layout/api/LineLayoutBox.h" 34 #include "core/layout/api/LineLayoutBox.h"
35 #include "core/layout/line/GlyphOverflow.h" 35 #include "core/layout/line/GlyphOverflow.h"
36 #include "core/layout/line/InlineTextBox.h" 36 #include "core/layout/line/InlineTextBox.h"
37 #include "core/layout/line/RootInlineBox.h" 37 #include "core/layout/line/RootInlineBox.h"
38 #include "core/paint/BoxPainter.h" 38 #include "core/paint/BoxPainter.h"
39 #include "core/paint/InlineFlowBoxPainter.h" 39 #include "core/paint/InlineFlowBoxPainter.h"
40 #include "core/style/ShadowList.h" 40 #include "core/style/ShadowList.h"
41 #include "platform/fonts/Font.h" 41 #include "platform/fonts/Font.h"
42 #include "wtf/SizeAssertions.h"
42 43
43 #include <math.h> 44 #include <math.h>
44 45
45 namespace blink { 46 namespace blink {
46 47
47 struct SameSizeAsInlineFlowBox : public InlineBox { 48 ASSERT_SIZE(InlineFlowBox, sizeof(InlineBox) + 24, sizeof(InlineBox) + 48);
48 void* pointers[5];
49 uint32_t bitfields : 23;
50 };
51
52 static_assert(sizeof(InlineFlowBox) == sizeof(SameSizeAsInlineFlowBox), "InlineF lowBox should stay small");
53 49
54 #if ENABLE(ASSERT) 50 #if ENABLE(ASSERT)
55 51
56 InlineFlowBox::~InlineFlowBox() 52 InlineFlowBox::~InlineFlowBox()
57 { 53 {
58 if (!m_hasBadChildList) 54 if (!m_hasBadChildList)
59 for (InlineBox* child = firstChild(); child; child = child->nextOnLine() ) 55 for (InlineBox* child = firstChild(); child; child = child->nextOnLine() )
60 child->setHasBadParent(); 56 child->setHasBadParent();
61 } 57 }
62 58
(...skipping 1246 matching lines...) Expand 10 before | Expand all | Expand 10 after
1309 ASSERT(child->prevOnLine() == prev); 1305 ASSERT(child->prevOnLine() == prev);
1310 prev = child; 1306 prev = child;
1311 } 1307 }
1312 ASSERT(prev == m_lastChild); 1308 ASSERT(prev == m_lastChild);
1313 #endif 1309 #endif
1314 } 1310 }
1315 1311
1316 #endif 1312 #endif
1317 1313
1318 } // namespace blink 1314 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/line/InlineBox.cpp ('k') | Source/core/layout/line/InlineTextBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698