| 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 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 } | 282 } |
| 283 | 283 |
| 284 void CompositedLayerMapping::UpdateBackdropFilters(const ComputedStyle& style) { | 284 void CompositedLayerMapping::UpdateBackdropFilters(const ComputedStyle& style) { |
| 285 graphics_layer_->SetBackdropFilters( | 285 graphics_layer_->SetBackdropFilters( |
| 286 OwningLayer().CreateCompositorFilterOperationsForBackdropFilter(style)); | 286 OwningLayer().CreateCompositorFilterOperationsForBackdropFilter(style)); |
| 287 } | 287 } |
| 288 | 288 |
| 289 void CompositedLayerMapping::UpdateStickyConstraints( | 289 void CompositedLayerMapping::UpdateStickyConstraints( |
| 290 const ComputedStyle& style, | 290 const ComputedStyle& style, |
| 291 const PaintLayer* compositing_container) { | 291 const PaintLayer* compositing_container) { |
| 292 bool sticky = style.HasStickyConstrainedPosition(); | 292 bool sticky = style.GetPosition() == EPosition::kSticky; |
| 293 const PaintLayer* ancestor_overflow_layer = | 293 const PaintLayer* ancestor_overflow_layer = |
| 294 owning_layer_.AncestorOverflowLayer(); | 294 owning_layer_.AncestorOverflowLayer(); |
| 295 // TODO(flackr): Do we still need this? | 295 // TODO(flackr): Do we still need this? |
| 296 if (sticky) { | 296 if (sticky) { |
| 297 if (!ancestor_overflow_layer->IsRootLayer()) { | 297 if (!ancestor_overflow_layer->IsRootLayer()) { |
| 298 sticky = ancestor_overflow_layer->NeedsCompositedScrolling(); | 298 sticky = ancestor_overflow_layer->NeedsCompositedScrolling(); |
| 299 } else { | 299 } else { |
| 300 sticky = GetLayoutObject().View()->GetFrameView()->IsScrollable(); | 300 sticky = GetLayoutObject().View()->GetFrameView()->IsScrollable(); |
| 301 } | 301 } |
| 302 } | 302 } |
| (...skipping 3305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3608 } else if (graphics_layer == decoration_outline_layer_.get()) { | 3608 } else if (graphics_layer == decoration_outline_layer_.get()) { |
| 3609 name = "Decoration Layer"; | 3609 name = "Decoration Layer"; |
| 3610 } else { | 3610 } else { |
| 3611 NOTREACHED(); | 3611 NOTREACHED(); |
| 3612 } | 3612 } |
| 3613 | 3613 |
| 3614 return name; | 3614 return name; |
| 3615 } | 3615 } |
| 3616 | 3616 |
| 3617 } // namespace blink | 3617 } // namespace blink |
| OLD | NEW |