| 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 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 421 } | 421 } |
| 422 } | 422 } |
| 423 | 423 |
| 424 void CompositedLayerMapping::updateCompositingReasons() | 424 void CompositedLayerMapping::updateCompositingReasons() |
| 425 { | 425 { |
| 426 // All other layers owned by this mapping will have the same compositing rea
son | 426 // All other layers owned by this mapping will have the same compositing rea
son |
| 427 // for their lifetime, so they are initialized only when created. | 427 // for their lifetime, so they are initialized only when created. |
| 428 m_graphicsLayer->setCompositingReasons(m_owningLayer.compositingReasons()); | 428 m_graphicsLayer->setCompositingReasons(m_owningLayer.compositingReasons()); |
| 429 } | 429 } |
| 430 | 430 |
| 431 void CompositedLayerMapping::updateAfterLayout(bool needsFullRepaint, bool isUpd
ateRoot) | |
| 432 { | |
| 433 if (needsFullRepaint && !paintsIntoCompositedAncestor()) | |
| 434 setContentsNeedDisplay(); | |
| 435 } | |
| 436 | |
| 437 bool CompositedLayerMapping::updateGraphicsLayerConfiguration(GraphicsLayerUpdat
er::UpdateType updateType) | 431 bool CompositedLayerMapping::updateGraphicsLayerConfiguration(GraphicsLayerUpdat
er::UpdateType updateType) |
| 438 { | 432 { |
| 439 if (!shouldUpdateGraphicsLayer(updateType)) | 433 if (!shouldUpdateGraphicsLayer(updateType)) |
| 440 return false; | 434 return false; |
| 441 | 435 |
| 442 RenderLayerCompositor* compositor = this->compositor(); | 436 RenderLayerCompositor* compositor = this->compositor(); |
| 443 RenderObject* renderer = this->renderer(); | 437 RenderObject* renderer = this->renderer(); |
| 444 | 438 |
| 445 m_owningLayer.updateDescendantDependentFlags(); | 439 m_owningLayer.updateDescendantDependentFlags(); |
| 446 m_owningLayer.stackingNode()->updateZOrderLists(); | 440 m_owningLayer.stackingNode()->updateZOrderLists(); |
| (...skipping 1711 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2158 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 2152 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { |
| 2159 name = "Scrolling Contents Layer"; | 2153 name = "Scrolling Contents Layer"; |
| 2160 } else { | 2154 } else { |
| 2161 ASSERT_NOT_REACHED(); | 2155 ASSERT_NOT_REACHED(); |
| 2162 } | 2156 } |
| 2163 | 2157 |
| 2164 return name; | 2158 return name; |
| 2165 } | 2159 } |
| 2166 | 2160 |
| 2167 } // namespace WebCore | 2161 } // namespace WebCore |
| OLD | NEW |