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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 if (!parented) | 101 if (!parented) |
102 currentCompositedLayerMapping->setSublayers(layerChildren); | 102 currentCompositedLayerMapping->setSublayers(layerChildren); |
103 | 103 |
104 if (shouldAppendLayer(layer)) | 104 if (shouldAppendLayer(layer)) |
105 info.childLayersOfEnclosingCompositedLayer->append(currentComposited
LayerMapping->childForSuperlayers()); | 105 info.childLayersOfEnclosingCompositedLayer->append(currentComposited
LayerMapping->childForSuperlayers()); |
106 } | 106 } |
107 | 107 |
108 if (layer.scrollParent() | 108 if (layer.scrollParent() |
109 && layer.scrollParent()->hasCompositedLayerMapping() | 109 && layer.scrollParent()->hasCompositedLayerMapping() |
110 && layer.scrollParent()->compositedLayerMapping()->needsToReparentOverfl
owControls() | 110 && layer.scrollParent()->compositedLayerMapping()->needsToReparentOverfl
owControls() |
111 && layer.scrollParent()->scrollableArea()->topmostScrollChild() == &laye
r) | 111 && layer.scrollParent()->getScrollableArea()->topmostScrollChild() == &l
ayer) |
112 info.childLayersOfEnclosingCompositedLayer->append(layer.scrollParent()-
>compositedLayerMapping()->detachLayerForOverflowControls(*info.enclosingComposi
tedLayer)); | 112 info.childLayersOfEnclosingCompositedLayer->append(layer.scrollParent()-
>compositedLayerMapping()->detachLayerForOverflowControls(*info.enclosingComposi
tedLayer)); |
113 } | 113 } |
114 | 114 |
115 } // namespace blink | 115 } // namespace blink |
OLD | NEW |