Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / page / CustomContextMenuProvider.h

diff --git a/src/third_party/WebKit/Source/core/page/CustomContextMenuProvider.h b/src/third_party/WebKit/Source/core/page/CustomContextMenuProvider.h
index bf04566..3f743be 100644 (file)
--- a/src/third_party/WebKit/Source/core/page/CustomContextMenuProvider.h
+++ b/src/third_party/WebKit/Source/core/page/CustomContextMenuProvider.h
@@ -16,28 +16,31 @@ class HTMLElement;
 class HTMLMenuElement;
 class HTMLMenuItemElement;
 
-class CustomContextMenuProvider FINAL : public ContextMenuProvider {
+class CustomContextMenuProvider final : public ContextMenuProvider {
 public:
-    static PassRefPtr<CustomContextMenuProvider> create(HTMLMenuElement& menu, HTMLElement& subject)
+    virtual ~CustomContextMenuProvider();
+
+    static PassRefPtrWillBeRawPtr<CustomContextMenuProvider> create(HTMLMenuElement& menu, HTMLElement& subject)
     {
-        return adoptRef(new CustomContextMenuProvider(menu, subject));
+        return adoptRefWillBeNoop(new CustomContextMenuProvider(menu, subject));
     }
 
+    virtual void trace(Visitor*);
+
 private:
     CustomContextMenuProvider(HTMLMenuElement&, HTMLElement&);
-    virtual ~CustomContextMenuProvider();
 
-    virtual void populateContextMenu(ContextMenu*) OVERRIDE;
-    virtual void contextMenuItemSelected(const ContextMenuItem*) OVERRIDE;
-    virtual void contextMenuCleared() OVERRIDE;
+    virtual void populateContextMenu(ContextMenu*) override;
+    virtual void contextMenuItemSelected(const ContextMenuItem*) override;
+    virtual void contextMenuCleared() override;
     void populateContextMenuItems(const HTMLMenuElement&, ContextMenu&);
     void appendSeparator(ContextMenu&);
     void appendMenuItem(HTMLMenuItemElement*, ContextMenu&);
     HTMLElement* menuItemAt(unsigned menuId);
 
-    RefPtrWillBePersistent<HTMLMenuElement> m_menu;
-    RefPtrWillBePersistent<HTMLElement> m_subjectElement;
-    WillBePersistentHeapVector<RefPtrWillBeMember<HTMLElement> > m_menuItems;
+    RefPtrWillBeMember<HTMLMenuElement> m_menu;
+    RefPtrWillBeMember<HTMLElement> m_subjectElement;
+    WillBeHeapVector<RefPtrWillBeMember<HTMLElement>> m_menuItems;
 };
 
 } // namespace blink