| 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 448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 459 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordina
tor()) | 459 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordina
tor()) |
| 460 scrollingCoordinator->frameViewFixedObjectsDidChange(m_renderView.fr
ameView()); | 460 scrollingCoordinator->frameViewFixedObjectsDidChange(m_renderView.fr
ameView()); |
| 461 } | 461 } |
| 462 | 462 |
| 463 return compositedLayerMappingChanged || nonCompositedReasonChanged; | 463 return compositedLayerMappingChanged || nonCompositedReasonChanged; |
| 464 } | 464 } |
| 465 | 465 |
| 466 bool RenderLayerCompositor::updateLayerIfViewportConstrained(RenderLayer* layer) | 466 bool RenderLayerCompositor::updateLayerIfViewportConstrained(RenderLayer* layer) |
| 467 { | 467 { |
| 468 RenderLayer::ViewportConstrainedNotCompositedReason viewportConstrainedNotCo
mpositedReason = RenderLayer::NoNotCompositedReason; | 468 RenderLayer::ViewportConstrainedNotCompositedReason viewportConstrainedNotCo
mpositedReason = RenderLayer::NoNotCompositedReason; |
| 469 m_compositingReasonFinder.requiresCompositingForPosition(layer->renderer(),
layer, &viewportConstrainedNotCompositedReason); | 469 m_compositingReasonFinder.requiresCompositingForPositionFixed(layer->rendere
r(), layer, &viewportConstrainedNotCompositedReason); |
| 470 | 470 |
| 471 if (layer->viewportConstrainedNotCompositedReason() != viewportConstrainedNo
tCompositedReason) { | 471 if (layer->viewportConstrainedNotCompositedReason() != viewportConstrainedNo
tCompositedReason) { |
| 472 ASSERT(viewportConstrainedNotCompositedReason == RenderLayer::NoNotCompo
sitedReason || layer->renderer()->style()->position() == FixedPosition); | 472 ASSERT(viewportConstrainedNotCompositedReason == RenderLayer::NoNotCompo
sitedReason || layer->renderer()->style()->position() == FixedPosition); |
| 473 layer->setViewportConstrainedNotCompositedReason(viewportConstrainedNotC
ompositedReason); | 473 layer->setViewportConstrainedNotCompositedReason(viewportConstrainedNotC
ompositedReason); |
| 474 return true; | 474 return true; |
| 475 } | 475 } |
| 476 return false; | 476 return false; |
| 477 } | 477 } |
| 478 | 478 |
| 479 // These are temporary hacks to work around chicken-egg issues while we continue
to refactor the compositing code. | 479 // These are temporary hacks to work around chicken-egg issues while we continue
to refactor the compositing code. |
| (...skipping 778 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1258 } else if (graphicsLayer == m_scrollLayer.get()) { | 1258 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 1259 name = "LocalFrame Scrolling Layer"; | 1259 name = "LocalFrame Scrolling Layer"; |
| 1260 } else { | 1260 } else { |
| 1261 ASSERT_NOT_REACHED(); | 1261 ASSERT_NOT_REACHED(); |
| 1262 } | 1262 } |
| 1263 | 1263 |
| 1264 return name; | 1264 return name; |
| 1265 } | 1265 } |
| 1266 | 1266 |
| 1267 } // namespace WebCore | 1267 } // namespace WebCore |
| OLD | NEW |