diff options
author | reed <reed@chromium.org> | 2015-08-12 18:58:52 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-12 18:58:52 -0700 |
commit | cc1229c9d5e57b45305ba8f99ae33e92db0032bc (patch) | |
tree | 372478ad166e65f2a3a936c7c0b08df70258288f /src/core/SkEndian.h | |
parent | 0010945335b497ee08ef12e1ce862ff2fefb8e01 (diff) |
Revert "Revert[4] "move some public headers into private""
This reverts commit 33e00db73d5f1836481cf4053c64e4ed20537662.
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
Diffstat (limited to 'src/core/SkEndian.h')
-rw-r--r-- | src/core/SkEndian.h | 194 |
1 files changed, 0 insertions, 194 deletions
diff --git a/src/core/SkEndian.h b/src/core/SkEndian.h deleted file mode 100644 index 0955fcc505..0000000000 --- a/src/core/SkEndian.h +++ /dev/null @@ -1,194 +0,0 @@ -/* - * Copyright 2006 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 SkEndian_DEFINED -#define SkEndian_DEFINED - -#include "SkTypes.h" - -/** \file SkEndian.h - - Macros and helper functions for handling 16 and 32 bit values in - big and little endian formats. -*/ - -#if defined(SK_CPU_LENDIAN) && defined(SK_CPU_BENDIAN) - #error "can't have both LENDIAN and BENDIAN defined" -#endif - -#if !defined(SK_CPU_LENDIAN) && !defined(SK_CPU_BENDIAN) - #error "need either LENDIAN or BENDIAN defined" -#endif - -/** Swap the two bytes in the low 16bits of the parameters. - e.g. 0x1234 -> 0x3412 -*/ -static inline uint16_t SkEndianSwap16(uint16_t value) { - return static_cast<uint16_t>((value >> 8) | (value << 8)); -} - -template<uint16_t N> struct SkTEndianSwap16 { - static const uint16_t value = static_cast<uint16_t>((N >> 8) | ((N & 0xFF) << 8)); -}; - -/** Vector version of SkEndianSwap16(), which swaps the - low two bytes of each value in the array. -*/ -static inline void SkEndianSwap16s(uint16_t array[], int count) { - SkASSERT(count == 0 || array != NULL); - - while (--count >= 0) { - *array = SkEndianSwap16(*array); - array += 1; - } -} - -/** Reverse all 4 bytes in a 32bit value. - e.g. 0x12345678 -> 0x78563412 -*/ -static inline uint32_t SkEndianSwap32(uint32_t value) { - return ((value & 0xFF) << 24) | - ((value & 0xFF00) << 8) | - ((value & 0xFF0000) >> 8) | - (value >> 24); -} - -template<uint32_t N> struct SkTEndianSwap32 { - static const uint32_t value = ((N & 0xFF) << 24) | - ((N & 0xFF00) << 8) | - ((N & 0xFF0000) >> 8) | - (N >> 24); -}; - -/** Vector version of SkEndianSwap32(), which swaps the - bytes of each value in the array. -*/ -static inline void SkEndianSwap32s(uint32_t array[], int count) { - SkASSERT(count == 0 || array != NULL); - - while (--count >= 0) { - *array = SkEndianSwap32(*array); - array += 1; - } -} - -/** Reverse all 8 bytes in a 64bit value. - e.g. 0x1122334455667788 -> 0x8877665544332211 -*/ -static inline uint64_t SkEndianSwap64(uint64_t value) { - return (((value & 0x00000000000000FFULL) << (8*7)) | - ((value & 0x000000000000FF00ULL) << (8*5)) | - ((value & 0x0000000000FF0000ULL) << (8*3)) | - ((value & 0x00000000FF000000ULL) << (8*1)) | - ((value & 0x000000FF00000000ULL) >> (8*1)) | - ((value & 0x0000FF0000000000ULL) >> (8*3)) | - ((value & 0x00FF000000000000ULL) >> (8*5)) | - ((value) >> (8*7))); -} -template<uint64_t N> struct SkTEndianSwap64 { - static const uint64_t value = (((N & 0x00000000000000FFULL) << (8*7)) | - ((N & 0x000000000000FF00ULL) << (8*5)) | - ((N & 0x0000000000FF0000ULL) << (8*3)) | - ((N & 0x00000000FF000000ULL) << (8*1)) | - ((N & 0x000000FF00000000ULL) >> (8*1)) | - ((N & 0x0000FF0000000000ULL) >> (8*3)) | - ((N & 0x00FF000000000000ULL) >> (8*5)) | - ((N) >> (8*7))); -}; - -/** Vector version of SkEndianSwap64(), which swaps the - bytes of each value in the array. -*/ -static inline void SkEndianSwap64s(uint64_t array[], int count) { - SkASSERT(count == 0 || array != NULL); - - while (--count >= 0) { - *array = SkEndianSwap64(*array); - array += 1; - } -} - -#ifdef SK_CPU_LENDIAN - #define SkEndian_SwapBE16(n) SkEndianSwap16(n) - #define SkEndian_SwapBE32(n) SkEndianSwap32(n) - #define SkEndian_SwapBE64(n) SkEndianSwap64(n) - #define SkEndian_SwapLE16(n) (n) - #define SkEndian_SwapLE32(n) (n) - #define SkEndian_SwapLE64(n) (n) - - #define SkTEndian_SwapBE16(n) SkTEndianSwap16<n>::value - #define SkTEndian_SwapBE32(n) SkTEndianSwap32<n>::value - #define SkTEndian_SwapBE64(n) SkTEndianSwap64<n>::value - #define SkTEndian_SwapLE16(n) (n) - #define SkTEndian_SwapLE32(n) (n) - #define SkTEndian_SwapLE64(n) (n) -#else // SK_CPU_BENDIAN - #define SkEndian_SwapBE16(n) (n) - #define SkEndian_SwapBE32(n) (n) - #define SkEndian_SwapBE64(n) (n) - #define SkEndian_SwapLE16(n) SkEndianSwap16(n) - #define SkEndian_SwapLE32(n) SkEndianSwap32(n) - #define SkEndian_SwapLE64(n) SkEndianSwap64(n) - - #define SkTEndian_SwapBE16(n) (n) - #define SkTEndian_SwapBE32(n) (n) - #define SkTEndian_SwapBE64(n) (n) - #define SkTEndian_SwapLE16(n) SkTEndianSwap16<n>::value - #define SkTEndian_SwapLE32(n) SkTEndianSwap32<n>::value - #define SkTEndian_SwapLE64(n) SkTEndianSwap64<n>::value -#endif - -// When a bytestream is embedded in a 32-bit word, how far we need to -// shift the word to extract each byte from the low 8 bits by anding with 0xff. -#ifdef SK_CPU_LENDIAN - #define SkEndian_Byte0Shift 0 - #define SkEndian_Byte1Shift 8 - #define SkEndian_Byte2Shift 16 - #define SkEndian_Byte3Shift 24 -#else // SK_CPU_BENDIAN - #define SkEndian_Byte0Shift 24 - #define SkEndian_Byte1Shift 16 - #define SkEndian_Byte2Shift 8 - #define SkEndian_Byte3Shift 0 -#endif - - -#if defined(SK_UINT8_BITFIELD_LENDIAN) && defined(SK_UINT8_BITFIELD_BENDIAN) - #error "can't have both bitfield LENDIAN and BENDIAN defined" -#endif - -#if !defined(SK_UINT8_BITFIELD_LENDIAN) && !defined(SK_UINT8_BITFIELD_BENDIAN) - #ifdef SK_CPU_LENDIAN - #define SK_UINT8_BITFIELD_LENDIAN - #else - #define SK_UINT8_BITFIELD_BENDIAN - #endif -#endif - -#ifdef SK_UINT8_BITFIELD_LENDIAN - #define SK_UINT8_BITFIELD(f0, f1, f2, f3, f4, f5, f6, f7) \ - SK_OT_BYTE f0 : 1; \ - SK_OT_BYTE f1 : 1; \ - SK_OT_BYTE f2 : 1; \ - SK_OT_BYTE f3 : 1; \ - SK_OT_BYTE f4 : 1; \ - SK_OT_BYTE f5 : 1; \ - SK_OT_BYTE f6 : 1; \ - SK_OT_BYTE f7 : 1; -#else - #define SK_UINT8_BITFIELD(f0, f1, f2, f3, f4, f5, f6, f7) \ - SK_OT_BYTE f7 : 1; \ - SK_OT_BYTE f6 : 1; \ - SK_OT_BYTE f5 : 1; \ - SK_OT_BYTE f4 : 1; \ - SK_OT_BYTE f3 : 1; \ - SK_OT_BYTE f2 : 1; \ - SK_OT_BYTE f1 : 1; \ - SK_OT_BYTE f0 : 1; -#endif - -#endif |