Attachment #224304 for bug #128878

View Details Raw Unified Return to Bug 128878



2014-02-15  Ryosuke Niwa  <rniwa@webkit.org>

        Remove unused arguments from moveTo(Range*)
        https://bugs.webkit.org/show_bug.cgi?id=128878

        Reviewed by NOBODY (OOPS!).

        Cleanup.

        * bindings/objc/DOMUIKitExtensions.mm:
        (-[DOMRange move:inDirection:]):
        (-[DOMRange extend:inDirection:]):
        * editing/FrameSelection.cpp:
        (WebCore::FrameSelection::moveTo):
        * editing/FrameSelection.h:

2014-02-15  Andreas Kling  <akling@apple.com>

        Add checked casts for Event.



{
    Range *range = core(self);
    FrameSelection frameSelection;
    frameSelection.moveTo(range);
    
    TextGranularity granularity = CharacterGranularity;
    // Until WebKit supports vertical layout, "down" is equivalent to "forward by a line" and

{
    Range *range = core(self);
    FrameSelection frameSelection;
    frameSelection.moveTo(range);
    
    for (UInt32 i = 0; i < amount; i++)
        frameSelection.modify(FrameSelection::AlterationExtend, (SelectionDirection)direction, CharacterGranularity);    



    setSelection(VisibleSelection(pos, affinity, m_selection.isDirectional()), defaultSetSelectionOptions(userTriggered));
}

void FrameSelection::moveTo(const Range *r)
{
    VisibleSelection selection = r ? VisibleSelection(r->startPosition(), r->endPosition()) : VisibleSelection();
    setSelection(selection);
}

void FrameSelection::moveTo(const Position &base, const Position &extent, EAffinity affinity, EUserTriggered userTriggered)

Lines 135-141 public: Source/WebCore/editing/FrameSelection.h_sec1
- Source/WebCore/editing/FrameSelection.h -1 / +1 lines
135		135
136	Element* rootEditableElementOrDocumentElement() const;	136	Element* rootEditableElementOrDocumentElement() const;
137		137
138	void moveTo(const Range*, EAffinity, EUserTriggered = NotUserTriggered);	138	void moveTo(const Range*);
139	void moveTo(const VisiblePosition&, EUserTriggered = NotUserTriggered, CursorAlignOnScroll = AlignCursorOnScrollIfNeeded);	139	void moveTo(const VisiblePosition&, EUserTriggered = NotUserTriggered, CursorAlignOnScroll = AlignCursorOnScrollIfNeeded);
140	void moveTo(const VisiblePosition&, const VisiblePosition&, EUserTriggered = NotUserTriggered);	140	void moveTo(const VisiblePosition&, const VisiblePosition&, EUserTriggered = NotUserTriggered);
141	void moveTo(const Position&, EAffinity, EUserTriggered = NotUserTriggered);	141	void moveTo(const Position&, EAffinity, EUserTriggered = NotUserTriggered);

Return to Bug 128878

Lines 94-100 - (void)move:(UInt32)amount inDirection: Source/WebCore/bindings/objc/DOMUIKitExtensions.mm_sec1
- Source/WebCore/bindings/objc/DOMUIKitExtensions.mm -2 / +2 lines
94	{	94	{
95	Range *range = core(self);	95	Range *range = core(self);
96	FrameSelection frameSelection;	96	FrameSelection frameSelection;
97	frameSelection.moveTo(range, DOWNSTREAM);	97	frameSelection.moveTo(range);
98		98
99	TextGranularity granularity = CharacterGranularity;	99	TextGranularity granularity = CharacterGranularity;
100	// Until WebKit supports vertical layout, "down" is equivalent to "forward by a line" and	100	// Until WebKit supports vertical layout, "down" is equivalent to "forward by a line" and
Lines 121-127 - (void)extend:(UInt32)amount inDirectio Source/WebCore/bindings/objc/DOMUIKitExtensions.mm_sec2
121	{	121	{
122	Range *range = core(self);	122	Range *range = core(self);
123	FrameSelection frameSelection;	123	FrameSelection frameSelection;
124	frameSelection.moveTo(range, DOWNSTREAM);	124	frameSelection.moveTo(range);
125		125
126	for (UInt32 i = 0; i < amount; i++)	126	for (UInt32 i = 0; i < amount; i++)
127	frameSelection.modify(FrameSelection::AlterationExtend, (SelectionDirection)direction, CharacterGranularity);	127	frameSelection.modify(FrameSelection::AlterationExtend, (SelectionDirection)direction, CharacterGranularity);

Lines 152-161 void FrameSelection::moveTo(const Positi Source/WebCore/editing/FrameSelection.cpp_sec1
- Source/WebCore/editing/FrameSelection.cpp -3 / +3 lines
152	setSelection(VisibleSelection(pos, affinity, m_selection.isDirectional()), defaultSetSelectionOptions(userTriggered));	152	setSelection(VisibleSelection(pos, affinity, m_selection.isDirectional()), defaultSetSelectionOptions(userTriggered));
153	}	153	}
154		154
155	void FrameSelection::moveTo(const Range *r, EAffinity affinity, EUserTriggered userTriggered)	155	void FrameSelection::moveTo(const Range *r)
156	{	156	{
157	VisibleSelection selection = r ? VisibleSelection(r->startPosition(), r->endPosition(), affinity) : VisibleSelection(Position(), Position(), affinity);	157	VisibleSelection selection = r ? VisibleSelection(r->startPosition(), r->endPosition()) : VisibleSelection();
158	setSelection(selection, defaultSetSelectionOptions(userTriggered));	158	setSelection(selection);
159	}	159	}
160		160
161	void FrameSelection::moveTo(const Position &base, const Position &extent, EAffinity affinity, EUserTriggered userTriggered)	161	void FrameSelection::moveTo(const Position &base, const Position &extent, EAffinity affinity, EUserTriggered userTriggered)

Lines 1-3 Source/WebCore/ChangeLog_sec1
- Source/WebCore/ChangeLog +16 lines
		1	2014-02-15 Ryosuke Niwa <rniwa@webkit.org>
		2
		3	Remove unused arguments from moveTo(Range*)
		4	https://bugs.webkit.org/show_bug.cgi?id=128878
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Cleanup.
		9
		10	* bindings/objc/DOMUIKitExtensions.mm:
		11	(-[DOMRange move:inDirection:]):
		12	(-[DOMRange extend:inDirection:]):
		13	* editing/FrameSelection.cpp:
		14	(WebCore::FrameSelection::moveTo):
		15	* editing/FrameSelection.h:
		16
1	2014-02-15 Andreas Kling <akling@apple.com>	17	2014-02-15 Andreas Kling <akling@apple.com>
2		18
3	Add checked casts for Event.	19	Add checked casts for Event.