| 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 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 484 // by checking for a parent. | 484 // by checking for a parent. |
| 485 if (layer->parent()) | 485 if (layer->parent()) |
| 486 layer->repainter().computeRepaintRectsIncludingNonCompositingDes
cendants(); | 486 layer->repainter().computeRepaintRectsIncludingNonCompositingDes
cendants(); |
| 487 repaintOnCompositingChange(layer); | 487 repaintOnCompositingChange(layer); |
| 488 } | 488 } |
| 489 } | 489 } |
| 490 } | 490 } |
| 491 | 491 |
| 492 void RenderLayerCompositor::updateLayerCompositingState(RenderLayer* layer, Upda
teLayerCompositingStateOptions options) | 492 void RenderLayerCompositor::updateLayerCompositingState(RenderLayer* layer, Upda
teLayerCompositingStateOptions options) |
| 493 { | 493 { |
| 494 updateDirectCompositingReasons(layer); | 494 layer->setCompositingReasons(layer->styleDeterminedCompositingReasons(), Com
positingReasonComboAllStyleDeterminedReasons); |
| 495 CompositingStateTransitionType compositedLayerUpdate = CompositingLayerAssig
ner(this).computeCompositedLayerUpdate(layer); | 495 CompositingStateTransitionType compositedLayerUpdate = CompositingLayerAssig
ner(this).computeCompositedLayerUpdate(layer); |
| 496 | 496 |
| 497 if (compositedLayerUpdate != NoCompositingStateChange) | 497 if (compositedLayerUpdate != NoCompositingStateChange) |
| 498 setNeedsCompositingUpdate(CompositingUpdateRebuildTree); | 498 setNeedsCompositingUpdate(CompositingUpdateRebuildTree); |
| 499 | 499 |
| 500 if (options == UseChickenEggHacks) | 500 if (options == UseChickenEggHacks) |
| 501 applyUpdateLayerCompositingStateChickenEggHacks(layer, compositedLayerUp
date); | 501 applyUpdateLayerCompositingStateChickenEggHacks(layer, compositedLayerUp
date); |
| 502 } | 502 } |
| 503 | 503 |
| 504 void RenderLayerCompositor::repaintOnCompositingChange(RenderLayer* layer) | 504 void RenderLayerCompositor::repaintOnCompositingChange(RenderLayer* layer) |
| (...skipping 745 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1250 } else if (graphicsLayer == m_scrollLayer.get()) { | 1250 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 1251 name = "LocalFrame Scrolling Layer"; | 1251 name = "LocalFrame Scrolling Layer"; |
| 1252 } else { | 1252 } else { |
| 1253 ASSERT_NOT_REACHED(); | 1253 ASSERT_NOT_REACHED(); |
| 1254 } | 1254 } |
| 1255 | 1255 |
| 1256 return name; | 1256 return name; |
| 1257 } | 1257 } |
| 1258 | 1258 |
| 1259 } // namespace WebCore | 1259 } // namespace WebCore |
| OLD | NEW |