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

Side by Side Diff: Source/web/ContextMenuClientImpl.cpp

Issue 639023004: Oilpan: move HistoryItem to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « Source/core/loader/HistoryItem.cpp ('k') | Source/web/WebHistoryItem.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2009, 2012 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 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 300
301 // If it's not a link, an image, a media element, or an image/media link, 301 // If it's not a link, an image, a media element, or an image/media link,
302 // show a selection menu or a more generic page menu. 302 // show a selection menu or a more generic page menu.
303 if (selectedFrame->document()->loader()) 303 if (selectedFrame->document()->loader())
304 data.frameEncoding = selectedFrame->document()->encodingName(); 304 data.frameEncoding = selectedFrame->document()->encodingName();
305 305
306 // Send the frame and page URLs in any case. 306 // Send the frame and page URLs in any case.
307 data.pageURL = urlFromFrame(m_webView->mainFrameImpl()->frame()); 307 data.pageURL = urlFromFrame(m_webView->mainFrameImpl()->frame());
308 if (selectedFrame != m_webView->mainFrameImpl()->frame()) { 308 if (selectedFrame != m_webView->mainFrameImpl()->frame()) {
309 data.frameURL = urlFromFrame(selectedFrame); 309 data.frameURL = urlFromFrame(selectedFrame);
310 RefPtr<HistoryItem> historyItem = selectedFrame->loader().currentItem(); 310 RefPtrWillBeRawPtr<HistoryItem> historyItem = selectedFrame->loader().cu rrentItem();
311 if (historyItem) 311 if (historyItem)
312 data.frameHistoryItem = WebHistoryItem(historyItem); 312 data.frameHistoryItem = WebHistoryItem(historyItem);
313 } 313 }
314 314
315 if (r.isSelected()) { 315 if (r.isSelected()) {
316 if (!isHTMLInputElement(*r.innerNonSharedNode()) || toHTMLInputElement(r .innerNonSharedNode())->type() != InputTypeNames::password) 316 if (!isHTMLInputElement(*r.innerNonSharedNode()) || toHTMLInputElement(r .innerNonSharedNode())->type() != InputTypeNames::password)
317 data.selectedText = selectedFrame->selectedText().stripWhiteSpace(); 317 data.selectedText = selectedFrame->selectedText().stripWhiteSpace();
318 } 318 }
319 319
320 if (r.isContentEditable()) { 320 if (r.isContentEditable()) {
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 outputItems[i] = subItems[i]; 438 outputItems[i] = subItems[i];
439 subMenuItems.swap(outputItems); 439 subMenuItems.swap(outputItems);
440 } 440 }
441 441
442 void ContextMenuClientImpl::populateCustomMenuItems(const ContextMenu* defaultMe nu, WebContextMenuData* data) 442 void ContextMenuClientImpl::populateCustomMenuItems(const ContextMenu* defaultMe nu, WebContextMenuData* data)
443 { 443 {
444 populateSubMenuItems(defaultMenu->items(), data->customItems); 444 populateSubMenuItems(defaultMenu->items(), data->customItems);
445 } 445 }
446 446
447 } // namespace blink 447 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/loader/HistoryItem.cpp ('k') | Source/web/WebHistoryItem.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698