| 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 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 m_isAcceleratedCompositingActive = false; | 278 m_isAcceleratedCompositingActive = false; |
| 279 } | 279 } |
| 280 } | 280 } |
| 281 } | 281 } |
| 282 | 282 |
| 283 WebSize WebPagePopupImpl::size() | 283 WebSize WebPagePopupImpl::size() |
| 284 { | 284 { |
| 285 return m_popupClient->contentSize(); | 285 return m_popupClient->contentSize(); |
| 286 } | 286 } |
| 287 | 287 |
| 288 void WebPagePopupImpl::animate(double) | 288 void WebPagePopupImpl::animate(WebFrameTime frameTime) |
| 289 { | 289 { |
| 290 PageWidgetDelegate::animate(m_page.get(), monotonicallyIncreasingTime()); | 290 PageWidgetDelegate::animate(m_page.get(), frameTime); |
| 291 } | 291 } |
| 292 | 292 |
| 293 void WebPagePopupImpl::willCloseLayerTreeView() | 293 void WebPagePopupImpl::willCloseLayerTreeView() |
| 294 { | 294 { |
| 295 setIsAcceleratedCompositingActive(false); | 295 setIsAcceleratedCompositingActive(false); |
| 296 m_layerTreeView = 0; | 296 m_layerTreeView = 0; |
| 297 } | 297 } |
| 298 | 298 |
| 299 void WebPagePopupImpl::layout() | 299 void WebPagePopupImpl::layout() |
| 300 { | 300 { |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 399 // A WebPagePopupImpl instance usually has two references. | 399 // A WebPagePopupImpl instance usually has two references. |
| 400 // - One owned by the instance itself. It represents the visible widget. | 400 // - One owned by the instance itself. It represents the visible widget. |
| 401 // - One owned by a WebViewImpl. It's released when the WebViewImpl ask the | 401 // - One owned by a WebViewImpl. It's released when the WebViewImpl ask the |
| 402 // WebPagePopupImpl to close. | 402 // WebPagePopupImpl to close. |
| 403 // We need them because the closing operation is asynchronous and the widget | 403 // We need them because the closing operation is asynchronous and the widget |
| 404 // can be closed while the WebViewImpl is unaware of it. | 404 // can be closed while the WebViewImpl is unaware of it. |
| 405 return adoptRef(new WebPagePopupImpl(client)).leakRef(); | 405 return adoptRef(new WebPagePopupImpl(client)).leakRef(); |
| 406 } | 406 } |
| 407 | 407 |
| 408 } // namespace blink | 408 } // namespace blink |
| OLD | NEW |