| 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 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 298 // in this case, there is no need to dirty our ancestors further. | 298 // in this case, there is no need to dirty our ancestors further. |
| 299 if (layer->isSelfPaintingLayer()) { | 299 if (layer->isSelfPaintingLayer()) { |
| 300 ASSERT(!parent() || parent()->m_hasSelfPaintingLayerDescendantDirty
|| parent()->m_hasSelfPaintingLayerDescendant); | 300 ASSERT(!parent() || parent()->m_hasSelfPaintingLayerDescendantDirty
|| parent()->m_hasSelfPaintingLayerDescendant); |
| 301 break; | 301 break; |
| 302 } | 302 } |
| 303 } | 303 } |
| 304 } | 304 } |
| 305 | 305 |
| 306 bool RenderLayer::scrollsWithViewport() const | 306 bool RenderLayer::scrollsWithViewport() const |
| 307 { | 307 { |
| 308 return renderer()->style()->position() == FixedPosition && renderer()->conta
iningBlock()->enclosingLayer()->isRootLayer(); | 308 return renderer()->style()->position() == FixedPosition && renderer()->conta
inerForFixedPosition() == renderer()->view(); |
| 309 } | 309 } |
| 310 | 310 |
| 311 bool RenderLayer::scrollsWithRespectTo(const RenderLayer* other) const | 311 bool RenderLayer::scrollsWithRespectTo(const RenderLayer* other) const |
| 312 { | 312 { |
| 313 if (scrollsWithViewport() != other->scrollsWithViewport()) | 313 if (scrollsWithViewport() != other->scrollsWithViewport()) |
| 314 return true; | 314 return true; |
| 315 return ancestorScrollingLayer() != other->ancestorScrollingLayer(); | 315 return ancestorScrollingLayer() != other->ancestorScrollingLayer(); |
| 316 } | 316 } |
| 317 | 317 |
| 318 void RenderLayer::updateTransformationMatrix() | 318 void RenderLayer::updateTransformationMatrix() |
| (...skipping 3367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3686 } | 3686 } |
| 3687 } | 3687 } |
| 3688 | 3688 |
| 3689 void showLayerTree(const blink::RenderObject* renderer) | 3689 void showLayerTree(const blink::RenderObject* renderer) |
| 3690 { | 3690 { |
| 3691 if (!renderer) | 3691 if (!renderer) |
| 3692 return; | 3692 return; |
| 3693 showLayerTree(renderer->enclosingLayer()); | 3693 showLayerTree(renderer->enclosingLayer()); |
| 3694 } | 3694 } |
| 3695 #endif | 3695 #endif |
| OLD | NEW |