| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2013 Intel Corporation. All rights reserved. | 3 * Copyright (C) 2013 Intel Corporation. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 #endif // INSIDE_BLINK | 84 #endif // INSIDE_BLINK |
| 85 | 85 |
| 86 private: | 86 private: |
| 87 T* m_ptr; | 87 T* m_ptr; |
| 88 }; | 88 }; |
| 89 | 89 |
| 90 #if INSIDE_BLINK | 90 #if INSIDE_BLINK |
| 91 template<typename T> template<typename U> inline WebPrivateOwnPtr<T>::WebPrivate
OwnPtr(const PassOwnPtr<U>& o, EnsurePtrConvertibleArgDefn(U, T)) | 91 template<typename T> template<typename U> inline WebPrivateOwnPtr<T>::WebPrivate
OwnPtr(const PassOwnPtr<U>& o, EnsurePtrConvertibleArgDefn(U, T)) |
| 92 : m_ptr(o.leakPtr()) | 92 : m_ptr(o.leakPtr()) |
| 93 { | 93 { |
| 94 COMPILE_ASSERT(!WTF::IsArray<T>::value, Pointers_to_array_must_never_be_conv
erted); | 94 static_assert(!WTF::IsArray<T>::value, "Pointers to array must never be conv
erted"); |
| 95 } | 95 } |
| 96 #endif | 96 #endif |
| 97 | 97 |
| 98 } // namespace blink | 98 } // namespace blink |
| 99 | 99 |
| 100 #endif | 100 #endif |
| OLD | NEW |