Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(337)

Side by Side Diff: Source/core/layout/LayoutVideo.cpp

Issue 1254613003: Let the WebMediaPlayer decide whether to use overlay video. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Address Xianzhu's Comments Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 239
240 LayoutUnit LayoutVideo::offsetHeight() const 240 LayoutUnit LayoutVideo::offsetHeight() const
241 { 241 {
242 if (const LayoutBlock* block = layoutObjectPlaceholder(this)) 242 if (const LayoutBlock* block = layoutObjectPlaceholder(this))
243 return block->offsetHeight(); 243 return block->offsetHeight();
244 return LayoutMedia::offsetHeight(); 244 return LayoutMedia::offsetHeight();
245 } 245 }
246 246
247 CompositingReasons LayoutVideo::additionalCompositingReasons() const 247 CompositingReasons LayoutVideo::additionalCompositingReasons() const
248 { 248 {
249 if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled()) { 249 HTMLMediaElement* element = toHTMLMediaElement(node());
250 HTMLMediaElement* media = toHTMLMediaElement(node()); 250 if (element->isFullscreen() && element->usesOverlayFullscreenVideo())
251 if (media->isFullscreen()) 251 return CompositingReasonVideo;
252 return CompositingReasonVideo;
253 }
254 252
255 if (shouldDisplayVideo() && supportsAcceleratedRendering()) 253 if (shouldDisplayVideo() && supportsAcceleratedRendering())
256 return CompositingReasonVideo; 254 return CompositingReasonVideo;
257 255
258 return CompositingReasonNone; 256 return CompositingReasonNone;
259 } 257 }
260 258
261 } // namespace blink 259 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/HTMLVideoElement.cpp ('k') | Source/core/layout/compositing/CompositedDeprecatedPaintLayerMapping.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698