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/LayoutListMarker.h

Issue 2553793003: Establish a list marker's offset before floats have been added to its line (Closed)
Patch Set: bug 548616 Created 4 years 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 LayoutRect localSelectionRect() const final; 55 LayoutRect localSelectionRect() const final;
56 bool isImage() const override; 56 bool isImage() const override;
57 const StyleImage* image() const { return m_image.get(); } 57 const StyleImage* image() const { return m_image.get(); }
58 const LayoutListItem* listItem() const { return m_listItem; } 58 const LayoutListItem* listItem() const { return m_listItem; }
59 LayoutSize imageBulletSize() const; 59 LayoutSize imageBulletSize() const;
60 60
61 void listItemStyleDidChange(); 61 void listItemStyleDidChange();
62 62
63 const char* name() const override { return "LayoutListMarker"; } 63 const char* name() const override { return "LayoutListMarker"; }
64 64
65 LayoutUnit lineOffset() const { return m_lineOffset; }
66
65 protected: 67 protected:
66 void willBeDestroyed() override; 68 void willBeDestroyed() override;
67 69
68 private: 70 private:
69 LayoutListMarker(LayoutListItem*); 71 LayoutListMarker(LayoutListItem*);
70 72
71 void computePreferredLogicalWidths() override; 73 void computePreferredLogicalWidths() override;
72 74
73 bool isOfType(LayoutObjectType type) const override { 75 bool isOfType(LayoutObjectType type) const override {
74 return type == LayoutObjectListMarker || LayoutBox::isOfType(type); 76 return type == LayoutObjectListMarker || LayoutBox::isOfType(type);
(...skipping 30 matching lines...) Expand all
105 void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override; 107 void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
106 bool anonymousHasStylePropagationOverride() override { return true; } 108 bool anonymousHasStylePropagationOverride() override { return true; }
107 109
108 bool paintedOutputOfObjectHasNoEffectRegardlessOfSize() const override { 110 bool paintedOutputOfObjectHasNoEffectRegardlessOfSize() const override {
109 return false; 111 return false;
110 } 112 }
111 113
112 String m_text; 114 String m_text;
113 Persistent<StyleImage> m_image; 115 Persistent<StyleImage> m_image;
114 LayoutListItem* m_listItem; 116 LayoutListItem* m_listItem;
117 LayoutUnit m_lineOffset;
115 }; 118 };
116 119
117 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutListMarker, isListMarker()); 120 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutListMarker, isListMarker());
118 121
119 } // namespace blink 122 } // namespace blink
120 123
121 #endif // LayoutListMarker_h 124 #endif // LayoutListMarker_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutListItem.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutListMarker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698