| 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 CompositingState compositingState = layer.compositingState(); | 50 CompositingState compositingState = layer.compositingState(); |
| 51 if (compositingState != NotComposited && compositingState != PaintsIntoG
roupedBacking) { | 51 if (compositingState != NotComposited && compositingState != PaintsIntoG
roupedBacking) { |
| 52 m_compositingAncestor = &layer; | 52 m_compositingAncestor = &layer; |
| 53 if (layer.stackingNode()->isStackingContext()) | 53 if (layer.stackingNode()->isStackingContext()) |
| 54 m_compositingStackingContext = &layer; | 54 m_compositingStackingContext = &layer; |
| 55 } | 55 } |
| 56 } | 56 } |
| 57 | 57 |
| 58 const PaintLayer* compositingContainer(const PaintLayer& layer) const | 58 const PaintLayer* compositingContainer(const PaintLayer& layer) const |
| 59 { | 59 { |
| 60 return layer.stackingNode()->isTreatedAsOrStackingContext() ? m_composit
ingStackingContext : m_compositingAncestor; | 60 return layer.stackingNode()->isStacked() ? m_compositingStackingContext
: m_compositingAncestor; |
| 61 } | 61 } |
| 62 | 62 |
| 63 const PaintLayer* compositingStackingContext() const | 63 const PaintLayer* compositingStackingContext() const |
| 64 { | 64 { |
| 65 return m_compositingStackingContext; | 65 return m_compositingStackingContext; |
| 66 } | 66 } |
| 67 | 67 |
| 68 private: | 68 private: |
| 69 const PaintLayer* m_compositingStackingContext; | 69 const PaintLayer* m_compositingStackingContext; |
| 70 const PaintLayer* m_compositingAncestor; | 70 const PaintLayer* m_compositingAncestor; |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 if (layer.hasCompositedLayerMapping()) | 118 if (layer.hasCompositedLayerMapping()) |
| 119 layer.compositedLayerMapping()->assertNeedsToUpdateGraphicsLayerBitsClea
red(); | 119 layer.compositedLayerMapping()->assertNeedsToUpdateGraphicsLayerBitsClea
red(); |
| 120 | 120 |
| 121 for (PaintLayer* child = layer.firstChild(); child; child = child->nextSibli
ng()) | 121 for (PaintLayer* child = layer.firstChild(); child; child = child->nextSibli
ng()) |
| 122 assertNeedsToUpdateGraphicsLayerBitsCleared(*child); | 122 assertNeedsToUpdateGraphicsLayerBitsCleared(*child); |
| 123 } | 123 } |
| 124 | 124 |
| 125 #endif | 125 #endif |
| 126 | 126 |
| 127 } // namespace blink | 127 } // namespace blink |
| OLD | NEW |