wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 769080 - Fix Azure build errors about Uint8ClampedArray on Android. Fix some uninitialized variable warnings. r=Ms2ger

Browse Source
This commit is contained in:
Chris Peterson 2012-06-29 15:17:03 -07:00
parent 9d5cc16dc2
commit 36fdd81fa4
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
content/canvas/src/nsCanvasRenderingContext2DAzure.cpp
View File

@ -82,6 +82,7 @@
#include "mozilla/dom/ContentParent.h" #include "mozilla/dom/ContentParent.h"
#include "mozilla/dom/ImageData.h" #include "mozilla/dom/ImageData.h"
#include "mozilla/dom/PBrowserParent.h" #include "mozilla/dom/PBrowserParent.h"
#include "mozilla/dom/TypedArray.h"
#include "mozilla/gfx/2D.h" #include "mozilla/gfx/2D.h"
#include "mozilla/gfx/PathHelpers.h" #include "mozilla/gfx/PathHelpers.h"
#include "mozilla/ipc/DocumentRendererParent.h" #include "mozilla/ipc/DocumentRendererParent.h"
@ -1556,6 +1557,8 @@ WrapStyle(JSContext* cx, JSObject* obj,
ok = dom::WrapObject(cx, obj, supports, &v); ok = dom::WrapObject(cx, obj, supports, &v);
break; break;
} }
default:
MOZ_NOT_REACHED("unexpected CanvasMultiGetterType");
} }
if (!ok) { if (!ok) {
error.Throw(NS_ERROR_FAILURE); error.Throw(NS_ERROR_FAILURE);
@ -3289,7 +3292,6 @@ nsCanvasRenderingContext2DAzure::DrawOrMeasureText(const nsAString& aRawText,
case TEXT_BASELINE_TOP: case TEXT_BASELINE_TOP:
anchorY = fontMetrics.emAscent; anchorY = fontMetrics.emAscent;
break; break;
break;
case TEXT_BASELINE_MIDDLE: case TEXT_BASELINE_MIDDLE:
anchorY = (fontMetrics.emAscent - fontMetrics.emDescent) * .5f; anchorY = (fontMetrics.emAscent - fontMetrics.emDescent) * .5f;
break; break;
@ -3301,6 +3303,8 @@ nsCanvasRenderingContext2DAzure::DrawOrMeasureText(const nsAString& aRawText,
case TEXT_BASELINE_BOTTOM: case TEXT_BASELINE_BOTTOM:
anchorY = -fontMetrics.emDescent; anchorY = -fontMetrics.emDescent;
break; break;
default:
MOZ_NOT_REACHED("unexpected TextBaseline");
} }
processor.mPt.y += anchorY; processor.mPt.y += anchorY;