Attachment #223599 for bug #128481

View Details Raw Unified Return to Bug 128481

| Differences between



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

        Cleanup the interface of FrameSelection
        https://bugs.webkit.org/show_bug.cgi?id=128481

        Reviewed by NOBODY (OOPS!).

        Removed FrameSelection::end() as intended in r163232, and the stale declaration of
        paintDragCaret() which was supposed to be removed when we extracted DragCaretController.

        Renamed caretRenderer() to caretRendererWithoutUpdatingLayout() to clarify the contract
        as the only caller of this function is RenderBlock::paintCaret.

        Also, made recomputeCaretRect() and invalidateCaretRect() private.

        * WebCore.exp.in:
        * editing/FrameSelection.cpp:
        (WebCore::FrameSelection::caretRendererWithoutUpdatingLayout):
        (WebCore::FrameSelection::selectionBounds):
        (WebCore::FrameSelection::revealSelection):
        * editing/FrameSelection.h:
        (WebCore::FrameSelection::setCaretVisible):
        * page/DragController.cpp:
        (WebCore::dragLocForSelectionDrag):
        * page/FrameSnapshotting.cpp:
        (WebCore::snapshotSelection):
        * page/win/FrameWin.cpp:
        (WebCore::imageFromSelection):
        * rendering/RenderBlock.cpp:
        (WebCore::RenderBlock::paintCaret):
        * testing/Internals.cpp:
        (WebCore::Internals::selectionBounds):

2014-02-08  Dan Bernstein  <mitz@apple.com>

        Remove outdated workarounds in DocumentLoader::dataReceived



__ZNK7WebCore14DocumentMarker11descriptionEv
__ZNK7WebCore14FrameSelection11currentFormEv
__ZNK7WebCore14FrameSelection15copyTypingStyleEv
__ZNK7WebCore14FrameSelection15selectionBoundsEb
__ZNK7WebCore14FrameSelection18isFocusedAndActiveEv
__ZNK7WebCore14FrameSelection31getClippedVisibleTextRectanglesERN3WTF6VectorINS_9FloatRectELm0ENS1_15CrashOnOverflowEEE
__ZNK7WebCore14FrameSelection36rootEditableElementOrDocumentElementEv
__ZNK7WebCore14FrameSelection6boundsEb
__ZNK7WebCore14InsertionPoint8isActiveEv
__ZNK7WebCore14RenderListItem10markerTextEv
__ZNK7WebCore14ResourceBuffer4dataEv



    return true;
}

RenderObject* FrameSelection::caretRendererWithoutUpdatingLayout() const
{
    return WebCore::caretRenderer(m_selection.start().deprecatedNode());
}

    return m_frame->editor().client()->shouldDeleteRange(selection.toNormalizedRange().get());
}

FloatRect FrameSelection::selectionBounds(bool clipToVisibleContent) const
{
    if (!m_frame->document())
        return LayoutRect();

        rect = absoluteCaretBounds();
        break;
    case VisibleSelection::RangeSelection:
        rect = revealExtentOption == RevealExtent ? VisiblePosition(m_selection.extent()).absoluteCaretBounds() : enclosingIntRect(selectionBounds(false));
        break;
    }




    void setExtent(const VisiblePosition&, EUserTriggered = NotUserTriggered);
    void setExtent(const Position&, EAffinity, EUserTriggered = NotUserTriggered);

    Position end() const { return m_selection.end(); }

    // Return the renderer that is responsible for painting the caret (in the selection start node)
    RenderObject* caretRendererWithoutUpdatingLayout() const;

    // Caret rect local to the caret's renderer
    LayoutRect localCaretRect();

    void textWasReplaced(CharacterData*, unsigned offset, unsigned oldLength, unsigned newLength);

    void setCaretVisible(bool caretIsVisible) { setCaretVisibility(caretIsVisible ? Visible : Hidden); }
    bool recomputeCaretRect();
    void invalidateCaretRect();
    void paintCaret(GraphicsContext*, const LayoutPoint&, const LayoutRect& clipRect);

    // Used to suspend caret blinking while the mouse is down.

    enum EndPointsAdjustmentMode { AdjustEndpointsAtBidiBoundary, DoNotAdjsutEndpoints };
    void setSelectionByMouseIfDifferent(const VisibleSelection&, TextGranularity, EndPointsAdjustmentMode = DoNotAdjsutEndpoints);

    void paintDragCaret(GraphicsContext*, const LayoutPoint&, const LayoutRect& clipRect) const;

    EditingStyle* typingStyle() const;
    PassRefPtr<MutableStyleProperties> copyTypingStyle() const;
    void setTypingStyle(PassRefPtr<EditingStyle>);
    void clearTypingStyle();

    FloatRect selectionBounds(bool clipToVisibleContent = true) const;

    void getClippedVisibleTextRectangles(Vector<FloatRect>&) const;


    void caretBlinkTimerFired(Timer<FrameSelection>&);

    void setCaretVisibility(CaretVisibility);
    bool recomputeCaretRect();
    void invalidateCaretRect();

    bool dispatchSelectStart();


