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

Unified Diff: Source/core/editing/EditorCommand.cpp

Issue 224113002: Oilpan: move Range object to the oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Use STACK_ALLOCATED() + incorporate ager's overview of macros in this area. Created 6 years, 9 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
Index: Source/core/editing/EditorCommand.cpp
diff --git a/Source/core/editing/EditorCommand.cpp b/Source/core/editing/EditorCommand.cpp
index 46c65f17dec2b533b99a94e3444d8400b2021701..6712cbb1096f17878f730c82efbda242bb35b60d 100644
--- a/Source/core/editing/EditorCommand.cpp
+++ b/Source/core/editing/EditorCommand.cpp
@@ -213,12 +213,11 @@ static bool expandSelectionToGranularity(LocalFrame& frame, TextGranularity gran
{
VisibleSelection selection = frame.selection().selection();
selection.expandUsingGranularity(granularity);
- RefPtr<Range> newRange = selection.toNormalizedRange();
+ RefPtrWillBeRawPtr<Range> newRange = selection.toNormalizedRange();
if (!newRange)
return false;
if (newRange->collapsed(IGNORE_EXCEPTION))
return false;
- RefPtr<Range> oldRange = frame.selection().selection().toNormalizedRange();
Mads Ager (chromium) 2014/04/04 07:48:38 Ditto?
EAffinity affinity = frame.selection().affinity();
frame.selection().setSelectedRange(newRange.get(), affinity, FrameSelection::CloseTyping);
return true;
@@ -264,7 +263,7 @@ static unsigned verticalScrollDistance(LocalFrame& frame)
return static_cast<unsigned>(max(max<int>(height * ScrollableArea::minFractionToStepWhenPaging(), height - ScrollableArea::maxOverlapBetweenPages()), 1));
}
-static RefPtr<Range> unionDOMRanges(Range* a, Range* b)
+static PassRefPtrWillBeRawPtr<Range> unionDOMRanges(Range* a, Range* b)
{
Range* start = a->compareBoundaryPoints(Range::START_TO_START, b, ASSERT_NO_EXCEPTION) <= 0 ? a : b;
Range* end = a->compareBoundaryPoints(Range::END_TO_END, b, ASSERT_NO_EXCEPTION) <= 0 ? b : a;
@@ -380,7 +379,7 @@ static bool executeDeleteToEndOfParagraph(LocalFrame& frame, Event*, EditorComma
static bool executeDeleteToMark(LocalFrame& frame, Event*, EditorCommandSource, const String&)
{
- RefPtr<Range> mark = frame.editor().mark().toNormalizedRange();
+ RefPtrWillBeRawPtr<Range> mark = frame.editor().mark().toNormalizedRange();
if (mark) {
bool selected = frame.selection().setSelectedRange(unionDOMRanges(mark.get(), frame.editor().selectedRange().get()).get(), DOWNSTREAM, FrameSelection::CloseTyping);
ASSERT(selected);
@@ -1028,8 +1027,8 @@ static bool executeSelectSentence(LocalFrame& frame, Event*, EditorCommandSource
static bool executeSelectToMark(LocalFrame& frame, Event*, EditorCommandSource, const String&)
{
- RefPtr<Range> mark = frame.editor().mark().toNormalizedRange();
- RefPtr<Range> selection = frame.editor().selectedRange();
+ RefPtrWillBeRawPtr<Range> mark = frame.editor().mark().toNormalizedRange();
+ RefPtrWillBeRawPtr<Range> selection = frame.editor().selectedRange();
if (!mark || !selection)
return false;
frame.selection().setSelectedRange(unionDOMRanges(mark.get(), selection.get()).get(), DOWNSTREAM, FrameSelection::CloseTyping);

Powered by Google App Engine
This is Rietveld 408576698