| 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 496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 507 | 507 |
| 508 if (layer->viewportConstrainedNotCompositedReason() != viewportConstrainedNo
tCompositedReason) { | 508 if (layer->viewportConstrainedNotCompositedReason() != viewportConstrainedNo
tCompositedReason) { |
| 509 ASSERT(viewportConstrainedNotCompositedReason == RenderLayer::NoNotCompo
sitedReason || layer->renderer()->style()->position() == FixedPosition); | 509 ASSERT(viewportConstrainedNotCompositedReason == RenderLayer::NoNotCompo
sitedReason || layer->renderer()->style()->position() == FixedPosition); |
| 510 layer->setViewportConstrainedNotCompositedReason(viewportConstrainedNotC
ompositedReason); | 510 layer->setViewportConstrainedNotCompositedReason(viewportConstrainedNotC
ompositedReason); |
| 511 return true; | 511 return true; |
| 512 } | 512 } |
| 513 return false; | 513 return false; |
| 514 } | 514 } |
| 515 | 515 |
| 516 // These are temporary hacks to work around chicken-egg issues while we continue
to refactor the compositing code. | 516 // These are temporary hacks to work around chicken-egg issues while we continue
to refactor the compositing code. |
| 517 // See crbug.com/339892 for a list of tests that fail if this method is removed. | 517 // See crbug.com/383191 for a list of tests that fail if this method is removed. |
| 518 void RenderLayerCompositor::applyUpdateLayerCompositingStateChickenEggHacks(Rend
erLayer* layer, CompositingStateTransitionType compositedLayerUpdate) | 518 void RenderLayerCompositor::applyUpdateLayerCompositingStateChickenEggHacks(Rend
erLayer* layer, CompositingStateTransitionType compositedLayerUpdate) |
| 519 { | 519 { |
| 520 if (compositedLayerUpdate != NoCompositingStateChange) | 520 if (compositedLayerUpdate != NoCompositingStateChange) |
| 521 allocateOrClearCompositedLayerMapping(layer, compositedLayerUpdate); | 521 allocateOrClearCompositedLayerMapping(layer, compositedLayerUpdate); |
| 522 } | 522 } |
| 523 | 523 |
| 524 void RenderLayerCompositor::updateLayerCompositingState(RenderLayer* layer, Upda
teLayerCompositingStateOptions options) | 524 void RenderLayerCompositor::updateLayerCompositingState(RenderLayer* layer, Upda
teLayerCompositingStateOptions options) |
| 525 { | 525 { |
| 526 updateDirectCompositingReasons(layer); | 526 updateDirectCompositingReasons(layer); |
| 527 CompositingStateTransitionType compositedLayerUpdate = CompositingLayerAssig
ner(this).computeCompositedLayerUpdate(layer); | 527 CompositingStateTransitionType compositedLayerUpdate = CompositingLayerAssig
ner(this).computeCompositedLayerUpdate(layer); |
| (...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1315 } else if (graphicsLayer == m_scrollLayer.get()) { | 1315 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 1316 name = "LocalFrame Scrolling Layer"; | 1316 name = "LocalFrame Scrolling Layer"; |
| 1317 } else { | 1317 } else { |
| 1318 ASSERT_NOT_REACHED(); | 1318 ASSERT_NOT_REACHED(); |
| 1319 } | 1319 } |
| 1320 | 1320 |
| 1321 return name; | 1321 return name; |
| 1322 } | 1322 } |
| 1323 | 1323 |
| 1324 } // namespace WebCore | 1324 } // namespace WebCore |
| OLD | NEW |