Lines 697-703 static IntPoint dragLocForDHTMLDrag(cons Source/WebCore/page/DragController.cpp_sec1
- Source/WebCore/page/DragController.cpp -1 / +1 lines
697		697
698	static IntPoint dragLocForSelectionDrag(Frame& src)	698	static IntPoint dragLocForSelectionDrag(Frame& src)
699	{	699	{
700	IntRect draggingRect = enclosingIntRect(src.selection().bounds());	700	IntRect draggingRect = enclosingIntRect(src.selection().selectionBounds());
701	int xpos = draggingRect.maxX();	701	int xpos = draggingRect.maxX();
702	xpos = draggingRect.x() < xpos ? draggingRect.x() : xpos;	702	xpos = draggingRect.x() < xpos ? draggingRect.x() : xpos;
703	int ypos = draggingRect.maxY();	703	int ypos = draggingRect.maxY();

Lines 105-111 std::unique_ptr<ImageBuffer> snapshotSel Source/WebCore/page/FrameSnapshotting.cpp_sec1
- Source/WebCore/page/FrameSnapshotting.cpp -1 / +1 lines
105	return nullptr;	105	return nullptr;
106		106
107	options \|= SnapshotOptionsPaintSelectionOnly;	107	options \|= SnapshotOptionsPaintSelectionOnly;
108	return snapshotFrameRect(frame, enclosingIntRect(frame.selection().bounds()), options);	108	return snapshotFrameRect(frame, enclosingIntRect(frame.selection().selectionBounds()), options);
109	}	109	}
110		110
111	std::unique_ptr<ImageBuffer> snapshotNode(Frame& frame, Node& node)	111	std::unique_ptr<ImageBuffer> snapshotNode(Frame& frame, Node& node)

Lines 50-56 GDIObject<HBITMAP> imageFromSelection(Fr Source/WebCore/page/win/FrameWin.cpp_sec1
- Source/WebCore/page/win/FrameWin.cpp -1 / +1 lines
50	frame->document()->updateLayout();	50	frame->document()->updateLayout();
51		51
52	frame->view()->setPaintBehavior(PaintBehaviorSelectionOnly \| (forceBlackText ? PaintBehaviorForceBlackText : 0));	52	frame->view()->setPaintBehavior(PaintBehaviorSelectionOnly \| (forceBlackText ? PaintBehaviorForceBlackText : 0));
53	FloatRect fr = frame->selection().bounds();	53	FloatRect fr = frame->selection().selectionBounds();
54	IntRect ir(static_cast<int>(fr.x()), static_cast<int>(fr.y()), static_cast<int>(fr.width()), static_cast<int>(fr.height()));	54	IntRect ir(static_cast<int>(fr.x()), static_cast<int>(fr.y()), static_cast<int>(fr.width()), static_cast<int>(fr.height()));
55	GDIObject<HBITMAP> image = imageFromRect(frame, ir);	55	GDIObject<HBITMAP> image = imageFromRect(frame, ir);
56	frame->view()->setPaintBehavior(PaintBehaviorNormal);	56	frame->view()->setPaintBehavior(PaintBehaviorNormal);

Lines 2277-2283 void RenderBlock::paintCaret(PaintInfo& Source/WebCore/rendering/RenderBlock.cpp_sec1
- Source/WebCore/rendering/RenderBlock.cpp -1 / +1 lines
2277	RenderObject* caretPainter;	2277	RenderObject* caretPainter;
2278	bool isContentEditable;	2278	bool isContentEditable;
2279	if (type == CursorCaret) {	2279	if (type == CursorCaret) {
2280	caretPainter = frame().selection().caretRenderer();	2280	caretPainter = frame().selection().caretRendererWithoutUpdatingLayout();
2281	isContentEditable = frame().selection().selection().hasEditableStyle();	2281	isContentEditable = frame().selection().selection().hasEditableStyle();
2282	} else {	2282	} else {
2283	caretPainter = frame().page()->dragCaretController().caretRenderer();	2283	caretPainter = frame().page()->dragCaretController().caretRenderer();

Lines 2135-2141 PassRefPtr<ClientRect> Internals::select Source/WebCore/testing/Internals.cpp_sec1
- Source/WebCore/testing/Internals.cpp -1 / +1 lines
2135	return ClientRect::create();	2135	return ClientRect::create();
2136	}	2136	}
2137		2137
2138	return ClientRect::create(document->frame()->selection().bounds());	2138	return ClientRect::create(document->frame()->selection().selectionBounds());
2139	}	2139	}
2140		2140
2141	#if ENABLE(VIBRATION)	2141	#if ENABLE(VIBRATION)



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

        Cleanup the interface of FrameSelection
        https://bugs.webkit.org/show_bug.cgi?id=128481

        Reviewed by NOBODY (OOPS!).

        * WebProcess/WebPage/FindController.cpp:
        (WebKit::FindController::getFindIndicatorBitmapAndRect):
        (WebKit::FindController::drawRect):
        * WebProcess/WebPage/WebPage.cpp:
        (WebKit::WebPage::scaledSnapshotWithOptions):

2014-02-08  Brady Eidson  <beidson@apple.com>

        IDB: storage/indexeddb/mozilla/cursors.html fails




bool FindController::getFindIndicatorBitmapAndRect(Frame* frame, ShareableBitmap::Handle& handle, IntRect& selectionRect)
{
    selectionRect = enclosingIntRect(frame->selection().selectionBounds());

    // Selection rect can be empty for matches that are currently obscured from view.
    if (selectionRect.isEmpty())

        return;

    if (Frame* selectedFrame = frameWithSelection(m_webPage->corePage())) {
        IntRect findIndicatorRect = selectedFrame->view()->contentsToWindow(enclosingIntRect(selectedFrame->selection().selectionBounds()));

        if (findIndicatorRect != m_findIndicatorRect)
            hideFindIndicator();

Lines 1524-1530 PassRefPtr<WebImage> WebPage::scaledSnap Source/WebKit2/WebProcess/WebPage/WebPage.cpp_sec1
- Source/WebKit2/WebProcess/WebPage/WebPage.cpp -1 / +1 lines
1524	frameView->paintContentsForSnapshot(graphicsContext.get(), rect, shouldPaintSelection, coordinateSpace);	1524	frameView->paintContentsForSnapshot(graphicsContext.get(), rect, shouldPaintSelection, coordinateSpace);
1525		1525
1526	if (options & SnapshotOptionsPaintSelectionRectangle) {	1526	if (options & SnapshotOptionsPaintSelectionRectangle) {
1527	FloatRect selectionRectangle = m_mainFrame->coreFrame()->selection().bounds();	1527	FloatRect selectionRectangle = m_mainFrame->coreFrame()->selection().selectionBounds();
1528	graphicsContext->setStrokeColor(Color(0xFF, 0, 0), ColorSpaceDeviceRGB);	1528	graphicsContext->setStrokeColor(Color(0xFF, 0, 0), ColorSpaceDeviceRGB);
1529	graphicsContext->strokeRect(selectionRectangle, 1);	1529	graphicsContext->strokeRect(selectionRectangle, 1);
1530	}	1530	}



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

        Cleanup the interface of FrameSelection
        https://bugs.webkit.org/show_bug.cgi?id=128481

        Reviewed by NOBODY (OOPS!).

        * WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
        (DumpRenderTreeSupportEfl::selectionRectangle):

2014-02-08  Darin Adler  <darin@apple.com>

        Change TextIterator to use StringView, preparing to wean it from deprecatedCharacters

Lines 199-205 WebCore::IntRect DumpRenderTreeSupportEf Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp_sec1
- Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp -1 / +1 lines
199	{	199	{
200	DRT_SUPPORT_FRAME_GET_OR_RETURN(ewkFrame, frame, WebCore::IntRect());	200	DRT_SUPPORT_FRAME_GET_OR_RETURN(ewkFrame, frame, WebCore::IntRect());
201		201
202	return enclosingIntRect(frame->selection().bounds());	202	return enclosingIntRect(frame->selection().selectionBounds());
203	}	203	}
204		204
205	// Compare with "WebKit/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm	205	// Compare with "WebKit/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm



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

        Cleanup the interface of FrameSelection
        https://bugs.webkit.org/show_bug.cgi?id=128481

        Reviewed by NOBODY (OOPS!).

        * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
        (DumpRenderTreeSupportGtk::rectangleForSelection):

2014-02-08  Darin Adler  <darin@apple.com>

        Change TextIterator to use StringView, preparing to wean it from deprecatedCharacters

Lines 500-506 void DumpRenderTreeSupportGtk::rectangle Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp_sec1
- Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp -1 / +1 lines
500	if (!coreFrame)	500	if (!coreFrame)
501	return;	501	return;
502		502
503	IntRect bounds = enclosingIntRect(coreFrame->selection().bounds());	503	IntRect bounds = enclosingIntRect(coreFrame->selection().selectionBounds());
504	rectangle->x = bounds.x();	504	rectangle->x = bounds.x();
505	rectangle->y = bounds.y();	505	rectangle->y = bounds.y();
506	rectangle->width = bounds.width();	506	rectangle->width = bounds.width();



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

        Cleanup the interface of FrameSelection
        https://bugs.webkit.org/show_bug.cgi?id=128481

        Reviewed by NOBODY (OOPS!).

        * WebView/WebHTMLView.mm:
        (-[WebHTMLView _lookUpInDictionaryFromMenu:]):
        (-[WebHTMLView selectionRect]):
        (-[WebHTMLView selectionImageRect]):

2014-02-08  Dan Bernstein  <mitz@apple.com>

        Remove use of PLATFORM(MAC) from WebKit/mac



    if (!coreFrame)
        return;

    NSRect rect = coreFrame->selection().selectionBounds();

    NSDictionary *attributes = [attrString fontAttributesInRange:NSMakeRange(0,1)];
    NSFont *font = [attributes objectForKey:NSFontAttributeName];

{
    if (![self _hasSelection])
        return NSZeroRect;
    return core([self _frame])->selection().selectionBounds();
}

- (NSArray *)selectionTextRects

{
    if (![self _hasSelection])
        return NSZeroRect;
    return core([self _frame])->selection().selectionBounds();
}

#if !PLATFORM(IOS)



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

        Cleanup the interface of FrameSelection
        https://bugs.webkit.org/show_bug.cgi?id=128481

        Reviewed by NOBODY (OOPS!).

        * WebView.cpp:
        (WebView::selectionRect):

2014-02-08  Darin Adler  <darin@apple.com>

        Change TextIterator to use StringView, preparing to wean it from deprecatedCharacters

Lines 3605-3611 HRESULT STDMETHODCALLTYPE WebView::selec Source/WebKit/win/WebView.cpp_sec1
- Source/WebKit/win/WebView.cpp -1 / +1 lines
3605	{	3605	{
3606	WebCore::Frame& frame = m_page->focusController().focusedOrMainFrame();	3606	WebCore::Frame& frame = m_page->focusController().focusedOrMainFrame();
3607		3607
3608	IntRect ir = enclosingIntRect(frame.selection().bounds());	3608	IntRect ir = enclosingIntRect(frame.selection().selectionBounds());
3609	ir = frame.view()->convertToContainingWindow(ir);	3609	ir = frame.view()->convertToContainingWindow(ir);
3610	ir.move(-frame.view()->scrollOffset().width(), -frame.view()->scrollOffset().height());	3610	ir.move(-frame.view()->scrollOffset().width(), -frame.view()->scrollOffset().height());
3611	rc->left = ir.x();	3611	rc->left = ir.x();

Return to Bug 128481

Lines 1555-1564 __ZNK7WebCore14DocumentLoader9isLoadingE Source/WebCore/WebCore.exp.in_sec1
- Source/WebCore/WebCore.exp.in -1 / +1 lines
1555	__ZNK7WebCore14DocumentMarker11descriptionEv	1555	__ZNK7WebCore14DocumentMarker11descriptionEv
1556	__ZNK7WebCore14FrameSelection11currentFormEv	1556	__ZNK7WebCore14FrameSelection11currentFormEv
1557	__ZNK7WebCore14FrameSelection15copyTypingStyleEv	1557	__ZNK7WebCore14FrameSelection15copyTypingStyleEv
		1558	__ZNK7WebCore14FrameSelection15selectionBoundsEb
1558	__ZNK7WebCore14FrameSelection18isFocusedAndActiveEv	1559	__ZNK7WebCore14FrameSelection18isFocusedAndActiveEv
1559	__ZNK7WebCore14FrameSelection31getClippedVisibleTextRectanglesERN3WTF6VectorINS_9FloatRectELm0ENS1_15CrashOnOverflowEEE	1560	__ZNK7WebCore14FrameSelection31getClippedVisibleTextRectanglesERN3WTF6VectorINS_9FloatRectELm0ENS1_15CrashOnOverflowEEE
1560	__ZNK7WebCore14FrameSelection36rootEditableElementOrDocumentElementEv	1561	__ZNK7WebCore14FrameSelection36rootEditableElementOrDocumentElementEv
1561	__ZNK7WebCore14FrameSelection6boundsEb
1562	__ZNK7WebCore14InsertionPoint8isActiveEv	1562	__ZNK7WebCore14InsertionPoint8isActiveEv
1563	__ZNK7WebCore14RenderListItem10markerTextEv	1563	__ZNK7WebCore14RenderListItem10markerTextEv
1564	__ZNK7WebCore14ResourceBuffer4dataEv	1564	__ZNK7WebCore14ResourceBuffer4dataEv

Lines 1344-1350 bool CaretBase::updateCaretRect(Document Source/WebCore/editing/FrameSelection.cpp_sec1
- Source/WebCore/editing/FrameSelection.cpp -3 / +3 lines
1344	return true;	1344	return true;
1345	}	1345	}
1346		1346
1347	RenderObject* FrameSelection::caretRenderer() const	1347	RenderObject* FrameSelection::caretRendererWithoutUpdatingLayout() const
1348	{	1348	{
1349	return WebCore::caretRenderer(m_selection.start().deprecatedNode());	1349	return WebCore::caretRenderer(m_selection.start().deprecatedNode());
1350	}	1350	}
Lines 1977-1983 bool FrameSelection::shouldDeleteSelecti Source/WebCore/editing/FrameSelection.cpp_sec2
1977	return m_frame->editor().client()->shouldDeleteRange(selection.toNormalizedRange().get());	1977	return m_frame->editor().client()->shouldDeleteRange(selection.toNormalizedRange().get());
1978	}	1978	}
1979		1979
1980	FloatRect FrameSelection::bounds(bool clipToVisibleContent) const	1980	FloatRect FrameSelection::selectionBounds(bool clipToVisibleContent) const
1981	{	1981	{
1982	if (!m_frame->document())	1982	if (!m_frame->document())
1983	return LayoutRect();	1983	return LayoutRect();
Lines 2065-2071 void FrameSelection::revealSelection(con Source/WebCore/editing/FrameSelection.cpp_sec3
2065	rect = absoluteCaretBounds();	2065	rect = absoluteCaretBounds();
2066	break;	2066	break;
2067	case VisibleSelection::RangeSelection:	2067	case VisibleSelection::RangeSelection:
2068	rect = revealExtentOption == RevealExtent ? VisiblePosition(m_selection.extent()).absoluteCaretBounds() : enclosingIntRect(bounds(false));	2068	rect = revealExtentOption == RevealExtent ? VisiblePosition(m_selection.extent()).absoluteCaretBounds() : enclosingIntRect(selectionBounds(false));
2069	break;	2069	break;
2070	}	2070	}
2071		2071

Lines 165-174 public: Source/WebCore/editing/FrameSelection.h_sec1
- Source/WebCore/editing/FrameSelection.h -8 / +4 lines
165	void setExtent(const VisiblePosition&, EUserTriggered = NotUserTriggered);	165	void setExtent(const VisiblePosition&, EUserTriggered = NotUserTriggered);
166	void setExtent(const Position&, EAffinity, EUserTriggered = NotUserTriggered);	166	void setExtent(const Position&, EAffinity, EUserTriggered = NotUserTriggered);
167		167
168	Position end() const { return m_selection.end(); }
169
170	// Return the renderer that is responsible for painting the caret (in the selection start node)	168	// Return the renderer that is responsible for painting the caret (in the selection start node)
171	RenderObject* caretRenderer() const;	169	RenderObject* caretRendererWithoutUpdatingLayout() const;
172		170
173	// Caret rect local to the caret's renderer	171	// Caret rect local to the caret's renderer
174	LayoutRect localCaretRect();	172	LayoutRect localCaretRect();
Lines 193-200 public: Source/WebCore/editing/FrameSelection.h_sec2
193	void textWasReplaced(CharacterData*, unsigned offset, unsigned oldLength, unsigned newLength);	191	void textWasReplaced(CharacterData*, unsigned offset, unsigned oldLength, unsigned newLength);
194		192
195	void setCaretVisible(bool caretIsVisible) { setCaretVisibility(caretIsVisible ? Visible : Hidden); }	193	void setCaretVisible(bool caretIsVisible) { setCaretVisibility(caretIsVisible ? Visible : Hidden); }
196	bool recomputeCaretRect();
197	void invalidateCaretRect();
198	void paintCaret(GraphicsContext*, const LayoutPoint&, const LayoutRect& clipRect);	194	void paintCaret(GraphicsContext*, const LayoutPoint&, const LayoutRect& clipRect);
199		195
200	// Used to suspend caret blinking while the mouse is down.	196	// Used to suspend caret blinking while the mouse is down.
Lines 257-270 public: Source/WebCore/editing/FrameSelection.h_sec3
257	enum EndPointsAdjustmentMode { AdjustEndpointsAtBidiBoundary, DoNotAdjsutEndpoints };	253	enum EndPointsAdjustmentMode { AdjustEndpointsAtBidiBoundary, DoNotAdjsutEndpoints };
258	void setSelectionByMouseIfDifferent(const VisibleSelection&, TextGranularity, EndPointsAdjustmentMode = DoNotAdjsutEndpoints);	254	void setSelectionByMouseIfDifferent(const VisibleSelection&, TextGranularity, EndPointsAdjustmentMode = DoNotAdjsutEndpoints);
259		255
260	void paintDragCaret(GraphicsContext*, const LayoutPoint&, const LayoutRect& clipRect) const;
261
262	EditingStyle* typingStyle() const;	256	EditingStyle* typingStyle() const;
263	PassRefPtr<MutableStyleProperties> copyTypingStyle() const;	257	PassRefPtr<MutableStyleProperties> copyTypingStyle() const;
264	void setTypingStyle(PassRefPtr<EditingStyle>);	258	void setTypingStyle(PassRefPtr<EditingStyle>);
265	void clearTypingStyle();	259	void clearTypingStyle();
266		260
267	FloatRect bounds(bool clipToVisibleContent = true) const;	261	FloatRect selectionBounds(bool clipToVisibleContent = true) const;
268		262
269	void getClippedVisibleTextRectangles(Vector<FloatRect>&) const;	263	void getClippedVisibleTextRectangles(Vector<FloatRect>&) const;
270		264
Lines 317-322 private: Source/WebCore/editing/FrameSelection.h_sec4
317	void caretBlinkTimerFired(Timer<FrameSelection>&);	311	void caretBlinkTimerFired(Timer<FrameSelection>&);
318		312
319	void setCaretVisibility(CaretVisibility);	313	void setCaretVisibility(CaretVisibility);
		314	bool recomputeCaretRect();
		315	void invalidateCaretRect();
320		316
321	bool dispatchSelectStart();	317	bool dispatchSelectStart();
322		318

Lines 5682-5688 - (void)_lookUpInDictionaryFromMenu:(id) Source/WebKit/mac/WebView/WebHTMLView.mm_sec1
- Source/WebKit/mac/WebView/WebHTMLView.mm -3 / +3 lines
5682	if (!coreFrame)	5682	if (!coreFrame)
5683	return;	5683	return;
5684		5684
5685	NSRect rect = coreFrame->selection().bounds();	5685	NSRect rect = coreFrame->selection().selectionBounds();
5686		5686
5687	NSDictionary *attributes = [attrString fontAttributesInRange:NSMakeRange(0,1)];	5687	NSDictionary *attributes = [attrString fontAttributesInRange:NSMakeRange(0,1)];
5688	NSFont *font = [attributes objectForKey:NSFontAttributeName];	5688	NSFont *font = [attributes objectForKey:NSFontAttributeName];
Lines 6528-6534 - (NSRect)selectionRect Source/WebKit/mac/WebView/WebHTMLView.mm_sec2
6528	{	6528	{
6529	if (![self _hasSelection])	6529	if (![self _hasSelection])
6530	return NSZeroRect;	6530	return NSZeroRect;
6531	return core([self _frame])->selection().bounds();	6531	return core([self _frame])->selection().selectionBounds();
6532	}	6532	}
6533		6533
6534	- (NSArray *)selectionTextRects	6534	- (NSArray *)selectionTextRects
Lines 6579-6585 - (NSRect)selectionImageRect Source/WebKit/mac/WebView/WebHTMLView.mm_sec3
6579	{	6579	{
6580	if (![self _hasSelection])	6580	if (![self _hasSelection])
6581	return NSZeroRect;	6581	return NSZeroRect;
6582	return core([self _frame])->selection().bounds();	6582	return core([self _frame])->selection().selectionBounds();
6583	}	6583	}
6584		6584
6585	#if !PLATFORM(IOS)	6585	#if !PLATFORM(IOS)

Lines 1-3 Source/WebCore/ChangeLog_sec1
- Source/WebCore/ChangeLog +33 lines
		1	2014-02-08 Ryosuke Niwa <rniwa@webkit.org>
		2
		3	Cleanup the interface of FrameSelection
		4	https://bugs.webkit.org/show_bug.cgi?id=128481
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Removed FrameSelection::end() as intended in r163232, and the stale declaration of
		9	paintDragCaret() which was supposed to be removed when we extracted DragCaretController.
		10
		11	Renamed caretRenderer() to caretRendererWithoutUpdatingLayout() to clarify the contract
		12	as the only caller of this function is RenderBlock::paintCaret.
		13
		14	Also, made recomputeCaretRect() and invalidateCaretRect() private.
		15
		16	* WebCore.exp.in:
		17	* editing/FrameSelection.cpp:
		18	(WebCore::FrameSelection::caretRendererWithoutUpdatingLayout):
		19	(WebCore::FrameSelection::selectionBounds):
		20	(WebCore::FrameSelection::revealSelection):
		21	* editing/FrameSelection.h:
		22	(WebCore::FrameSelection::setCaretVisible):
		23	* page/DragController.cpp:
		24	(WebCore::dragLocForSelectionDrag):
		25	* page/FrameSnapshotting.cpp:
		26	(WebCore::snapshotSelection):
		27	* page/win/FrameWin.cpp:
		28	(WebCore::imageFromSelection):
		29	* rendering/RenderBlock.cpp:
		30	(WebCore::RenderBlock::paintCaret):
		31	* testing/Internals.cpp:
		32	(WebCore::Internals::selectionBounds):
		33
1	2014-02-08 Dan Bernstein <mitz@apple.com>	34	2014-02-08 Dan Bernstein <mitz@apple.com>
2		35
3	Remove outdated workarounds in DocumentLoader::dataReceived	36	Remove outdated workarounds in DocumentLoader::dataReceived

Lines 1-3 Source/WebKit2/ChangeLog_sec1
- Source/WebKit2/ChangeLog +13 lines
		1	2014-02-08 Ryosuke Niwa <rniwa@webkit.org>
		2
		3	Cleanup the interface of FrameSelection
		4	https://bugs.webkit.org/show_bug.cgi?id=128481
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* WebProcess/WebPage/FindController.cpp:
		9	(WebKit::FindController::getFindIndicatorBitmapAndRect):
		10	(WebKit::FindController::drawRect):
		11	* WebProcess/WebPage/WebPage.cpp:
		12	(WebKit::WebPage::scaledSnapshotWithOptions):
		13
1	2014-02-08 Brady Eidson <beidson@apple.com>	14	2014-02-08 Brady Eidson <beidson@apple.com>
2		15
3	IDB: storage/indexeddb/mozilla/cursors.html fails	16	IDB: storage/indexeddb/mozilla/cursors.html fails

Lines 201-207 void FindController::findStringMatches(c Source/WebKit2/WebProcess/WebPage/FindController.cpp_sec1
- Source/WebKit2/WebProcess/WebPage/FindController.cpp -2 / +2 lines
201		201
202	bool FindController::getFindIndicatorBitmapAndRect(Frame* frame, ShareableBitmap::Handle& handle, IntRect& selectionRect)	202	bool FindController::getFindIndicatorBitmapAndRect(Frame* frame, ShareableBitmap::Handle& handle, IntRect& selectionRect)
203	{	203	{
204	selectionRect = enclosingIntRect(frame->selection().bounds());	204	selectionRect = enclosingIntRect(frame->selection().selectionBounds());
205		205
206	// Selection rect can be empty for matches that are currently obscured from view.	206	// Selection rect can be empty for matches that are currently obscured from view.
207	if (selectionRect.isEmpty())	207	if (selectionRect.isEmpty())
Lines 427-433 void FindController::drawRect(PageOverla Source/WebKit2/WebProcess/WebPage/FindController.cpp_sec2
427	return;	427	return;
428		428
429	if (Frame* selectedFrame = frameWithSelection(m_webPage->corePage())) {	429	if (Frame* selectedFrame = frameWithSelection(m_webPage->corePage())) {
430	IntRect findIndicatorRect = selectedFrame->view()->contentsToWindow(enclosingIntRect(selectedFrame->selection().bounds()));	430	IntRect findIndicatorRect = selectedFrame->view()->contentsToWindow(enclosingIntRect(selectedFrame->selection().selectionBounds()));
431		431
432	if (findIndicatorRect != m_findIndicatorRect)	432	if (findIndicatorRect != m_findIndicatorRect)
433	hideFindIndicator();	433	hideFindIndicator();

Lines 1-3 Source/WebKit/efl/ChangeLog_sec1
- Source/WebKit/efl/ChangeLog +10 lines
		1	2014-02-08 Ryosuke Niwa <rniwa@webkit.org>
		2
		3	Cleanup the interface of FrameSelection
		4	https://bugs.webkit.org/show_bug.cgi?id=128481
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
		9	(DumpRenderTreeSupportEfl::selectionRectangle):
		10
1	2014-02-08 Darin Adler <darin@apple.com>	11	2014-02-08 Darin Adler <darin@apple.com>
2		12
3	Change TextIterator to use StringView, preparing to wean it from deprecatedCharacters	13	Change TextIterator to use StringView, preparing to wean it from deprecatedCharacters

Lines 1-3 Source/WebKit/gtk/ChangeLog_sec1
- Source/WebKit/gtk/ChangeLog +10 lines
		1	2014-02-08 Ryosuke Niwa <rniwa@webkit.org>
		2
		3	Cleanup the interface of FrameSelection
		4	https://bugs.webkit.org/show_bug.cgi?id=128481
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
		9	(DumpRenderTreeSupportGtk::rectangleForSelection):
		10
1	2014-02-08 Darin Adler <darin@apple.com>	11	2014-02-08 Darin Adler <darin@apple.com>
2		12
3	Change TextIterator to use StringView, preparing to wean it from deprecatedCharacters	13	Change TextIterator to use StringView, preparing to wean it from deprecatedCharacters

Lines 1-3 Source/WebKit/mac/ChangeLog_sec1
- Source/WebKit/mac/ChangeLog +12 lines
		1	2014-02-08 Ryosuke Niwa <rniwa@webkit.org>
		2
		3	Cleanup the interface of FrameSelection
		4	https://bugs.webkit.org/show_bug.cgi?id=128481
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* WebView/WebHTMLView.mm:
		9	(-[WebHTMLView _lookUpInDictionaryFromMenu:]):
		10	(-[WebHTMLView selectionRect]):
		11	(-[WebHTMLView selectionImageRect]):
		12
1	2014-02-08 Dan Bernstein <mitz@apple.com>	13	2014-02-08 Dan Bernstein <mitz@apple.com>
2		14
3	Remove use of PLATFORM(MAC) from WebKit/mac	15	Remove use of PLATFORM(MAC) from WebKit/mac

Lines 1-3 Source/WebKit/win/ChangeLog_sec1
- Source/WebKit/win/ChangeLog +10 lines
		1	2014-02-08 Ryosuke Niwa <rniwa@webkit.org>
		2
		3	Cleanup the interface of FrameSelection
		4	https://bugs.webkit.org/show_bug.cgi?id=128481
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* WebView.cpp:
		9	(WebView::selectionRect):
		10
1	2014-02-08 Darin Adler <darin@apple.com>	11	2014-02-08 Darin Adler <darin@apple.com>
2		12
3	Change TextIterator to use StringView, preparing to wean it from deprecatedCharacters	13	Change TextIterator to use StringView, preparing to wean it from deprecatedCharacters