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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 m_compositingAncestor = &layer; | 50 m_compositingAncestor = &layer; |
51 if (layer.stackingNode()->isStackingContext()) | 51 if (layer.stackingNode()->isStackingContext()) |
52 m_compositingStackingContext = &layer; | 52 m_compositingStackingContext = &layer; |
53 } | 53 } |
54 } | 54 } |
55 | 55 |
56 const PaintLayer* compositingContainer(const PaintLayer& layer) const { | 56 const PaintLayer* compositingContainer(const PaintLayer& layer) const { |
57 // TODO(chrishtr) this is not very performant for floats, but they should | 57 // TODO(chrishtr) this is not very performant for floats, but they should |
58 // be uncommon enough, and SPv2 will remove this code. | 58 // be uncommon enough, and SPv2 will remove this code. |
59 if (layer.layoutObject()->isFloating() && layer.layoutObject()->parent() && | 59 if (layer.layoutObject()->isFloating() && layer.layoutObject()->parent() && |
| 60 !layer.stackingNode()->isStacked() && |
60 !layer.layoutObject()->parent()->isLayoutBlockFlow()) { | 61 !layer.layoutObject()->parent()->isLayoutBlockFlow()) { |
61 return layer.enclosingLayerWithCompositedLayerMapping(ExcludeSelf); | 62 return layer.enclosingLayerWithCompositedLayerMapping(ExcludeSelf); |
62 } | 63 } |
63 return layer.stackingNode()->isStacked() ? m_compositingStackingContext | 64 return layer.stackingNode()->isStacked() ? m_compositingStackingContext |
64 : m_compositingAncestor; | 65 : m_compositingAncestor; |
65 } | 66 } |
66 | 67 |
67 const PaintLayer* compositingStackingContext() const { | 68 const PaintLayer* compositingStackingContext() const { |
68 return m_compositingStackingContext; | 69 return m_compositingStackingContext; |
69 } | 70 } |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 ->assertNeedsToUpdateGraphicsLayerBitsCleared(); | 130 ->assertNeedsToUpdateGraphicsLayerBitsCleared(); |
130 | 131 |
131 for (PaintLayer* child = layer.firstChild(); child; | 132 for (PaintLayer* child = layer.firstChild(); child; |
132 child = child->nextSibling()) | 133 child = child->nextSibling()) |
133 assertNeedsToUpdateGraphicsLayerBitsCleared(*child); | 134 assertNeedsToUpdateGraphicsLayerBitsCleared(*child); |
134 } | 135 } |
135 | 136 |
136 #endif | 137 #endif |
137 | 138 |
138 } // namespace blink | 139 } // namespace blink |
OLD | NEW |