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 738 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
749 void RenderLayerCompositor::setOverlayLayer(GraphicsLayer* layer) | 749 void RenderLayerCompositor::setOverlayLayer(GraphicsLayer* layer) |
750 { | 750 { |
751 ASSERT(rootGraphicsLayer()); | 751 ASSERT(rootGraphicsLayer()); |
752 | 752 |
753 if (layer->parent() != m_overflowControlsHostLayer.get()) | 753 if (layer->parent() != m_overflowControlsHostLayer.get()) |
754 m_overflowControlsHostLayer->addChild(layer); | 754 m_overflowControlsHostLayer->addChild(layer); |
755 } | 755 } |
756 | 756 |
757 bool RenderLayerCompositor::canBeComposited(const RenderLayer* layer) const | 757 bool RenderLayerCompositor::canBeComposited(const RenderLayer* layer) const |
758 { | 758 { |
759 // FIXME: We disable accelerated compositing for elements in a RenderFlowThr
ead as it doesn't work properly. | 759 return m_hasAcceleratedCompositing && layer->isSelfPaintingLayer() && !layer
->subtreeIsInvisible(); |
760 // See http://webkit.org/b/84900 to re-enable it. | |
761 return m_hasAcceleratedCompositing && layer->isSelfPaintingLayer() && !layer
->subtreeIsInvisible() && layer->renderer()->flowThreadState() == RenderObject::
NotInsideFlowThread; | |
762 } | 760 } |
763 | 761 |
764 // Return true if the given layer is a stacking context and has compositing chil
d | 762 // Return true if the given layer is a stacking context and has compositing chil
d |
765 // layers that it needs to clip. In this case we insert a clipping GraphicsLayer | 763 // layers that it needs to clip. In this case we insert a clipping GraphicsLayer |
766 // into the hierarchy between this layer and its children in the z-order hierarc
hy. | 764 // into the hierarchy between this layer and its children in the z-order hierarc
hy. |
767 bool RenderLayerCompositor::clipsCompositingDescendants(const RenderLayer* layer
) const | 765 bool RenderLayerCompositor::clipsCompositingDescendants(const RenderLayer* layer
) const |
768 { | 766 { |
769 return layer->hasCompositingDescendant() && layer->renderer()->hasClipOrOver
flowClip(); | 767 return layer->hasCompositingDescendant() && layer->renderer()->hasClipOrOver
flowClip(); |
770 } | 768 } |
771 | 769 |
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1190 } else if (graphicsLayer == m_scrollLayer.get()) { | 1188 } else if (graphicsLayer == m_scrollLayer.get()) { |
1191 name = "LocalFrame Scrolling Layer"; | 1189 name = "LocalFrame Scrolling Layer"; |
1192 } else { | 1190 } else { |
1193 ASSERT_NOT_REACHED(); | 1191 ASSERT_NOT_REACHED(); |
1194 } | 1192 } |
1195 | 1193 |
1196 return name; | 1194 return name; |
1197 } | 1195 } |
1198 | 1196 |
1199 } // namespace blink | 1197 } // namespace blink |
OLD | NEW |