| 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 bool HTMLVideoElement::rendererIsNeeded(const RenderStyle& style) | 62 bool HTMLVideoElement::rendererIsNeeded(const RenderStyle& style) |
| 63 { | 63 { |
| 64 return HTMLElement::rendererIsNeeded(style); | 64 return HTMLElement::rendererIsNeeded(style); |
| 65 } | 65 } |
| 66 | 66 |
| 67 RenderObject* HTMLVideoElement::createRenderer(RenderStyle*) | 67 RenderObject* HTMLVideoElement::createRenderer(RenderStyle*) |
| 68 { | 68 { |
| 69 return new RenderVideo(this); | 69 return new RenderVideo(this); |
| 70 } | 70 } |
| 71 | 71 |
| 72 void HTMLVideoElement::attach(const AttachContext& context) | 72 void HTMLVideoElement::createRenderTree(const AttachContext& context) |
| 73 { | 73 { |
| 74 HTMLMediaElement::attach(context); | 74 HTMLMediaElement::createRenderTree(context); |
| 75 | 75 |
| 76 updateDisplayState(); | 76 updateDisplayState(); |
| 77 if (shouldDisplayPosterImage()) { | 77 if (shouldDisplayPosterImage()) { |
| 78 if (!m_imageLoader) | 78 if (!m_imageLoader) |
| 79 m_imageLoader = adoptPtr(new HTMLImageLoader(this)); | 79 m_imageLoader = adoptPtr(new HTMLImageLoader(this)); |
| 80 m_imageLoader->updateFromElement(); | 80 m_imageLoader->updateFromElement(); |
| 81 if (renderer()) | 81 if (renderer()) |
| 82 toRenderImage(renderer())->imageResource()->setImageResource(m_image
Loader->image()); | 82 toRenderImage(renderer())->imageResource()->setImageResource(m_image
Loader->image()); |
| 83 } | 83 } |
| 84 } | 84 } |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 | 275 |
| 276 KURL HTMLVideoElement::posterImageURL() const | 276 KURL HTMLVideoElement::posterImageURL() const |
| 277 { | 277 { |
| 278 String url = stripLeadingAndTrailingHTMLSpaces(imageSourceURL()); | 278 String url = stripLeadingAndTrailingHTMLSpaces(imageSourceURL()); |
| 279 if (url.isEmpty()) | 279 if (url.isEmpty()) |
| 280 return KURL(); | 280 return KURL(); |
| 281 return document().completeURL(url); | 281 return document().completeURL(url); |
| 282 } | 282 } |
| 283 | 283 |
| 284 } | 284 } |
| OLD | NEW |