OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google 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 are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
273 m_isAcceleratedCompositingActive = false; | 273 m_isAcceleratedCompositingActive = false; |
274 } | 274 } |
275 } | 275 } |
276 } | 276 } |
277 | 277 |
278 WebSize WebPagePopupImpl::size() | 278 WebSize WebPagePopupImpl::size() |
279 { | 279 { |
280 return m_popupClient->contentSize(); | 280 return m_popupClient->contentSize(); |
281 } | 281 } |
282 | 282 |
283 void WebPagePopupImpl::animate(double) | 283 void WebPagePopupImpl::beginFrame(const WebBeginFrameArgs& frameTime) |
284 { | 284 { |
| 285 // FIXME: This should use frameTime.lastFrameTimeMonotonic but doing so |
| 286 // breaks tests. |
285 PageWidgetDelegate::animate(m_page.get(), monotonicallyIncreasingTime()); | 287 PageWidgetDelegate::animate(m_page.get(), monotonicallyIncreasingTime()); |
286 } | 288 } |
287 | 289 |
288 void WebPagePopupImpl::willCloseLayerTreeView() | 290 void WebPagePopupImpl::willCloseLayerTreeView() |
289 { | 291 { |
290 setIsAcceleratedCompositingActive(false); | 292 setIsAcceleratedCompositingActive(false); |
291 m_layerTreeView = 0; | 293 m_layerTreeView = 0; |
292 } | 294 } |
293 | 295 |
294 void WebPagePopupImpl::layout() | 296 void WebPagePopupImpl::layout() |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
394 // A WebPagePopupImpl instance usually has two references. | 396 // A WebPagePopupImpl instance usually has two references. |
395 // - One owned by the instance itself. It represents the visible widget. | 397 // - One owned by the instance itself. It represents the visible widget. |
396 // - One owned by a WebViewImpl. It's released when the WebViewImpl ask the | 398 // - One owned by a WebViewImpl. It's released when the WebViewImpl ask the |
397 // WebPagePopupImpl to close. | 399 // WebPagePopupImpl to close. |
398 // We need them because the closing operation is asynchronous and the widget | 400 // We need them because the closing operation is asynchronous and the widget |
399 // can be closed while the WebViewImpl is unaware of it. | 401 // can be closed while the WebViewImpl is unaware of it. |
400 return adoptRef(new WebPagePopupImpl(client)).leakRef(); | 402 return adoptRef(new WebPagePopupImpl(client)).leakRef(); |
401 } | 403 } |
402 | 404 |
403 } // namespace blink | 405 } // namespace blink |
OLD | NEW |