| 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 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 287 } | 287 } |
| 288 | 288 |
| 289 void CompositedLayerMapping::updateBackdropFilters(const ComputedStyle& style) { | 289 void CompositedLayerMapping::updateBackdropFilters(const ComputedStyle& style) { |
| 290 m_graphicsLayer->setBackdropFilters( | 290 m_graphicsLayer->setBackdropFilters( |
| 291 owningLayer().createCompositorFilterOperationsForBackdropFilter(style)); | 291 owningLayer().createCompositorFilterOperationsForBackdropFilter(style)); |
| 292 } | 292 } |
| 293 | 293 |
| 294 void CompositedLayerMapping::updateStickyConstraints( | 294 void CompositedLayerMapping::updateStickyConstraints( |
| 295 const ComputedStyle& style, | 295 const ComputedStyle& style, |
| 296 const PaintLayer* compositingContainer) { | 296 const PaintLayer* compositingContainer) { |
| 297 bool sticky = style.position() == EPosition::kSticky; | 297 bool sticky = style.hasStickyConstrainedPosition(); |
| 298 const PaintLayer* ancestorOverflowLayer = | 298 const PaintLayer* ancestorOverflowLayer = |
| 299 m_owningLayer.ancestorOverflowLayer(); | 299 m_owningLayer.ancestorOverflowLayer(); |
| 300 // TODO(flackr): Do we still need this? | 300 // TODO(flackr): Do we still need this? |
| 301 if (sticky) { | 301 if (sticky) { |
| 302 if (!ancestorOverflowLayer->isRootLayer()) { | 302 if (!ancestorOverflowLayer->isRootLayer()) { |
| 303 sticky = ancestorOverflowLayer->needsCompositedScrolling(); | 303 sticky = ancestorOverflowLayer->needsCompositedScrolling(); |
| 304 } else { | 304 } else { |
| 305 sticky = layoutObject().view()->frameView()->isScrollable(); | 305 sticky = layoutObject().view()->frameView()->isScrollable(); |
| 306 } | 306 } |
| 307 } | 307 } |
| (...skipping 3190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3498 } else if (graphicsLayer == m_decorationOutlineLayer.get()) { | 3498 } else if (graphicsLayer == m_decorationOutlineLayer.get()) { |
| 3499 name = "Decoration Layer"; | 3499 name = "Decoration Layer"; |
| 3500 } else { | 3500 } else { |
| 3501 ASSERT_NOT_REACHED(); | 3501 ASSERT_NOT_REACHED(); |
| 3502 } | 3502 } |
| 3503 | 3503 |
| 3504 return name; | 3504 return name; |
| 3505 } | 3505 } |
| 3506 | 3506 |
| 3507 } // namespace blink | 3507 } // namespace blink |
| OLD | NEW |