| 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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 // for checking overlap of any layers outside this context that may | 126 // for checking overlap of any layers outside this context that may |
| 127 // overlap things from inside this context. Therefore, we must merge | 127 // overlap things from inside this context. Therefore, we must merge |
| 128 // the information from the top of the stack before popping the stack. | 128 // the information from the top of the stack before popping the stack. |
| 129 // | 129 // |
| 130 // FIXME: we may be able to avoid this deep copy by rearranging how | 130 // FIXME: we may be able to avoid this deep copy by rearranging how |
| 131 // overlapMap state is managed. | 131 // overlapMap state is managed. |
| 132 m_overlapStack[m_overlapStack.size() - 2].clipped.unite( | 132 m_overlapStack[m_overlapStack.size() - 2].clipped.unite( |
| 133 m_overlapStack.last().clipped); | 133 m_overlapStack.last().clipped); |
| 134 m_overlapStack[m_overlapStack.size() - 2].unclipped.unite( | 134 m_overlapStack[m_overlapStack.size() - 2].unclipped.unite( |
| 135 m_overlapStack.last().unclipped); | 135 m_overlapStack.last().unclipped); |
| 136 m_overlapStack.removeLast(); | 136 m_overlapStack.pop_back(); |
| 137 } | 137 } |
| 138 | 138 |
| 139 private: | 139 private: |
| 140 Vector<OverlapMapContainers> m_overlapStack; | 140 Vector<OverlapMapContainers> m_overlapStack; |
| 141 }; | 141 }; |
| 142 | 142 |
| 143 class CompositingRequirementsUpdater::RecursionData { | 143 class CompositingRequirementsUpdater::RecursionData { |
| 144 public: | 144 public: |
| 145 explicit RecursionData(PaintLayer* compositingAncestor) | 145 explicit RecursionData(PaintLayer* compositingAncestor) |
| 146 : m_compositingAncestor(compositingAncestor), | 146 : m_compositingAncestor(compositingAncestor), |
| (...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 538 descendantHas3DTransform |= | 538 descendantHas3DTransform |= |
| 539 anyDescendantHas3DTransform || layer->has3DTransform(); | 539 anyDescendantHas3DTransform || layer->has3DTransform(); |
| 540 } | 540 } |
| 541 | 541 |
| 542 // At this point we have finished collecting all reasons to composite this | 542 // At this point we have finished collecting all reasons to composite this |
| 543 // layer. | 543 // layer. |
| 544 layer->setCompositingReasons(reasonsToComposite); | 544 layer->setCompositingReasons(reasonsToComposite); |
| 545 } | 545 } |
| 546 | 546 |
| 547 } // namespace blink | 547 } // namespace blink |
| OLD | NEW |