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 11 matching lines...) Expand all Loading... |
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
25 */ | 25 */ |
26 | 26 |
27 #include "core/layout/compositing/GraphicsLayerTreeBuilder.h" | 27 #include "core/layout/compositing/GraphicsLayerTreeBuilder.h" |
28 | 28 |
29 #include "core/html/HTMLMediaElement.h" | 29 #include "core/html/HTMLMediaElement.h" |
30 #include "core/html/HTMLVideoElement.h" | 30 #include "core/html/HTMLVideoElement.h" |
31 #include "core/layout/LayoutPart.h" | 31 #include "core/layout/LayoutPart.h" |
32 #include "core/layout/LayoutView.h" | |
33 #include "core/layout/compositing/CompositedLayerMapping.h" | 32 #include "core/layout/compositing/CompositedLayerMapping.h" |
34 #include "core/layout/compositing/PaintLayerCompositor.h" | 33 #include "core/layout/compositing/PaintLayerCompositor.h" |
35 #include "core/paint/PaintLayer.h" | 34 #include "core/paint/PaintLayer.h" |
36 | 35 |
37 namespace blink { | 36 namespace blink { |
38 | 37 |
39 GraphicsLayerTreeBuilder::GraphicsLayerTreeBuilder() | 38 GraphicsLayerTreeBuilder::GraphicsLayerTreeBuilder() |
40 { | 39 { |
41 } | 40 } |
42 | 41 |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 } | 105 } |
107 | 106 |
108 if (layer.scrollParent() | 107 if (layer.scrollParent() |
109 && layer.scrollParent()->hasCompositedLayerMapping() | 108 && layer.scrollParent()->hasCompositedLayerMapping() |
110 && layer.scrollParent()->compositedLayerMapping()->needsToReparentOverfl
owControls() | 109 && layer.scrollParent()->compositedLayerMapping()->needsToReparentOverfl
owControls() |
111 && layer.scrollParent()->getScrollableArea()->topmostScrollChild() == &l
ayer) | 110 && layer.scrollParent()->getScrollableArea()->topmostScrollChild() == &l
ayer) |
112 info.childLayersOfEnclosingCompositedLayer->append(layer.scrollParent()-
>compositedLayerMapping()->detachLayerForOverflowControls(*info.enclosingComposi
tedLayer)); | 111 info.childLayersOfEnclosingCompositedLayer->append(layer.scrollParent()-
>compositedLayerMapping()->detachLayerForOverflowControls(*info.enclosingComposi
tedLayer)); |
113 } | 112 } |
114 | 113 |
115 } // namespace blink | 114 } // namespace blink |
OLD | NEW |