| 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 if (!currentCompositedLayerMapping->hasClippingLayer() && !currentCompos
itedLayerMapping->hasScrollingLayer()) { | 89 if (!currentCompositedLayerMapping->hasClippingLayer() && !currentCompos
itedLayerMapping->hasScrollingLayer()) { |
| 90 if (GraphicsLayer* overflowControlLayer = currentCompositedLayerMapp
ing->layerForHorizontalScrollbar()) { | 90 if (GraphicsLayer* overflowControlLayer = currentCompositedLayerMapp
ing->layerForHorizontalScrollbar()) { |
| 91 overflowControlLayer->removeFromParent(); | 91 overflowControlLayer->removeFromParent(); |
| 92 currentCompositedLayerMapping->parentForSublayers()->addChild(ov
erflowControlLayer); | 92 currentCompositedLayerMapping->parentForSublayers()->addChild(ov
erflowControlLayer); |
| 93 } | 93 } |
| 94 | 94 |
| 95 if (GraphicsLayer* overflowControlLayer = currentCompositedLayerMapp
ing->layerForVerticalScrollbar()) { | 95 if (GraphicsLayer* overflowControlLayer = currentCompositedLayerMapp
ing->layerForVerticalScrollbar()) { |
| 96 overflowControlLayer->removeFromParent(); | 96 overflowControlLayer->removeFromParent(); |
| 97 currentCompositedLayerMapping->parentForSublayers()->addChild(ov
erflowControlLayer); | 97 currentCompositedLayerMapping->parentForSublayers()->addChild(ov
erflowControlLayer); |
| 98 } | 98 } |
| 99 | |
| 100 if (GraphicsLayer* overflowControlLayer = currentCompositedLayerMapp
ing->layerForScrollCorner()) { | |
| 101 overflowControlLayer->removeFromParent(); | |
| 102 currentCompositedLayerMapping->parentForSublayers()->addChild(ov
erflowControlLayer); | |
| 103 } | |
| 104 } | 99 } |
| 105 | 100 |
| 106 info.childLayersOfEnclosingCompositedLayer->append(currentCompositedLaye
rMapping->childForSuperlayers()); | 101 info.childLayersOfEnclosingCompositedLayer->append(currentCompositedLaye
rMapping->childForSuperlayers()); |
| 107 } | 102 } |
| 108 | 103 |
| 109 if (layer.scrollParent() | 104 if (layer.scrollParent() |
| 110 && layer.scrollParent()->hasCompositedLayerMapping() | 105 && layer.scrollParent()->hasCompositedLayerMapping() |
| 111 && layer.scrollParent()->compositedLayerMapping()->needsToReparentOverfl
owControls() | 106 && layer.scrollParent()->compositedLayerMapping()->needsToReparentOverfl
owControls() |
| 112 && layer.scrollParent()->scrollableArea()->topmostScrollChild() == &laye
r) | 107 && layer.scrollParent()->scrollableArea()->topmostScrollChild() == &laye
r) |
| 113 info.childLayersOfEnclosingCompositedLayer->append(layer.scrollParent()-
>compositedLayerMapping()->detachLayerForOverflowControls(*info.enclosingComposi
tedLayer)); | 108 info.childLayersOfEnclosingCompositedLayer->append(layer.scrollParent()-
>compositedLayerMapping()->detachLayerForOverflowControls(*info.enclosingComposi
tedLayer)); |
| 114 } | 109 } |
| 115 | 110 |
| 116 } | 111 } |
| OLD | NEW |