OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. |
3 * Copyright (C) 2010 Igalia S.L | 3 * Copyright (C) 2010 Igalia S.L |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 ContextMenuController::ContextMenuController(Page*, ContextMenuClient* client) | 43 ContextMenuController::ContextMenuController(Page*, ContextMenuClient* client) |
44 : m_client(client) | 44 : m_client(client) |
45 { | 45 { |
46 ASSERT_ARG(client, client); | 46 ASSERT_ARG(client, client); |
47 } | 47 } |
48 | 48 |
49 ContextMenuController::~ContextMenuController() | 49 ContextMenuController::~ContextMenuController() |
50 { | 50 { |
51 } | 51 } |
52 | 52 |
53 PassOwnPtr<ContextMenuController> ContextMenuController::create(Page* page, Cont
extMenuClient* client) | 53 PassOwnPtrWillBeRawPtr<ContextMenuController> ContextMenuController::create(Page
* page, ContextMenuClient* client) |
54 { | 54 { |
55 return adoptPtr(new ContextMenuController(page, client)); | 55 return adoptPtrWillBeNoop(new ContextMenuController(page, client)); |
| 56 } |
| 57 |
| 58 void ContextMenuController::trace(Visitor* visitor) |
| 59 { |
| 60 visitor->trace(m_hitTestResult); |
56 } | 61 } |
57 | 62 |
58 void ContextMenuController::clearContextMenu() | 63 void ContextMenuController::clearContextMenu() |
59 { | 64 { |
60 m_contextMenu.clear(); | 65 m_contextMenu.clear(); |
61 if (m_menuProvider) | 66 if (m_menuProvider) |
62 m_menuProvider->contextMenuCleared(); | 67 m_menuProvider->contextMenuCleared(); |
63 m_menuProvider = nullptr; | 68 m_menuProvider = nullptr; |
64 m_client->clearContextMenu(); | 69 m_client->clearContextMenu(); |
65 m_hitTestResult = HitTestResult(); | 70 m_hitTestResult = HitTestResult(); |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 ASSERT(item->type() == ActionType || item->type() == CheckableActionType); | 134 ASSERT(item->type() == ActionType || item->type() == CheckableActionType); |
130 | 135 |
131 if (item->action() < ContextMenuItemBaseCustomTag || item->action() > Contex
tMenuItemLastCustomTag) | 136 if (item->action() < ContextMenuItemBaseCustomTag || item->action() > Contex
tMenuItemLastCustomTag) |
132 return; | 137 return; |
133 | 138 |
134 ASSERT(m_menuProvider); | 139 ASSERT(m_menuProvider); |
135 m_menuProvider->contextMenuItemSelected(item); | 140 m_menuProvider->contextMenuItemSelected(item); |
136 } | 141 } |
137 | 142 |
138 } // namespace WebCore | 143 } // namespace WebCore |
OLD | NEW |