| 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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 overflowControlLayer->removeFromParent(); | 119 overflowControlLayer->removeFromParent(); |
| 120 currentCompositedLayerMapping->parentForSublayers()->addChild(ov
erflowControlLayer); | 120 currentCompositedLayerMapping->parentForSublayers()->addChild(ov
erflowControlLayer); |
| 121 } | 121 } |
| 122 } | 122 } |
| 123 | 123 |
| 124 if (shouldAppendLayer(layer)) | 124 if (shouldAppendLayer(layer)) |
| 125 info.childLayersOfEnclosingCompositedLayer->append(currentComposited
LayerMapping->childForSuperlayers()); | 125 info.childLayersOfEnclosingCompositedLayer->append(currentComposited
LayerMapping->childForSuperlayers()); |
| 126 } | 126 } |
| 127 | 127 |
| 128 if (layer.scrollParent() | 128 if (layer.scrollParent() |
| 129 && layer.scrollParent()->hasCompositedLayerMapping() | 129 && layer.scrollParent()->needsToReparentOverflowControls() |
| 130 && layer.scrollParent()->scrollableArea()->hasOverlayScrollbars() | |
| 131 && layer.scrollParent()->scrollableArea()->topmostScrollChild() == &laye
r) | 130 && layer.scrollParent()->scrollableArea()->topmostScrollChild() == &laye
r) |
| 132 info.childLayersOfEnclosingCompositedLayer->append(layer.scrollParent()-
>compositedLayerMapping()->detachLayerForOverflowControls(*info.enclosingComposi
tedLayer)); | 131 info.childLayersOfEnclosingCompositedLayer->append(layer.scrollParent()-
>compositedLayerMapping()->detachLayerForOverflowControls(*info.enclosingComposi
tedLayer)); |
| 133 } | 132 } |
| 134 | 133 |
| 135 } | 134 } |
| OLD | NEW |