| 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 19 matching lines...) Expand all Loading... |
| 30 #include "HTMLNames.h" | 30 #include "HTMLNames.h" |
| 31 #include "core/dom/Document.h" | 31 #include "core/dom/Document.h" |
| 32 #include "core/html/HTMLVideoElement.h" | 32 #include "core/html/HTMLVideoElement.h" |
| 33 #include "core/frame/Frame.h" | 33 #include "core/frame/Frame.h" |
| 34 #include "core/frame/FrameView.h" | 34 #include "core/frame/FrameView.h" |
| 35 #include "core/page/Page.h" | 35 #include "core/page/Page.h" |
| 36 #include "core/rendering/LayoutRectRecorder.h" | 36 #include "core/rendering/LayoutRectRecorder.h" |
| 37 #include "core/rendering/PaintInfo.h" | 37 #include "core/rendering/PaintInfo.h" |
| 38 #include "core/rendering/RenderFullScreen.h" | 38 #include "core/rendering/RenderFullScreen.h" |
| 39 #include "platform/graphics/media/MediaPlayer.h" | 39 #include "platform/graphics/media/MediaPlayer.h" |
| 40 #include "public/platform/WebLayer.h" |
| 40 | 41 |
| 41 namespace WebCore { | 42 namespace WebCore { |
| 42 | 43 |
| 43 using namespace HTMLNames; | 44 using namespace HTMLNames; |
| 44 | 45 |
| 45 RenderVideo::RenderVideo(HTMLVideoElement* video) | 46 RenderVideo::RenderVideo(HTMLVideoElement* video) |
| 46 : RenderMedia(video) | 47 : RenderMedia(video) |
| 47 { | 48 { |
| 48 setIntrinsicSize(calculateIntrinsicSize()); | 49 setIntrinsicSize(calculateIntrinsicSize()); |
| 49 } | 50 } |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 } | 272 } |
| 272 | 273 |
| 273 LayoutUnit RenderVideo::offsetHeight() const | 274 LayoutUnit RenderVideo::offsetHeight() const |
| 274 { | 275 { |
| 275 if (const RenderBlock* block = rendererPlaceholder(this)) | 276 if (const RenderBlock* block = rendererPlaceholder(this)) |
| 276 return block->offsetHeight(); | 277 return block->offsetHeight(); |
| 277 return RenderMedia::offsetHeight(); | 278 return RenderMedia::offsetHeight(); |
| 278 } | 279 } |
| 279 | 280 |
| 280 } // namespace WebCore | 281 } // namespace WebCore |
| OLD | NEW |