Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / PopupListBox.h

diff --git a/src/third_party/WebKit/Source/web/PopupListBox.h b/src/third_party/WebKit/Source/web/PopupListBox.h
index 94e0eeb..4affb0e 100644 (file)
--- a/src/third_party/WebKit/Source/web/PopupListBox.h
+++ b/src/third_party/WebKit/Source/web/PopupListBox.h
@@ -36,9 +36,7 @@
 #include "platform/text/TextDirection.h"
 #include "wtf/text/WTFString.h"
 
-namespace WebCore {
-
-typedef unsigned long long TimeStamp;
+namespace blink {
 
 class Font;
 class GraphicsContext;
@@ -49,6 +47,7 @@ class PlatformGestureEvent;
 class PlatformTouchEvent;
 class PlatformWheelEvent;
 class PopupMenuClient;
+typedef unsigned long long TimeStamp;
 
 class PopupContent {
 public:
@@ -80,6 +79,7 @@ struct PopupItem {
     TextDirection textDirection;
     bool hasTextDirectionOverride;
     bool enabled;
+    bool displayNone;
 };
 
 // This class uses WebCore code to paint and handle events for a drop-down list
@@ -143,6 +143,8 @@ public:
     // Gets the height of a row.
     int getRowHeight(int index);
 
+    int getRowBaseWidth(int index);
+
     virtual void setMaxHeight(int maxHeight) OVERRIDE { m_maxHeight = maxHeight; }
 
     void setMaxWidth(int maxWidth) { m_maxWindowWidth = maxWidth; }
@@ -272,9 +274,9 @@ private:
     int m_maxWindowWidth;
 
     // To forward last mouse release event.
-    RefPtr<Element> m_focusedElement;
+    RefPtrWillBePersistent<Element> m_focusedElement;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif