| 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 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 return false; | 92 return false; |
| 93 for (unsigned i = 0; i < m_layerRects.size(); i++) { | 93 for (unsigned i = 0; i < m_layerRects.size(); i++) { |
| 94 if (m_layerRects[i].intersects(bounds)) | 94 if (m_layerRects[i].intersects(bounds)) |
| 95 return true; | 95 return true; |
| 96 } | 96 } |
| 97 return false; | 97 return false; |
| 98 } | 98 } |
| 99 | 99 |
| 100 void unite(const OverlapMapContainer& otherContainer) | 100 void unite(const OverlapMapContainer& otherContainer) |
| 101 { | 101 { |
| 102 m_layerRects.append(otherContainer.m_layerRects); | 102 m_layerRects.appendVector(otherContainer.m_layerRects); |
| 103 m_boundingBox.unite(otherContainer.m_boundingBox); | 103 m_boundingBox.unite(otherContainer.m_boundingBox); |
| 104 } | 104 } |
| 105 private: | 105 private: |
| 106 Vector<IntRect> m_layerRects; | 106 Vector<IntRect> m_layerRects; |
| 107 IntRect m_boundingBox; | 107 IntRect m_boundingBox; |
| 108 }; | 108 }; |
| 109 | 109 |
| 110 class RenderLayerCompositor::OverlapMap { | 110 class RenderLayerCompositor::OverlapMap { |
| 111 WTF_MAKE_NONCOPYABLE(OverlapMap); | 111 WTF_MAKE_NONCOPYABLE(OverlapMap); |
| 112 public: | 112 public: |
| (...skipping 2615 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2728 } else if (graphicsLayer == m_scrollLayer.get()) { | 2728 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 2729 name = "Frame Scrolling Layer"; | 2729 name = "Frame Scrolling Layer"; |
| 2730 } else { | 2730 } else { |
| 2731 ASSERT_NOT_REACHED(); | 2731 ASSERT_NOT_REACHED(); |
| 2732 } | 2732 } |
| 2733 | 2733 |
| 2734 return name; | 2734 return name; |
| 2735 } | 2735 } |
| 2736 | 2736 |
| 2737 } // namespace WebCore | 2737 } // namespace WebCore |
| OLD | NEW |