diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-17 16:44:46 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-17 16:44:46 +0000 |
| commit | 8f4d2306fa866a26f9448048ff63f692b2ba43aa (patch) | |
| tree | 7a48d817cb5220f87e81781320b002eead2495a0 /src/xml | |
| parent | a34b638b909f58dd7c66546a0f49923112f7f785 (diff) | |
remove SK_SCALAR_IS_[FLOAT,FIXED] and assume floats
To keep the CL (slightly) managable, this does not make any changes to
existing macros (e.g. SkScalarMul). Just tackling #ifdef constructs this
time around.
BUG=
R=bsalomon@google.com, caryclark@google.com
Review URL: https://codereview.chromium.org/117053002
git-svn-id: http://skia.googlecode.com/svn/trunk@12712 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/xml')
| -rw-r--r-- | src/xml/SkJSDisplayable.cpp | 8 | ||||
| -rw-r--r-- | src/xml/SkXMLWriter.cpp | 2 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/xml/SkJSDisplayable.cpp b/src/xml/SkJSDisplayable.cpp index 502779743f..02a0501672 100644 --- a/src/xml/SkJSDisplayable.cpp +++ b/src/xml/SkJSDisplayable.cpp @@ -277,11 +277,7 @@ JSBool SkJSDisplayable::GetProperty(JSContext *cx, JSObject *obj, jsval id, if (SkScalarFraction(scalar) == 0) *vp = INT_TO_JSVAL(SkScalarFloor(scalar)); else -#ifdef SK_SCALAR_IS_FLOAT *vp = DOUBLE_TO_JSVAL(scalar); -#else - *vp = DOUBLE_TO_JSVAL(scalar / 65536.0f ); -#endif break; case SkType_String: str = JS_NewStringCopyN(cx, string->c_str(), string->size()); @@ -323,11 +319,7 @@ JSBool SkJSDisplayable::SetProperty(JSContext *cx, JSObject *obj, jsval id, jsva scalar = SkIntToScalar(JSVAL_TO_INT(value)); else { SkASSERT(JSVAL_IS_DOUBLE(value)); -#ifdef SK_SCALAR_IS_FLOAT scalar = (float) *(double*) JSVAL_TO_DOUBLE(value); -#else - scalar = (SkFixed) (*(double*)JSVAL_TO_DOUBLE(value) * 65536.0); -#endif } break; case SkType_String: diff --git a/src/xml/SkXMLWriter.cpp b/src/xml/SkXMLWriter.cpp index 2ff47eae66..ec351b728b 100644 --- a/src/xml/SkXMLWriter.cpp +++ b/src/xml/SkXMLWriter.cpp @@ -309,9 +309,7 @@ void SkXMLStreamWriter::UnitTest() w.addAttribute("hello", "world"); w.addS32Attribute("dec", 42); w.addHexAttribute("hex", 0x42, 3); -#ifdef SK_SCALAR_IS_FLOAT w.addScalarAttribute("scalar", -4.2f); -#endif w.startElement("elem1"); w.endElement(); w.startElement("elem1"); |