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

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

Issue 2005813003: Move LayoutInline forward-declaration 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutBlockFlow.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) 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.
(...skipping 18 matching lines...) Expand all
29 #include "core/layout/LayoutBox.h" 29 #include "core/layout/LayoutBox.h"
30 #include "core/style/ShapeValue.h" 30 #include "core/style/ShapeValue.h"
31 #include "platform/text/TextBreakIterator.h" 31 #include "platform/text/TextBreakIterator.h"
32 #include "wtf/ListHashSet.h" 32 #include "wtf/ListHashSet.h"
33 #include "wtf/OwnPtr.h" 33 #include "wtf/OwnPtr.h"
34 34
35 namespace blink { 35 namespace blink {
36 36
37 class LineLayoutState; 37 class LineLayoutState;
38 struct PaintInfo; 38 struct PaintInfo;
39 class LayoutInline;
40 class WordMeasurement; 39 class WordMeasurement;
41 40
42 typedef WTF::ListHashSet<LayoutBox*, 16> TrackedLayoutBoxListHashSet; 41 typedef WTF::ListHashSet<LayoutBox*, 16> TrackedLayoutBoxListHashSet;
43 typedef WTF::HashMap<const LayoutBlock*, OwnPtr<TrackedLayoutBoxListHashSet>> Tr ackedDescendantsMap; 42 typedef WTF::HashMap<const LayoutBlock*, OwnPtr<TrackedLayoutBoxListHashSet>> Tr ackedDescendantsMap;
44 typedef WTF::HashMap<const LayoutBox*, LayoutBlock*> TrackedContainerMap; 43 typedef WTF::HashMap<const LayoutBox*, LayoutBlock*> TrackedContainerMap;
45 typedef Vector<WordMeasurement, 64> WordMeasurements; 44 typedef Vector<WordMeasurement, 64> WordMeasurements;
46 45
47 enum ContainingBlockState { NewContainingBlock, SameContainingBlock }; 46 enum ContainingBlockState { NewContainingBlock, SameContainingBlock };
48 47
49 // LayoutBlock is the class that is used by any LayoutObject 48 // LayoutBlock is the class that is used by any LayoutObject
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 // FIXME: This is temporary as we move code that accesses block flow 444 // FIXME: This is temporary as we move code that accesses block flow
446 // member variables out of LayoutBlock and into LayoutBlockFlow. 445 // member variables out of LayoutBlock and into LayoutBlockFlow.
447 friend class LayoutBlockFlow; 446 friend class LayoutBlockFlow;
448 }; 447 };
449 448
450 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock()); 449 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock());
451 450
452 } // namespace blink 451 } // namespace blink
453 452
454 #endif // LayoutBlock_h 453 #endif // LayoutBlock_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutBlockFlow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698