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

Side by Side Diff: Source/core/rendering/RenderMenuList.h

Issue 602353002: Removed duplicated virtual computePreferredLogicalWidths() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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 * This file is part of the select element renderer in WebCore. 2 * This file is part of the select element renderer in WebCore.
3 * 3 *
4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
5 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 virtual void updateFromElement() OVERRIDE; 67 virtual void updateFromElement() OVERRIDE;
68 68
69 virtual LayoutRect controlClipRect(const LayoutPoint&) const OVERRIDE; 69 virtual LayoutRect controlClipRect(const LayoutPoint&) const OVERRIDE;
70 virtual bool hasControlClip() const OVERRIDE { return true; } 70 virtual bool hasControlClip() const OVERRIDE { return true; }
71 virtual bool canHaveGeneratedChildren() const OVERRIDE { return false; } 71 virtual bool canHaveGeneratedChildren() const OVERRIDE { return false; }
72 72
73 virtual const char* renderName() const OVERRIDE { return "RenderMenuList"; } 73 virtual const char* renderName() const OVERRIDE { return "RenderMenuList"; }
74 74
75 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE; 75 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE;
76 virtual void computePreferredLogicalWidths() OVERRIDE;
77 76
78 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE; 77 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE;
79 78
80 // PopupMenuClient methods 79 // PopupMenuClient methods
81 virtual void valueChanged(unsigned listIndex, bool fireOnChange = true) OVER RIDE; 80 virtual void valueChanged(unsigned listIndex, bool fireOnChange = true) OVER RIDE;
82 virtual void selectionChanged(unsigned, bool) OVERRIDE { } 81 virtual void selectionChanged(unsigned, bool) OVERRIDE { }
83 virtual void selectionCleared() OVERRIDE { } 82 virtual void selectionCleared() OVERRIDE { }
84 virtual String itemText(unsigned listIndex) const OVERRIDE; 83 virtual String itemText(unsigned listIndex) const OVERRIDE;
85 virtual String itemToolTip(unsigned listIndex) const OVERRIDE; 84 virtual String itemToolTip(unsigned listIndex) const OVERRIDE;
86 virtual String itemAccessibilityText(unsigned listIndex) const OVERRIDE; 85 virtual String itemAccessibilityText(unsigned listIndex) const OVERRIDE;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 130
132 RefPtrWillBeMember<PopupMenu> m_popup; 131 RefPtrWillBeMember<PopupMenu> m_popup;
133 bool m_popupIsVisible; 132 bool m_popupIsVisible;
134 }; 133 };
135 134
136 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMenuList, isMenuList()); 135 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMenuList, isMenuList());
137 136
138 } 137 }
139 138
140 #endif 139 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698