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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutInline.cpp

Issue 2863933003: Remove the parameter of LayoutBox::XXXOverflowRectForPropagation() (Closed)
Patch Set: - Created 3 years, 7 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
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. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 1061 matching lines...) Expand 10 before | Expand all | Expand 10 after
1072 bool is_horizontal = Style()->IsHorizontalWritingMode(); 1072 bool is_horizontal = Style()->IsHorizontalWritingMode();
1073 for (LayoutObject* curr = FirstChild(); curr; curr = curr->NextSibling()) { 1073 for (LayoutObject* curr = FirstChild(); curr; curr = curr->NextSibling()) {
1074 if (curr->IsFloatingOrOutOfFlowPositioned()) 1074 if (curr->IsFloatingOrOutOfFlowPositioned())
1075 continue; 1075 continue;
1076 1076
1077 // For overflow we just have to propagate by hand and recompute it all. 1077 // For overflow we just have to propagate by hand and recompute it all.
1078 if (curr->IsBox()) { 1078 if (curr->IsBox()) {
1079 LayoutBox* curr_box = ToLayoutBox(curr); 1079 LayoutBox* curr_box = ToLayoutBox(curr);
1080 if (!curr_box->HasSelfPaintingLayer() && curr_box->InlineBoxWrapper()) { 1080 if (!curr_box->HasSelfPaintingLayer() && curr_box->InlineBoxWrapper()) {
1081 LayoutRect logical_rect = 1081 LayoutRect logical_rect =
1082 curr_box->LogicalVisualOverflowRectForPropagation(StyleRef()); 1082 curr_box->LogicalVisualOverflowRectForPropagation();
1083 if (is_horizontal) { 1083 if (is_horizontal) {
1084 logical_rect.MoveBy(curr_box->Location()); 1084 logical_rect.MoveBy(curr_box->Location());
1085 result.UniteIfNonZero(logical_rect); 1085 result.UniteIfNonZero(logical_rect);
1086 } else { 1086 } else {
1087 logical_rect.MoveBy(curr_box->Location()); 1087 logical_rect.MoveBy(curr_box->Location());
1088 result.UniteIfNonZero(logical_rect.TransposedRect()); 1088 result.UniteIfNonZero(logical_rect.TransposedRect());
1089 } 1089 }
1090 } 1090 }
1091 } else if (curr->IsLayoutInline()) { 1091 } else if (curr->IsLayoutInline()) {
1092 // If the child doesn't need line boxes either, then we can recur. 1092 // If the child doesn't need line boxes either, then we can recur.
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
1551 paint_invalidator.InvalidateDisplayItemClient(*box, invalidation_reason); 1551 paint_invalidator.InvalidateDisplayItemClient(*box, invalidation_reason);
1552 } 1552 }
1553 1553
1554 // TODO(lunalu): Not to just dump 0, 0 as the x and y here 1554 // TODO(lunalu): Not to just dump 0, 0 as the x and y here
1555 LayoutRect LayoutInline::DebugRect() const { 1555 LayoutRect LayoutInline::DebugRect() const {
1556 IntRect lines_box = EnclosingIntRect(LinesBoundingBox()); 1556 IntRect lines_box = EnclosingIntRect(LinesBoundingBox());
1557 return LayoutRect(IntRect(0, 0, lines_box.Width(), lines_box.Height())); 1557 return LayoutRect(IntRect(0, 0, lines_box.Width(), lines_box.Height()));
1558 } 1558 }
1559 1559
1560 } // namespace blink 1560 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBoxTest.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutTableRow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698