| 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 video->suspendIfNeeded(); | 64 video->suspendIfNeeded(); |
| 65 return video.release(); | 65 return video.release(); |
| 66 } | 66 } |
| 67 | 67 |
| 68 DEFINE_TRACE(HTMLVideoElement) | 68 DEFINE_TRACE(HTMLVideoElement) |
| 69 { | 69 { |
| 70 visitor->trace(m_imageLoader); | 70 visitor->trace(m_imageLoader); |
| 71 HTMLMediaElement::trace(visitor); | 71 HTMLMediaElement::trace(visitor); |
| 72 } | 72 } |
| 73 | 73 |
| 74 bool HTMLVideoElement::layoutObjectIsNeeded(const LayoutStyle& style) | 74 bool HTMLVideoElement::layoutObjectIsNeeded(const ComputedStyle& style) |
| 75 { | 75 { |
| 76 return HTMLElement::layoutObjectIsNeeded(style); | 76 return HTMLElement::layoutObjectIsNeeded(style); |
| 77 } | 77 } |
| 78 | 78 |
| 79 LayoutObject* HTMLVideoElement::createLayoutObject(const LayoutStyle&) | 79 LayoutObject* HTMLVideoElement::createLayoutObject(const ComputedStyle&) |
| 80 { | 80 { |
| 81 return new LayoutVideo(this); | 81 return new LayoutVideo(this); |
| 82 } | 82 } |
| 83 | 83 |
| 84 void HTMLVideoElement::attach(const AttachContext& context) | 84 void HTMLVideoElement::attach(const AttachContext& context) |
| 85 { | 85 { |
| 86 HTMLMediaElement::attach(context); | 86 HTMLMediaElement::attach(context); |
| 87 | 87 |
| 88 updateDisplayState(); | 88 updateDisplayState(); |
| 89 if (shouldDisplayPosterImage()) { | 89 if (shouldDisplayPosterImage()) { |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 318 { | 318 { |
| 319 return !isMediaDataCORSSameOrigin(destinationSecurityOrigin); | 319 return !isMediaDataCORSSameOrigin(destinationSecurityOrigin); |
| 320 } | 320 } |
| 321 | 321 |
| 322 FloatSize HTMLVideoElement::sourceSize() const | 322 FloatSize HTMLVideoElement::sourceSize() const |
| 323 { | 323 { |
| 324 return FloatSize(videoWidth(), videoHeight()); | 324 return FloatSize(videoWidth(), videoHeight()); |
| 325 } | 325 } |
| 326 | 326 |
| 327 } | 327 } |
| OLD | NEW |