| 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 10 matching lines...) Expand all Loading... |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 | 27 |
| 28 #include "core/rendering/RenderVideo.h" | 28 #include "core/rendering/RenderVideo.h" |
| 29 | 29 |
| 30 #include "HTMLNames.h" | 30 #include "HTMLNames.h" |
| 31 #include "HTMLVideoElement.h" | |
| 32 #include "core/dom/Document.h" | 31 #include "core/dom/Document.h" |
| 32 #include "core/html/HTMLVideoElement.h" |
| 33 #include "core/page/Frame.h" | 33 #include "core/page/Frame.h" |
| 34 #include "core/page/FrameView.h" | 34 #include "core/page/FrameView.h" |
| 35 #include "core/page/Page.h" | 35 #include "core/page/Page.h" |
| 36 #include "core/platform/graphics/GraphicsContext.h" | 36 #include "core/platform/graphics/GraphicsContext.h" |
| 37 #include "core/platform/graphics/MediaPlayer.h" | 37 #include "core/platform/graphics/MediaPlayer.h" |
| 38 #include "core/rendering/PaintInfo.h" | 38 #include "core/rendering/PaintInfo.h" |
| 39 #include "core/rendering/RenderFullScreen.h" | 39 #include "core/rendering/RenderFullScreen.h" |
| 40 #include "core/rendering/RenderView.h" | 40 #include "core/rendering/RenderView.h" |
| 41 | 41 |
| 42 namespace WebCore { | 42 namespace WebCore { |
| (...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 322 } | 322 } |
| 323 | 323 |
| 324 LayoutUnit RenderVideo::offsetHeight() const | 324 LayoutUnit RenderVideo::offsetHeight() const |
| 325 { | 325 { |
| 326 if (const RenderBlock* block = rendererPlaceholder(this)) | 326 if (const RenderBlock* block = rendererPlaceholder(this)) |
| 327 return block->offsetHeight(); | 327 return block->offsetHeight(); |
| 328 return RenderMedia::offsetHeight(); | 328 return RenderMedia::offsetHeight(); |
| 329 } | 329 } |
| 330 | 330 |
| 331 } // namespace WebCore | 331 } // namespace WebCore |
| OLD | NEW |