| 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 1300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1311 FloatPoint pos(additionalOffset); | 1311 FloatPoint pos(additionalOffset); |
| 1312 pos.move(box->locationOffset()); // FIXME: Snap offsets? crbug.c
om/350474 | 1312 pos.move(box->locationOffset()); // FIXME: Snap offsets? crbug.c
om/350474 |
| 1313 box->addFocusRingRects(rects, flooredIntPoint(pos), paintContain
er); | 1313 box->addFocusRingRects(rects, flooredIntPoint(pos), paintContain
er); |
| 1314 } | 1314 } |
| 1315 } else { | 1315 } else { |
| 1316 current->addFocusRingRects(rects, additionalOffset, paintContainer); | 1316 current->addFocusRingRects(rects, additionalOffset, paintContainer); |
| 1317 } | 1317 } |
| 1318 } | 1318 } |
| 1319 } | 1319 } |
| 1320 | 1320 |
| 1321 // FIXME: In repaint-after-layout, we should be able to change the logic to remo
ve the need for this function. See crbug.com/368416. | |
| 1322 LayoutPoint RenderObject::positionFromPaintInvalidationContainer(const RenderLay
erModelObject* paintInvalidationContainer, const PaintInvalidationState* paintIn
validationState) const | 1321 LayoutPoint RenderObject::positionFromPaintInvalidationContainer(const RenderLay
erModelObject* paintInvalidationContainer, const PaintInvalidationState* paintIn
validationState) const |
| 1323 { | 1322 { |
| 1324 // FIXME: This assert should be re-enabled when we move paint invalidation t
o after compositing update. crbug.com/360286 | 1323 // FIXME: This assert should be re-enabled when we move paint invalidation t
o after compositing update. crbug.com/360286 |
| 1325 // ASSERT(containerForPaintInvalidation() == paintInvalidationContainer); | 1324 // ASSERT(containerForPaintInvalidation() == paintInvalidationContainer); |
| 1326 | 1325 |
| 1327 if (paintInvalidationContainer == this) | 1326 if (paintInvalidationContainer == this) |
| 1328 return LayoutPoint(); | 1327 return LayoutPoint(); |
| 1329 | 1328 |
| 1330 return LayoutPoint(localToContainerPoint(LayoutPoint(), paintInvalidationCon
tainer, 0, 0, paintInvalidationState)); | 1329 return LayoutPoint(localToContainerPoint(LayoutPoint(), paintInvalidationCon
tainer, 0, 0, paintInvalidationState)); |
| 1331 } | 1330 } |
| (...skipping 2116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3448 { | 3447 { |
| 3449 if (object1) { | 3448 if (object1) { |
| 3450 const blink::RenderObject* root = object1; | 3449 const blink::RenderObject* root = object1; |
| 3451 while (root->parent()) | 3450 while (root->parent()) |
| 3452 root = root->parent(); | 3451 root = root->parent(); |
| 3453 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3452 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 3454 } | 3453 } |
| 3455 } | 3454 } |
| 3456 | 3455 |
| 3457 #endif | 3456 #endif |
| OLD | NEW |