| 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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 return RenderMedia::offsetWidth(); | 267 return RenderMedia::offsetWidth(); |
| 268 } | 268 } |
| 269 | 269 |
| 270 LayoutUnit RenderVideo::offsetHeight() const | 270 LayoutUnit RenderVideo::offsetHeight() const |
| 271 { | 271 { |
| 272 if (const RenderBlock* block = rendererPlaceholder(this)) | 272 if (const RenderBlock* block = rendererPlaceholder(this)) |
| 273 return block->offsetHeight(); | 273 return block->offsetHeight(); |
| 274 return RenderMedia::offsetHeight(); | 274 return RenderMedia::offsetHeight(); |
| 275 } | 275 } |
| 276 | 276 |
| 277 CompositingReasons RenderVideo::additionalCompositingReasons(CompositingTriggerF
lags triggers) const | 277 CompositingReasons RenderVideo::additionalCompositingReasons() const |
| 278 { | 278 { |
| 279 if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled()) { | 279 if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled()) { |
| 280 HTMLMediaElement* media = toHTMLMediaElement(node()); | 280 HTMLMediaElement* media = toHTMLMediaElement(node()); |
| 281 if (media->isFullscreen()) | 281 if (media->isFullscreen()) |
| 282 return CompositingReasonVideo; | 282 return CompositingReasonVideo; |
| 283 } | 283 } |
| 284 | 284 |
| 285 if (shouldDisplayVideo() && supportsAcceleratedRendering()) | 285 if (shouldDisplayVideo() && supportsAcceleratedRendering()) |
| 286 return CompositingReasonVideo; | 286 return CompositingReasonVideo; |
| 287 | 287 |
| 288 return CompositingReasonNone; | 288 return CompositingReasonNone; |
| 289 } | 289 } |
| 290 | 290 |
| 291 } // namespace blink | 291 } // namespace blink |
| OLD | NEW |