OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights
reserved. | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights
reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 #include "public/platform/Platform.h" | 84 #include "public/platform/Platform.h" |
85 #include "public/platform/WebAudioSourceProvider.h" | 85 #include "public/platform/WebAudioSourceProvider.h" |
86 #include "public/platform/WebContentDecryptionModule.h" | 86 #include "public/platform/WebContentDecryptionModule.h" |
87 #include "public/platform/WebInbandTextTrack.h" | 87 #include "public/platform/WebInbandTextTrack.h" |
88 #include "public/platform/WebMediaPlayerSource.h" | 88 #include "public/platform/WebMediaPlayerSource.h" |
89 #include "public/platform/WebMediaStream.h" | 89 #include "public/platform/WebMediaStream.h" |
90 #include "public/platform/modules/remoteplayback/WebRemotePlaybackClient.h" | 90 #include "public/platform/modules/remoteplayback/WebRemotePlaybackClient.h" |
91 #include "public/platform/modules/remoteplayback/WebRemotePlaybackState.h" | 91 #include "public/platform/modules/remoteplayback/WebRemotePlaybackState.h" |
92 #include "wtf/CurrentTime.h" | 92 #include "wtf/CurrentTime.h" |
93 #include "wtf/MathExtras.h" | 93 #include "wtf/MathExtras.h" |
| 94 #include "wtf/PtrUtil.h" |
94 #include "wtf/text/CString.h" | 95 #include "wtf/text/CString.h" |
95 #include <limits> | 96 #include <limits> |
96 | 97 |
97 #define MEDIA_LOG DVLOG(3) | 98 #define MEDIA_LOG DVLOG(3) |
98 | 99 |
99 #ifndef LOG_MEDIA_EVENTS | 100 #ifndef LOG_MEDIA_EVENTS |
100 // Default to not logging events because so many are generated they can overwhel
m the rest of | 101 // Default to not logging events because so many are generated they can overwhel
m the rest of |
101 // the logging. | 102 // the logging. |
102 #define LOG_MEDIA_EVENTS 0 | 103 #define LOG_MEDIA_EVENTS 0 |
103 #endif | 104 #endif |
(...skipping 3501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3605 | 3606 |
3606 if (m_webLayer) | 3607 if (m_webLayer) |
3607 GraphicsLayer::unregisterContentsLayer(m_webLayer); | 3608 GraphicsLayer::unregisterContentsLayer(m_webLayer); |
3608 m_webLayer = webLayer; | 3609 m_webLayer = webLayer; |
3609 if (m_webLayer) | 3610 if (m_webLayer) |
3610 GraphicsLayer::registerContentsLayer(m_webLayer); | 3611 GraphicsLayer::registerContentsLayer(m_webLayer); |
3611 } | 3612 } |
3612 | 3613 |
3613 void HTMLMediaElement::mediaSourceOpened(WebMediaSource* webMediaSource) | 3614 void HTMLMediaElement::mediaSourceOpened(WebMediaSource* webMediaSource) |
3614 { | 3615 { |
3615 m_mediaSource->setWebMediaSourceAndOpen(adoptPtr(webMediaSource)); | 3616 m_mediaSource->setWebMediaSourceAndOpen(wrapUnique(webMediaSource)); |
3616 } | 3617 } |
3617 | 3618 |
3618 bool HTMLMediaElement::isInteractiveContent() const | 3619 bool HTMLMediaElement::isInteractiveContent() const |
3619 { | 3620 { |
3620 return fastHasAttribute(controlsAttr); | 3621 return fastHasAttribute(controlsAttr); |
3621 } | 3622 } |
3622 | 3623 |
3623 void HTMLMediaElement::defaultEventHandler(Event* event) | 3624 void HTMLMediaElement::defaultEventHandler(Event* event) |
3624 { | 3625 { |
3625 if (event->type() == EventTypeNames::focusin) { | 3626 if (event->type() == EventTypeNames::focusin) { |
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3985 | 3986 |
3986 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co
nst | 3987 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co
nst |
3987 { | 3988 { |
3988 IntRect result; | 3989 IntRect result; |
3989 if (LayoutObject* object = m_element->layoutObject()) | 3990 if (LayoutObject* object = m_element->layoutObject()) |
3990 result = object->absoluteBoundingBoxRect(); | 3991 result = object->absoluteBoundingBoxRect(); |
3991 return result; | 3992 return result; |
3992 } | 3993 } |
3993 | 3994 |
3994 } // namespace blink | 3995 } // namespace blink |
OLD | NEW |