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

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

Issue 1974323002: Move inlineElementContinuation() to LayoutBlockFlow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Don't introduce unnecessary type checks. Created 4 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 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2010 Google Inc. All rights reserved. 7 * Copyright (C) 2010 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 525
526 void LayoutBoxModelObject::updateFromStyle() 526 void LayoutBoxModelObject::updateFromStyle()
527 { 527 {
528 const ComputedStyle& styleToUse = styleRef(); 528 const ComputedStyle& styleToUse = styleRef();
529 setHasBoxDecorationBackground(calculateHasBoxDecorations()); 529 setHasBoxDecorationBackground(calculateHasBoxDecorations());
530 setInline(styleToUse.isDisplayInlineType()); 530 setInline(styleToUse.isDisplayInlineType());
531 setPositionState(styleToUse.position()); 531 setPositionState(styleToUse.position());
532 setHorizontalWritingMode(styleToUse.isHorizontalWritingMode()); 532 setHorizontalWritingMode(styleToUse.isHorizontalWritingMode());
533 } 533 }
534 534
535 static LayoutSize accumulateInFlowPositionOffsets(const LayoutObject* child) 535 static LayoutSize accumulateInFlowPositionOffsets(const LayoutObject* child)
szager1 2016/05/13 22:08:48 Is there any reason why this shouldn't be a virtua
mstensho (USE GERRIT) 2016/05/15 18:48:37 Done.
536 { 536 {
537 if (!child->isAnonymousBlock() || !child->isInFlowPositioned()) 537 if (!child->isAnonymousBlock() || !child->isInFlowPositioned() || !child->is LayoutBlockFlow())
538 return LayoutSize(); 538 return LayoutSize();
539 LayoutSize offset; 539 LayoutSize offset;
540 LayoutObject* p = toLayoutBlock(child)->inlineElementContinuation(); 540 LayoutObject* p = toLayoutBlockFlow(child)->inlineElementContinuation();
541 while (p && p->isLayoutInline()) { 541 while (p && p->isLayoutInline()) {
542 if (p->isInFlowPositioned()) { 542 if (p->isInFlowPositioned()) {
543 LayoutInline* layoutInline = toLayoutInline(p); 543 LayoutInline* layoutInline = toLayoutInline(p);
544 offset += layoutInline->offsetForInFlowPosition(); 544 offset += layoutInline->offsetForInFlowPosition();
545 } 545 }
546 p = p->parent(); 546 p = p->parent();
547 } 547 }
548 return offset; 548 return offset;
549 } 549 }
550 550
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after
1132 if (rootElementStyle->hasBackground()) 1132 if (rootElementStyle->hasBackground())
1133 return false; 1133 return false;
1134 1134
1135 if (node() != document().firstBodyElement()) 1135 if (node() != document().firstBodyElement())
1136 return false; 1136 return false;
1137 1137
1138 return true; 1138 return true;
1139 } 1139 }
1140 1140
1141 } // namespace blink 1141 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698