| 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 | 64 |
| 65 LayoutState state(*this, locationOffset()); | 65 LayoutState state(*this, locationOffset()); |
| 66 | 66 |
| 67 controlsRenderer->setLocation(LayoutPoint(borderLeft(), borderTop()) + Layou
tSize(paddingLeft(), paddingTop())); | 67 controlsRenderer->setLocation(LayoutPoint(borderLeft(), borderTop()) + Layou
tSize(paddingLeft(), paddingTop())); |
| 68 controlsRenderer->style()->setHeight(Length(newSize.height(), Fixed)); | 68 controlsRenderer->style()->setHeight(Length(newSize.height(), Fixed)); |
| 69 controlsRenderer->style()->setWidth(Length(newSize.width(), Fixed)); | 69 controlsRenderer->style()->setWidth(Length(newSize.width(), Fixed)); |
| 70 controlsRenderer->forceLayout(); | 70 controlsRenderer->forceLayout(); |
| 71 clearNeedsLayout(); | 71 clearNeedsLayout(); |
| 72 } | 72 } |
| 73 | 73 |
| 74 bool RenderMedia::isChildAllowed(RenderObject* child, const RenderStyle&) const | 74 bool RenderMedia::isChildAllowed(LayoutObject* child, const RenderStyle&) const |
| 75 { | 75 { |
| 76 // The only allowed child is the media controls. The user agent stylesheet | 76 // The only allowed child is the media controls. The user agent stylesheet |
| 77 // (mediaControls.css) has ::-webkit-media-controls { display: flex; }. If | 77 // (mediaControls.css) has ::-webkit-media-controls { display: flex; }. If |
| 78 // author style sets display: inline we would get an inline renderer as a | 78 // author style sets display: inline we would get an inline renderer as a |
| 79 // child of replaced content, which is not supposed to be possible. This | 79 // child of replaced content, which is not supposed to be possible. This |
| 80 // check can be removed if ::-webkit-media-controls is made internal. | 80 // check can be removed if ::-webkit-media-controls is made internal. |
| 81 return child->isFlexibleBox(); | 81 return child->isFlexibleBox(); |
| 82 } | 82 } |
| 83 | 83 |
| 84 void RenderMedia::paintReplaced(const PaintInfo&, const LayoutPoint&) | 84 void RenderMedia::paintReplaced(const PaintInfo&, const LayoutPoint&) |
| 85 { | 85 { |
| 86 } | 86 } |
| 87 | 87 |
| 88 } // namespace blink | 88 } // namespace blink |
| OLD | NEW |