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

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

Issue 2446433002: Cleanups to remove an unnecessary parameter in LayoutBox::mapScrollingContentsRectToBoxSpace. (Closed)
Patch Set: none Created 4 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
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutInline.cpp ('k') | no next file » | 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 * (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. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc.
7 * All rights reserved. 7 * All rights reserved.
8 * Copyright (C) 2009 Google Inc. All rights reserved. 8 * Copyright (C) 2009 Google Inc. All rights reserved.
9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. 9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
10 * (http://www.torchmobile.com/) 10 * (http://www.torchmobile.com/)
(...skipping 1282 matching lines...) Expand 10 before | Expand all | Expand 10 after
1293 return true; 1293 return true;
1294 1294
1295 if (LayoutObject* parent = this->parent()) { 1295 if (LayoutObject* parent = this->parent()) {
1296 if (parent->isBox()) { 1296 if (parent->isBox()) {
1297 LayoutBox* parentBox = toLayoutBox(parent); 1297 LayoutBox* parentBox = toLayoutBox(parent);
1298 1298
1299 // Never flip for SVG as it handles writing modes itself. 1299 // Never flip for SVG as it handles writing modes itself.
1300 if (!isSVG()) 1300 if (!isSVG())
1301 parentBox->flipForWritingMode(rect); 1301 parentBox->flipForWritingMode(rect);
1302 1302
1303 if (!parentBox->mapScrollingContentsRectToBoxSpace( 1303 if (parent != ancestor &&
1304 rect, parent == ancestor ? ApplyNonScrollOverflowClip 1304 !parentBox->mapScrollingContentsRectToBoxSpace(rect, visualRectFlags))
1305 : ApplyOverflowClip,
1306 visualRectFlags))
1307 return false; 1305 return false;
1308 } 1306 }
1309 return parent->mapToVisualRectInAncestorSpace(ancestor, rect, 1307 return parent->mapToVisualRectInAncestorSpace(ancestor, rect,
1310 visualRectFlags); 1308 visualRectFlags);
1311 } 1309 }
1312 return true; 1310 return true;
1313 } 1311 }
1314 1312
1315 void LayoutObject::dirtyLinesFromChangedChild(LayoutObject*, MarkingBehavior) {} 1313 void LayoutObject::dirtyLinesFromChangedChild(LayoutObject*, MarkingBehavior) {}
1316 1314
(...skipping 2220 matching lines...) Expand 10 before | Expand all | Expand 10 after
3537 const blink::LayoutObject* root = object1; 3535 const blink::LayoutObject* root = object1;
3538 while (root->parent()) 3536 while (root->parent())
3539 root = root->parent(); 3537 root = root->parent();
3540 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3538 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3541 } else { 3539 } else {
3542 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); 3540 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)");
3543 } 3541 }
3544 } 3542 }
3545 3543
3546 #endif 3544 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutInline.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698