Chromium Code Reviews| 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 * Copyright (C) 2014 Google Inc. All rights reserved. | 3 * Copyright (C) 2014 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 78 if (layer.stackingNode()->isStackingContext()) { | 78 if (layer.stackingNode()->isStackingContext()) { |
| 79 RenderLayerStackingNodeIterator iterator(*layer.stackingNode(), Negative ZOrderChildren); | 79 RenderLayerStackingNodeIterator iterator(*layer.stackingNode(), Negative ZOrderChildren); |
| 80 while (RenderLayerStackingNode* curNode = iterator.next()) | 80 while (RenderLayerStackingNode* curNode = iterator.next()) |
| 81 rebuild(*curNode->layer(), childList); | 81 rebuild(*curNode->layer(), childList); |
| 82 | 82 |
| 83 // If a negative z-order child is compositing, we get a foreground layer which needs to get parented. | 83 // If a negative z-order child is compositing, we get a foreground layer which needs to get parented. |
| 84 if (hasCompositedLayerMapping && currentCompositedLayerMapping->foregrou ndLayer()) | 84 if (hasCompositedLayerMapping && currentCompositedLayerMapping->foregrou ndLayer()) |
| 85 childList.append(currentCompositedLayerMapping->foregroundLayer()); | 85 childList.append(currentCompositedLayerMapping->foregroundLayer()); |
| 86 } | 86 } |
| 87 | 87 |
| 88 if (hasCompositedLayerMapping && currentCompositedLayerMapping->scrollingBlo ckSelectionLayer()) | |
|
Ian Vollick
2014/06/12 14:54:57
Please add a comment here explaining why this code
| |
| 89 childList.append(currentCompositedLayerMapping->scrollingBlockSelectionL ayer()); | |
|
abarth-chromium
2014/06/13 04:12:02
Note: If you have this logic here, you need to sch
hartmanng
2014/06/13 14:51:38
Turns out we can get away without this part by fix
| |
| 90 | |
| 88 RenderLayerStackingNodeIterator iterator(*layer.stackingNode(), NormalFlowCh ildren | PositiveZOrderChildren); | 91 RenderLayerStackingNodeIterator iterator(*layer.stackingNode(), NormalFlowCh ildren | PositiveZOrderChildren); |
| 89 while (RenderLayerStackingNode* curNode = iterator.next()) | 92 while (RenderLayerStackingNode* curNode = iterator.next()) |
| 90 rebuild(*curNode->layer(), childList); | 93 rebuild(*curNode->layer(), childList); |
| 91 | 94 |
| 92 if (hasCompositedLayerMapping) { | 95 if (hasCompositedLayerMapping) { |
| 93 bool parented = false; | 96 bool parented = false; |
| 94 if (layer.renderer()->isRenderPart()) | 97 if (layer.renderer()->isRenderPart()) |
| 95 parented = RenderLayerCompositor::parentFrameContentLayers(toRenderP art(layer.renderer())); | 98 parented = RenderLayerCompositor::parentFrameContentLayers(toRenderP art(layer.renderer())); |
| 96 | 99 |
| 97 if (!parented) | 100 if (!parented) |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 115 currentCompositedLayerMapping->parentForSublayers()->addChild(ov erflowControlLayer); | 118 currentCompositedLayerMapping->parentForSublayers()->addChild(ov erflowControlLayer); |
| 116 } | 119 } |
| 117 } | 120 } |
| 118 | 121 |
| 119 if (shouldAppendLayer(layer)) | 122 if (shouldAppendLayer(layer)) |
| 120 childLayersOfEnclosingLayer.append(currentCompositedLayerMapping->ch ildForSuperlayers()); | 123 childLayersOfEnclosingLayer.append(currentCompositedLayerMapping->ch ildForSuperlayers()); |
| 121 } | 124 } |
| 122 } | 125 } |
| 123 | 126 |
| 124 } | 127 } |
| OLD | NEW |