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

Side by Side Diff: third_party/WebKit/Source/web/ExternalPopupMenu.cpp

Issue 2014493002: Rename OwnPtr::clear() to reset() in web/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 // user released the mouse button before showing the popup, mouseup and 119 // user released the mouse button before showing the popup, mouseup and
120 // click events are correctly dispatched. Dispatching the synthetic 120 // click events are correctly dispatched. Dispatching the synthetic
121 // mouseup event is redundant in this case. 121 // mouseup event is redundant in this case.
122 } 122 }
123 #endif 123 #endif
124 } 124 }
125 125
126 void ExternalPopupMenu::dispatchEvent(Timer<ExternalPopupMenu>*) 126 void ExternalPopupMenu::dispatchEvent(Timer<ExternalPopupMenu>*)
127 { 127 {
128 m_webView.handleInputEvent(*m_syntheticEvent); 128 m_webView.handleInputEvent(*m_syntheticEvent);
129 m_syntheticEvent.clear(); 129 m_syntheticEvent.reset();
130 } 130 }
131 131
132 void ExternalPopupMenu::hide() 132 void ExternalPopupMenu::hide()
133 { 133 {
134 if (m_ownerElement) 134 if (m_ownerElement)
135 m_ownerElement->popupDidHide(); 135 m_ownerElement->popupDidHide();
136 if (!m_webExternalPopupMenu) 136 if (!m_webExternalPopupMenu)
137 return; 137 return;
138 m_webExternalPopupMenu->close(); 138 m_webExternalPopupMenu->close();
139 m_webExternalPopupMenu = 0; 139 m_webExternalPopupMenu = 0;
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 if (ownerElement.itemIsDisplayNone(*items[i])) 293 if (ownerElement.itemIsDisplayNone(*items[i]))
294 continue; 294 continue;
295 if (popupMenuItemIndex == i) 295 if (popupMenuItemIndex == i)
296 return indexTracker; 296 return indexTracker;
297 ++indexTracker; 297 ++indexTracker;
298 } 298 }
299 return -1; 299 return -1;
300 } 300 }
301 301
302 } // namespace blink 302 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/DevToolsEmulator.cpp ('k') | third_party/WebKit/Source/web/InspectorOverlay.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698