| 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 917 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 928 if (parentLayer) { | 928 if (parentLayer) { |
| 929 GraphicsLayer* hostingLayer = parentLayer->compositedLayerMapping()->par
entForSublayers(); | 929 GraphicsLayer* hostingLayer = parentLayer->compositedLayerMapping()->par
entForSublayers(); |
| 930 GraphicsLayer* hostedLayer = childLayer->compositedLayerMapping()->child
ForSuperlayers(); | 930 GraphicsLayer* hostedLayer = childLayer->compositedLayerMapping()->child
ForSuperlayers(); |
| 931 | 931 |
| 932 hostingLayer->addChild(hostedLayer); | 932 hostingLayer->addChild(hostedLayer); |
| 933 } else { | 933 } else { |
| 934 childLayer->compositedLayerMapping()->childForSuperlayers()->removeFromP
arent(); | 934 childLayer->compositedLayerMapping()->childForSuperlayers()->removeFromP
arent(); |
| 935 } | 935 } |
| 936 } | 936 } |
| 937 | 937 |
| 938 void RenderLayerCompositor::removeCompositedChildren(RenderLayer* layer) | |
| 939 { | |
| 940 ASSERT(layer->hasCompositedLayerMapping()); | |
| 941 | |
| 942 GraphicsLayer* hostingLayer = layer->compositedLayerMapping()->parentForSubl
ayers(); | |
| 943 hostingLayer->removeAllChildren(); | |
| 944 } | |
| 945 | |
| 946 void RenderLayerCompositor::frameViewDidChangeLocation(const IntPoint& contentsO
ffset) | 938 void RenderLayerCompositor::frameViewDidChangeLocation(const IntPoint& contentsO
ffset) |
| 947 { | 939 { |
| 948 if (m_overflowControlsHostLayer) | 940 if (m_overflowControlsHostLayer) |
| 949 m_overflowControlsHostLayer->setPosition(contentsOffset); | 941 m_overflowControlsHostLayer->setPosition(contentsOffset); |
| 950 } | 942 } |
| 951 | 943 |
| 952 void RenderLayerCompositor::frameViewDidChangeSize() | 944 void RenderLayerCompositor::frameViewDidChangeSize() |
| 953 { | 945 { |
| 954 if (m_containerLayer) { | 946 if (m_containerLayer) { |
| 955 FrameView* frameView = m_renderView.frameView(); | 947 FrameView* frameView = m_renderView.frameView(); |
| (...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1728 } else if (graphicsLayer == m_scrollLayer.get()) { | 1720 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 1729 name = "LocalFrame Scrolling Layer"; | 1721 name = "LocalFrame Scrolling Layer"; |
| 1730 } else { | 1722 } else { |
| 1731 ASSERT_NOT_REACHED(); | 1723 ASSERT_NOT_REACHED(); |
| 1732 } | 1724 } |
| 1733 | 1725 |
| 1734 return name; | 1726 return name; |
| 1735 } | 1727 } |
| 1736 | 1728 |
| 1737 } // namespace WebCore | 1729 } // namespace WebCore |
| OLD | NEW |