Chromium Code Reviews| 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 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 203 { | 203 { |
| 204 updateIntrinsicSize(); | 204 updateIntrinsicSize(); |
| 205 | 205 |
| 206 MediaPlayer* mediaPlayer = mediaElement()->player(); | 206 MediaPlayer* mediaPlayer = mediaElement()->player(); |
| 207 if (!mediaPlayer) | 207 if (!mediaPlayer) |
| 208 return; | 208 return; |
| 209 | 209 |
| 210 if (!videoElement()->isActive()) | 210 if (!videoElement()->isActive()) |
| 211 return; | 211 return; |
| 212 | 212 |
| 213 contentChanged(VideoChanged); | 213 videoElement()->setNeedsCompositingUpdate(); |
|
ojan
2014/06/11 18:22:15
This loses the m_compositedLayerMapping->contentCh
| |
| 214 } | 214 } |
| 215 | 215 |
| 216 LayoutUnit RenderVideo::computeReplacedLogicalWidth(ShouldComputePreferred shoul dComputePreferred) const | 216 LayoutUnit RenderVideo::computeReplacedLogicalWidth(ShouldComputePreferred shoul dComputePreferred) const |
| 217 { | 217 { |
| 218 return RenderReplaced::computeReplacedLogicalWidth(shouldComputePreferred); | 218 return RenderReplaced::computeReplacedLogicalWidth(shouldComputePreferred); |
| 219 } | 219 } |
| 220 | 220 |
| 221 LayoutUnit RenderVideo::computeReplacedLogicalHeight() const | 221 LayoutUnit RenderVideo::computeReplacedLogicalHeight() const |
| 222 { | 222 { |
| 223 return RenderReplaced::computeReplacedLogicalHeight(); | 223 return RenderReplaced::computeReplacedLogicalHeight(); |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 282 return CompositingReasonVideo; | 282 return CompositingReasonVideo; |
| 283 } | 283 } |
| 284 | 284 |
| 285 if ((triggers & VideoTrigger) && shouldDisplayVideo() && supportsAccelerated Rendering()) | 285 if ((triggers & VideoTrigger) && shouldDisplayVideo() && supportsAccelerated Rendering()) |
| 286 return CompositingReasonVideo; | 286 return CompositingReasonVideo; |
| 287 | 287 |
| 288 return CompositingReasonNone; | 288 return CompositingReasonNone; |
| 289 } | 289 } |
| 290 | 290 |
| 291 } // namespace WebCore | 291 } // namespace WebCore |
| OLD | NEW |