| 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 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 } else if (m_layerTreeView) { | 338 } else if (m_layerTreeView) { |
| 339 m_isAcceleratedCompositingActive = true; | 339 m_isAcceleratedCompositingActive = true; |
| 340 } else { | 340 } else { |
| 341 TRACE_EVENT0("blink", "WebPagePopupImpl::setIsAcceleratedCompositingActi
ve(true)"); | 341 TRACE_EVENT0("blink", "WebPagePopupImpl::setIsAcceleratedCompositingActi
ve(true)"); |
| 342 | 342 |
| 343 m_widgetClient->initializeLayerTreeView(); | 343 m_widgetClient->initializeLayerTreeView(); |
| 344 m_layerTreeView = m_widgetClient->layerTreeView(); | 344 m_layerTreeView = m_widgetClient->layerTreeView(); |
| 345 if (m_layerTreeView) { | 345 if (m_layerTreeView) { |
| 346 m_layerTreeView->setVisible(true); | 346 m_layerTreeView->setVisible(true); |
| 347 m_isAcceleratedCompositingActive = true; | 347 m_isAcceleratedCompositingActive = true; |
| 348 m_layerTreeView->setDeviceScaleFactor(m_widgetClient->deviceScaleFac
tor()); | 348 m_layerTreeView->setDeviceScaleFactor(m_webView->deviceScaleFactor()
); |
| 349 } else { | 349 } else { |
| 350 m_isAcceleratedCompositingActive = false; | 350 m_isAcceleratedCompositingActive = false; |
| 351 } | 351 } |
| 352 } | 352 } |
| 353 } | 353 } |
| 354 | 354 |
| 355 WebSize WebPagePopupImpl::size() | 355 WebSize WebPagePopupImpl::size() |
| 356 { | 356 { |
| 357 return m_popupClient->contentSize(); | 357 return m_popupClient->contentSize(); |
| 358 } | 358 } |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 539 // A WebPagePopupImpl instance usually has two references. | 539 // A WebPagePopupImpl instance usually has two references. |
| 540 // - One owned by the instance itself. It represents the visible widget. | 540 // - One owned by the instance itself. It represents the visible widget. |
| 541 // - One owned by a WebViewImpl. It's released when the WebViewImpl ask the | 541 // - One owned by a WebViewImpl. It's released when the WebViewImpl ask the |
| 542 // WebPagePopupImpl to close. | 542 // WebPagePopupImpl to close. |
| 543 // We need them because the closing operation is asynchronous and the widget | 543 // We need them because the closing operation is asynchronous and the widget |
| 544 // can be closed while the WebViewImpl is unaware of it. | 544 // can be closed while the WebViewImpl is unaware of it. |
| 545 return adoptRef(new WebPagePopupImpl(client)).leakRef(); | 545 return adoptRef(new WebPagePopupImpl(client)).leakRef(); |
| 546 } | 546 } |
| 547 | 547 |
| 548 } // namespace blink | 548 } // namespace blink |
| OLD | NEW |