| 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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 | 159 |
| 160 PassOwnPtr<GraphicsLayer> CompositedLayerMapping::createGraphicsLayer(Compositin
gReasons reasons) | 160 PassOwnPtr<GraphicsLayer> CompositedLayerMapping::createGraphicsLayer(Compositin
gReasons reasons) |
| 161 { | 161 { |
| 162 GraphicsLayerFactory* graphicsLayerFactory = 0; | 162 GraphicsLayerFactory* graphicsLayerFactory = 0; |
| 163 if (Page* page = renderer()->frame()->page()) | 163 if (Page* page = renderer()->frame()->page()) |
| 164 graphicsLayerFactory = page->chrome().client().graphicsLayerFactory(); | 164 graphicsLayerFactory = page->chrome().client().graphicsLayerFactory(); |
| 165 | 165 |
| 166 OwnPtr<GraphicsLayer> graphicsLayer = GraphicsLayer::create(graphicsLayerFac
tory, this); | 166 OwnPtr<GraphicsLayer> graphicsLayer = GraphicsLayer::create(graphicsLayerFac
tory, this); |
| 167 | 167 |
| 168 graphicsLayer->setCompositingReasons(reasons); | 168 graphicsLayer->setCompositingReasons(reasons); |
| 169 if (Node* owningNode = m_owningLayer.renderer()->generatingNode()) | 169 if (Node* owningNode = m_owningLayer.renderer()->node()) |
| 170 graphicsLayer->setOwnerNodeId(InspectorNodeIds::idForNode(owningNode)); | 170 graphicsLayer->setOwnerNodeId(InspectorNodeIds::idForNode(owningNode)); |
| 171 | 171 |
| 172 return graphicsLayer.release(); | 172 return graphicsLayer.release(); |
| 173 } | 173 } |
| 174 | 174 |
| 175 void CompositedLayerMapping::createPrimaryGraphicsLayer() | 175 void CompositedLayerMapping::createPrimaryGraphicsLayer() |
| 176 { | 176 { |
| 177 m_graphicsLayer = createGraphicsLayer(m_owningLayer.compositingReasons()); | 177 m_graphicsLayer = createGraphicsLayer(m_owningLayer.compositingReasons()); |
| 178 | 178 |
| 179 updateOpacity(renderer()->style()); | 179 updateOpacity(renderer()->style()); |
| (...skipping 1614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1794 } else if (graphicsLayer == m_overflowControlsClippingLayer.get()) { | 1794 } else if (graphicsLayer == m_overflowControlsClippingLayer.get()) { |
| 1795 name = "Overflow Controls ClipLayer Layer"; | 1795 name = "Overflow Controls ClipLayer Layer"; |
| 1796 } else { | 1796 } else { |
| 1797 ASSERT_NOT_REACHED(); | 1797 ASSERT_NOT_REACHED(); |
| 1798 } | 1798 } |
| 1799 | 1799 |
| 1800 return name; | 1800 return name; |
| 1801 } | 1801 } |
| 1802 | 1802 |
| 1803 } // namespace blink | 1803 } // namespace blink |
| OLD | NEW |