Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Side by Side Diff: Source/core/rendering/RenderInline.cpp

Issue 288013005: Handle transformed descendants when drawing focus rings (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Exclude the new flaky test. The other new test covers the change. Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1334 matching lines...) Expand 10 before | Expand all | Expand 10 after
1345 1345
1346 // FIXME: We can do better. 1346 // FIXME: We can do better.
1347 repaint(); 1347 repaint();
1348 } 1348 }
1349 1349
1350 void RenderInline::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer) 1350 void RenderInline::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer)
1351 { 1351 {
1352 AbsoluteRectsGeneratorContext context(rects, additionalOffset); 1352 AbsoluteRectsGeneratorContext context(rects, additionalOffset);
1353 generateLineBoxRects(context); 1353 generateLineBoxRects(context);
1354 1354
1355 for (RenderObject* curr = firstChild(); curr; curr = curr->nextSibling()) { 1355 addChildFocusRingRects(rects, additionalOffset, paintContainer);
1356 if (!curr->isText() && !curr->isListMarker()) {
1357 FloatPoint pos(additionalOffset);
1358 // FIXME: This doesn't work correctly with transforms.
1359 if (curr->hasLayer())
1360 pos = curr->localToContainerPoint(FloatPoint(), paintContainer);
1361 else if (curr->isBox())
1362 pos.move(toRenderBox(curr)->locationOffset());
1363 curr->addFocusRingRects(rects, flooredIntPoint(pos), paintContainer) ;
1364 }
1365 }
1366 1356
1367 if (continuation()) { 1357 if (continuation()) {
1368 // If the continuation doesn't paint into the same container, let its re paint container handle it. 1358 // If the continuation doesn't paint into the same container, let its re paint container handle it.
1369 if (paintContainer != continuation()->containerForRepaint()) 1359 if (paintContainer != continuation()->containerForRepaint())
1370 return; 1360 return;
1371 if (continuation()->isInline()) 1361 if (continuation()->isInline())
1372 continuation()->addFocusRingRects(rects, flooredLayoutPoint(addition alOffset + continuation()->containingBlock()->location() - containingBlock()->lo cation()), paintContainer); 1362 continuation()->addFocusRingRects(rects, flooredLayoutPoint(addition alOffset + continuation()->containingBlock()->location() - containingBlock()->lo cation()), paintContainer);
1373 else 1363 else
1374 continuation()->addFocusRingRects(rects, flooredLayoutPoint(addition alOffset + toRenderBox(continuation())->location() - containingBlock()->location ()), paintContainer); 1364 continuation()->addFocusRingRects(rects, flooredLayoutPoint(addition alOffset + toRenderBox(continuation())->location() - containingBlock()->location ()), paintContainer);
1375 } 1365 }
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
1576 container = this; 1566 container = this;
1577 1567
1578 FloatPoint absPos = container->localToAbsolute(); 1568 FloatPoint absPos = container->localToAbsolute();
1579 region.bounds.setX(absPos.x() + region.bounds.x()); 1569 region.bounds.setX(absPos.x() + region.bounds.x());
1580 region.bounds.setY(absPos.y() + region.bounds.y()); 1570 region.bounds.setY(absPos.y() + region.bounds.y());
1581 1571
1582 regions.append(region); 1572 regions.append(region);
1583 } 1573 }
1584 1574
1585 } // namespace WebCore 1575 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698