| 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 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 300 if (!ancestorOverflowLayer->isRootLayer()) { | 300 if (!ancestorOverflowLayer->isRootLayer()) { |
| 301 sticky = ancestorOverflowLayer->needsCompositedScrolling(); | 301 sticky = ancestorOverflowLayer->needsCompositedScrolling(); |
| 302 } else { | 302 } else { |
| 303 sticky = layoutObject().view()->frameView()->isScrollable(); | 303 sticky = layoutObject().view()->frameView()->isScrollable(); |
| 304 } | 304 } |
| 305 } | 305 } |
| 306 | 306 |
| 307 WebLayerStickyPositionConstraint webConstraint; | 307 WebLayerStickyPositionConstraint webConstraint; |
| 308 if (sticky) { | 308 if (sticky) { |
| 309 const StickyPositionScrollingConstraints& constraints = | 309 const StickyPositionScrollingConstraints& constraints = |
| 310 ancestorOverflowLayer->getScrollableArea()->stickyConstraintsMap().get( | 310 ancestorOverflowLayer->getScrollableArea()->stickyConstraintsMap().at( |
| 311 &m_owningLayer); | 311 &m_owningLayer); |
| 312 | 312 |
| 313 // Find the layout offset of the unshifted sticky box within its enclosing | 313 // Find the layout offset of the unshifted sticky box within its enclosing |
| 314 // layer. | 314 // layer. |
| 315 LayoutPoint enclosingLayerOffset; | 315 LayoutPoint enclosingLayerOffset; |
| 316 m_owningLayer.enclosingLayerWithCompositedLayerMapping(ExcludeSelf) | 316 m_owningLayer.enclosingLayerWithCompositedLayerMapping(ExcludeSelf) |
| 317 ->convertToLayerCoords(m_owningLayer.ancestorOverflowLayer(), | 317 ->convertToLayerCoords(m_owningLayer.ancestorOverflowLayer(), |
| 318 enclosingLayerOffset); | 318 enclosingLayerOffset); |
| 319 FloatPoint stickyBoxOffset = | 319 FloatPoint stickyBoxOffset = |
| 320 constraints.scrollContainerRelativeStickyBoxRect().location(); | 320 constraints.scrollContainerRelativeStickyBoxRect().location(); |
| (...skipping 3159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3480 } else if (graphicsLayer == m_decorationOutlineLayer.get()) { | 3480 } else if (graphicsLayer == m_decorationOutlineLayer.get()) { |
| 3481 name = "Decoration Layer"; | 3481 name = "Decoration Layer"; |
| 3482 } else { | 3482 } else { |
| 3483 ASSERT_NOT_REACHED(); | 3483 ASSERT_NOT_REACHED(); |
| 3484 } | 3484 } |
| 3485 | 3485 |
| 3486 return name; | 3486 return name; |
| 3487 } | 3487 } |
| 3488 | 3488 |
| 3489 } // namespace blink | 3489 } // namespace blink |
| OLD | NEW |