| 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 1287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1298 LayoutBox* parentBox = toLayoutBox(parent); | 1298 LayoutBox* parentBox = toLayoutBox(parent); |
| 1299 | 1299 |
| 1300 // Never flip for SVG as it handles writing modes itself. | 1300 // Never flip for SVG as it handles writing modes itself. |
| 1301 if (!isSVG()) { | 1301 if (!isSVG()) { |
| 1302 transformState.flatten(); | 1302 transformState.flatten(); |
| 1303 LayoutRect rect(transformState.lastPlanarQuad().boundingBox()); | 1303 LayoutRect rect(transformState.lastPlanarQuad().boundingBox()); |
| 1304 parentBox->flipForWritingMode(rect); | 1304 parentBox->flipForWritingMode(rect); |
| 1305 transformState.setQuad(FloatQuad(FloatRect(rect))); | 1305 transformState.setQuad(FloatQuad(FloatRect(rect))); |
| 1306 } | 1306 } |
| 1307 | 1307 |
| 1308 bool preserve3D = (parent->style()->preserves3D() && !parent->isText()) || | 1308 bool preserve3D = parent->style()->preserves3D() && !parent->isText(); |
| 1309 (style()->preserves3D() && !isText()); | |
| 1310 | 1309 |
| 1311 TransformState::TransformAccumulation accumulation = | 1310 TransformState::TransformAccumulation accumulation = |
| 1312 preserve3D ? TransformState::AccumulateTransform | 1311 preserve3D ? TransformState::AccumulateTransform |
| 1313 : TransformState::FlattenTransform; | 1312 : TransformState::FlattenTransform; |
| 1314 | 1313 |
| 1315 if (parent != ancestor && | 1314 if (parent != ancestor && |
| 1316 !parentBox->mapScrollingContentsRectToBoxSpace( | 1315 !parentBox->mapScrollingContentsRectToBoxSpace( |
| 1317 transformState, accumulation, visualRectFlags)) | 1316 transformState, accumulation, visualRectFlags)) |
| 1318 return false; | 1317 return false; |
| 1319 } | 1318 } |
| (...skipping 2274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3594 const blink::LayoutObject* root = object1; | 3593 const blink::LayoutObject* root = object1; |
| 3595 while (root->parent()) | 3594 while (root->parent()) |
| 3596 root = root->parent(); | 3595 root = root->parent(); |
| 3597 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); | 3596 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); |
| 3598 } else { | 3597 } else { |
| 3599 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); | 3598 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); |
| 3600 } | 3599 } |
| 3601 } | 3600 } |
| 3602 | 3601 |
| 3603 #endif | 3602 #endif |
| OLD | NEW |