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

Unified Diff: Source/core/rendering/RenderLayerModelObject.cpp

Issue 711493004: Remove unnecessary paintContainer parameter from addFocusRingRects (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderLayerModelObject.h ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderLayerModelObject.cpp
diff --git a/Source/core/rendering/RenderLayerModelObject.cpp b/Source/core/rendering/RenderLayerModelObject.cpp
index 15ebfe38763c8ffa29adb8bcb6271429b466752e..4c64cc72887ae45b39ca060eaced1d2d93750b40 100644
--- a/Source/core/rendering/RenderLayerModelObject.cpp
+++ b/Source/core/rendering/RenderLayerModelObject.cpp
@@ -211,5 +211,35 @@ void RenderLayerModelObject::setBackingNeedsPaintInvalidationInRect(const Layout
}
}
+void RenderLayerModelObject::addChildFocusRingRects(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset) const
+{
+ for (RenderObject* current = slowFirstChild(); current; current = current->nextSibling()) {
+ if (current->isText() || current->isListMarker())
+ continue;
+
+ if (!current->isBox()) {
+ current->addFocusRingRects(rects, additionalOffset);
+ continue;
+ }
+
+ RenderBox* box = toRenderBox(current);
+ if (!box->hasLayer()) {
+ box->addFocusRingRects(rects, additionalOffset + box->locationOffset());
+ continue;
+ }
+
+ Vector<LayoutRect> layerFocusRingRects;
+ box->addFocusRingRects(layerFocusRingRects, LayoutPoint());
+ for (size_t i = 0; i < layerFocusRingRects.size(); ++i) {
+ FloatQuad quadInBox = box->localToContainerQuad(FloatQuad(layerFocusRingRects[i]), this);
+ LayoutRect rect = LayoutRect(quadInBox.boundingBox());
+ if (!rect.isEmpty()) {
+ rect.moveBy(additionalOffset);
+ rects.append(rect);
+ }
+ }
+ }
+}
+
} // namespace blink
« no previous file with comments | « Source/core/rendering/RenderLayerModelObject.h ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698