| 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 4363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4374 void WebViewImpl::scheduleAnimation() | 4374 void WebViewImpl::scheduleAnimation() |
| 4375 { | 4375 { |
| 4376 if (m_layerTreeView) { | 4376 if (m_layerTreeView) { |
| 4377 m_layerTreeView->setNeedsAnimate(); | 4377 m_layerTreeView->setNeedsAnimate(); |
| 4378 return; | 4378 return; |
| 4379 } | 4379 } |
| 4380 if (m_client) | 4380 if (m_client) |
| 4381 m_client->scheduleAnimation(); | 4381 m_client->scheduleAnimation(); |
| 4382 } | 4382 } |
| 4383 | 4383 |
| 4384 void WebViewImpl::setCompositorAnimationTimeline(WebCompositorAnimationTimeline*
timeline) |
| 4385 { |
| 4386 if (m_layerTreeView) |
| 4387 m_layerTreeView->setCompositorAnimationTimeline(timeline); |
| 4388 } |
| 4389 |
| 4384 void WebViewImpl::initializeLayerTreeView() | 4390 void WebViewImpl::initializeLayerTreeView() |
| 4385 { | 4391 { |
| 4386 if (m_client) { | 4392 if (m_client) { |
| 4387 m_client->initializeLayerTreeView(); | 4393 m_client->initializeLayerTreeView(); |
| 4388 m_layerTreeView = m_client->layerTreeView(); | 4394 m_layerTreeView = m_client->layerTreeView(); |
| 4389 } | 4395 } |
| 4390 | 4396 |
| 4391 m_page->settings().setAcceleratedCompositingEnabled(m_layerTreeView != 0); | 4397 m_page->settings().setAcceleratedCompositingEnabled(m_layerTreeView != 0); |
| 4392 | 4398 |
| 4393 // FIXME: only unittests, click to play, Android priting, and printing (for
headers and footers) | 4399 // FIXME: only unittests, click to play, Android priting, and printing (for
headers and footers) |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4689 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4695 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4690 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4696 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4691 } | 4697 } |
| 4692 | 4698 |
| 4693 void WebViewImpl::forceNextWebGLContextCreationToFail() | 4699 void WebViewImpl::forceNextWebGLContextCreationToFail() |
| 4694 { | 4700 { |
| 4695 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); | 4701 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); |
| 4696 } | 4702 } |
| 4697 | 4703 |
| 4698 } // namespace blink | 4704 } // namespace blink |
| OLD | NEW |