| 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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 else | 157 else |
| 158 view()->unregisterMediaForPositionChangeNotification(*this); | 158 view()->unregisterMediaForPositionChangeNotification(*this); |
| 159 } | 159 } |
| 160 | 160 |
| 161 LayoutUnit LayoutMedia::computePanelWidth(const LayoutRect& mediaRect) const { | 161 LayoutUnit LayoutMedia::computePanelWidth(const LayoutRect& mediaRect) const { |
| 162 // TODO(mlamouri): we don't know if the main frame has an horizontal scrollbar | 162 // TODO(mlamouri): we don't know if the main frame has an horizontal scrollbar |
| 163 // if it is out of process. See https://crbug.com/662480 | 163 // if it is out of process. See https://crbug.com/662480 |
| 164 if (document().page()->mainFrame()->isRemoteFrame()) | 164 if (document().page()->mainFrame()->isRemoteFrame()) |
| 165 return mediaRect.width(); | 165 return mediaRect.width(); |
| 166 | 166 |
| 167 // TODO(foolip): when going fullscreen, the animation sometimes does not clear |
| 168 // up properly and the last `absoluteXOffset` received is incorrect. This is |
| 169 // a shortcut that we could ideally avoid. See https://crbug.com/663680 |
| 170 if (mediaElement() && mediaElement()->isFullscreen()) |
| 171 return mediaRect.width(); |
| 172 |
| 167 FrameHost* frameHost = document().frameHost(); | 173 FrameHost* frameHost = document().frameHost(); |
| 168 LocalFrame* mainFrame = document().page()->deprecatedLocalMainFrame(); | 174 LocalFrame* mainFrame = document().page()->deprecatedLocalMainFrame(); |
| 169 FrameView* pageView = mainFrame ? mainFrame->view() : nullptr; | 175 FrameView* pageView = mainFrame ? mainFrame->view() : nullptr; |
| 170 if (!frameHost || !mainFrame || !pageView) | 176 if (!frameHost || !mainFrame || !pageView) |
| 171 return mediaRect.width(); | 177 return mediaRect.width(); |
| 172 | 178 |
| 173 if (pageView->horizontalScrollbarMode() != ScrollbarAlwaysOff) | 179 if (pageView->horizontalScrollbarMode() != ScrollbarAlwaysOff) |
| 174 return mediaRect.width(); | 180 return mediaRect.width(); |
| 175 | 181 |
| 176 // On desktop, this will include scrollbars when they stay visible. | 182 // On desktop, this will include scrollbars when they stay visible. |
| 177 const LayoutUnit visibleWidth(frameHost->visualViewport().visibleWidth()); | 183 const LayoutUnit visibleWidth(frameHost->visualViewport().visibleWidth()); |
| 178 const LayoutUnit absoluteXOffset( | 184 const LayoutUnit absoluteXOffset( |
| 179 localToAbsolute( | 185 localToAbsolute( |
| 180 FloatPoint(mediaRect.location()), | 186 FloatPoint(mediaRect.location()), |
| 181 UseTransforms | ApplyContainerFlip | TraverseDocumentBoundaries) | 187 UseTransforms | ApplyContainerFlip | TraverseDocumentBoundaries) |
| 182 .x()); | 188 .x()); |
| 183 const LayoutUnit newWidth = visibleWidth - absoluteXOffset; | 189 const LayoutUnit newWidth = visibleWidth - absoluteXOffset; |
| 184 | 190 |
| 185 if (newWidth < 0) | 191 if (newWidth < 0) |
| 186 return mediaRect.width(); | 192 return mediaRect.width(); |
| 187 | 193 |
| 188 return std::min(mediaRect.width(), visibleWidth - absoluteXOffset); | 194 return std::min(mediaRect.width(), visibleWidth - absoluteXOffset); |
| 189 } | 195 } |
| 190 | 196 |
| 191 } // namespace blink | 197 } // namespace blink |
| OLD | NEW |