Source/WebCore/rendering/RenderMenuList.h - Issue 10871074: Merge 124556

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

Issue 10871074: Merge 124556 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/

Patch Set: Created 8 years, 4 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:

« no previous file with comments | « Source/WebCore/rendering/RenderListBox.cpp ('k') | Source/WebCore/rendering/RenderMenuList.cpp » ('j') | no next file with comments »

OLD	NEW
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 50 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
61	61

62 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) ;	62 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) ;

63 virtual void removeChild(RenderObject*);	63 virtual void removeChild(RenderObject*);

64 virtual bool createsAnonymousWrapper() const { return true; }	64 virtual bool createsAnonymousWrapper() const { return true; }

65	65

66 virtual void updateFromElement();	66 virtual void updateFromElement();

67	67

68 virtual LayoutRect controlClipRect(const LayoutPoint&) const;	68 virtual LayoutRect controlClipRect(const LayoutPoint&) const;

69 virtual bool hasControlClip() const { return true; }	69 virtual bool hasControlClip() const { return true; }

70 virtual bool canHaveGeneratedChildren() const OVERRIDE { return false; }	70 virtual bool canHaveGeneratedChildren() const OVERRIDE { return false; }

	71 virtual bool canBeReplacedWithInlineRunIn() const OVERRIDE;

71	72

72 virtual const char* renderName() const { return "RenderMenuList"; }	73 virtual const char* renderName() const { return "RenderMenuList"; }

73	74

74 virtual void computePreferredLogicalWidths();	75 virtual void computePreferredLogicalWidths();

75	76

76 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);	77 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);

77	78

78 virtual bool requiresForcedStyleRecalcPropagation() const { return true; }	79 virtual bool requiresForcedStyleRecalcPropagation() const { return true; }

79	80

80 // PopupMenuClient methods	81 // PopupMenuClient methods

(...skipping 58 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
139 ASSERT(!object \|\| object->isMenuList());	140 ASSERT(!object \|\| object->isMenuList());

140 return static_cast<RenderMenuList*>(object);	141 return static_cast<RenderMenuList*>(object);

141 }	142 }

142	143

143 // This will catch anyone doing an unnecessary cast.	144 // This will catch anyone doing an unnecessary cast.

144 void toRenderMenuList(const RenderMenuList*);	145 void toRenderMenuList(const RenderMenuList*);

145	146

146 }	147 }

147	148

148 #endif	149 #endif

OLD	NEW