| 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 773 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 784 // Create a clipping layer if this is an iframe or settings require to c
lip. | 784 // Create a clipping layer if this is an iframe or settings require to c
lip. |
| 785 m_containerLayer = GraphicsLayer::create(graphicsLayerFactory(), this); | 785 m_containerLayer = GraphicsLayer::create(graphicsLayerFactory(), this); |
| 786 bool containerMasksToBounds = false; | 786 bool containerMasksToBounds = false; |
| 787 if (Settings* settings = m_renderView.document().settings()) { | 787 if (Settings* settings = m_renderView.document().settings()) { |
| 788 if (settings->mainFrameClipsContent()) | 788 if (settings->mainFrameClipsContent()) |
| 789 containerMasksToBounds = true; | 789 containerMasksToBounds = true; |
| 790 } | 790 } |
| 791 m_containerLayer->setMasksToBounds(containerMasksToBounds); | 791 m_containerLayer->setMasksToBounds(containerMasksToBounds); |
| 792 | 792 |
| 793 m_scrollLayer = GraphicsLayer::create(graphicsLayerFactory(), this); | 793 m_scrollLayer = GraphicsLayer::create(graphicsLayerFactory(), this); |
| 794 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordina
tor()) | |
| 795 scrollingCoordinator->setLayerIsContainerForFixedPositionLayers(m_sc
rollLayer.get(), true); | |
| 796 | 794 |
| 797 // Hook them up | 795 // Hook them up |
| 798 m_overflowControlsHostLayer->addChild(m_containerLayer.get()); | 796 m_overflowControlsHostLayer->addChild(m_containerLayer.get()); |
| 799 m_containerLayer->addChild(m_scrollLayer.get()); | 797 m_containerLayer->addChild(m_scrollLayer.get()); |
| 800 m_scrollLayer->addChild(m_rootContentLayer.get()); | 798 m_scrollLayer->addChild(m_rootContentLayer.get()); |
| 801 | 799 |
| 802 frameViewDidChangeSize(); | 800 frameViewDidChangeSize(); |
| 803 } | 801 } |
| 804 | 802 |
| 805 // Check to see if we have to change the attachment | 803 // Check to see if we have to change the attachment |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 939 } else if (graphicsLayer == m_scrollLayer.get()) { | 937 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 940 name = "LocalFrame Scrolling Layer"; | 938 name = "LocalFrame Scrolling Layer"; |
| 941 } else { | 939 } else { |
| 942 ASSERT_NOT_REACHED(); | 940 ASSERT_NOT_REACHED(); |
| 943 } | 941 } |
| 944 | 942 |
| 945 return name; | 943 return name; |
| 946 } | 944 } |
| 947 | 945 |
| 948 } // namespace blink | 946 } // namespace blink |
| OLD | NEW |