| 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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 return; | 176 return; |
| 177 | 177 |
| 178 if (!videoElement()->inActiveDocument()) | 178 if (!videoElement()->inActiveDocument()) |
| 179 return; | 179 return; |
| 180 | 180 |
| 181 videoElement()->setNeedsCompositingUpdate(); | 181 videoElement()->setNeedsCompositingUpdate(); |
| 182 } | 182 } |
| 183 | 183 |
| 184 LayoutUnit LayoutVideo::computeReplacedLogicalWidth(ShouldComputePreferred shoul
dComputePreferred) const | 184 LayoutUnit LayoutVideo::computeReplacedLogicalWidth(ShouldComputePreferred shoul
dComputePreferred) const |
| 185 { | 185 { |
| 186 return RenderReplaced::computeReplacedLogicalWidth(shouldComputePreferred); | 186 return LayoutReplaced::computeReplacedLogicalWidth(shouldComputePreferred); |
| 187 } | 187 } |
| 188 | 188 |
| 189 LayoutUnit LayoutVideo::computeReplacedLogicalHeight() const | 189 LayoutUnit LayoutVideo::computeReplacedLogicalHeight() const |
| 190 { | 190 { |
| 191 return RenderReplaced::computeReplacedLogicalHeight(); | 191 return LayoutReplaced::computeReplacedLogicalHeight(); |
| 192 } | 192 } |
| 193 | 193 |
| 194 LayoutUnit LayoutVideo::minimumReplacedHeight() const | 194 LayoutUnit LayoutVideo::minimumReplacedHeight() const |
| 195 { | 195 { |
| 196 return RenderReplaced::minimumReplacedHeight(); | 196 return LayoutReplaced::minimumReplacedHeight(); |
| 197 } | 197 } |
| 198 | 198 |
| 199 bool LayoutVideo::supportsAcceleratedRendering() const | 199 bool LayoutVideo::supportsAcceleratedRendering() const |
| 200 { | 200 { |
| 201 return !!mediaElement()->platformLayer(); | 201 return !!mediaElement()->platformLayer(); |
| 202 } | 202 } |
| 203 | 203 |
| 204 static const RenderBlock* rendererPlaceholder(const LayoutObject* renderer) | 204 static const RenderBlock* rendererPlaceholder(const LayoutObject* renderer) |
| 205 { | 205 { |
| 206 LayoutObject* parent = renderer->parent(); | 206 LayoutObject* parent = renderer->parent(); |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 return CompositingReasonVideo; | 250 return CompositingReasonVideo; |
| 251 } | 251 } |
| 252 | 252 |
| 253 if (shouldDisplayVideo() && supportsAcceleratedRendering()) | 253 if (shouldDisplayVideo() && supportsAcceleratedRendering()) |
| 254 return CompositingReasonVideo; | 254 return CompositingReasonVideo; |
| 255 | 255 |
| 256 return CompositingReasonNone; | 256 return CompositingReasonNone; |
| 257 } | 257 } |
| 258 | 258 |
| 259 } // namespace blink | 259 } // namespace blink |
| OLD | NEW |