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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBlock.h

Issue 2010473002: Eliminate unnecessary includes and pointless forward declarations in LayoutBlock.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make it compile in release mode too 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
11 * 11 *
12 * This library is distributed in the hope that it will be useful, 12 * This library is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Library General Public License for more details. 15 * Library General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU Library General Public License 17 * You should have received a copy of the GNU Library General Public License
18 * along with this library; see the file COPYING.LIB. If not, write to 18 * along with this library; see the file COPYING.LIB. If not, write to
19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20 * Boston, MA 02110-1301, USA. 20 * Boston, MA 02110-1301, USA.
21 */ 21 */
22 22
23 #ifndef LayoutBlock_h 23 #ifndef LayoutBlock_h
24 #define LayoutBlock_h 24 #define LayoutBlock_h
25 25
26 #include "core/CoreExport.h" 26 #include "core/CoreExport.h"
27 #include "core/layout/FloatingObjects.h"
28 #include "core/layout/GapRects.h"
29 #include "core/layout/LayoutBox.h" 27 #include "core/layout/LayoutBox.h"
30 #include "core/style/ShapeValue.h"
31 #include "platform/text/TextBreakIterator.h"
32 #include "wtf/ListHashSet.h" 28 #include "wtf/ListHashSet.h"
33 #include "wtf/OwnPtr.h" 29 #include "wtf/OwnPtr.h"
34 30
35 namespace blink { 31 namespace blink {
36 32
37 struct PaintInfo; 33 struct PaintInfo;
34 class LineLayoutBox;
38 class WordMeasurement; 35 class WordMeasurement;
39 36
40 typedef WTF::ListHashSet<LayoutBox*, 16> TrackedLayoutBoxListHashSet; 37 typedef WTF::ListHashSet<LayoutBox*, 16> TrackedLayoutBoxListHashSet;
41 typedef WTF::HashMap<const LayoutBlock*, OwnPtr<TrackedLayoutBoxListHashSet>> Tr ackedDescendantsMap; 38 typedef WTF::HashMap<const LayoutBlock*, OwnPtr<TrackedLayoutBoxListHashSet>> Tr ackedDescendantsMap;
42 typedef WTF::HashMap<const LayoutBox*, LayoutBlock*> TrackedContainerMap; 39 typedef WTF::HashMap<const LayoutBox*, LayoutBlock*> TrackedContainerMap;
43 typedef Vector<WordMeasurement, 64> WordMeasurements; 40 typedef Vector<WordMeasurement, 64> WordMeasurements;
44 41
45 enum ContainingBlockState { NewContainingBlock, SameContainingBlock }; 42 enum ContainingBlockState { NewContainingBlock, SameContainingBlock };
46 43
47 // LayoutBlock is the class that is used by any LayoutObject 44 // LayoutBlock is the class that is used by any LayoutObject
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 // FIXME: This is temporary as we move code that accesses block flow 437 // FIXME: This is temporary as we move code that accesses block flow
441 // member variables out of LayoutBlock and into LayoutBlockFlow. 438 // member variables out of LayoutBlock and into LayoutBlockFlow.
442 friend class LayoutBlockFlow; 439 friend class LayoutBlockFlow;
443 }; 440 };
444 441
445 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock()); 442 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock());
446 443
447 } // namespace blink 444 } // namespace blink
448 445
449 #endif // LayoutBlock_h 446 #endif // LayoutBlock_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698