| 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 * (C) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
| 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) | 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. |
| 7 * All rights reserved. | 7 * All rights reserved. |
| 8 * Copyright (C) 2009 Google Inc. All rights reserved. | 8 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. | 9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. |
| 10 * (http://www.torchmobile.com/) | 10 * (http://www.torchmobile.com/) |
| (...skipping 2043 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2054 mode &= ~ApplyContainerFlip; | 2054 mode &= ~ApplyContainerFlip; |
| 2055 } | 2055 } |
| 2056 } | 2056 } |
| 2057 | 2057 |
| 2058 LayoutSize containerOffset = offsetFromContainer(container); | 2058 LayoutSize containerOffset = offsetFromContainer(container); |
| 2059 if (isLayoutFlowThread()) { | 2059 if (isLayoutFlowThread()) { |
| 2060 // So far the point has been in flow thread coordinates (i.e. as if | 2060 // So far the point has been in flow thread coordinates (i.e. as if |
| 2061 // everything in the fragmentation context lived in one tall single column). | 2061 // everything in the fragmentation context lived in one tall single column). |
| 2062 // Convert it to a visual point now, since we're about to escape the flow | 2062 // Convert it to a visual point now, since we're about to escape the flow |
| 2063 // thread. | 2063 // thread. |
| 2064 containerOffset += | 2064 containerOffset += columnOffset(LayoutPoint(transformState.mappedPoint())); |
| 2065 columnOffset(roundedLayoutPoint(transformState.mappedPoint())); | |
| 2066 } | 2065 } |
| 2067 | 2066 |
| 2068 // Text objects just copy their parent's computed style, so we need to ignore | 2067 // Text objects just copy their parent's computed style, so we need to ignore |
| 2069 // them. | 2068 // them. |
| 2070 bool preserve3D = | 2069 bool preserve3D = |
| 2071 mode & UseTransforms && | 2070 mode & UseTransforms && |
| 2072 ((container->style()->preserves3D() && !container->isText()) || | 2071 ((container->style()->preserves3D() && !container->isText()) || |
| 2073 (style()->preserves3D() && !isText())); | 2072 (style()->preserves3D() && !isText())); |
| 2074 if (mode & UseTransforms && shouldUseTransformFromContainer(container)) { | 2073 if (mode & UseTransforms && shouldUseTransformFromContainer(container)) { |
| 2075 TransformationMatrix t; | 2074 TransformationMatrix t; |
| (...skipping 1470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3546 const blink::LayoutObject* root = object1; | 3545 const blink::LayoutObject* root = object1; |
| 3547 while (root->parent()) | 3546 while (root->parent()) |
| 3548 root = root->parent(); | 3547 root = root->parent(); |
| 3549 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); | 3548 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); |
| 3550 } else { | 3549 } else { |
| 3551 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); | 3550 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); |
| 3552 } | 3551 } |
| 3553 } | 3552 } |
| 3554 | 3553 |
| 3555 #endif | 3554 #endif |
| OLD | NEW |