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

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

Issue 711493004: Remove unnecessary paintContainer parameter from addFocusRingRects (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 1 month 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
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 1350 matching lines...) Expand 10 before | Expand all | Expand 10 after
1361 1361
1362 void operator()(const FloatRect& rect) 1362 void operator()(const FloatRect& rect)
1363 { 1363 {
1364 if (!rect.isEmpty()) 1364 if (!rect.isEmpty())
1365 AbsoluteLayoutRectsGeneratorContext::operator()(rect); 1365 AbsoluteLayoutRectsGeneratorContext::operator()(rect);
1366 } 1366 }
1367 }; 1367 };
1368 1368
1369 } // unnamed namespace 1369 } // unnamed namespace
1370 1370
1371 void RenderInline::addFocusRingRects(Vector<LayoutRect>& rects, const LayoutPoin t& additionalOffset, const RenderLayerModelObject* paintContainer) const 1371 void RenderInline::addFocusRingRects(Vector<LayoutRect>& rects, const LayoutPoin t& additionalOffset) const
1372 { 1372 {
1373 AbsoluteLayoutRectsIgnoringEmptyRectsGeneratorContext context(rects, additio nalOffset); 1373 AbsoluteLayoutRectsIgnoringEmptyRectsGeneratorContext context(rects, additio nalOffset);
1374 generateLineBoxRects(context); 1374 generateLineBoxRects(context);
1375 1375
1376 addChildFocusRingRects(rects, additionalOffset, paintContainer); 1376 addChildFocusRingRects(rects, additionalOffset);
1377 1377
1378 if (continuation()) { 1378 if (continuation()) {
1379 // If the continuation doesn't paint into the same container, let its pa int invalidation container handle it.
1380 if (paintContainer != continuation()->containerForPaintInvalidation())
1381 return;
1382 if (continuation()->isInline()) 1379 if (continuation()->isInline())
1383 continuation()->addFocusRingRects(rects, additionalOffset + (continu ation()->containingBlock()->location() - containingBlock()->location()), paintCo ntainer); 1380 continuation()->addFocusRingRects(rects, additionalOffset + (continu ation()->containingBlock()->location() - containingBlock()->location()));
1384 else 1381 else
1385 continuation()->addFocusRingRects(rects, additionalOffset + (toRende rBox(continuation())->location() - containingBlock()->location()), paintContaine r); 1382 continuation()->addFocusRingRects(rects, additionalOffset + (toRende rBox(continuation())->location() - containingBlock()->location()));
1386 } 1383 }
1387 } 1384 }
1388 1385
1389 void RenderInline::computeSelfHitTestRects(Vector<LayoutRect>& rects, const Layo utPoint& layerOffset) const 1386 void RenderInline::computeSelfHitTestRects(Vector<LayoutRect>& rects, const Layo utPoint& layerOffset) const
1390 { 1387 {
1391 AbsoluteLayoutRectsGeneratorContext context(rects, layerOffset); 1388 AbsoluteLayoutRectsGeneratorContext context(rects, layerOffset);
1392 generateLineBoxRects(context); 1389 generateLineBoxRects(context);
1393 } 1390 }
1394 1391
1395 void RenderInline::addAnnotatedRegions(Vector<AnnotatedRegionValue>& regions) 1392 void RenderInline::addAnnotatedRegions(Vector<AnnotatedRegionValue>& regions)
(...skipping 14 matching lines...) Expand all
1410 container = this; 1407 container = this;
1411 1408
1412 FloatPoint absPos = container->localToAbsolute(); 1409 FloatPoint absPos = container->localToAbsolute();
1413 region.bounds.setX(absPos.x() + region.bounds.x()); 1410 region.bounds.setX(absPos.x() + region.bounds.x());
1414 region.bounds.setY(absPos.y() + region.bounds.y()); 1411 region.bounds.setY(absPos.y() + region.bounds.y());
1415 1412
1416 regions.append(region); 1413 regions.append(region);
1417 } 1414 }
1418 1415
1419 } // namespace blink 1416 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698