| 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 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 webConstraint.leftOffset = constraints.leftOffset(); | 338 webConstraint.leftOffset = constraints.leftOffset(); |
| 339 webConstraint.rightOffset = constraints.rightOffset(); | 339 webConstraint.rightOffset = constraints.rightOffset(); |
| 340 webConstraint.topOffset = constraints.topOffset(); | 340 webConstraint.topOffset = constraints.topOffset(); |
| 341 webConstraint.bottomOffset = constraints.bottomOffset(); | 341 webConstraint.bottomOffset = constraints.bottomOffset(); |
| 342 webConstraint.parentRelativeStickyBoxOffset = | 342 webConstraint.parentRelativeStickyBoxOffset = |
| 343 roundedIntPoint(stickyBoxOffset); | 343 roundedIntPoint(stickyBoxOffset); |
| 344 webConstraint.scrollContainerRelativeStickyBoxRect = | 344 webConstraint.scrollContainerRelativeStickyBoxRect = |
| 345 enclosingIntRect(constraints.scrollContainerRelativeStickyBoxRect()); | 345 enclosingIntRect(constraints.scrollContainerRelativeStickyBoxRect()); |
| 346 webConstraint.scrollContainerRelativeContainingBlockRect = enclosingIntRect( | 346 webConstraint.scrollContainerRelativeContainingBlockRect = enclosingIntRect( |
| 347 constraints.scrollContainerRelativeContainingBlockRect()); | 347 constraints.scrollContainerRelativeContainingBlockRect()); |
| 348 // TODO(smcgruer): Copy fields for nested sticky in cc (crbug.com/672710) |
| 348 } | 349 } |
| 349 | 350 |
| 350 m_graphicsLayer->setStickyPositionConstraint(webConstraint); | 351 m_graphicsLayer->setStickyPositionConstraint(webConstraint); |
| 351 } | 352 } |
| 352 | 353 |
| 353 void CompositedLayerMapping::updateLayerBlendMode(const ComputedStyle& style) { | 354 void CompositedLayerMapping::updateLayerBlendMode(const ComputedStyle& style) { |
| 354 setBlendMode(style.blendMode()); | 355 setBlendMode(style.blendMode()); |
| 355 } | 356 } |
| 356 | 357 |
| 357 void CompositedLayerMapping::updateIsRootForIsolatedGroup() { | 358 void CompositedLayerMapping::updateIsRootForIsolatedGroup() { |
| (...skipping 3122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3480 } else if (graphicsLayer == m_decorationOutlineLayer.get()) { | 3481 } else if (graphicsLayer == m_decorationOutlineLayer.get()) { |
| 3481 name = "Decoration Layer"; | 3482 name = "Decoration Layer"; |
| 3482 } else { | 3483 } else { |
| 3483 ASSERT_NOT_REACHED(); | 3484 ASSERT_NOT_REACHED(); |
| 3484 } | 3485 } |
| 3485 | 3486 |
| 3486 return name; | 3487 return name; |
| 3487 } | 3488 } |
| 3488 | 3489 |
| 3489 } // namespace blink | 3490 } // namespace blink |
| OLD | NEW |