| 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 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 290 WebSize WebPagePopupImpl::size() | 290 WebSize WebPagePopupImpl::size() |
| 291 { | 291 { |
| 292 return m_popupClient->contentSize(); | 292 return m_popupClient->contentSize(); |
| 293 } | 293 } |
| 294 | 294 |
| 295 void WebPagePopupImpl::animate(double) | 295 void WebPagePopupImpl::animate(double) |
| 296 { | 296 { |
| 297 PageWidgetDelegate::animate(m_page.get(), monotonicallyIncreasingTime()); | 297 PageWidgetDelegate::animate(m_page.get(), monotonicallyIncreasingTime()); |
| 298 } | 298 } |
| 299 | 299 |
| 300 void WebPagePopupImpl::enterForceCompositingMode(bool enter) | |
| 301 { | |
| 302 if (!m_page) | |
| 303 return; | |
| 304 if (m_page->settings().forceCompositingMode() == enter) | |
| 305 return; | |
| 306 | |
| 307 TRACE_EVENT1("webkit", "WebPagePopupImpl::enterForceCompositingMode", "enter
", enter); | |
| 308 m_page->settings().setForceCompositingMode(enter); | |
| 309 if (enter) { | |
| 310 LocalFrame* mainFrame = m_page->mainFrame(); | |
| 311 if (!mainFrame) | |
| 312 return; | |
| 313 mainFrame->view()->updateCompositingLayersAfterStyleChange(); | |
| 314 } | |
| 315 } | |
| 316 | |
| 317 void WebPagePopupImpl::willCloseLayerTreeView() | 300 void WebPagePopupImpl::willCloseLayerTreeView() |
| 318 { | 301 { |
| 319 setIsAcceleratedCompositingActive(false); | 302 setIsAcceleratedCompositingActive(false); |
| 320 m_layerTreeView = 0; | 303 m_layerTreeView = 0; |
| 321 } | 304 } |
| 322 | 305 |
| 323 void WebPagePopupImpl::layout() | 306 void WebPagePopupImpl::layout() |
| 324 { | 307 { |
| 325 PageWidgetDelegate::layout(m_page.get()); | 308 PageWidgetDelegate::layout(m_page.get()); |
| 326 } | 309 } |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 423 // A WebPagePopupImpl instance usually has two references. | 406 // A WebPagePopupImpl instance usually has two references. |
| 424 // - One owned by the instance itself. It represents the visible widget. | 407 // - One owned by the instance itself. It represents the visible widget. |
| 425 // - One owned by a WebViewImpl. It's released when the WebViewImpl ask the | 408 // - One owned by a WebViewImpl. It's released when the WebViewImpl ask the |
| 426 // WebPagePopupImpl to close. | 409 // WebPagePopupImpl to close. |
| 427 // We need them because the closing operation is asynchronous and the widget | 410 // We need them because the closing operation is asynchronous and the widget |
| 428 // can be closed while the WebViewImpl is unaware of it. | 411 // can be closed while the WebViewImpl is unaware of it. |
| 429 return adoptRef(new WebPagePopupImpl(client)).leakRef(); | 412 return adoptRef(new WebPagePopupImpl(client)).leakRef(); |
| 430 } | 413 } |
| 431 | 414 |
| 432 } // namespace blink | 415 } // namespace blink |
| OLD | NEW |