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

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

Issue 1280543005: Refactor LayoutInline::addOutlineRects to avoid tricky logic to avoid dups (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 4 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 | 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 * (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 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 } 407 }
408 } 408 }
409 return; 409 return;
410 } 410 }
411 411
412 if (descendant.isBox()) { 412 if (descendant.isBox()) {
413 descendant.addOutlineRects(rects, additionalOffset + toLayoutBox(descend ant).locationOffset()); 413 descendant.addOutlineRects(rects, additionalOffset + toLayoutBox(descend ant).locationOffset());
414 return; 414 return;
415 } 415 }
416 416
417 if (descendant.isLayoutInline()) {
418 // Some ancestor of the LayoutInline has already added outline rects for line boxes,
chrishtr 2015/08/10 20:14:47 Add to this: // The rects are computed by an ance
Xianzhu 2015/08/10 21:52:32 Done.
419 // so the LayoutInline needs to add outline rects for children and conti nuations only.
420 toLayoutInline(descendant).addOutlineRectsForChildrenAndContinuations(re cts, additionalOffset);
421 return;
422 }
423
417 descendant.addOutlineRects(rects, additionalOffset); 424 descendant.addOutlineRects(rects, additionalOffset);
418 } 425 }
419 426
420 bool LayoutBoxModelObject::calculateHasBoxDecorations() const 427 bool LayoutBoxModelObject::calculateHasBoxDecorations() const
421 { 428 {
422 const ComputedStyle& styleToUse = styleRef(); 429 const ComputedStyle& styleToUse = styleRef();
423 return hasBackground() || styleToUse.hasBorderDecoration() || styleToUse.has Appearance() || styleToUse.boxShadow(); 430 return hasBackground() || styleToUse.hasBorderDecoration() || styleToUse.has Appearance() || styleToUse.boxShadow();
424 } 431 }
425 432
426 bool LayoutBoxModelObject::hasNonEmptyLayoutSize() const 433 bool LayoutBoxModelObject::hasNonEmptyLayoutSize() const
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
1003 if (rootElementStyle->hasBackground()) 1010 if (rootElementStyle->hasBackground())
1004 return false; 1011 return false;
1005 1012
1006 if (node() != document().firstBodyElement()) 1013 if (node() != document().firstBodyElement())
1007 return false; 1014 return false;
1008 1015
1009 return true; 1016 return true;
1010 } 1017 }
1011 1018
1012 } // namespace blink 1019 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698