| 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 10 matching lines...) Expand all Loading... |
| 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 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/GraphicsLayerUpdater.h" | 27 #include "core/layout/compositing/GraphicsLayerUpdater.h" |
| 28 | 28 |
| 29 #include "core/html/HTMLMediaElement.h" | 29 #include "core/html/HTMLMediaElement.h" |
| 30 #include "core/inspector/InspectorTraceEvents.h" | 30 #include "core/inspector/InspectorTraceEvents.h" |
| 31 #include "core/layout/LayoutBlock.h" |
| 31 #include "core/layout/compositing/CompositedLayerMapping.h" | 32 #include "core/layout/compositing/CompositedLayerMapping.h" |
| 32 #include "core/layout/compositing/PaintLayerCompositor.h" | 33 #include "core/layout/compositing/PaintLayerCompositor.h" |
| 33 #include "core/paint/PaintLayer.h" | 34 #include "core/paint/PaintLayer.h" |
| 34 #include "platform/instrumentation/tracing/TraceEvent.h" | 35 #include "platform/instrumentation/tracing/TraceEvent.h" |
| 35 | 36 |
| 36 namespace blink { | 37 namespace blink { |
| 37 | 38 |
| 38 class GraphicsLayerUpdater::UpdateContext { | 39 class GraphicsLayerUpdater::UpdateContext { |
| 39 public: | 40 public: |
| 40 UpdateContext() | 41 UpdateContext() |
| 41 : m_compositingStackingContext(nullptr), m_compositingAncestor(nullptr) {} | 42 : m_compositingStackingContext(nullptr), m_compositingAncestor(nullptr) {} |
| 42 | 43 |
| 43 UpdateContext(const UpdateContext& other, const PaintLayer& layer) | 44 UpdateContext(const UpdateContext& other, const PaintLayer& layer) |
| 44 : m_compositingStackingContext(other.m_compositingStackingContext), | 45 : m_compositingStackingContext(other.m_compositingStackingContext), |
| 45 m_compositingAncestor(other.compositingContainer(layer)) { | 46 m_compositingAncestor(other.compositingContainer(layer)) { |
| 46 CompositingState compositingState = layer.compositingState(); | 47 CompositingState compositingState = layer.compositingState(); |
| 47 if (compositingState != NotComposited && | 48 if (compositingState != NotComposited && |
| 48 compositingState != PaintsIntoGroupedBacking) { | 49 compositingState != PaintsIntoGroupedBacking) { |
| 49 m_compositingAncestor = &layer; | 50 m_compositingAncestor = &layer; |
| 50 if (layer.stackingNode()->isStackingContext()) | 51 if (layer.stackingNode()->isStackingContext()) |
| 51 m_compositingStackingContext = &layer; | 52 m_compositingStackingContext = &layer; |
| 52 } | 53 } |
| 53 } | 54 } |
| 54 | 55 |
| 55 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 |
| 58 // be uncommon enough, and SPv2 will remove this code. |
| 59 if (layer.layoutObject()->isFloating() && layer.layoutObject()->parent() && |
| 60 !layer.layoutObject()->parent()->isLayoutBlockFlow()) |
| 61 return layer.layoutObject()->containingBlock()->enclosingLayer(); |
| 56 return layer.stackingNode()->isStacked() ? m_compositingStackingContext | 62 return layer.stackingNode()->isStacked() ? m_compositingStackingContext |
| 57 : m_compositingAncestor; | 63 : m_compositingAncestor; |
| 58 } | 64 } |
| 59 | 65 |
| 60 const PaintLayer* compositingStackingContext() const { | 66 const PaintLayer* compositingStackingContext() const { |
| 61 return m_compositingStackingContext; | 67 return m_compositingStackingContext; |
| 62 } | 68 } |
| 63 | 69 |
| 64 private: | 70 private: |
| 65 const PaintLayer* m_compositingStackingContext; | 71 const PaintLayer* m_compositingStackingContext; |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 ->assertNeedsToUpdateGraphicsLayerBitsCleared(); | 128 ->assertNeedsToUpdateGraphicsLayerBitsCleared(); |
| 123 | 129 |
| 124 for (PaintLayer* child = layer.firstChild(); child; | 130 for (PaintLayer* child = layer.firstChild(); child; |
| 125 child = child->nextSibling()) | 131 child = child->nextSibling()) |
| 126 assertNeedsToUpdateGraphicsLayerBitsCleared(*child); | 132 assertNeedsToUpdateGraphicsLayerBitsCleared(*child); |
| 127 } | 133 } |
| 128 | 134 |
| 129 #endif | 135 #endif |
| 130 | 136 |
| 131 } // namespace blink | 137 } // namespace blink |
| OLD | NEW |