Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(399)

Side by Side Diff: third_party/WebKit/Source/core/page/ContextMenuController.cpp

Issue 2014483003: Rename OwnPtr::clear() to reset() in core/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 } 60 }
61 61
62 DEFINE_TRACE(ContextMenuController) 62 DEFINE_TRACE(ContextMenuController)
63 { 63 {
64 visitor->trace(m_menuProvider); 64 visitor->trace(m_menuProvider);
65 visitor->trace(m_hitTestResult); 65 visitor->trace(m_hitTestResult);
66 } 66 }
67 67
68 void ContextMenuController::clearContextMenu() 68 void ContextMenuController::clearContextMenu()
69 { 69 {
70 m_contextMenu.clear(); 70 m_contextMenu.reset();
71 if (m_menuProvider) 71 if (m_menuProvider)
72 m_menuProvider->contextMenuCleared(); 72 m_menuProvider->contextMenuCleared();
73 m_menuProvider = nullptr; 73 m_menuProvider = nullptr;
74 m_client->clearContextMenu(); 74 m_client->clearContextMenu();
75 m_hitTestResult = HitTestResult(); 75 m_hitTestResult = HitTestResult();
76 } 76 }
77 77
78 void ContextMenuController::documentDetached(Document* document) 78 void ContextMenuController::documentDetached(Document* document)
79 { 79 {
80 if (Node* innerNode = m_hitTestResult.innerNode()) { 80 if (Node* innerNode = m_hitTestResult.innerNode()) {
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 ASSERT(item->type() == ActionType || item->type() == CheckableActionType); 188 ASSERT(item->type() == ActionType || item->type() == CheckableActionType);
189 189
190 if (item->action() < ContextMenuItemBaseCustomTag || item->action() > Contex tMenuItemLastCustomTag) 190 if (item->action() < ContextMenuItemBaseCustomTag || item->action() > Contex tMenuItemLastCustomTag)
191 return; 191 return;
192 192
193 ASSERT(m_menuProvider); 193 ASSERT(m_menuProvider);
194 m_menuProvider->contextMenuItemSelected(item); 194 m_menuProvider->contextMenuItemSelected(item);
195 } 195 }
196 196
197 } // namespace blink 197 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698