| Index: Source/web/PopupListBox.h
|
| diff --git a/Source/web/PopupListBox.h b/Source/web/PopupListBox.h
|
| index be525a2f4feb7d29f6ec7dbf7a976721b56d0f2c..4affb0ef4ec07c99223e6f087696bb503082128d 100644
|
| --- a/Source/web/PopupListBox.h
|
| +++ b/Source/web/PopupListBox.h
|
| @@ -37,6 +37,7 @@
|
| #include "wtf/text/WTFString.h"
|
|
|
| namespace blink {
|
| +
|
| class Font;
|
| class GraphicsContext;
|
| class IntRect;
|
| @@ -46,10 +47,6 @@ class PlatformGestureEvent;
|
| class PlatformTouchEvent;
|
| class PlatformWheelEvent;
|
| class PopupMenuClient;
|
| -}
|
| -
|
| -namespace blink {
|
| -
|
| typedef unsigned long long TimeStamp;
|
|
|
| class PopupContent {
|
| @@ -79,7 +76,7 @@ struct PopupItem {
|
| String label;
|
| Type type;
|
| int yOffset; // y offset of this item, relative to the top of the popup.
|
| - blink::TextDirection textDirection;
|
| + TextDirection textDirection;
|
| bool hasTextDirectionOverride;
|
| bool enabled;
|
| bool displayNone;
|
| @@ -87,25 +84,25 @@ struct PopupItem {
|
|
|
| // This class uses WebCore code to paint and handle events for a drop-down list
|
| // box ("combobox" on Windows).
|
| -class PopupListBox FINAL : public blink::FramelessScrollView, public PopupContent {
|
| +class PopupListBox FINAL : public FramelessScrollView, public PopupContent {
|
| public:
|
| - static PassRefPtr<PopupListBox> create(blink::PopupMenuClient* client, bool deviceSupportsTouch)
|
| + static PassRefPtr<PopupListBox> create(PopupMenuClient* client, bool deviceSupportsTouch)
|
| {
|
| return adoptRef(new PopupListBox(client, deviceSupportsTouch));
|
| }
|
|
|
| // FramelessScrollView
|
| - virtual void paint(blink::GraphicsContext*, const blink::IntRect&) OVERRIDE;
|
| - virtual bool handleMouseDownEvent(const blink::PlatformMouseEvent&) OVERRIDE;
|
| - virtual bool handleMouseMoveEvent(const blink::PlatformMouseEvent&) OVERRIDE;
|
| - virtual bool handleMouseReleaseEvent(const blink::PlatformMouseEvent&) OVERRIDE;
|
| - virtual bool handleWheelEvent(const blink::PlatformWheelEvent&) OVERRIDE;
|
| - virtual bool handleKeyEvent(const blink::PlatformKeyboardEvent&) OVERRIDE;
|
| - virtual bool handleTouchEvent(const blink::PlatformTouchEvent&) OVERRIDE;
|
| - virtual bool handleGestureEvent(const blink::PlatformGestureEvent&) OVERRIDE;
|
| + virtual void paint(GraphicsContext*, const IntRect&) OVERRIDE;
|
| + virtual bool handleMouseDownEvent(const PlatformMouseEvent&) OVERRIDE;
|
| + virtual bool handleMouseMoveEvent(const PlatformMouseEvent&) OVERRIDE;
|
| + virtual bool handleMouseReleaseEvent(const PlatformMouseEvent&) OVERRIDE;
|
| + virtual bool handleWheelEvent(const PlatformWheelEvent&) OVERRIDE;
|
| + virtual bool handleKeyEvent(const PlatformKeyboardEvent&) OVERRIDE;
|
| + virtual bool handleTouchEvent(const PlatformTouchEvent&) OVERRIDE;
|
| + virtual bool handleGestureEvent(const PlatformGestureEvent&) OVERRIDE;
|
|
|
| // ScrollView
|
| - virtual blink::HostWindow* hostWindow() const OVERRIDE;
|
| + virtual HostWindow* hostWindow() const OVERRIDE;
|
| virtual bool shouldPlaceVerticalScrollbarOnLeft() const OVERRIDE;
|
|
|
| // PopupListBox methods
|
| @@ -166,7 +163,7 @@ private:
|
| friend class PopupContainer;
|
| friend class RefCounted<PopupListBox>;
|
|
|
| - PopupListBox(blink::PopupMenuClient*, bool deviceSupportsTouch);
|
| + PopupListBox(PopupMenuClient*, bool deviceSupportsTouch);
|
|
|
| virtual ~PopupListBox()
|
| {
|
| @@ -199,22 +196,22 @@ private:
|
| void invalidateRow(int index);
|
|
|
| // Get the bounds of a row.
|
| - blink::IntRect getRowBounds(int index);
|
| + IntRect getRowBounds(int index);
|
|
|
| // Converts a point to an index of the row the point is over
|
| - int pointToRowIndex(const blink::IntPoint&);
|
| + int pointToRowIndex(const IntPoint&);
|
|
|
| // Paint an individual row
|
| - void paintRow(blink::GraphicsContext*, const blink::IntRect&, int rowIndex);
|
| + void paintRow(GraphicsContext*, const IntRect&, int rowIndex);
|
|
|
| // Test if the given point is within the bounds of the popup window.
|
| - bool isPointInBounds(const blink::IntPoint&);
|
| + bool isPointInBounds(const IntPoint&);
|
|
|
| // Called when the user presses a text key. Does a prefix-search of the items.
|
| - void typeAheadFind(const blink::PlatformKeyboardEvent&);
|
| + void typeAheadFind(const PlatformKeyboardEvent&);
|
|
|
| // Returns the font to use for the given row
|
| - blink::Font getRowFont(int index);
|
| + Font getRowFont(int index);
|
|
|
| // Moves the selection down/up one item, taking care of looping back to the
|
| // first/last element if m_loopSelectionNavigation is true.
|
| @@ -255,14 +252,14 @@ private:
|
| Vector<PopupItem*> m_items;
|
|
|
| // The <select> PopupMenuClient that opened us.
|
| - blink::PopupMenuClient* m_popupClient;
|
| + PopupMenuClient* m_popupClient;
|
|
|
| // The scrollbar which has mouse capture. Mouse events go straight to this
|
| // if not null.
|
| - RefPtr<blink::Scrollbar> m_capturingScrollbar;
|
| + RefPtr<Scrollbar> m_capturingScrollbar;
|
|
|
| // The last scrollbar that the mouse was over. Used for mouseover highlights.
|
| - RefPtr<blink::Scrollbar> m_lastScrollbarUnderMouse;
|
| + RefPtr<Scrollbar> m_lastScrollbarUnderMouse;
|
|
|
| // The string the user has typed so far into the popup. Used for typeAheadFind.
|
| String m_typedString;
|
| @@ -277,7 +274,7 @@ private:
|
| int m_maxWindowWidth;
|
|
|
| // To forward last mouse release event.
|
| - RefPtrWillBePersistent<blink::Element> m_focusedElement;
|
| + RefPtrWillBePersistent<Element> m_focusedElement;
|
| };
|
|
|
| } // namespace blink
|
|
|