Index: Source/WebCore/rendering/RenderListBox.h |
diff --git a/Source/WebCore/rendering/RenderListBox.h b/Source/WebCore/rendering/RenderListBox.h |
index 6ea7c3b51334288aa84dc632c957517c37107e68..2b3af174577b74ed4aa7bffc1403c55937568a03 100644 |
--- a/Source/WebCore/rendering/RenderListBox.h |
+++ b/Source/WebCore/rendering/RenderListBox.h |
@@ -32,29 +32,16 @@ |
#define RenderListBox_h |
#include "RenderBlock.h" |
-#include "ScrollableArea.h" |
namespace WebCore { |
class HTMLSelectElement; |
-class RenderListBox : public RenderBlock, private ScrollableArea { |
+class RenderListBox : public RenderBlock { |
public: |
explicit RenderListBox(Element*); |
virtual ~RenderListBox(); |
- void selectionChanged(); |
- |
- void setOptionsChanged(bool changed) { m_optionsChanged = changed; } |
- |
- int listIndexAtOffset(const LayoutSize&); |
- LayoutRect itemBoundingBoxRect(const LayoutPoint&, int index); |
- |
- bool scrollToRevealElementAtListIndex(int index); |
- bool listIndexIsVisible(int index); |
- |
- int scrollToward(const IntPoint&); // Returns the new index or -1 if no scroll occurred |
- |
int size() const; |
private: |
@@ -63,92 +50,9 @@ private: |
virtual const char* renderName() const { return "RenderListBox"; } |
virtual bool isListBox() const { return true; } |
- |
- virtual void updateFromElement(); |
- virtual bool canBeReplacedWithInlineRunIn() const OVERRIDE; |
- virtual bool hasControlClip() const { return true; } |
- virtual void paintObject(PaintInfo&, const LayoutPoint&); |
- virtual LayoutRect controlClipRect(const LayoutPoint&) const; |
- |
- virtual bool isPointInOverflowControl(HitTestResult&, const LayoutPoint& locationInContainer, const LayoutPoint& accumulatedOffset); |
- |
- virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Node** stopNode = 0); |
- virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Node** stopNode = 0); |
- |
- virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const OVERRIDE; |
- virtual void computePreferredLogicalWidths() OVERRIDE; |
- virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const; |
virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const OVERRIDE; |
- |
- virtual void layout(); |
- |
- virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) OVERRIDE; |
- |
- virtual bool canBeProgramaticallyScrolled() const { return true; } |
- virtual void autoscroll(const IntPoint&); |
- virtual void stopAutoscroll(); |
- |
- virtual bool shouldPanScroll() const { return true; } |
- virtual void panScroll(const IntPoint&); |
- |
- virtual int verticalScrollbarWidth() const; |
- virtual int scrollLeft() const; |
- virtual int scrollTop() const; |
- virtual int scrollWidth() const; |
- virtual int scrollHeight() const; |
- virtual void setScrollLeft(int); |
- virtual void setScrollTop(int); |
- |
- virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE; |
- |
- // ScrollableArea interface. |
- virtual int scrollSize(ScrollbarOrientation) const OVERRIDE; |
- virtual int scrollPosition(Scrollbar*) const OVERRIDE; |
- virtual void setScrollOffset(const IntPoint&) OVERRIDE; |
- virtual void invalidateScrollbarRect(Scrollbar*, const IntRect&) OVERRIDE; |
- virtual bool isActive() const OVERRIDE; |
- virtual bool isScrollCornerVisible() const OVERRIDE { return false; } // We don't support resize on list boxes yet. If we did these would have to change. |
- virtual IntRect scrollCornerRect() const OVERRIDE { return IntRect(); } |
- virtual void invalidateScrollCornerRect(const IntRect&) OVERRIDE { } |
- virtual IntRect convertFromScrollbarToContainingView(const Scrollbar*, const IntRect&) const OVERRIDE; |
- virtual IntRect convertFromContainingViewToScrollbar(const Scrollbar*, const IntRect&) const OVERRIDE; |
- virtual IntPoint convertFromScrollbarToContainingView(const Scrollbar*, const IntPoint&) const OVERRIDE; |
- virtual IntPoint convertFromContainingViewToScrollbar(const Scrollbar*, const IntPoint&) const OVERRIDE; |
- virtual Scrollbar* verticalScrollbar() const OVERRIDE { return m_vBar.get(); } |
- virtual IntSize contentsSize() const OVERRIDE; |
- virtual int visibleHeight() const OVERRIDE; |
- virtual int visibleWidth() const OVERRIDE; |
- virtual IntPoint lastKnownMousePosition() const OVERRIDE; |
- virtual bool shouldSuspendScrollAnimations() const OVERRIDE; |
- virtual bool scrollbarsCanBeActive() const OVERRIDE; |
- |
- virtual ScrollableArea* enclosingScrollableArea() const OVERRIDE; |
- virtual IntRect scrollableAreaBoundingBox() const OVERRIDE; |
- |
- // NOTE: This should only be called by the overriden setScrollOffset from ScrollableArea. |
- void scrollTo(int newOffset); |
- |
- void setHasVerticalScrollbar(bool hasScrollbar); |
- PassRefPtr<Scrollbar> createScrollbar(); |
- void destroyScrollbar(); |
- |
LayoutUnit itemHeight() const; |
- void valueChanged(unsigned listIndex); |
- int numVisibleItems() const; |
- int numItems() const; |
- LayoutUnit listHeight() const; |
- void paintScrollbar(PaintInfo&, const LayoutPoint&); |
- void paintItemForeground(PaintInfo&, const LayoutPoint&, int listIndex); |
- void paintItemBackground(PaintInfo&, const LayoutPoint&, int listIndex); |
- void scrollToRevealSelection(); |
- |
- bool m_optionsChanged; |
- bool m_scrollToRevealSelectionAfterLayout; |
- bool m_inAutoscroll; |
- int m_optionsWidth; |
- int m_indexOffset; |
- |
- RefPtr<Scrollbar> m_vBar; |
+ virtual bool canBeProgramaticallyScrolled() const OVERRIDE { return true; } |
}; |
inline RenderListBox* toRenderListBox(RenderObject* object) |