| Index: third_party/WebKit/Source/wtf/ByteSwap.h
|
| diff --git a/third_party/WebKit/Source/wtf/ByteSwap.h b/third_party/WebKit/Source/wtf/ByteSwap.h
|
| index 3f4462ccaafea0a59b7c9c0b16a876aa0a1700f2..21a7fe7588a83c6bb7f722a53a87c8f60429bb4e 100644
|
| --- a/third_party/WebKit/Source/wtf/ByteSwap.h
|
| +++ b/third_party/WebKit/Source/wtf/ByteSwap.h
|
| @@ -1,91 +1,9 @@
|
| -/*
|
| - * Copyright (C) 2013 Google Inc. All rights reserved.
|
| - *
|
| - * Redistribution and use in source and binary forms, with or without
|
| - * modification, are permitted provided that the following conditions are
|
| - * met:
|
| - *
|
| - * * Redistributions of source code must retain the above copyright
|
| - * notice, this list of conditions and the following disclaimer.
|
| - * * Redistributions in binary form must reproduce the above
|
| - * copyright notice, this list of conditions and the following disclaimer
|
| - * in the documentation and/or other materials provided with the
|
| - * distribution.
|
| - * * Neither the name of Google Inc. nor the names of its
|
| - * contributors may be used to endorse or promote products derived from
|
| - * this software without specific prior written permission.
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
| - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
| - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
| - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
| - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
| - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
| - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
| - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
| - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| - */
|
| +// Copyright 2017 The Chromium Authors. All rights reserved.
|
| +// Use of this source code is governed by a BSD-style license that can be
|
| +// found in the LICENSE file.
|
|
|
| -#ifndef WTF_ByteSwap_h
|
| -#define WTF_ByteSwap_h
|
| +#include "platform/wtf/ByteSwap.h"
|
|
|
| -#include "wtf/CPU.h"
|
| -#include "wtf/Compiler.h"
|
| -
|
| -#include <stdint.h>
|
| -
|
| -#if COMPILER(MSVC)
|
| -#include <stdlib.h>
|
| -#endif
|
| -
|
| -namespace WTF {
|
| -
|
| -inline uint32_t wswap32(uint32_t x) {
|
| - return ((x & 0xffff0000) >> 16) | ((x & 0x0000ffff) << 16);
|
| -}
|
| -
|
| -#if COMPILER(MSVC)
|
| -
|
| -ALWAYS_INLINE uint64_t bswap64(uint64_t x) {
|
| - return _byteswap_uint64(x);
|
| -}
|
| -ALWAYS_INLINE uint32_t bswap32(uint32_t x) {
|
| - return _byteswap_ulong(x);
|
| -}
|
| -ALWAYS_INLINE uint16_t bswap16(uint16_t x) {
|
| - return _byteswap_ushort(x);
|
| -}
|
| -
|
| -#else
|
| -
|
| -ALWAYS_INLINE uint64_t bswap64(uint64_t x) {
|
| - return __builtin_bswap64(x);
|
| -}
|
| -ALWAYS_INLINE uint32_t bswap32(uint32_t x) {
|
| - return __builtin_bswap32(x);
|
| -}
|
| -ALWAYS_INLINE uint16_t bswap16(uint16_t x) {
|
| - return __builtin_bswap16(x);
|
| -}
|
| -
|
| -#endif
|
| -
|
| -#if CPU(64BIT)
|
| -
|
| -ALWAYS_INLINE size_t bswapuintptrt(size_t x) {
|
| - return bswap64(x);
|
| -}
|
| -
|
| -#else
|
| -
|
| -ALWAYS_INLINE size_t bswapuintptrt(size_t x) {
|
| - return bswap32(x);
|
| -}
|
| -
|
| -#endif
|
| -
|
| -} // namespace WTF
|
| -
|
| -#endif // WTF_ByteSwap_h
|
| +// The contents of this header was moved to platform/wtf as part of
|
| +// WTF migration project. See the following post for details:
|
| +// https://groups.google.com/a/chromium.org/d/msg/blink-dev/tLdAZCTlcAA/bYXVT8gYCAAJ
|
|
|