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

Side by Side Diff: Source/core/layout/LayoutListMarker.h

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/layout/LayoutListItem.cpp ('k') | Source/core/layout/LayoutListMarker.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) 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. All rights reserv ed. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009 Apple Inc. All rights reserv ed.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 78
79 bool isText() const { return !isImage(); } 79 bool isText() const { return !isImage(); }
80 80
81 virtual void setSelectionState(SelectionState) override; 81 virtual void setSelectionState(SelectionState) override;
82 virtual LayoutRect selectionRectForPaintInvalidation(const LayoutBoxModelObj ect* paintInvalidationContainer) const override; 82 virtual LayoutRect selectionRectForPaintInvalidation(const LayoutBoxModelObj ect* paintInvalidationContainer) const override;
83 virtual bool canBeSelectionLeaf() const override { return true; } 83 virtual bool canBeSelectionLeaf() const override { return true; }
84 84
85 void updateMargins(); 85 void updateMargins();
86 void updateContent(); 86 void updateContent();
87 87
88 virtual void styleWillChange(StyleDifference, const LayoutStyle& newStyle) o verride; 88 virtual void styleWillChange(StyleDifference, const ComputedStyle& newStyle) override;
89 virtual void styleDidChange(StyleDifference, const LayoutStyle* oldStyle) ov erride; 89 virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
90 90
91 String m_text; 91 String m_text;
92 RefPtr<StyleImage> m_image; 92 RefPtr<StyleImage> m_image;
93 LayoutListItem* m_listItem; 93 LayoutListItem* m_listItem;
94 }; 94 };
95 95
96 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutListMarker, isListMarker()); 96 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutListMarker, isListMarker());
97 97
98 } // namespace blink 98 } // namespace blink
99 99
100 #endif // LayoutListMarker_h 100 #endif // LayoutListMarker_h
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutListItem.cpp ('k') | Source/core/layout/LayoutListMarker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698