| 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 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 502 } else if (m_graphicsLayer->maskLayer() && m_graphicsLayer->maskLayer() != m
_maskLayer.get()) { | 502 } else if (m_graphicsLayer->maskLayer() && m_graphicsLayer->maskLayer() != m
_maskLayer.get()) { |
| 503 m_graphicsLayer->setMaskLayer(nullptr); | 503 m_graphicsLayer->setMaskLayer(nullptr); |
| 504 maskLayerChanged = true; | 504 maskLayerChanged = true; |
| 505 } | 505 } |
| 506 if (hasClippingLayer()) | 506 if (hasClippingLayer()) |
| 507 clippingLayer()->setMaskLayer(layerToApplyChildClippingMask == clippingL
ayer() ? m_childClippingMaskLayer.get() : nullptr); | 507 clippingLayer()->setMaskLayer(layerToApplyChildClippingMask == clippingL
ayer() ? m_childClippingMaskLayer.get() : nullptr); |
| 508 if (hasScrollingLayer()) | 508 if (hasScrollingLayer()) |
| 509 scrollingLayer()->setMaskLayer(layerToApplyChildClippingMask == scrollin
gLayer() ? m_childClippingMaskLayer.get() : nullptr); | 509 scrollingLayer()->setMaskLayer(layerToApplyChildClippingMask == scrollin
gLayer() ? m_childClippingMaskLayer.get() : nullptr); |
| 510 m_graphicsLayer->setContentsClippingMaskLayer(shouldApplyChildClippingMaskOn
Contents ? m_childClippingMaskLayer.get() : nullptr); | 510 m_graphicsLayer->setContentsClippingMaskLayer(shouldApplyChildClippingMaskOn
Contents ? m_childClippingMaskLayer.get() : nullptr); |
| 511 | 511 |
| 512 if (m_owningLayer.reflectionInfo()) { | 512 if (m_owningLayer.reflectionInfo() && !RuntimeEnabledFeatures::cssBoxReflect
FilterEnabled()) { |
| 513 if (m_owningLayer.reflectionInfo()->reflectionLayer()->hasCompositedLaye
rMapping()) { | 513 if (m_owningLayer.reflectionInfo()->reflectionLayer()->hasCompositedLaye
rMapping()) { |
| 514 GraphicsLayer* reflectionLayer = m_owningLayer.reflectionInfo()->ref
lectionLayer()->compositedLayerMapping()->mainGraphicsLayer(); | 514 GraphicsLayer* reflectionLayer = m_owningLayer.reflectionInfo()->ref
lectionLayer()->compositedLayerMapping()->mainGraphicsLayer(); |
| 515 m_graphicsLayer->setReplicatedByLayer(reflectionLayer); | 515 m_graphicsLayer->setReplicatedByLayer(reflectionLayer); |
| 516 } | 516 } |
| 517 } else { | 517 } else { |
| 518 m_graphicsLayer->setReplicatedByLayer(nullptr); | 518 m_graphicsLayer->setReplicatedByLayer(nullptr); |
| 519 } | 519 } |
| 520 | 520 |
| 521 updateBackgroundColor(); | 521 updateBackgroundColor(); |
| 522 | 522 |
| (...skipping 2021 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2544 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 2544 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { |
| 2545 name = "Scrolling Contents Layer"; | 2545 name = "Scrolling Contents Layer"; |
| 2546 } else { | 2546 } else { |
| 2547 ASSERT_NOT_REACHED(); | 2547 ASSERT_NOT_REACHED(); |
| 2548 } | 2548 } |
| 2549 | 2549 |
| 2550 return name; | 2550 return name; |
| 2551 } | 2551 } |
| 2552 | 2552 |
| 2553 } // namespace blink | 2553 } // namespace blink |
| OLD | NEW |