Chromium Code Reviews| 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 1704 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1715 | 1715 |
| 1716 if (m_continuousPaintingEnabled) { | 1716 if (m_continuousPaintingEnabled) { |
| 1717 ContinuousPainter::setNeedsDisplayRecursive(m_rootGraphicsLayer, m_pageO verlays.get()); | 1717 ContinuousPainter::setNeedsDisplayRecursive(m_rootGraphicsLayer, m_pageO verlays.get()); |
| 1718 m_client->scheduleAnimation(); | 1718 m_client->scheduleAnimation(); |
| 1719 } | 1719 } |
| 1720 } | 1720 } |
| 1721 | 1721 |
| 1722 void WebViewImpl::layout() | 1722 void WebViewImpl::layout() |
| 1723 { | 1723 { |
| 1724 TRACE_EVENT0("webkit", "WebViewImpl::layout"); | 1724 TRACE_EVENT0("webkit", "WebViewImpl::layout"); |
| 1725 // FIXME: This shouldn't be necessary to kick pages into compositing mode. | |
|
esprehn
2014/05/14 20:32:02
Can you file a bug or add a better description?
enne (OOO)
2014/05/14 20:42:20
Done.
| |
| 1726 enterForceCompositingMode(true); | |
| 1725 PageWidgetDelegate::layout(m_page.get()); | 1727 PageWidgetDelegate::layout(m_page.get()); |
| 1726 updateLayerTreeBackgroundColor(); | 1728 updateLayerTreeBackgroundColor(); |
| 1727 | 1729 |
| 1728 for (size_t i = 0; i < m_linkHighlights.size(); ++i) | 1730 for (size_t i = 0; i < m_linkHighlights.size(); ++i) |
| 1729 m_linkHighlights[i]->updateGeometry(); | 1731 m_linkHighlights[i]->updateGeometry(); |
| 1730 } | 1732 } |
| 1731 | 1733 |
| 1732 void WebViewImpl::enterForceCompositingMode(bool enter) | 1734 void WebViewImpl::enterForceCompositingMode(bool enter) |
| 1733 { | 1735 { |
| 1734 if (page()->settings().forceCompositingMode() == enter) | 1736 if (page()->settings().forceCompositingMode() == enter) |
| (...skipping 2329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4064 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); | 4066 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); |
| 4065 | 4067 |
| 4066 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4068 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 4067 return false; | 4069 return false; |
| 4068 | 4070 |
| 4069 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4071 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4070 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); | 4072 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); |
| 4071 } | 4073 } |
| 4072 | 4074 |
| 4073 } // namespace blink | 4075 } // namespace blink |
| OLD | NEW |