OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights
reserved. | 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights
reserved. |
5 * | 5 * |
6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
10 * | 10 * |
(...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
585 } | 585 } |
586 | 586 |
587 LayoutSize RenderInline::offsetFromContainer(const RenderObject* container, cons
t LayoutPoint& point, bool* offsetDependsOnPoint) const | 587 LayoutSize RenderInline::offsetFromContainer(const RenderObject* container, cons
t LayoutPoint& point, bool* offsetDependsOnPoint) const |
588 { | 588 { |
589 ASSERT(container == this->container()); | 589 ASSERT(container == this->container()); |
590 | 590 |
591 LayoutSize offset; | 591 LayoutSize offset; |
592 if (isRelPositioned()) | 592 if (isRelPositioned()) |
593 offset += offsetForInFlowPosition(); | 593 offset += offsetForInFlowPosition(); |
594 | 594 |
595 if (container->hasOverflowClip()) | |
596 offset -= toRenderBox(container)->scrolledContentOffset(); | |
597 | |
598 // FIXME(sky): Remove now that it's always false? | 595 // FIXME(sky): Remove now that it's always false? |
599 if (offsetDependsOnPoint) | 596 if (offsetDependsOnPoint) |
600 *offsetDependsOnPoint = false; | 597 *offsetDependsOnPoint = false; |
601 | 598 |
602 return offset; | 599 return offset; |
603 } | 600 } |
604 | 601 |
605 void RenderInline::mapLocalToContainer(const RenderLayerModelObject* paintInvali
dationContainer, TransformState& transformState, MapCoordinatesFlags mode) const | 602 void RenderInline::mapLocalToContainer(const RenderLayerModelObject* paintInvali
dationContainer, TransformState& transformState, MapCoordinatesFlags mode) const |
606 { | 603 { |
607 if (paintInvalidationContainer == this) | 604 if (paintInvalidationContainer == this) |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
770 | 767 |
771 void RenderInline::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint&
additionalOffset, const RenderLayerModelObject* paintContainer) const | 768 void RenderInline::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint&
additionalOffset, const RenderLayerModelObject* paintContainer) const |
772 { | 769 { |
773 AbsoluteRectsIgnoringEmptyRectsGeneratorContext context(rects, additionalOff
set); | 770 AbsoluteRectsIgnoringEmptyRectsGeneratorContext context(rects, additionalOff
set); |
774 generateLineBoxRects(context); | 771 generateLineBoxRects(context); |
775 | 772 |
776 addChildFocusRingRects(rects, additionalOffset, paintContainer); | 773 addChildFocusRingRects(rects, additionalOffset, paintContainer); |
777 } | 774 } |
778 | 775 |
779 } // namespace blink | 776 } // namespace blink |
OLD | NEW |