| 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 456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 467 | 467 |
| 468 return compositedLayerMappingChanged; | 468 return compositedLayerMappingChanged; |
| 469 } | 469 } |
| 470 | 470 |
| 471 void RenderLayerCompositor::paintInvalidationOnCompositingChange(RenderLayer* la
yer) | 471 void RenderLayerCompositor::paintInvalidationOnCompositingChange(RenderLayer* la
yer) |
| 472 { | 472 { |
| 473 // If the renderer is not attached yet, no need to issue paint invalidations
. | 473 // If the renderer is not attached yet, no need to issue paint invalidations
. |
| 474 if (layer->renderer() != &m_renderView && !layer->renderer()->parent()) | 474 if (layer->renderer() != &m_renderView && !layer->renderer()->parent()) |
| 475 return; | 475 return; |
| 476 | 476 |
| 477 // For querying RenderLayer::compositingState() | |
| 478 // Eager invalidation here is correct, since we are invalidating with respec
t to the previous frame's | |
| 479 // compositing state when changing the compositing backing of the layer. | |
| 480 DisableCompositingQueryAsserts disabler; | |
| 481 | |
| 482 layer->paintInvalidator().paintInvalidationIncludingNonCompositingDescendant
s(); | 477 layer->paintInvalidator().paintInvalidationIncludingNonCompositingDescendant
s(); |
| 483 } | 478 } |
| 484 | 479 |
| 485 void RenderLayerCompositor::frameViewDidChangeLocation(const IntPoint& contentsO
ffset) | 480 void RenderLayerCompositor::frameViewDidChangeLocation(const IntPoint& contentsO
ffset) |
| 486 { | 481 { |
| 487 if (m_overflowControlsHostLayer) | 482 if (m_overflowControlsHostLayer) |
| 488 m_overflowControlsHostLayer->setPosition(contentsOffset); | 483 m_overflowControlsHostLayer->setPosition(contentsOffset); |
| 489 } | 484 } |
| 490 | 485 |
| 491 void RenderLayerCompositor::frameViewDidChangeSize() | 486 void RenderLayerCompositor::frameViewDidChangeSize() |
| (...skipping 677 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1169 } else if (graphicsLayer == m_scrollLayer.get()) { | 1164 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 1170 name = "LocalFrame Scrolling Layer"; | 1165 name = "LocalFrame Scrolling Layer"; |
| 1171 } else { | 1166 } else { |
| 1172 ASSERT_NOT_REACHED(); | 1167 ASSERT_NOT_REACHED(); |
| 1173 } | 1168 } |
| 1174 | 1169 |
| 1175 return name; | 1170 return name; |
| 1176 } | 1171 } |
| 1177 | 1172 |
| 1178 } // namespace blink | 1173 } // namespace blink |
| OLD | NEW |