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

Unified Diff: trunk/Source/core/page/DragController.cpp

Issue 291233003: Revert 174382 "Oilpan: make DocumentFragment a heap allocated ob..." (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/Source/core/inspector/InspectorDOMAgent.cpp ('k') | trunk/Source/core/page/DragData.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/Source/core/page/DragController.cpp
===================================================================
--- trunk/Source/core/page/DragController.cpp (revision 174395)
+++ trunk/Source/core/page/DragController.cpp (working copy)
@@ -148,14 +148,15 @@
return adoptPtr(new DragController(page, client));
}
-static PassRefPtrWillBeRawPtr<DocumentFragment> documentFragmentFromDragData(DragData* dragData, LocalFrame* frame, RefPtrWillBeRawPtr<Range> context, bool allowPlainText, bool& chosePlainText)
+static PassRefPtr<DocumentFragment> documentFragmentFromDragData(DragData* dragData, LocalFrame* frame, RefPtrWillBeRawPtr<Range> context,
+ bool allowPlainText, bool& chosePlainText)
{
ASSERT(dragData);
chosePlainText = false;
Document& document = context->ownerDocument();
if (dragData->containsCompatibleContent()) {
- if (PassRefPtrWillBeRawPtr<DocumentFragment> fragment = dragData->asFragment(frame, context, allowPlainText, chosePlainText))
+ if (PassRefPtr<DocumentFragment> fragment = dragData->asFragment(frame, context, allowPlainText, chosePlainText))
return fragment;
if (dragData->containsURL(DragData::DoNotConvertFilenames)) {
@@ -173,7 +174,7 @@
}
RefPtr<Node> anchorText = document.createTextNode(title);
anchor->appendChild(anchorText);
- RefPtrWillBeRawPtr<DocumentFragment> fragment = document.createDocumentFragment();
+ RefPtr<DocumentFragment> fragment = document.createDocumentFragment();
fragment->appendChild(anchor);
return fragment.release();
}
@@ -493,7 +494,7 @@
ResourceCacheValidationSuppressor validationSuppressor(fetcher);
if (dragIsMove(innerFrame->selection(), dragData) || dragCaret.isContentRichlyEditable()) {
bool chosePlainText = false;
- RefPtrWillBeRawPtr<DocumentFragment> fragment = documentFragmentFromDragData(dragData, innerFrame.get(), range, true, chosePlainText);
+ RefPtr<DocumentFragment> fragment = documentFragmentFromDragData(dragData, innerFrame.get(), range, true, chosePlainText);
if (!fragment)
return false;
« no previous file with comments | « trunk/Source/core/inspector/InspectorDOMAgent.cpp ('k') | trunk/Source/core/page/DragData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698