| 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. All rights reserv
ed. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv
ed. |
| 7 * Copyright (C) 2009 Google Inc. All rights reserved. | 7 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) | 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) |
| 9 * | 9 * |
| 10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
| (...skipping 1324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1335 box->addFocusRingRects(rects, flooredIntPoint(pos), paintContain
er); | 1335 box->addFocusRingRects(rects, flooredIntPoint(pos), paintContain
er); |
| 1336 } | 1336 } |
| 1337 } else { | 1337 } else { |
| 1338 current->addFocusRingRects(rects, additionalOffset, paintContainer); | 1338 current->addFocusRingRects(rects, additionalOffset, paintContainer); |
| 1339 } | 1339 } |
| 1340 } | 1340 } |
| 1341 } | 1341 } |
| 1342 | 1342 |
| 1343 LayoutPoint RenderObject::positionFromPaintInvalidationContainer(const RenderLay
erModelObject* paintInvalidationContainer, const PaintInvalidationState* paintIn
validationState) const | 1343 LayoutPoint RenderObject::positionFromPaintInvalidationContainer(const RenderLay
erModelObject* paintInvalidationContainer, const PaintInvalidationState* paintIn
validationState) const |
| 1344 { | 1344 { |
| 1345 // FIXME: This assert should be re-enabled when we move paint invalidation t
o after compositing update. crbug.com/360286 | 1345 ASSERT(containerForPaintInvalidation() == paintInvalidationContainer); |
| 1346 // ASSERT(containerForPaintInvalidation() == paintInvalidationContainer); | |
| 1347 | 1346 |
| 1348 if (paintInvalidationContainer == this) | 1347 if (paintInvalidationContainer == this) |
| 1349 return LayoutPoint(); | 1348 return LayoutPoint(); |
| 1350 | 1349 |
| 1351 return LayoutPoint(localToContainerPoint(LayoutPoint(), paintInvalidationCon
tainer, 0, 0, paintInvalidationState)); | 1350 return LayoutPoint(localToContainerPoint(LayoutPoint(), paintInvalidationCon
tainer, 0, 0, paintInvalidationState)); |
| 1352 } | 1351 } |
| 1353 | 1352 |
| 1354 IntRect RenderObject::absoluteBoundingBoxRect() const | 1353 IntRect RenderObject::absoluteBoundingBoxRect() const |
| 1355 { | 1354 { |
| 1356 Vector<FloatQuad> quads; | 1355 Vector<FloatQuad> quads; |
| (...skipping 2106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3463 { | 3462 { |
| 3464 if (object1) { | 3463 if (object1) { |
| 3465 const blink::RenderObject* root = object1; | 3464 const blink::RenderObject* root = object1; |
| 3466 while (root->parent()) | 3465 while (root->parent()) |
| 3467 root = root->parent(); | 3466 root = root->parent(); |
| 3468 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3467 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 3469 } | 3468 } |
| 3470 } | 3469 } |
| 3471 | 3470 |
| 3472 #endif | 3471 #endif |
| OLD | NEW |