| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 1170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1181 } | 1181 } |
| 1182 if (m_containerLayer) { | 1182 if (m_containerLayer) { |
| 1183 FrameView* frameView = m_renderView.frameView(); | 1183 FrameView* frameView = m_renderView.frameView(); |
| 1184 m_containerLayer->setSize(frameView->unscaledVisibleContentSize()); | 1184 m_containerLayer->setSize(frameView->unscaledVisibleContentSize()); |
| 1185 } | 1185 } |
| 1186 } | 1186 } |
| 1187 | 1187 |
| 1188 void RenderLayerCompositor::updateStyleDeterminedCompositingReasons(RenderLayer*
layer) | 1188 void RenderLayerCompositor::updateStyleDeterminedCompositingReasons(RenderLayer*
layer) |
| 1189 { | 1189 { |
| 1190 CompositingReasons reasons = m_compositingReasonFinder.styleDeterminedReason
s(layer->renderer()); | 1190 CompositingReasons reasons = m_compositingReasonFinder.styleDeterminedReason
s(layer->renderer()); |
| 1191 layer->setCompositingReasons(reasons, CompositingReasonComboAllStyleDetermin
edReasons); | 1191 layer->setStyleDeterminedCompositingReasons(reasons); |
| 1192 } | 1192 } |
| 1193 | 1193 |
| 1194 void RenderLayerCompositor::updateDirectCompositingReasons(RenderLayer* layer) | 1194 void RenderLayerCompositor::updateDirectCompositingReasons(RenderLayer* layer) |
| 1195 { | 1195 { |
| 1196 CompositingReasons reasons = m_compositingReasonFinder.directReasons(layer,
&m_needsToRecomputeCompositingRequirements); | 1196 CompositingReasons reasons = m_compositingReasonFinder.directReasons(layer,
&m_needsToRecomputeCompositingRequirements); |
| 1197 if (layer->suppressingCompositedLayerCreation()) |
| 1198 reasons = m_compositingReasonFinder.suppressWillChangeAndAnimationForGpu
Rasterization(layer, reasons); |
| 1197 layer->setCompositingReasons(reasons, CompositingReasonComboAllDirectReasons
); | 1199 layer->setCompositingReasons(reasons, CompositingReasonComboAllDirectReasons
); |
| 1198 } | 1200 } |
| 1199 | 1201 |
| 1200 bool RenderLayerCompositor::needsOwnBacking(const RenderLayer* layer) const | 1202 bool RenderLayerCompositor::needsOwnBacking(const RenderLayer* layer) const |
| 1201 { | 1203 { |
| 1202 if (!canBeComposited(layer)) | 1204 if (!canBeComposited(layer)) |
| 1203 return false; | 1205 return false; |
| 1204 | 1206 |
| 1205 // If squashing is disabled, then layers that would have been squashed shoul
d just be separately composited. | 1207 // If squashing is disabled, then layers that would have been squashed shoul
d just be separately composited. |
| 1206 bool needsOwnBackingForDisabledSquashing = !layerSquashingEnabled() && requi
resSquashing(layer->compositingReasons()); | 1208 bool needsOwnBackingForDisabledSquashing = !layerSquashingEnabled() && requi
resSquashing(layer->compositingReasons()); |
| (...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1728 } else if (graphicsLayer == m_scrollLayer.get()) { | 1730 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 1729 name = "LocalFrame Scrolling Layer"; | 1731 name = "LocalFrame Scrolling Layer"; |
| 1730 } else { | 1732 } else { |
| 1731 ASSERT_NOT_REACHED(); | 1733 ASSERT_NOT_REACHED(); |
| 1732 } | 1734 } |
| 1733 | 1735 |
| 1734 return name; | 1736 return name; |
| 1735 } | 1737 } |
| 1736 | 1738 |
| 1737 } // namespace WebCore | 1739 } // namespace WebCore |
| OLD | NEW |