diff options
Diffstat (limited to 'Source/WebCore/html/MediaError.h')
| -rw-r--r-- | Source/WebCore/html/MediaError.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Source/WebCore/html/MediaError.h b/Source/WebCore/html/MediaError.h index b0bf5f765..1e59b7d0c 100644 --- a/Source/WebCore/html/MediaError.h +++ b/Source/WebCore/html/MediaError.h @@ -10,10 +10,10 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE COMPUTER, INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. 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 @@ -23,12 +23,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef MediaError_h -#define MediaError_h +#pragma once #if ENABLE(VIDEO) -#include <wtf/PassRefPtr.h> #include <wtf/RefCounted.h> namespace WebCore { @@ -40,12 +38,12 @@ public: MEDIA_ERR_NETWORK, MEDIA_ERR_DECODE, MEDIA_ERR_SRC_NOT_SUPPORTED -#if ENABLE(ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA_V2) +#if ENABLE(LEGACY_ENCRYPTED_MEDIA) , MEDIA_ERR_ENCRYPTED #endif }; - static PassRefPtr<MediaError> create(Code code) { return adoptRef(new MediaError(code)); } + static Ref<MediaError> create(Code code) { return adoptRef(*new MediaError(code)); } Code code() const { return m_code; } @@ -57,5 +55,4 @@ private: } // namespace WebCore -#endif -#endif +#endif // ENABLE(VIDEO) |