Chromium Code Reviews| 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 2379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2390 m_overflowControlsHostLayer = GraphicsLayer::create(graphicsLayerFactory (), this); | 2390 m_overflowControlsHostLayer = GraphicsLayer::create(graphicsLayerFactory (), this); |
| 2391 #ifndef NDEBUG | 2391 #ifndef NDEBUG |
| 2392 m_overflowControlsHostLayer->setName("overflow controls host"); | 2392 m_overflowControlsHostLayer->setName("overflow controls host"); |
| 2393 #endif | 2393 #endif |
| 2394 | 2394 |
| 2395 // Create a clipping layer if this is an iframe | 2395 // Create a clipping layer if this is an iframe |
| 2396 m_clipLayer = GraphicsLayer::create(graphicsLayerFactory(), this); | 2396 m_clipLayer = GraphicsLayer::create(graphicsLayerFactory(), this); |
| 2397 #ifndef NDEBUG | 2397 #ifndef NDEBUG |
| 2398 m_clipLayer->setName("frame clipping"); | 2398 m_clipLayer->setName("frame clipping"); |
| 2399 #endif | 2399 #endif |
| 2400 m_clipLayer->setMasksToBounds(true); | 2400 if (expectedAttachment != RootLayerAttachedViaChromeClient) |
|
trchen
2013/07/11 01:11:16
if (!isMainFrame())
sounds more straightforward IM
aelias_OOO_until_Jul13
2013/07/11 03:46:17
Done.
| |
| 2401 m_clipLayer->setMasksToBounds(true); | |
| 2401 | 2402 |
| 2402 m_scrollLayer = GraphicsLayer::create(graphicsLayerFactory(), this); | 2403 m_scrollLayer = GraphicsLayer::create(graphicsLayerFactory(), this); |
| 2403 #ifndef NDEBUG | 2404 #ifndef NDEBUG |
| 2404 m_scrollLayer->setName("frame scrolling"); | 2405 m_scrollLayer->setName("frame scrolling"); |
| 2405 #endif | 2406 #endif |
| 2406 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordina tor()) | 2407 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordina tor()) |
| 2407 scrollingCoordinator->setLayerIsContainerForFixedPositionLayers(m_sc rollLayer.get(), true); | 2408 scrollingCoordinator->setLayerIsContainerForFixedPositionLayers(m_sc rollLayer.get(), true); |
| 2408 | 2409 |
| 2409 // Hook them up | 2410 // Hook them up |
| 2410 m_overflowControlsHostLayer->addChild(m_clipLayer.get()); | 2411 m_overflowControlsHostLayer->addChild(m_clipLayer.get()); |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2742 info.addMember(m_layerForScrollCorner, "layerForScrollCorner"); | 2743 info.addMember(m_layerForScrollCorner, "layerForScrollCorner"); |
| 2743 #if ENABLE(RUBBER_BANDING) | 2744 #if ENABLE(RUBBER_BANDING) |
| 2744 info.addMember(m_layerForOverhangAreas, "layerForOverhangAreas"); | 2745 info.addMember(m_layerForOverhangAreas, "layerForOverhangAreas"); |
| 2745 info.addMember(m_contentShadowLayer, "contentShadowLayer"); | 2746 info.addMember(m_contentShadowLayer, "contentShadowLayer"); |
| 2746 info.addMember(m_layerForTopOverhangArea, "layerForTopOverhangArea"); | 2747 info.addMember(m_layerForTopOverhangArea, "layerForTopOverhangArea"); |
| 2747 info.addMember(m_layerForBottomOverhangArea, "layerForBottomOverhangArea"); | 2748 info.addMember(m_layerForBottomOverhangArea, "layerForBottomOverhangArea"); |
| 2748 #endif | 2749 #endif |
| 2749 } | 2750 } |
| 2750 | 2751 |
| 2751 } // namespace WebCore | 2752 } // namespace WebCore |
| OLD | NEW |