| 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 926 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 937 | 937 |
| 938 void RenderLayerCompositor::updateStyleDeterminedCompositingReasons(RenderLayer*
layer) | 938 void RenderLayerCompositor::updateStyleDeterminedCompositingReasons(RenderLayer*
layer) |
| 939 { | 939 { |
| 940 CompositingReasons reasons = m_compositingReasonFinder.styleDeterminedReason
s(layer->renderer()); | 940 CompositingReasons reasons = m_compositingReasonFinder.styleDeterminedReason
s(layer->renderer()); |
| 941 layer->setStyleDeterminedCompositingReasons(reasons); | 941 layer->setStyleDeterminedCompositingReasons(reasons); |
| 942 } | 942 } |
| 943 | 943 |
| 944 void RenderLayerCompositor::updateDirectCompositingReasons(RenderLayer* layer) | 944 void RenderLayerCompositor::updateDirectCompositingReasons(RenderLayer* layer) |
| 945 { | 945 { |
| 946 CompositingReasons reasons = m_compositingReasonFinder.directReasons(layer,
&m_needsToRecomputeCompositingRequirements); | 946 CompositingReasons reasons = m_compositingReasonFinder.directReasons(layer,
&m_needsToRecomputeCompositingRequirements); |
| 947 if (layer->suppressingCompositedLayerCreation()) | |
| 948 reasons = m_compositingReasonFinder.suppressWillChangeAndAnimationForGpu
Rasterization(layer, reasons); | |
| 949 layer->setCompositingReasons(reasons, CompositingReasonComboAllDirectReasons
); | 947 layer->setCompositingReasons(reasons, CompositingReasonComboAllDirectReasons
); |
| 950 } | 948 } |
| 951 | 949 |
| 952 bool RenderLayerCompositor::canBeComposited(const RenderLayer* layer) const | 950 bool RenderLayerCompositor::canBeComposited(const RenderLayer* layer) const |
| 953 { | 951 { |
| 954 // FIXME: We disable accelerated compositing for elements in a RenderFlowThr
ead as it doesn't work properly. | 952 // FIXME: We disable accelerated compositing for elements in a RenderFlowThr
ead as it doesn't work properly. |
| 955 // See http://webkit.org/b/84900 to re-enable it. | 953 // See http://webkit.org/b/84900 to re-enable it. |
| 956 return m_hasAcceleratedCompositing && layer->isSelfPaintingLayer() && layer-
>renderer()->flowThreadState() == RenderObject::NotInsideFlowThread; | 954 return m_hasAcceleratedCompositing && layer->isSelfPaintingLayer() && layer-
>renderer()->flowThreadState() == RenderObject::NotInsideFlowThread; |
| 957 } | 955 } |
| 958 | 956 |
| (...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1472 } else if (graphicsLayer == m_scrollLayer.get()) { | 1470 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 1473 name = "LocalFrame Scrolling Layer"; | 1471 name = "LocalFrame Scrolling Layer"; |
| 1474 } else { | 1472 } else { |
| 1475 ASSERT_NOT_REACHED(); | 1473 ASSERT_NOT_REACHED(); |
| 1476 } | 1474 } |
| 1477 | 1475 |
| 1478 return name; | 1476 return name; |
| 1479 } | 1477 } |
| 1480 | 1478 |
| 1481 } // namespace WebCore | 1479 } // namespace WebCore |
| OLD | NEW |