| 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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 |
| OLD | NEW |