| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010, 2011 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 733 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 744 m_scrollingContentsLayer->setOffsetFromRenderer(scrollingContentsOffset,
GraphicsLayer::DontSetNeedsDisplay); | 744 m_scrollingContentsLayer->setOffsetFromRenderer(scrollingContentsOffset,
GraphicsLayer::DontSetNeedsDisplay); |
| 745 | 745 |
| 746 if (m_foregroundLayer) { | 746 if (m_foregroundLayer) { |
| 747 if (m_foregroundLayer->size() != m_scrollingContentsLayer->size()) | 747 if (m_foregroundLayer->size() != m_scrollingContentsLayer->size()) |
| 748 m_foregroundLayer->setSize(m_scrollingContentsLayer->size()); | 748 m_foregroundLayer->setSize(m_scrollingContentsLayer->size()); |
| 749 m_foregroundLayer->setNeedsDisplay(); | 749 m_foregroundLayer->setNeedsDisplay(); |
| 750 m_foregroundLayer->setOffsetFromRenderer(m_scrollingContentsLayer->o
ffsetFromRenderer()); | 750 m_foregroundLayer->setOffsetFromRenderer(m_scrollingContentsLayer->o
ffsetFromRenderer()); |
| 751 } | 751 } |
| 752 } | 752 } |
| 753 | 753 |
| 754 m_owningLayer->positionOverflowControls(); |
| 755 |
| 754 // If this layer was created just for clipping or to apply perspective, it d
oesn't need its own backing store. | 756 // If this layer was created just for clipping or to apply perspective, it d
oesn't need its own backing store. |
| 755 setRequiresOwnBackingStore(compositor()->requiresOwnBackingStore(m_owningLay
er, compAncestor)); | 757 setRequiresOwnBackingStore(compositor()->requiresOwnBackingStore(m_owningLay
er, compAncestor)); |
| 756 | 758 |
| 757 updateContentsRect(isSimpleContainer); | 759 updateContentsRect(isSimpleContainer); |
| 758 updateBackgroundColor(isSimpleContainer); | 760 updateBackgroundColor(isSimpleContainer); |
| 759 updateDrawsContent(isSimpleContainer); | 761 updateDrawsContent(isSimpleContainer); |
| 760 updateContentsOpaque(); | 762 updateContentsOpaque(); |
| 761 updateAfterWidgetResize(); | 763 updateAfterWidgetResize(); |
| 762 registerScrollingLayers(); | 764 registerScrollingLayers(); |
| 763 | 765 |
| (...skipping 1210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1974 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 1976 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { |
| 1975 name = "Scrolling Contents Layer"; | 1977 name = "Scrolling Contents Layer"; |
| 1976 } else { | 1978 } else { |
| 1977 ASSERT_NOT_REACHED(); | 1979 ASSERT_NOT_REACHED(); |
| 1978 } | 1980 } |
| 1979 | 1981 |
| 1980 return name; | 1982 return name; |
| 1981 } | 1983 } |
| 1982 | 1984 |
| 1983 } // namespace WebCore | 1985 } // namespace WebCore |
| OLD | NEW |