| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv
ed. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv
ed. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 369 if (geometryMap.getMapCoordinatesFlags() & TraverseDocumentBoundaries) { | 369 if (geometryMap.getMapCoordinatesFlags() & TraverseDocumentBoundaries) { |
| 370 if (LayoutPart* parentDocLayoutObject = frame()->ownerLayoutObject()) { | 370 if (LayoutPart* parentDocLayoutObject = frame()->ownerLayoutObject()) { |
| 371 offset = -LayoutSize(m_frameView->scrollOffset()); | 371 offset = -LayoutSize(m_frameView->scrollOffset()); |
| 372 offset += parentDocLayoutObject->contentBoxOffset(); | 372 offset += parentDocLayoutObject->contentBoxOffset(); |
| 373 container = parentDocLayoutObject; | 373 container = parentDocLayoutObject; |
| 374 } | 374 } |
| 375 } | 375 } |
| 376 | 376 |
| 377 // If a container was specified, and was not 0 or the LayoutView, then we | 377 // If a container was specified, and was not 0 or the LayoutView, then we |
| 378 // should have found it by now unless we're traversing to a parent document. | 378 // should have found it by now unless we're traversing to a parent document. |
| 379 ASSERT_ARG(ancestorToStopAt, !ancestorToStopAt || ancestorToStopAt == this |
| container); | 379 DCHECK(!ancestorToStopAt || ancestorToStopAt == this || container); |
| 380 | 380 |
| 381 if ((!ancestorToStopAt || container) && shouldUseTransformFromContainer(cont
ainer)) { | 381 if ((!ancestorToStopAt || container) && shouldUseTransformFromContainer(cont
ainer)) { |
| 382 TransformationMatrix t; | 382 TransformationMatrix t; |
| 383 getTransformFromContainer(container, LayoutSize(), t); | 383 getTransformFromContainer(container, LayoutSize(), t); |
| 384 geometryMap.push(this, t, HasTransform, offsetForFixedPosition); | 384 geometryMap.push(this, t, HasTransform, offsetForFixedPosition); |
| 385 } else { | 385 } else { |
| 386 geometryMap.push(this, offset, 0, offsetForFixedPosition); | 386 geometryMap.push(this, offset, 0, offsetForFixedPosition); |
| 387 } | 387 } |
| 388 | 388 |
| 389 return container; | 389 return container; |
| (...skipping 646 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1036 | 1036 |
| 1037 ScrollResult LayoutView::scroll(ScrollGranularity granularity, const FloatSize&
delta) | 1037 ScrollResult LayoutView::scroll(ScrollGranularity granularity, const FloatSize&
delta) |
| 1038 { | 1038 { |
| 1039 if (!frameView()) | 1039 if (!frameView()) |
| 1040 return ScrollResult(); | 1040 return ScrollResult(); |
| 1041 | 1041 |
| 1042 return frame()->applyScrollDelta(granularity, delta, false); | 1042 return frame()->applyScrollDelta(granularity, delta, false); |
| 1043 } | 1043 } |
| 1044 | 1044 |
| 1045 } // namespace blink | 1045 } // namespace blink |
| OLD | NEW |