Bug 1048752. Part 13: Remove GetGeometry's aBidiIndicatorSize. r=tn

Callers always pass null.

--HG--
extra : rebase_source : 169f9fe4f4236cffe2c0f760305ebf8093300c69
This commit is contained in:
Robert O'Callahan 2014-08-06 17:19:26 +12:00
Родитель 224aa3096d
Коммит bdbb11f64d
2 изменённых файлов: 3 добавлений и 6 удалений

Просмотреть файл

@ -339,8 +339,7 @@ nsCaret::GetGeometryForFrame(nsIFrame* aFrame,
return NS_OK; return NS_OK;
} }
nsIFrame* nsCaret::GetGeometry(nsISelection* aSelection, nsRect* aRect, nsIFrame* nsCaret::GetGeometry(nsISelection* aSelection, nsRect* aRect)
nscoord* aBidiIndicatorSize)
{ {
nsCOMPtr<nsIDOMNode> focusNode; nsCOMPtr<nsIDOMNode> focusNode;
nsresult rv = aSelection->GetFocusNode(getter_AddRefs(focusNode)); nsresult rv = aSelection->GetFocusNode(getter_AddRefs(focusNode));
@ -368,7 +367,7 @@ nsIFrame* nsCaret::GetGeometry(nsISelection* aSelection, nsRect* aRect,
if (NS_FAILED(rv) || !frame) if (NS_FAILED(rv) || !frame)
return nullptr; return nullptr;
GetGeometryForFrame(frame, frameOffset, aRect, aBidiIndicatorSize); GetGeometryForFrame(frame, frameOffset, aRect, nullptr);
return frame; return frame;
} }

Просмотреть файл

@ -94,11 +94,9 @@ class nsCaret : public nsISelectionListener
* i.e., disregarding blink status). The geometry is stored in aRect, * i.e., disregarding blink status). The geometry is stored in aRect,
* and we return the frame aRect is relative to. * and we return the frame aRect is relative to.
* @param aRect must be non-null * @param aRect must be non-null
* @param aBidiIndicatorSize if non-null, set to the bidi indicator size.
*/ */
nsIFrame* GetGeometry(nsISelection* aSelection, nsIFrame* GetGeometry(nsISelection* aSelection,
nsRect* aRect, nsRect* aRect);
nscoord* aBidiIndicatorSize = nullptr);
/** GetCaretFrame /** GetCaretFrame
* Get the current frame that the caret should be drawn in. If the caret is * Get the current frame that the caret should be drawn in. If the caret is
* not currently visible (i.e., it is between blinks), then this will * not currently visible (i.e., it is between blinks), then this will