OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
reserved. |
3 * | 3 * |
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. | 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. |
5 * | 5 * |
6 * Other contributors: | 6 * Other contributors: |
7 * Robert O'Callahan <roc+@cs.cmu.edu> | 7 * Robert O'Callahan <roc+@cs.cmu.edu> |
8 * David Baron <dbaron@fas.harvard.edu> | 8 * David Baron <dbaron@fas.harvard.edu> |
9 * Christian Biesinger <cbiesinger@web.de> | 9 * Christian Biesinger <cbiesinger@web.de> |
10 * Randall Jesup <rjesup@wgate.com> | 10 * Randall Jesup <rjesup@wgate.com> |
(...skipping 3965 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3976 // (eg. for border / scroll bars) and if it's composited then the en
tire contents | 3976 // (eg. for border / scroll bars) and if it's composited then the en
tire contents |
3977 // as well as they may be on another composited layer. Skip reportin
g contents | 3977 // as well as they may be on another composited layer. Skip reportin
g contents |
3978 // for non-composited layers as they'll get projected to the same la
yer as the | 3978 // for non-composited layers as they'll get projected to the same la
yer as the |
3979 // bounding box. | 3979 // bounding box. |
3980 if (compositingState() != NotComposited) | 3980 if (compositingState() != NotComposited) |
3981 rect.append(m_scrollableArea->overflowRect()); | 3981 rect.append(m_scrollableArea->overflowRect()); |
3982 | 3982 |
3983 rects.set(this, rect); | 3983 rects.set(this, rect); |
3984 if (const RenderLayer* parentLayer = parent()) { | 3984 if (const RenderLayer* parentLayer = parent()) { |
3985 LayerHitTestRects::iterator iter = rects.find(parentLayer); | 3985 LayerHitTestRects::iterator iter = rects.find(parentLayer); |
3986 if (iter == rects.end()) | 3986 if (iter == rects.end()) { |
3987 iter = rects.add(parentLayer, Vector<LayoutRect>()).iterator
; | 3987 rects.add(parentLayer, Vector<LayoutRect>()).storedValue->va
lue.append(boundingBox(parentLayer)); |
3988 iter->value.append(boundingBox(parentLayer)); | 3988 } else { |
| 3989 iter->value.append(boundingBox(parentLayer)); |
| 3990 } |
3989 } | 3991 } |
3990 } else { | 3992 } else { |
3991 rect.append(localBoundingBox()); | 3993 rect.append(localBoundingBox()); |
3992 rects.set(this, rect); | 3994 rects.set(this, rect); |
3993 } | 3995 } |
3994 } | 3996 } |
3995 } | 3997 } |
3996 | 3998 |
3997 DisableCompositingQueryAsserts::DisableCompositingQueryAsserts() | 3999 DisableCompositingQueryAsserts::DisableCompositingQueryAsserts() |
3998 : m_disabler(gCompositingQueryMode, CompositingQueriesAreAllowed) { } | 4000 : m_disabler(gCompositingQueryMode, CompositingQueriesAreAllowed) { } |
(...skipping 12 matching lines...) Expand all Loading... |
4011 } | 4013 } |
4012 } | 4014 } |
4013 | 4015 |
4014 void showLayerTree(const WebCore::RenderObject* renderer) | 4016 void showLayerTree(const WebCore::RenderObject* renderer) |
4015 { | 4017 { |
4016 if (!renderer) | 4018 if (!renderer) |
4017 return; | 4019 return; |
4018 showLayerTree(renderer->enclosingLayer()); | 4020 showLayerTree(renderer->enclosingLayer()); |
4019 } | 4021 } |
4020 #endif | 4022 #endif |
OLD | NEW |