Attachment #223544 for bug #128439

View Details Raw Unified Return to Bug 128439



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

        Merge updateSelectionCachesIfSelectionIsInsideTextFormControl into setSelectionWithoutUpdatingAppearance
        https://bugs.webkit.org/show_bug.cgi?id=128439

        Reviewed by NOBODY (OOPS!).

        FrameSelection::selectAll had a superfluous call to updateSelectionCachesIfSelectionIsInsideTextFormControl
        because it wasn't setting UserTriggered option to avoid revealing selection.

        Call setSelection with UserTriggered and recently added DoNotRevealSelection option and merge
        updateSelectionCachesIfSelectionIsInsideTextFormControl into setSelectionWithoutUpdatingAppearance.

        Also rename local variables in setSelectionWithoutUpdatingAppearance, newSelection to
        newSelectionPossiblyWithoutDirection and s to newSelection so that they're self explanatory.

        In addition, we now update the input element's selection caches before calling
        selectFrameElementInParentIfFullySelected but this should be fine because selection cannot simultaneously
        select the entire document and be inside a text form control.

        * editing/FrameSelection.cpp:
        (WebCore::FrameSelection::setSelectionWithoutUpdatingAppearance):
        (WebCore::FrameSelection::selectAll):

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

        EFL build fix attempt after r163662.



    setSelection(newSelection, UserTriggered | DoNotRevealSelection | CloseTyping | ClearTypingStyle, AlignCursorOnScrollIfNeeded, granularity);
}

bool FrameSelection::setSelectionWithoutUpdatingAppearance(const VisibleSelection& newSelectionPossiblyWithoutDirection, SetSelectionOptions options, CursorAlignOnScroll align, TextGranularity granularity, EUserTriggered userTriggered)
{
    bool closeTyping = options & CloseTyping;
    bool shouldClearTypingStyle = options & ClearTypingStyle;

    VisibleSelection newSelection = newSelectionPossiblyWithoutDirection;
    if (shouldAlwaysUseDirectionalSelection(m_frame))
        newSelection.setIsDirectional(true);

    if (!m_frame) {
        m_selection = newSelection;
        return false;
    }

    // <http://bugs.webkit.org/show_bug.cgi?id=23464>: Infinite recursion at FrameSelection::setSelection
    // if document->frame() == m_frame we can get into an infinite loop
    if (Document* newSelectionDocument = newSelection.base().document()) {
        if (RefPtr<Frame> newSelectionFrame = newSelectionDocument->frame()) {
            if (newSelectionFrame != m_frame && newSelectionDocument != m_frame->document()) {
                newSelectionFrame->selection().setSelection(newSelection, options, align, granularity);
                // It's possible that during the above set selection, this FrameSelection has been modified by
                // selectFrameElementInParentIfFullySelected, but that the selection is no longer valid since
                // the frame is about to be destroyed. If this is the case, clear our selection.
                if (newSelectionFrame->hasOneRef() && !m_selection.isNonOrphanedCaretOrRange())
                    clear();
                return false;
            }
        }
    }


    if (shouldClearTypingStyle)
        clearTypingStyle();

    if (m_selection == s) {
        // Even if selection was not changed, selection offsets may have been changed.
        updateSelectionCachesIfSelectionIsInsideTextFormControl(userTriggered);
        return false;
    }

    VisibleSelection oldSelection = m_selection;
    m_selection = newSelection;

    // Selection offsets should increase when LF is inserted before the caret in InsertLineBreakCommand. See <https://webkit.org/b/56061>.
    if (HTMLTextFormControlElement* textControl = enclosingTextFormControl(newSelection.start()))
        textControl->selectionChanged(userTriggered == UserTriggered);

    if (oldSelection == newSelection)
        return false;

    m_selection = s;
    setCaretRectNeedsUpdate();

    if (!newSelection.isNone() && !(options & DoNotSetFocus))
        setFocusedElementIfNeeded();

    // Always clear the x position used for vertical arrow navigation.
    // It will be restored by the vertical arrow navigation code if necessary.
    m_xPosForVerticalArrowNavigation = NoXPosForVerticalArrowNavigation();
    selectFrameElementInParentIfFullySelected();
    updateSelectionCachesIfSelectionIsInsideTextFormControl(userTriggered);
    m_frame->editor().respondToChangedSelection(oldSelection, options);
    m_frame->document()->enqueueDocumentEvent(Event::create(eventNames().selectionchangeEvent, false, false));


    VisibleSelection newSelection(VisibleSelection::selectionFromContentsOfNode(root.get()));

    if (shouldChangeSelection(newSelection))
        setSelection(newSelection, UserTriggered | CloseTyping | ClearTypingStyle | DoNotRevealSelection);

    selectFrameElementInParentIfFullySelected();
    updateSelectionCachesIfSelectionIsInsideTextFormControl(UserTriggered);
}

bool FrameSelection::setSelectedRange(Range* range, EAffinity affinity, bool closeTyping)

#endif
}

