| 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(WebBeginFrameArgs frameTime) |
| 284 { | 284 { |
| 285 PageWidgetDelegate::animate(m_page.get(), monotonicallyIncreasingTime()); | 285 PageWidgetDelegate::animate(m_page.get(), frameTime.lastFrameTime); |
| 286 } | 286 } |
| 287 | 287 |
| 288 void WebPagePopupImpl::willCloseLayerTreeView() | 288 void WebPagePopupImpl::willCloseLayerTreeView() |
| 289 { | 289 { |
| 290 setIsAcceleratedCompositingActive(false); | 290 setIsAcceleratedCompositingActive(false); |
| 291 m_layerTreeView = 0; | 291 m_layerTreeView = 0; |
| 292 } | 292 } |
| 293 | 293 |
| 294 void WebPagePopupImpl::layout() | 294 void WebPagePopupImpl::layout() |
| 295 { | 295 { |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 394 // A WebPagePopupImpl instance usually has two references. | 394 // A WebPagePopupImpl instance usually has two references. |
| 395 // - One owned by the instance itself. It represents the visible widget. | 395 // - 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 | 396 // - One owned by a WebViewImpl. It's released when the WebViewImpl ask the |
| 397 // WebPagePopupImpl to close. | 397 // WebPagePopupImpl to close. |
| 398 // We need them because the closing operation is asynchronous and the widget | 398 // We need them because the closing operation is asynchronous and the widget |
| 399 // can be closed while the WebViewImpl is unaware of it. | 399 // can be closed while the WebViewImpl is unaware of it. |
| 400 return adoptRef(new WebPagePopupImpl(client)).leakRef(); | 400 return adoptRef(new WebPagePopupImpl(client)).leakRef(); |
| 401 } | 401 } |
| 402 | 402 |
| 403 } // namespace blink | 403 } // namespace blink |
| OLD | NEW |