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

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

Issue 1433503003: Avoid using ImageResource->imageSize() to get the marker size (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Let imageBulletSize return IntSize Created 5 years, 1 month 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. 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 51
52 bool isInside() const; 52 bool isInside() const;
53 53
54 void updateMarginsAndContent(); 54 void updateMarginsAndContent();
55 55
56 IntRect getRelativeMarkerRect() const; 56 IntRect getRelativeMarkerRect() const;
57 LayoutRect localSelectionRect() const; 57 LayoutRect localSelectionRect() const;
58 bool isImage() const override; 58 bool isImage() const override;
59 const StyleImage* image() const { return m_image.get(); } 59 const StyleImage* image() const { return m_image.get(); }
60 const LayoutListItem* listItem() const { return m_listItem; } 60 const LayoutListItem* listItem() const { return m_listItem; }
61 IntSize imageBulletSize() const;
61 62
62 void listItemStyleDidChange(); 63 void listItemStyleDidChange();
63 64
64 const char* name() const override { return "LayoutListMarker"; } 65 const char* name() const override { return "LayoutListMarker"; }
65 66
66 protected: 67 protected:
67 void willBeDestroyed() override; 68 void willBeDestroyed() override;
68 69
69 private: 70 private:
70 LayoutListMarker(LayoutListItem*); 71 LayoutListMarker(LayoutListItem*);
(...skipping 29 matching lines...) Expand all
100 String m_text; 101 String m_text;
101 RefPtrWillBePersistent<StyleImage> m_image; 102 RefPtrWillBePersistent<StyleImage> m_image;
102 LayoutListItem* m_listItem; 103 LayoutListItem* m_listItem;
103 }; 104 };
104 105
105 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutListMarker, isListMarker()); 106 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutListMarker, isListMarker());
106 107
107 } // namespace blink 108 } // namespace blink
108 109
109 #endif // LayoutListMarker_h 110 #endif // LayoutListMarker_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698