Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 07:15:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1057256 - Part 1 - Remove NS_ENSURE_TRUE in SelectionCarets.cpp. r=roc

Browse Source 
Remove NS_ENSURE_TRUE and NS_ENSURE_TRUE_VOID since they are deprecated,
and we do not need to print log in plain null pointer check.
This commit is contained in:
Ting-Yu Lin 2014-08-25 02:50:00 +02:00
parent ce44192262
commit 9a407aec80
1 changed files with 59 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
layout/base/SelectionCarets.cpp
View File

@ -206,7 +206,10 @@ SelectionCarets::HandleEvent(WidgetEvent* aEvent)
static void
SetElementVisibility(dom::Element* aElement, bool aVisible)
{
NS_ENSURE_TRUE_VOID(aElement);
if (!aElement) {
return;
}
ErrorResult err;
aElement->ClassList()->Toggle(NS_LITERAL_STRING("hidden"),
dom::Optional<bool>(!aVisible), err);
@ -258,7 +261,10 @@ SelectionCarets::SetTilted(bool aIsTilt)
{
dom::Element* startElement = mPresShell->GetSelectionCaretsStartElement();
dom::Element* endElement = mPresShell->GetSelectionCaretsEndElement();
NS_ENSURE_TRUE_VOID(startElement && endElement);
if (!startElement || !endElement) {
return;
}
ErrorResult err;
startElement->ClassList()->Toggle(NS_LITERAL_STRING("tilt"),
@ -313,7 +319,9 @@ FindFirstNodeWithFrame(nsIDocument* aDocument,
bool aBackward,
int& aOutOffset)
{
NS_ENSURE_TRUE(aDocument && aRange && aFrameSelection, nullptr);
if (!aDocument || !aRange || !aFrameSelection) {
return nullptr;
}
nsCOMPtr<nsINode> startNode =
do_QueryInterface(aBackward ? aRange->GetEndParent() : aRange->GetStartParent());
@ -341,7 +349,10 @@ FindFirstNodeWithFrame(nsIDocument* aDocument,
nullptr,
err);
NS_ENSURE_TRUE(walker, nullptr);
if (!walker) {
return nullptr;
}
startFrame = startContent ? startContent->GetPrimaryFrame() : nullptr;
while (!startFrame && startNode != endNode) {
if (aBackward) {
@ -508,15 +519,22 @@ SelectionCarets::SelectWord()
return NS_OK;
}
NS_ENSURE_TRUE(mPresShell, NS_OK);
if (!mPresShell) {
return NS_OK;
}
nsIFrame* canvasFrame = mPresShell->GetCanvasFrame();
NS_ENSURE_TRUE(canvasFrame, NS_OK);
if (!canvasFrame) {
return NS_OK;
}
// Find content offsets for mouse down point
nsIFrame *ptFrame = nsLayoutUtils::GetFrameForPoint(canvasFrame, mDownPoint,
nsLayoutUtils::IGNORE_PAINT_SUPPRESSION | nsLayoutUtils::IGNORE_CROSS_DOC);
NS_ENSURE_TRUE(ptFrame, NS_OK);
if (!ptFrame) {
return NS_OK;
}
nsPoint ptInFrame = mDownPoint;
nsLayoutUtils::TransformPoint(canvasFrame, ptFrame, ptInFrame);
@ -569,7 +587,9 @@ CompareRangeWithContentOffset(nsRange* aRange,
nsIFrame* theFrame =
aSelection->GetFrameForNodeOffset(content, nodeOffset, hint, &offset);
NS_ENSURE_TRUE(theFrame, false);
if (!theFrame) {
return false;
}
// Move one character forward/backward from point and get offset
nsPeekOffsetStruct pos(eSelectCluster,
@ -605,7 +625,9 @@ nsEventStatus
SelectionCarets::DragSelection(const nsPoint &movePoint)
{
nsIFrame* canvasFrame = mPresShell->GetCanvasFrame();
NS_ENSURE_TRUE(canvasFrame, nsEventStatus_eConsumeNoDefault);
if (!canvasFrame) {
return nsEventStatus_eConsumeNoDefault;
}
// Find out which content we point to
nsIFrame *ptFrame = nsLayoutUtils::GetFrameForPoint(canvasFrame, movePoint,
@ -629,7 +651,9 @@ SelectionCarets::DragSelection(const nsPoint &movePoint)
nsFrame::ContentOffsets offsets =
newFrame->GetContentOffsetsFromPoint(newPoint);
NS_ENSURE_TRUE(offsets.content, nsEventStatus_eConsumeNoDefault);
if (!offsets.content) {
return nsEventStatus_eConsumeNoDefault;
}
nsISelection* caretSelection = GetSelection();
nsRefPtr<dom::Selection> selection = static_cast<dom::Selection*>(caretSelection);
@ -726,7 +750,9 @@ SelectionCarets::SetSelectionDirection(bool aForward)
static void
SetFramePos(dom::Element* aElement, const nsPoint& aPosition)
{
NS_ENSURE_TRUE_VOID(aElement);
if (!aElement) {
return;
}
nsAutoString styleStr;
styleStr.AppendLiteral("left:");
@ -755,10 +781,14 @@ SelectionCarets::GetStartFrameRect()
{
nsIFrame* canvasFrame = mPresShell->GetCanvasFrame();
dom::Element* element = mPresShell->GetSelectionCaretsStartElement();
NS_ENSURE_TRUE(element, nsRect());
if (!element) {
return nsRect();
}
nsIFrame* frame = element->GetPrimaryFrame();
NS_ENSURE_TRUE(frame, nsRect());
if (!frame) {
return nsRect();
}
nsRect frameRect = frame->GetRectRelativeToSelf();
nsLayoutUtils::TransformRect(frame, canvasFrame, frameRect);
@ -770,10 +800,14 @@ SelectionCarets::GetEndFrameRect()
{
nsIFrame* canvasFrame = mPresShell->GetCanvasFrame();
dom::Element* element = mPresShell->GetSelectionCaretsEndElement();
NS_ENSURE_TRUE(element, nsRect());
if (!element) {
return nsRect();
}
nsIFrame* frame = element->GetPrimaryFrame();
NS_ENSURE_TRUE(frame, nsRect());
if (!frame) {
return nsRect();
}
nsRect frameRect = frame->GetRectRelativeToSelf();
nsLayoutUtils::TransformRect(frame, canvasFrame, frameRect);
@ -784,7 +818,9 @@ nsIFrame*
SelectionCarets::GetCaretFocusFrame()
{
nsRefPtr<nsCaret> caret = mPresShell->GetCaret();
NS_ENSURE_TRUE(caret, nullptr);
if (!caret) {
return nullptr;
}
nsRect focusRect;
return caret->GetGeometry(&focusRect);
@ -793,9 +829,14 @@ SelectionCarets::GetCaretFocusFrame()
bool
SelectionCarets::GetCaretVisible()
{
NS_ENSURE_TRUE(mPresShell, false);
if (!mPresShell) {
return false;
}
nsRefPtr<nsCaret> caret = mPresShell->GetCaret();
NS_ENSURE_TRUE(caret, false);
if (!caret) {
return false;
}
return caret->IsVisible();
}