| 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 video->suspendIfNeeded(); | 65 video->suspendIfNeeded(); |
| 66 return video.release(); | 66 return video.release(); |
| 67 } | 67 } |
| 68 | 68 |
| 69 DEFINE_TRACE(HTMLVideoElement) | 69 DEFINE_TRACE(HTMLVideoElement) |
| 70 { | 70 { |
| 71 visitor->trace(m_imageLoader); | 71 visitor->trace(m_imageLoader); |
| 72 HTMLMediaElement::trace(visitor); | 72 HTMLMediaElement::trace(visitor); |
| 73 } | 73 } |
| 74 | 74 |
| 75 bool HTMLVideoElement::layoutObjectIsNeeded(const ComputedStyle& style) | |
| 76 { | |
| 77 return HTMLElement::layoutObjectIsNeeded(style); | |
| 78 } | |
| 79 | |
| 80 LayoutObject* HTMLVideoElement::createLayoutObject(const ComputedStyle&) | 75 LayoutObject* HTMLVideoElement::createLayoutObject(const ComputedStyle&) |
| 81 { | 76 { |
| 82 return new LayoutVideo(this); | 77 return new LayoutVideo(this); |
| 83 } | 78 } |
| 84 | 79 |
| 85 void HTMLVideoElement::attach(const AttachContext& context) | 80 void HTMLVideoElement::attach(const AttachContext& context) |
| 86 { | 81 { |
| 87 HTMLMediaElement::attach(context); | 82 HTMLMediaElement::attach(context); |
| 88 | 83 |
| 89 updateDisplayState(); | 84 updateDisplayState(); |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 326 { | 321 { |
| 327 return !isMediaDataCORSSameOrigin(destinationSecurityOrigin); | 322 return !isMediaDataCORSSameOrigin(destinationSecurityOrigin); |
| 328 } | 323 } |
| 329 | 324 |
| 330 FloatSize HTMLVideoElement::elementSize() const | 325 FloatSize HTMLVideoElement::elementSize() const |
| 331 { | 326 { |
| 332 return FloatSize(videoWidth(), videoHeight()); | 327 return FloatSize(videoWidth(), videoHeight()); |
| 333 } | 328 } |
| 334 | 329 |
| 335 } // namespace blink | 330 } // namespace blink |
| OLD | NEW |