| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights |
| 3 * reserved. | 3 * reserved. |
| 4 * | 4 * |
| 5 * Portions are Copyright (C) 1998 Netscape Communications Corporation. | 5 * Portions are Copyright (C) 1998 Netscape Communications Corporation. |
| 6 * | 6 * |
| 7 * Other contributors: | 7 * Other contributors: |
| 8 * Robert O'Callahan <roc+@cs.cmu.edu> | 8 * Robert O'Callahan <roc+@cs.cmu.edu> |
| 9 * David Baron <dbaron@fas.harvard.edu> | 9 * David Baron <dbaron@fas.harvard.edu> |
| 10 * Christian Biesinger <cbiesinger@web.de> | 10 * Christian Biesinger <cbiesinger@web.de> |
| (...skipping 3071 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3082 // composited then the entire contents as well as they may be on another | 3082 // composited then the entire contents as well as they may be on another |
| 3083 // composited layer. Skip reporting contents for non-composited layers as | 3083 // composited layer. Skip reporting contents for non-composited layers as |
| 3084 // they'll get projected to the same layer as the bounding box. | 3084 // they'll get projected to the same layer as the bounding box. |
| 3085 if (compositingState() != NotComposited) | 3085 if (compositingState() != NotComposited) |
| 3086 rect.push_back(m_scrollableArea->overflowRect()); | 3086 rect.push_back(m_scrollableArea->overflowRect()); |
| 3087 | 3087 |
| 3088 rects.set(this, rect); | 3088 rects.set(this, rect); |
| 3089 if (const PaintLayer* parentLayer = parent()) { | 3089 if (const PaintLayer* parentLayer = parent()) { |
| 3090 LayerHitTestRects::iterator iter = rects.find(parentLayer); | 3090 LayerHitTestRects::iterator iter = rects.find(parentLayer); |
| 3091 if (iter == rects.end()) { | 3091 if (iter == rects.end()) { |
| 3092 rects.add(parentLayer, Vector<LayoutRect>()) | 3092 rects.insert(parentLayer, Vector<LayoutRect>()) |
| 3093 .storedValue->value.push_back(physicalBoundingBox(parentLayer)); | 3093 .storedValue->value.push_back(physicalBoundingBox(parentLayer)); |
| 3094 } else { | 3094 } else { |
| 3095 iter->value.push_back(physicalBoundingBox(parentLayer)); | 3095 iter->value.push_back(physicalBoundingBox(parentLayer)); |
| 3096 } | 3096 } |
| 3097 } | 3097 } |
| 3098 } else { | 3098 } else { |
| 3099 rect.push_back(logicalBoundingBox()); | 3099 rect.push_back(logicalBoundingBox()); |
| 3100 rects.set(this, rect); | 3100 rects.set(this, rect); |
| 3101 } | 3101 } |
| 3102 } | 3102 } |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3191 } | 3191 } |
| 3192 | 3192 |
| 3193 void showLayerTree(const blink::LayoutObject* layoutObject) { | 3193 void showLayerTree(const blink::LayoutObject* layoutObject) { |
| 3194 if (!layoutObject) { | 3194 if (!layoutObject) { |
| 3195 LOG(INFO) << "Cannot showLayerTree. Root is (nil)"; | 3195 LOG(INFO) << "Cannot showLayerTree. Root is (nil)"; |
| 3196 return; | 3196 return; |
| 3197 } | 3197 } |
| 3198 showLayerTree(layoutObject->enclosingLayer()); | 3198 showLayerTree(layoutObject->enclosingLayer()); |
| 3199 } | 3199 } |
| 3200 #endif | 3200 #endif |
| OLD | NEW |