| Index: Source/core/page/ContextMenuController.h
|
| diff --git a/Source/core/page/ContextMenuController.h b/Source/core/page/ContextMenuController.h
|
| index 04833285f4f444784466d198b0c0d300d0b19c1d..82d1f523c25c5d45274f961c8ef3af9f864011f8 100644
|
| --- a/Source/core/page/ContextMenuController.h
|
| +++ b/Source/core/page/ContextMenuController.h
|
| @@ -27,6 +27,7 @@
|
| #define ContextMenuController_h
|
|
|
| #include "core/rendering/HitTestResult.h"
|
| +#include "platform/heap/Handle.h"
|
| #include "wtf/Noncopyable.h"
|
| #include "wtf/OwnPtr.h"
|
| #include "wtf/PassRefPtr.h"
|
| @@ -43,7 +44,7 @@ namespace blink {
|
| class LocalFrame;
|
| class Page;
|
|
|
| - class ContextMenuController : public NoBaseWillBeGarbageCollectedFinalized<ContextMenuController> {
|
| + class ContextMenuController final : public NoBaseWillBeGarbageCollectedFinalized<ContextMenuController> {
|
| WTF_MAKE_NONCOPYABLE(ContextMenuController); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
|
| public:
|
| static PassOwnPtrWillBeRawPtr<ContextMenuController> create(Page*, ContextMenuClient*);
|
| @@ -56,8 +57,8 @@ namespace blink {
|
| void documentDetached(Document*);
|
|
|
| void handleContextMenuEvent(Event*);
|
| - void showContextMenu(Event*, PassRefPtr<ContextMenuProvider>);
|
| - void showContextMenuAtPoint(LocalFrame*, float x, float y, PassRefPtr<ContextMenuProvider>);
|
| + void showContextMenu(Event*, PassRefPtrWillBeRawPtr<ContextMenuProvider>);
|
| + void showContextMenuAtPoint(LocalFrame*, float x, float y, PassRefPtrWillBeRawPtr<ContextMenuProvider>);
|
|
|
| void contextMenuItemSelected(const ContextMenuItem*);
|
|
|
| @@ -73,10 +74,10 @@ namespace blink {
|
|
|
| ContextMenuClient* m_client;
|
| OwnPtr<ContextMenu> m_contextMenu;
|
| - RefPtr<ContextMenuProvider> m_menuProvider;
|
| + RefPtrWillBeMember<ContextMenuProvider> m_menuProvider;
|
| HitTestResult m_hitTestResult;
|
| };
|
|
|
| -}
|
| +} // namespace blink
|
|
|
| -#endif
|
| +#endif // ContextMenuController_h
|
|
|