| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010 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 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 439 } | 439 } |
| 440 break; | 440 break; |
| 441 case RemoveOwnCompositedLayerMapping: | 441 case RemoveOwnCompositedLayerMapping: |
| 442 // PutInSquashingLayer means you might have to remove the composited layer m
apping first. | 442 // PutInSquashingLayer means you might have to remove the composited layer m
apping first. |
| 443 case PutInSquashingLayer: | 443 case PutInSquashingLayer: |
| 444 if (layer->hasCompositedLayerMapping()) { | 444 if (layer->hasCompositedLayerMapping()) { |
| 445 // If we're removing the compositedLayerMapping from a reflection, c
lear the source GraphicsLayer's pointer to | 445 // If we're removing the compositedLayerMapping from a reflection, c
lear the source GraphicsLayer's pointer to |
| 446 // its replica GraphicsLayer. In practice this should never happen b
ecause reflectee and reflection | 446 // its replica GraphicsLayer. In practice this should never happen b
ecause reflectee and reflection |
| 447 // are both either composited, or not composited. | 447 // are both either composited, or not composited. |
| 448 if (layer->isReflection()) { | 448 if (layer->isReflection()) { |
| 449 Layer* sourceLayer = toLayoutLayerModelObject(layer->renderer()-
>parent())->layer(); | 449 Layer* sourceLayer = toLayoutBoxModelObject(layer->renderer()->p
arent())->layer(); |
| 450 if (sourceLayer->hasCompositedLayerMapping()) { | 450 if (sourceLayer->hasCompositedLayerMapping()) { |
| 451 ASSERT(sourceLayer->compositedLayerMapping()->mainGraphicsLa
yer()->replicaLayer() == layer->compositedLayerMapping()->mainGraphicsLayer()); | 451 ASSERT(sourceLayer->compositedLayerMapping()->mainGraphicsLa
yer()->replicaLayer() == layer->compositedLayerMapping()->mainGraphicsLayer()); |
| 452 sourceLayer->compositedLayerMapping()->mainGraphicsLayer()->
setReplicatedByLayer(0); | 452 sourceLayer->compositedLayerMapping()->mainGraphicsLayer()->
setReplicatedByLayer(0); |
| 453 } | 453 } |
| 454 } | 454 } |
| 455 | 455 |
| 456 layer->clearCompositedLayerMapping(); | 456 layer->clearCompositedLayerMapping(); |
| 457 compositedLayerMappingChanged = true; | 457 compositedLayerMappingChanged = true; |
| 458 } | 458 } |
| 459 | 459 |
| (...skipping 701 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1161 } else if (graphicsLayer == m_scrollLayer.get()) { | 1161 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 1162 name = "LocalFrame Scrolling Layer"; | 1162 name = "LocalFrame Scrolling Layer"; |
| 1163 } else { | 1163 } else { |
| 1164 ASSERT_NOT_REACHED(); | 1164 ASSERT_NOT_REACHED(); |
| 1165 } | 1165 } |
| 1166 | 1166 |
| 1167 return name; | 1167 return name; |
| 1168 } | 1168 } |
| 1169 | 1169 |
| 1170 } // namespace blink | 1170 } // namespace blink |
| OLD | NEW |