Update To 11.40.268.0

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

diff --git a/src/third_party/WebKit/Source/web/PopupMenuChromium.h b/src/third_party/WebKit/Source/web/PopupMenuChromium.h
index 4c00929..e8ef543 100644 (file)
--- a/src/third_party/WebKit/Source/web/PopupMenuChromium.h
+++ b/src/third_party/WebKit/Source/web/PopupMenuChromium.h
@@ -41,20 +41,24 @@ class FrameView;
 class PopupContainer;
 class PopupMenuClient;
 
-class PopupMenuChromium FINAL : public PopupMenu {
+class PopupMenuChromium final : public PopupMenu {
 public:
     PopupMenuChromium(LocalFrame&, PopupMenuClient*);
     virtual ~PopupMenuChromium();
 
-    virtual void show(const FloatQuad& controlPosition, const IntSize& controlSize, int index) OVERRIDE;
-    virtual void hide() OVERRIDE;
-    virtual void updateFromElement() OVERRIDE;
-    virtual void disconnectClient() OVERRIDE;
+    virtual void show(const FloatQuad& controlPosition, const IntSize& controlSize, int index) override;
+    virtual void hide() override;
+    virtual void updateFromElement() override;
+    virtual void disconnectClient() override;
+
+    virtual void trace(Visitor*) override;
 
 private:
+    void dispose();
+
     PopupMenuClient* m_popupClient;
-    RefPtr<FrameView> m_frameView;
-    RefPtr<PopupContainer> m_popup;
+    RefPtrWillBeMember<FrameView> m_frameView;
+    RefPtrWillBeMember<PopupContainer> m_popup;
 };
 
 } // namespace blink