diff --git a/content/canvas/src/nsCanvasRenderingContext2D.cpp b/content/canvas/src/nsCanvasRenderingContext2D.cpp index 735b4586cb9..afc8fe74523 100644 --- a/content/canvas/src/nsCanvasRenderingContext2D.cpp +++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp @@ -1754,8 +1754,6 @@ nsCanvasRenderingContext2D::GetMozFillRule(nsAString& aString) aString.AssignLiteral("nonzero"); break; case gfxContext::FILL_RULE_EVEN_ODD: aString.AssignLiteral("evenodd"); break; - default: - return NS_ERROR_FAILURE; } return NS_OK; } @@ -2631,9 +2629,6 @@ nsCanvasRenderingContext2D::GetTextAlign(nsAString& ta) case TEXT_ALIGN_CENTER: ta.AssignLiteral("center"); break; - default: - NS_ERROR("textAlign holds invalid value"); - return NS_ERROR_FAILURE; } return NS_OK; @@ -2681,9 +2676,6 @@ nsCanvasRenderingContext2D::GetTextBaseline(nsAString& tb) case TEXT_BASELINE_BOTTOM: tb.AssignLiteral("bottom"); break; - default: - NS_ERROR("textBaseline holds invalid value"); - return NS_ERROR_FAILURE; } return NS_OK; @@ -2981,9 +2973,6 @@ nsCanvasRenderingContext2D::DrawOrMeasureText(const nsAString& aRawText, case TEXT_BASELINE_BOTTOM: anchorY = -fontMetrics.emDescent; break; - default: - NS_ERROR("mTextBaseline holds invalid value"); - return NS_ERROR_FAILURE; } processor.mPt.y += anchorY; diff --git a/content/canvas/src/nsCanvasRenderingContext2DAzure.cpp b/content/canvas/src/nsCanvasRenderingContext2DAzure.cpp index 7e7b08773c0..9e89dd4d32e 100644 --- a/content/canvas/src/nsCanvasRenderingContext2DAzure.cpp +++ b/content/canvas/src/nsCanvasRenderingContext2DAzure.cpp @@ -1828,8 +1828,6 @@ nsCanvasRenderingContext2DAzure::GetMozFillRule(nsAString& aString) aString.AssignLiteral("nonzero"); break; case FILL_EVEN_ODD: aString.AssignLiteral("evenodd"); break; - default: - return NS_ERROR_FAILURE; } return NS_OK; @@ -2843,9 +2841,6 @@ nsCanvasRenderingContext2DAzure::GetTextAlign(nsAString& ta) case TEXT_ALIGN_CENTER: ta.AssignLiteral("center"); break; - default: - NS_ERROR("textAlign holds invalid value"); - return NS_ERROR_FAILURE; } return NS_OK; @@ -2893,9 +2888,6 @@ nsCanvasRenderingContext2DAzure::GetTextBaseline(nsAString& tb) case TEXT_BASELINE_BOTTOM: tb.AssignLiteral("bottom"); break; - default: - NS_ERROR("textBaseline holds invalid value"); - return NS_ERROR_FAILURE; } return NS_OK; @@ -3285,9 +3277,6 @@ nsCanvasRenderingContext2DAzure::DrawOrMeasureText(const nsAString& aRawText, case TEXT_BASELINE_BOTTOM: anchorY = -fontMetrics.emDescent; break; - default: - NS_ERROR("mTextBaseline holds invalid value"); - return NS_ERROR_FAILURE; } processor.mPt.y += anchorY; @@ -3436,8 +3425,6 @@ nsCanvasRenderingContext2DAzure::GetLineCap(nsAString& capstyle) case CAP_SQUARE: capstyle.AssignLiteral("square"); break; - default: - return NS_ERROR_FAILURE; } return NS_OK;