| 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 3929 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3940 return WebMediaPlayer::CORSModeUseCredentials; | 3940 return WebMediaPlayer::CORSModeUseCredentials; |
| 3941 return WebMediaPlayer::CORSModeAnonymous; | 3941 return WebMediaPlayer::CORSModeAnonymous; |
| 3942 } | 3942 } |
| 3943 | 3943 |
| 3944 void HTMLMediaElement::mediaPlayerSetWebLayer(blink::WebLayer* webLayer) | 3944 void HTMLMediaElement::mediaPlayerSetWebLayer(blink::WebLayer* webLayer) |
| 3945 { | 3945 { |
| 3946 if (webLayer == m_webLayer) | 3946 if (webLayer == m_webLayer) |
| 3947 return; | 3947 return; |
| 3948 | 3948 |
| 3949 // If either of the layers is null we need to enable or disable compositing.
This is done by triggering a style recalc. | 3949 // If either of the layers is null we need to enable or disable compositing.
This is done by triggering a style recalc. |
| 3950 if (!m_webLayer || !webLayer) | 3950 if ((!m_webLayer || !webLayer) |
| 3951 #if ENABLE(OILPAN) |
| 3952 && !isFinalizing() |
| 3953 #endif |
| 3954 ) |
| 3951 setNeedsCompositingUpdate(); | 3955 setNeedsCompositingUpdate(); |
| 3952 | 3956 |
| 3953 if (m_webLayer) | 3957 if (m_webLayer) |
| 3954 GraphicsLayer::unregisterContentsLayer(m_webLayer); | 3958 GraphicsLayer::unregisterContentsLayer(m_webLayer); |
| 3955 m_webLayer = webLayer; | 3959 m_webLayer = webLayer; |
| 3956 if (m_webLayer) { | 3960 if (m_webLayer) |
| 3957 GraphicsLayer::registerContentsLayer(m_webLayer); | 3961 GraphicsLayer::registerContentsLayer(m_webLayer); |
| 3958 } | |
| 3959 } | 3962 } |
| 3960 | 3963 |
| 3961 void HTMLMediaElement::mediaPlayerMediaSourceOpened(blink::WebMediaSource* webMe
diaSource) | 3964 void HTMLMediaElement::mediaPlayerMediaSourceOpened(blink::WebMediaSource* webMe
diaSource) |
| 3962 { | 3965 { |
| 3963 m_mediaSource->setWebMediaSourceAndOpen(adoptPtr(webMediaSource)); | 3966 m_mediaSource->setWebMediaSourceAndOpen(adoptPtr(webMediaSource)); |
| 3964 } | 3967 } |
| 3965 | 3968 |
| 3966 bool HTMLMediaElement::isInteractiveContent() const | 3969 bool HTMLMediaElement::isInteractiveContent() const |
| 3967 { | 3970 { |
| 3968 return fastHasAttribute(controlsAttr); | 3971 return fastHasAttribute(controlsAttr); |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4029 | 4032 |
| 4030 #if ENABLE(WEB_AUDIO) | 4033 #if ENABLE(WEB_AUDIO) |
| 4031 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) | 4034 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) |
| 4032 { | 4035 { |
| 4033 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) | 4036 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) |
| 4034 audioSourceProvider()->setClient(0); | 4037 audioSourceProvider()->setClient(0); |
| 4035 } | 4038 } |
| 4036 #endif | 4039 #endif |
| 4037 | 4040 |
| 4038 } | 4041 } |
| OLD | NEW |