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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutMedia.cpp

Issue 2499013003: Media Controls: don't "cut" controls if fully hidden. (Closed)
Patch Set: review comments Created 4 years, 1 month 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
« no previous file with comments | « third_party/WebKit/LayoutTests/media/controls/overflow-fully-hidden.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 if (pageView->horizontalScrollbarMode() != ScrollbarAlwaysOff) 173 if (pageView->horizontalScrollbarMode() != ScrollbarAlwaysOff)
174 return mediaRect.width(); 174 return mediaRect.width();
175 175
176 // On desktop, this will include scrollbars when they stay visible. 176 // On desktop, this will include scrollbars when they stay visible.
177 const LayoutUnit visibleWidth(frameHost->visualViewport().visibleWidth()); 177 const LayoutUnit visibleWidth(frameHost->visualViewport().visibleWidth());
178 const LayoutUnit absoluteXOffset( 178 const LayoutUnit absoluteXOffset(
179 localToAbsolute( 179 localToAbsolute(
180 FloatPoint(mediaRect.location()), 180 FloatPoint(mediaRect.location()),
181 UseTransforms | ApplyContainerFlip | TraverseDocumentBoundaries) 181 UseTransforms | ApplyContainerFlip | TraverseDocumentBoundaries)
182 .x()); 182 .x());
183 DCHECK_GE(visibleWidth - absoluteXOffset, 0); 183 const LayoutUnit newWidth = visibleWidth - absoluteXOffset;
184
185 if (newWidth < 0)
186 return mediaRect.width();
184 187
185 return std::min(mediaRect.width(), visibleWidth - absoluteXOffset); 188 return std::min(mediaRect.width(), visibleWidth - absoluteXOffset);
186 } 189 }
187 190
188 } // namespace blink 191 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/media/controls/overflow-fully-hidden.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698