| 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 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 return; | 175 return; |
| 176 | 176 |
| 177 videoElement()->setNeedsCompositingUpdate(); | 177 videoElement()->setNeedsCompositingUpdate(); |
| 178 } | 178 } |
| 179 | 179 |
| 180 LayoutUnit LayoutVideo::computeReplacedLogicalWidth(ShouldComputePreferred shoul
dComputePreferred) const | 180 LayoutUnit LayoutVideo::computeReplacedLogicalWidth(ShouldComputePreferred shoul
dComputePreferred) const |
| 181 { | 181 { |
| 182 return LayoutReplaced::computeReplacedLogicalWidth(shouldComputePreferred); | 182 return LayoutReplaced::computeReplacedLogicalWidth(shouldComputePreferred); |
| 183 } | 183 } |
| 184 | 184 |
| 185 LayoutUnit LayoutVideo::computeReplacedLogicalHeight() const | 185 LayoutUnit LayoutVideo::computeReplacedLogicalHeight(LayoutUnit estimatedUsedWid
th) const |
| 186 { | 186 { |
| 187 return LayoutReplaced::computeReplacedLogicalHeight(); | 187 return LayoutReplaced::computeReplacedLogicalHeight(estimatedUsedWidth); |
| 188 } | 188 } |
| 189 | 189 |
| 190 LayoutUnit LayoutVideo::minimumReplacedHeight() const | 190 LayoutUnit LayoutVideo::minimumReplacedHeight() const |
| 191 { | 191 { |
| 192 return LayoutReplaced::minimumReplacedHeight(); | 192 return LayoutReplaced::minimumReplacedHeight(); |
| 193 } | 193 } |
| 194 | 194 |
| 195 bool LayoutVideo::supportsAcceleratedRendering() const | 195 bool LayoutVideo::supportsAcceleratedRendering() const |
| 196 { | 196 { |
| 197 return !!mediaElement()->platformLayer(); | 197 return !!mediaElement()->platformLayer(); |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 if (element->isFullscreen() && element->usesOverlayFullscreenVideo()) | 244 if (element->isFullscreen() && element->usesOverlayFullscreenVideo()) |
| 245 return CompositingReasonVideo; | 245 return CompositingReasonVideo; |
| 246 | 246 |
| 247 if (shouldDisplayVideo() && supportsAcceleratedRendering()) | 247 if (shouldDisplayVideo() && supportsAcceleratedRendering()) |
| 248 return CompositingReasonVideo; | 248 return CompositingReasonVideo; |
| 249 | 249 |
| 250 return CompositingReasonNone; | 250 return CompositingReasonNone; |
| 251 } | 251 } |
| 252 | 252 |
| 253 } // namespace blink | 253 } // namespace blink |
| OLD | NEW |