cc1229c9d5
This reverts commit 33e00db73d
.
BUG=skia:
TBR=
NOTREECHECKS=True
FAILED: /b/build/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/components/user_manager/user_manager_test_support.fake_user_manager.o.d -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_FILE_OFFSET_BITS=64 -DCHROMIUM_BUILD -DCR_CLANG_REVISION=242792-1 -DCOMPONENT_BUILD -DUI_COMPOSITOR_IMAGE_TRANSPORT -DUSE_AURA=1 -DUSE_ASH=1 -DUSE_PANGO=1 -DUSE_CAIRO=1 -DUSE_DEFAULT_RENDER_THEME=1 -DUSE_LIBJPEG_TURBO=1 -DUSE_X11=1 -DIMAGE_LOADER_EXTENSION=1 -DENABLE_WEBRTC=1 -DENABLE_MEDIA_ROUTER=1 -DUSE_PROPRIETARY_CODECS -DENABLE_PEPPER_CDMS -DENABLE_CONFIGURATION_POLICY -DENABLE_NOTIFICATIONS -DENABLE_HIDPI=1 -DENABLE_TOPCHROME_MD=1 -DUSE_UDEV -DDONT_EMBED_BUILD_METADATA -DDCHECK_ALWAYS_ON=1 -DFIELDTRIAL_TESTING_ENABLED -DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_BACKGROUND=1 -DENABLE_GOOGLE_NOW=1 -DENABLE_PRINTING=1 -DENABLE_PRINT_PREVIEW=1 -DENABLE_SPELLCHECK=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_MDNS=1 -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DSAFE_BROWSING_SERVICE -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DUNIT_TEST -DGTEST_HAS_RTTI=0 -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -DUSE_GLIB=1 -DUSE_NSS_CERTS=1 -DOS_CHROMEOS=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_DEBUG -D_GLIBCXX_DEBUG=1 -Igen -I../.. -I../../skia/config -I../../testing/gmock/include -I../../testing/gtest/include -Werror -pthread -fno-strict-aliasing -Wall -Wno-unused-parameter -Wno-missing-field-initializers -fvisibility=hidden -pipe -fPIC -Wno-reserved-user-defined-literal -Xclang -load -Xclang /b/build/slave/linux_chromeos/build/src/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so -Xclang -add-plugin -Xclang find-bad-constructs -Xclang -plugin-arg-find-bad-constructs -Xclang check-templates -fcolor-diagnostics -B/b/build/slave/linux_chromeos/build/src/third_party/binutils/Linux_x64/Release/bin -Wheader-hygiene -Wno-char-subscripts -Wno-unneeded-internal-declaration -Wno-covered-switch-default -Wstring-conversion -Wno-c++11-narrowing -Wno-deprecated-register -Wno-inconsistent-missing-override -Wno-shift-negative-value -pthread -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -m64 -march=x86-64 -O0 -g -funwind-tables -gsplit-dwarf -Wno-undefined-bool-conversion -Wno-tautological-undefined-compare -g0 -fno-exceptions -fno-rtti -fno-threadsafe-statics -fvisibility-inlines-hidden -Wsign-compare -std=gnu++11 -c ../../components/user_manager/fake_user_manager.cc -o obj/components/user_manager/user_manager_test_support.fake_user_manager.o
In file included from ../../components/user_manager/fake_user_manager.cc:5:
In file included from ../../components/user_manager/fake_user_manager.h:12:
In file included from ../../components/user_manager/user.h:14:
In file included from ../../components/user_manager/user_image/user_image.h:12:
In file included from ../../ui/gfx/image/image_skia.h:15:
In file included from ../../ui/gfx/image/image_skia_rep.h:8:
In file included from ../../third_party/skia/include/core/SkBitmap.h:11:
In file included from ../../third_party/skia/include/core/SkColor.h:11:
In file included from ../../third_party/skia/include/core/SkScalar.h:12:
../../third_party/skia/include/core/../private/SkFloatingPoint.h:13:10: fatal error: 'SkTypes.h' file not found
#include "SkTypes.h"
ninja -w dupbuild=err -C /b/build/slave/linux_chromeos/build/src/out/Debug accessibility_unittests accessibility_unittests_run app_list_unittests app_list_unittests_run app_shell_unittests app_shell_unittests_run ash_unittests ash_unittests_run aura_builder aura_unittests aura_unittests_run base_unittests base_unittests_run browser_tests browser_tests_run cacheinvalidation_unittests cacheinvalidation_unittests_run chromeos_unittests chromeos_unittests_run components_unittests components_unittests_run compositor_unittests compositor_unittests_run content_browsertests content_browsertests_run content_unittests content_unittests_run crypto_unittests crypto_unittests_run dbus_unittests device_unittests device_unittests_run display_unittests display_unittests_run events_unittests events_unittests_run extensions_browsertests extensions_browsertests_run extensions_unittests extensions_unittests_run gcm_unit_tests gcm_unit_tests_run gfx_unittests gfx_unittests_run google_apis_unittests google_apis_unittests_run gpu_unittests gpu_unittests_run interactive_ui_tests interactive_ui_tests_run ipc_tests ipc_tests_run jingle_unittests jingle_unittests_run media_unittests media_unittests_run message_center_unittests message_center_unittests_run midi_unittests midi_unittests_run nacl_helper_nonsfi_unittests nacl_loader_unittests nacl_loader_unittests_run net_unittests net_unittests_run ppapi_unittests printing_unittests printing_unittests_run remoting_unittests remoting_unittests_run sandbox_linux_unittests sandbox_linux_unittests_run skia_unittests skia_unittests_run sql_unittests sql_unittests_run sync_unit_tests sync_unit_tests_run ui_base_unittests ui_base_unittests_run ui_chromeos_unittests ui_touch_selection_unittests ui_touch_selection_unittests_run unit_tests unit_tests_run url_unittests url_unittests_run views_unittests wm_unittests wm_unittests_run -j50
ninja: Entering directory `/b/build/slave/linux_chromeos/build/src/out/Debug'
Review URL: https://codereview.chromium.org/1288863002
133 lines
3.8 KiB
C
133 lines
3.8 KiB
C
|
|
/*
|
|
* Copyright 2008 The Android Open Source Project
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
|
|
#ifndef SkFloatBits_DEFINED
|
|
#define SkFloatBits_DEFINED
|
|
|
|
#include "SkTypes.h"
|
|
|
|
/** Convert a sign-bit int (i.e. float interpreted as int) into a 2s compliement
|
|
int. This also converts -0 (0x80000000) to 0. Doing this to a float allows
|
|
it to be compared using normal C operators (<, <=, etc.)
|
|
*/
|
|
static inline int32_t SkSignBitTo2sCompliment(int32_t x) {
|
|
if (x < 0) {
|
|
x &= 0x7FFFFFFF;
|
|
x = -x;
|
|
}
|
|
return x;
|
|
}
|
|
|
|
/** Convert a 2s compliment int to a sign-bit (i.e. int interpreted as float).
|
|
This undoes the result of SkSignBitTo2sCompliment().
|
|
*/
|
|
static inline int32_t Sk2sComplimentToSignBit(int32_t x) {
|
|
int sign = x >> 31;
|
|
// make x positive
|
|
x = (x ^ sign) - sign;
|
|
// set the sign bit as needed
|
|
x |= sign << 31;
|
|
return x;
|
|
}
|
|
|
|
/** Given the bit representation of a float, return its value cast to an int.
|
|
If the value is out of range, or NaN, return return +/- SK_MaxS32
|
|
*/
|
|
int32_t SkFloatBits_toIntCast(int32_t floatBits);
|
|
|
|
/** Given the bit representation of a float, return its floor as an int.
|
|
If the value is out of range, or NaN, return return +/- SK_MaxS32
|
|
*/
|
|
SK_API int32_t SkFloatBits_toIntFloor(int32_t floatBits);
|
|
|
|
/** Given the bit representation of a float, return it rounded to an int.
|
|
If the value is out of range, or NaN, return return +/- SK_MaxS32
|
|
*/
|
|
SK_API int32_t SkFloatBits_toIntRound(int32_t floatBits);
|
|
|
|
/** Given the bit representation of a float, return its ceiling as an int.
|
|
If the value is out of range, or NaN, return return +/- SK_MaxS32
|
|
*/
|
|
SK_API int32_t SkFloatBits_toIntCeil(int32_t floatBits);
|
|
|
|
|
|
union SkFloatIntUnion {
|
|
float fFloat;
|
|
int32_t fSignBitInt;
|
|
};
|
|
|
|
// Helper to see a float as its bit pattern (w/o aliasing warnings)
|
|
static inline int32_t SkFloat2Bits(float x) {
|
|
SkFloatIntUnion data;
|
|
data.fFloat = x;
|
|
return data.fSignBitInt;
|
|
}
|
|
|
|
// Helper to see a bit pattern as a float (w/o aliasing warnings)
|
|
static inline float SkBits2Float(int32_t floatAsBits) {
|
|
SkFloatIntUnion data;
|
|
data.fSignBitInt = floatAsBits;
|
|
return data.fFloat;
|
|
}
|
|
|
|
/** Return the float as a 2s compliment int. Just to be used to compare floats
|
|
to each other or against positive float-bit-constants (like 0). This does
|
|
not return the int equivalent of the float, just something cheaper for
|
|
compares-only.
|
|
*/
|
|
static inline int32_t SkFloatAs2sCompliment(float x) {
|
|
return SkSignBitTo2sCompliment(SkFloat2Bits(x));
|
|
}
|
|
|
|
/** Return the 2s compliment int as a float. This undos the result of
|
|
SkFloatAs2sCompliment
|
|
*/
|
|
static inline float Sk2sComplimentAsFloat(int32_t x) {
|
|
return SkBits2Float(Sk2sComplimentToSignBit(x));
|
|
}
|
|
|
|
/** Return x cast to a float (i.e. (float)x)
|
|
*/
|
|
float SkIntToFloatCast(int x);
|
|
|
|
/** Return the float cast to an int.
|
|
If the value is out of range, or NaN, return +/- SK_MaxS32
|
|
*/
|
|
static inline int32_t SkFloatToIntCast(float x) {
|
|
return SkFloatBits_toIntCast(SkFloat2Bits(x));
|
|
}
|
|
|
|
/** Return the floor of the float as an int.
|
|
If the value is out of range, or NaN, return +/- SK_MaxS32
|
|
*/
|
|
static inline int32_t SkFloatToIntFloor(float x) {
|
|
return SkFloatBits_toIntFloor(SkFloat2Bits(x));
|
|
}
|
|
|
|
/** Return the float rounded to an int.
|
|
If the value is out of range, or NaN, return +/- SK_MaxS32
|
|
*/
|
|
static inline int32_t SkFloatToIntRound(float x) {
|
|
return SkFloatBits_toIntRound(SkFloat2Bits(x));
|
|
}
|
|
|
|
/** Return the ceiling of the float as an int.
|
|
If the value is out of range, or NaN, return +/- SK_MaxS32
|
|
*/
|
|
static inline int32_t SkFloatToIntCeil(float x) {
|
|
return SkFloatBits_toIntCeil(SkFloat2Bits(x));
|
|
}
|
|
|
|
// Scalar wrappers for float-bit routines
|
|
|
|
#define SkScalarAs2sCompliment(x) SkFloatAs2sCompliment(x)
|
|
#define Sk2sComplimentAsScalar(x) Sk2sComplimentAsFloat(x)
|
|
|
|
#endif
|