| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 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 4233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4244 m_layerTreeView->detachCompositorAnimationTimeline(timeline); | 4244 m_layerTreeView->detachCompositorAnimationTimeline(timeline); |
| 4245 } | 4245 } |
| 4246 | 4246 |
| 4247 void WebViewImpl::initializeLayerTreeView() | 4247 void WebViewImpl::initializeLayerTreeView() |
| 4248 { | 4248 { |
| 4249 if (m_client) { | 4249 if (m_client) { |
| 4250 m_client->initializeLayerTreeView(); | 4250 m_client->initializeLayerTreeView(); |
| 4251 m_layerTreeView = m_client->layerTreeView(); | 4251 m_layerTreeView = m_client->layerTreeView(); |
| 4252 } | 4252 } |
| 4253 | 4253 |
| 4254 if (WebDevToolsAgentImpl* devTools = mainFrameDevToolsAgentImpl()) |
| 4255 devTools->layerTreeViewChanged(m_layerTreeView); |
| 4256 |
| 4254 m_page->settings().setAcceleratedCompositingEnabled(m_layerTreeView != 0); | 4257 m_page->settings().setAcceleratedCompositingEnabled(m_layerTreeView != 0); |
| 4255 | 4258 |
| 4256 // FIXME: only unittests, click to play, Android priting, and printing (for
headers and footers) | 4259 // FIXME: only unittests, click to play, Android priting, and printing (for
headers and footers) |
| 4257 // make this assert necessary. We should make them not hit this code and the
n delete allowsBrokenNullLayerTreeView. | 4260 // make this assert necessary. We should make them not hit this code and the
n delete allowsBrokenNullLayerTreeView. |
| 4258 ASSERT(m_layerTreeView || !m_client || m_client->allowsBrokenNullLayerTreeVi
ew()); | 4261 ASSERT(m_layerTreeView || !m_client || m_client->allowsBrokenNullLayerTreeVi
ew()); |
| 4259 } | 4262 } |
| 4260 | 4263 |
| 4261 void WebViewImpl::setIsAcceleratedCompositingActive(bool active) | 4264 void WebViewImpl::setIsAcceleratedCompositingActive(bool active) |
| 4262 { | 4265 { |
| 4263 // In the middle of shutting down; don't try to spin back up a compositor. | 4266 // In the middle of shutting down; don't try to spin back up a compositor. |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4506 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4509 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4507 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4510 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4508 } | 4511 } |
| 4509 | 4512 |
| 4510 void WebViewImpl::forceNextWebGLContextCreationToFail() | 4513 void WebViewImpl::forceNextWebGLContextCreationToFail() |
| 4511 { | 4514 { |
| 4512 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); | 4515 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); |
| 4513 } | 4516 } |
| 4514 | 4517 |
| 4515 } // namespace blink | 4518 } // namespace blink |
| OLD | NEW |