| 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 592 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 603 bool RenderLayerCompositor::parentFrameContentLayers(RenderPart* renderer) | 603 bool RenderLayerCompositor::parentFrameContentLayers(RenderPart* renderer) |
| 604 { | 604 { |
| 605 RenderLayerCompositor* innerCompositor = frameContentsCompositor(renderer); | 605 RenderLayerCompositor* innerCompositor = frameContentsCompositor(renderer); |
| 606 if (!innerCompositor || !innerCompositor->staleInCompositingMode() || innerC
ompositor->rootLayerAttachment() != RootLayerAttachedViaEnclosingFrame) | 606 if (!innerCompositor || !innerCompositor->staleInCompositingMode() || innerC
ompositor->rootLayerAttachment() != RootLayerAttachedViaEnclosingFrame) |
| 607 return false; | 607 return false; |
| 608 | 608 |
| 609 RenderLayer* layer = renderer->layer(); | 609 RenderLayer* layer = renderer->layer(); |
| 610 if (!layer->hasCompositedLayerMapping()) | 610 if (!layer->hasCompositedLayerMapping()) |
| 611 return false; | 611 return false; |
| 612 | 612 |
| 613 CompositedLayerMappingPtr compositedLayerMapping = layer->compositedLayerMap
ping(); | 613 CompositedLayerMapping* compositedLayerMapping = layer->compositedLayerMappi
ng(); |
| 614 GraphicsLayer* hostingLayer = compositedLayerMapping->parentForSublayers(); | 614 GraphicsLayer* hostingLayer = compositedLayerMapping->parentForSublayers(); |
| 615 GraphicsLayer* rootLayer = innerCompositor->rootGraphicsLayer(); | 615 GraphicsLayer* rootLayer = innerCompositor->rootGraphicsLayer(); |
| 616 if (hostingLayer->children().size() != 1 || hostingLayer->children()[0] != r
ootLayer) { | 616 if (hostingLayer->children().size() != 1 || hostingLayer->children()[0] != r
ootLayer) { |
| 617 hostingLayer->removeAllChildren(); | 617 hostingLayer->removeAllChildren(); |
| 618 hostingLayer->addChild(rootLayer); | 618 hostingLayer->addChild(rootLayer); |
| 619 } | 619 } |
| 620 return true; | 620 return true; |
| 621 } | 621 } |
| 622 | 622 |
| 623 static void fullyInvalidatePaintRecursive(RenderLayer* layer) | 623 static void fullyInvalidatePaintRecursive(RenderLayer* layer) |
| (...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1162 } else if (graphicsLayer == m_scrollLayer.get()) { | 1162 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 1163 name = "LocalFrame Scrolling Layer"; | 1163 name = "LocalFrame Scrolling Layer"; |
| 1164 } else { | 1164 } else { |
| 1165 ASSERT_NOT_REACHED(); | 1165 ASSERT_NOT_REACHED(); |
| 1166 } | 1166 } |
| 1167 | 1167 |
| 1168 return name; | 1168 return name; |
| 1169 } | 1169 } |
| 1170 | 1170 |
| 1171 } // namespace blink | 1171 } // namespace blink |
| OLD | NEW |