| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2009, 2010 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 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 bool HTMLVideoElement::webkitDisplayingFullscreen() | 243 bool HTMLVideoElement::webkitDisplayingFullscreen() |
| 244 { | 244 { |
| 245 return isFullscreen(); | 245 return isFullscreen(); |
| 246 } | 246 } |
| 247 | 247 |
| 248 bool HTMLVideoElement::usesOverlayFullscreenVideo() const | 248 bool HTMLVideoElement::usesOverlayFullscreenVideo() const |
| 249 { | 249 { |
| 250 if (RuntimeEnabledFeatures::forceOverlayFullscreenVideoEnabled()) | 250 if (RuntimeEnabledFeatures::forceOverlayFullscreenVideoEnabled()) |
| 251 return true; | 251 return true; |
| 252 | 252 |
| 253 // TODO(watk): Remove this and the REF check below when the chromium side ch
ange to not | 253 return webMediaPlayer() && webMediaPlayer()->supportsOverlayFullscreenVideo(
); |
| 254 // set OverlayFullscreenVideo on Android lands. http://crbug.com/511376 | |
| 255 if (HTMLMediaElement::isMediaStreamURL(sourceURL().string())) | |
| 256 return false; | |
| 257 | |
| 258 return RuntimeEnabledFeatures::overlayFullscreenVideoEnabled() | |
| 259 || (webMediaPlayer() && webMediaPlayer()->supportsOverlayFullscreenVideo
()); | |
| 260 } | 254 } |
| 261 | 255 |
| 262 void HTMLVideoElement::didMoveToNewDocument(Document& oldDocument) | 256 void HTMLVideoElement::didMoveToNewDocument(Document& oldDocument) |
| 263 { | 257 { |
| 264 if (m_imageLoader) | 258 if (m_imageLoader) |
| 265 m_imageLoader->elementDidMoveToNewDocument(); | 259 m_imageLoader->elementDidMoveToNewDocument(); |
| 266 HTMLMediaElement::didMoveToNewDocument(oldDocument); | 260 HTMLMediaElement::didMoveToNewDocument(oldDocument); |
| 267 } | 261 } |
| 268 | 262 |
| 269 unsigned HTMLVideoElement::webkitDecodedFrameCount() const | 263 unsigned HTMLVideoElement::webkitDecodedFrameCount() const |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 319 { | 313 { |
| 320 return !isMediaDataCORSSameOrigin(destinationSecurityOrigin); | 314 return !isMediaDataCORSSameOrigin(destinationSecurityOrigin); |
| 321 } | 315 } |
| 322 | 316 |
| 323 FloatSize HTMLVideoElement::elementSize() const | 317 FloatSize HTMLVideoElement::elementSize() const |
| 324 { | 318 { |
| 325 return FloatSize(videoWidth(), videoHeight()); | 319 return FloatSize(videoWidth(), videoHeight()); |
| 326 } | 320 } |
| 327 | 321 |
| 328 } // namespace blink | 322 } // namespace blink |
| OLD | NEW |