void FrameSelection::updateSelectionCachesIfSelectionIsInsideTextFormControl(EUserTriggered userTriggered)
{
    if (HTMLTextFormControlElement* textControl = enclosingTextFormControl(m_selection.start()))
        textControl->selectionChanged(userTriggered == UserTriggered);
}

// Helper function that tells whether a particular node is an element that has an entire
// Frame and FrameView, a <frame>, <iframe>, or <object>.
static bool isFrameElement(const Node* n)

Return to Bug 128439

Lines 250-282 void FrameSelection::setSelectionByMouse Source/WebCore/editing/FrameSelection.cpp_sec1
- Source/WebCore/editing/FrameSelection.cpp -35 / +26 lines
250	setSelection(newSelection, UserTriggered \| DoNotRevealSelection \| CloseTyping \| ClearTypingStyle, AlignCursorOnScrollIfNeeded, granularity);	250	setSelection(newSelection, UserTriggered \| DoNotRevealSelection \| CloseTyping \| ClearTypingStyle, AlignCursorOnScrollIfNeeded, granularity);
251	}	251	}
252		252
253	bool FrameSelection::setSelectionWithoutUpdatingAppearance(const VisibleSelection& newSelection, SetSelectionOptions options, CursorAlignOnScroll align, TextGranularity granularity, EUserTriggered userTriggered)	253	bool FrameSelection::setSelectionWithoutUpdatingAppearance(const VisibleSelection& newSelectionPossiblyWithoutDirection, SetSelectionOptions options, CursorAlignOnScroll align, TextGranularity granularity, EUserTriggered userTriggered)
254	{	254	{
255	bool closeTyping = options & CloseTyping;	255	bool closeTyping = options & CloseTyping;
256	bool shouldClearTypingStyle = options & ClearTypingStyle;	256	bool shouldClearTypingStyle = options & ClearTypingStyle;
257		257
258	VisibleSelection s = newSelection;	258	VisibleSelection newSelection = newSelectionPossiblyWithoutDirection;
259	if (shouldAlwaysUseDirectionalSelection(m_frame))	259	if (shouldAlwaysUseDirectionalSelection(m_frame))
260	s.setIsDirectional(true);	260	newSelection.setIsDirectional(true);
261		261
262	if (!m_frame) {	262	if (!m_frame) {
263	m_selection = s;	263	m_selection = newSelection;
264	return false;	264	return false;
265	}	265	}
266		266
267	// <http://bugs.webkit.org/show_bug.cgi?id=23464>: Infinite recursion at FrameSelection::setSelection	267	// <http://bugs.webkit.org/show_bug.cgi?id=23464>: Infinite recursion at FrameSelection::setSelection
268	// if document->frame() == m_frame we can get into an infinite loop	268	// if document->frame() == m_frame we can get into an infinite loop
269	if (s.base().anchorNode()) {	269	if (Document* newSelectionDocument = newSelection.base().document()) {
270	Document& document = s.base().anchorNode()->document();	270	if (RefPtr<Frame> newSelectionFrame = newSelectionDocument->frame()) {
271	if (document.frame() && document.frame() != m_frame && &document != m_frame->document()) {	271	if (newSelectionFrame != m_frame && newSelectionDocument != m_frame->document()) {
272	RefPtr<Frame> guard = document.frame();	272	newSelectionFrame->selection().setSelection(newSelection, options, align, granularity);
273	document.frame()->selection().setSelection(s, options, align, granularity);	273	// It's possible that during the above set selection, this FrameSelection has been modified by
274	// It's possible that during the above set selection, this FrameSelection has been modified by	274	// selectFrameElementInParentIfFullySelected, but that the selection is no longer valid since
275	// selectFrameElementInParentIfFullySelected, but that the selection is no longer valid since	275	// the frame is about to be destroyed. If this is the case, clear our selection.
276	// the frame is about to be destroyed. If this is the case, clear our selection.	276	if (newSelectionFrame->hasOneRef() && !m_selection.isNonOrphanedCaretOrRange())
277	if (guard->hasOneRef() && !m_selection.isNonOrphanedCaretOrRange())	277	clear();
278	clear();	278	return false;
279	return false;	279	}
280	}	280	}
281	}	281	}
282		282
Lines 292-316 bool FrameSelection::setSelectionWithout Source/WebCore/editing/FrameSelection.cpp_sec2
292	if (shouldClearTypingStyle)	292	if (shouldClearTypingStyle)
293	clearTypingStyle();	293	clearTypingStyle();
294		294
295	if (m_selection == s) {
296	// Even if selection was not changed, selection offsets may have been changed.
297	updateSelectionCachesIfSelectionIsInsideTextFormControl(userTriggered);
298	return false;
299	}
300
301	VisibleSelection oldSelection = m_selection;	295	VisibleSelection oldSelection = m_selection;
		296	m_selection = newSelection;
		297
		298	// Selection offsets should increase when LF is inserted before the caret in InsertLineBreakCommand. See <https://webkit.org/b/56061>.
		299	if (HTMLTextFormControlElement* textControl = enclosingTextFormControl(newSelection.start()))
		300	textControl->selectionChanged(userTriggered == UserTriggered);
		301
		302	if (oldSelection == newSelection)
		303	return false;
302		304
303	m_selection = s;
304	setCaretRectNeedsUpdate();	305	setCaretRectNeedsUpdate();
305		306
306	if (!s.isNone() && !(options & DoNotSetFocus))	307	if (!newSelection.isNone() && !(options & DoNotSetFocus))
307	setFocusedElementIfNeeded();	308	setFocusedElementIfNeeded();
308		309
309	// Always clear the x position used for vertical arrow navigation.	310	// Always clear the x position used for vertical arrow navigation.
310	// It will be restored by the vertical arrow navigation code if necessary.	311	// It will be restored by the vertical arrow navigation code if necessary.
311	m_xPosForVerticalArrowNavigation = NoXPosForVerticalArrowNavigation();	312	m_xPosForVerticalArrowNavigation = NoXPosForVerticalArrowNavigation();
312	selectFrameElementInParentIfFullySelected();	313	selectFrameElementInParentIfFullySelected();
313	updateSelectionCachesIfSelectionIsInsideTextFormControl(userTriggered);
314	m_frame->editor().respondToChangedSelection(oldSelection, options);	314	m_frame->editor().respondToChangedSelection(oldSelection, options);
315	m_frame->document()->enqueueDocumentEvent(Event::create(eventNames().selectionchangeEvent, false, false));	315	m_frame->document()->enqueueDocumentEvent(Event::create(eventNames().selectionchangeEvent, false, false));
316		316
Lines 1706-1715 void FrameSelection::selectAll() Source/WebCore/editing/FrameSelection.cpp_sec3
1706	VisibleSelection newSelection(VisibleSelection::selectionFromContentsOfNode(root.get()));	1706	VisibleSelection newSelection(VisibleSelection::selectionFromContentsOfNode(root.get()));
1707		1707
1708	if (shouldChangeSelection(newSelection))	1708	if (shouldChangeSelection(newSelection))
1709	setSelection(newSelection);	1709	setSelection(newSelection, UserTriggered \| CloseTyping \| ClearTypingStyle \| DoNotRevealSelection);
1710
1711	selectFrameElementInParentIfFullySelected();
1712	updateSelectionCachesIfSelectionIsInsideTextFormControl(UserTriggered);
1713	}	1710	}
1714		1711
1715	bool FrameSelection::setSelectedRange(Range* range, EAffinity affinity, bool closeTyping)	1712	bool FrameSelection::setSelectedRange(Range* range, EAffinity affinity, bool closeTyping)
Lines 1912-1923 void FrameSelection::caretBlinkTimerFire Source/WebCore/editing/FrameSelection.cpp_sec4
1912	#endif	1909	#endif
1913	}	1910	}
1914		1911
1915	void FrameSelection::updateSelectionCachesIfSelectionIsInsideTextFormControl(EUserTriggered userTriggered)
1916	{
1917	if (HTMLTextFormControlElement* textControl = enclosingTextFormControl(m_selection.start()))
1918	textControl->selectionChanged(userTriggered == UserTriggered);
1919	}
1920
1921	// Helper function that tells whether a particular node is an element that has an entire	1912	// Helper function that tells whether a particular node is an element that has an entire
1922	// Frame and FrameView, a <frame>, <iframe>, or <object>.	1913	// Frame and FrameView, a <frame>, <iframe>, or <object>.
1923	static bool isFrameElement(const Node* n)	1914	static bool isFrameElement(const Node* n)

