| 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;
|
|
|
|
|