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

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

Issue 2759883002: Get markers back while list items have overflow:hidden children (Closed)
Patch Set: add layout test case Created 3 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
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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009 Apple Inc. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009 Apple Inc.
5 * All rights reserved. 5 * All rights 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 static void updateItemValuesForOrderedList(const HTMLOListElement*); 57 static void updateItemValuesForOrderedList(const HTMLOListElement*);
58 static unsigned itemCountForOrderedList(const HTMLOListElement*); 58 static unsigned itemCountForOrderedList(const HTMLOListElement*);
59 59
60 bool isEmpty() const; 60 bool isEmpty() const;
61 61
62 LayoutListMarker* marker() const { return m_marker; } 62 LayoutListMarker* marker() const { return m_marker; }
63 63
64 const char* name() const override { return "LayoutListItem"; } 64 const char* name() const override { return "LayoutListItem"; }
65 65
66 void addLogicalHeightFromChild(const LayoutBox&);
67
66 private: 68 private:
67 bool isOfType(LayoutObjectType type) const override { 69 bool isOfType(LayoutObjectType type) const override {
68 return type == LayoutObjectListItem || LayoutBlockFlow::isOfType(type); 70 return type == LayoutObjectListItem || LayoutBlockFlow::isOfType(type);
69 } 71 }
70 72
71 void willBeDestroyed() override; 73 void willBeDestroyed() override;
72 74
73 void insertedIntoTree() override; 75 void insertedIntoTree() override;
74 void willBeRemovedFromTree() override; 76 void willBeRemovedFromTree() override;
75 77
(...skipping 21 matching lines...) Expand all
97 bool m_hasExplicitValue : 1; 99 bool m_hasExplicitValue : 1;
98 mutable bool m_isValueUpToDate : 1; 100 mutable bool m_isValueUpToDate : 1;
99 bool m_notInList : 1; 101 bool m_notInList : 1;
100 }; 102 };
101 103
102 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutListItem, isListItem()); 104 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutListItem, isListItem());
103 105
104 } // namespace blink 106 } // namespace blink
105 107
106 #endif // LayoutListItem_h 108 #endif // LayoutListItem_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698