Lines 1-3 Source/WebCore/ChangeLog_sec1
- Source/WebCore/ChangeLog +24 lines
		1	2014-02-07 Ryosuke Niwa <rniwa@webkit.org>
		2
		3	Merge updateSelectionCachesIfSelectionIsInsideTextFormControl into setSelectionWithoutUpdatingAppearance
		4	https://bugs.webkit.org/show_bug.cgi?id=128439
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	FrameSelection::selectAll had a superfluous call to updateSelectionCachesIfSelectionIsInsideTextFormControl
		9	because it wasn't setting UserTriggered option to avoid revealing selection.
		10
		11	Call setSelection with UserTriggered and recently added DoNotRevealSelection option and merge
		12	updateSelectionCachesIfSelectionIsInsideTextFormControl into setSelectionWithoutUpdatingAppearance.
		13
		14	Also rename local variables in setSelectionWithoutUpdatingAppearance, newSelection to
		15	newSelectionPossiblyWithoutDirection and s to newSelection so that they're self explanatory.
		16
		17	In addition, we now update the input element's selection caches before calling
		18	selectFrameElementInParentIfFullySelected but this should be fine because selection cannot simultaneously
		19	select the entire document and be inside a text form control.
		20
		21	* editing/FrameSelection.cpp:
		22	(WebCore::FrameSelection::setSelectionWithoutUpdatingAppearance):
		23	(WebCore::FrameSelection::selectAll):
		24
1	2014-02-07 Ryosuke Niwa <rniwa@webkit.org>	25	2014-02-07 Ryosuke Niwa <rniwa@webkit.org>
2		26
3	EFL build fix attempt after r163662.	27	EFL build fix attempt after r163662.