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

Side by Side Diff: Source/core/dom/Element.cpp

Issue 25048006: Attempt to clean up requiresLayoutToDetermineWidth to be more clear (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: MATCH THE CHUNKS HARDER Created 7 years, 2 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
« no previous file with comments | « no previous file | Source/core/rendering/RenderBox.h » ('j') | Source/core/rendering/RenderBox.cpp » ('J')
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) 2001 Peter Kelly (pmk@post.com) 4 * (C) 2001 Peter Kelly (pmk@post.com)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * (C) 2007 David Smith (catfish.man@gmail.com) 6 * (C) 2007 David Smith (catfish.man@gmail.com)
7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved. 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
8 * (C) 2007 Eric Seidel (eric@webkit.org) 8 * (C) 2007 Eric Seidel (eric@webkit.org)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 if (RenderBoxModelObject* renderer = renderBoxModelObject()) 582 if (RenderBoxModelObject* renderer = renderBoxModelObject())
583 return adjustForLocalZoom(renderer->pixelSnappedOffsetTop(), renderer); 583 return adjustForLocalZoom(renderer->pixelSnappedOffsetTop(), renderer);
584 return 0; 584 return 0;
585 } 585 }
586 586
587 int Element::offsetWidth() 587 int Element::offsetWidth()
588 { 588 {
589 document().updateStyleForNodeIfNeeded(this); 589 document().updateStyleForNodeIfNeeded(this);
590 590
591 if (RenderBox* renderer = renderBox()) { 591 if (RenderBox* renderer = renderBox()) {
592 if (!renderer->requiresLayoutToDetermineWidth()) 592 if (renderer->canDetermineWidthWithoutLayout())
593 return adjustLayoutUnitForAbsoluteZoom(renderer->fixedOffsetWidth(), renderer).round(); 593 return adjustLayoutUnitForAbsoluteZoom(renderer->fixedOffsetWidth(), renderer).round();
594 } 594 }
595 595
596 document().partialUpdateLayoutIgnorePendingStylesheets(this); 596 document().partialUpdateLayoutIgnorePendingStylesheets(this);
597 if (RenderBoxModelObject* renderer = renderBoxModelObject()) 597 if (RenderBoxModelObject* renderer = renderBoxModelObject())
598 return adjustLayoutUnitForAbsoluteZoom(renderer->pixelSnappedOffsetWidth (), renderer).round(); 598 return adjustLayoutUnitForAbsoluteZoom(renderer->pixelSnappedOffsetWidth (), renderer).round();
599 return 0; 599 return 0;
600 } 600 }
601 601
602 int Element::offsetHeight() 602 int Element::offsetHeight()
(...skipping 3039 matching lines...) Expand 10 before | Expand all | Expand 10 after
3642 return 0; 3642 return 0;
3643 } 3643 }
3644 3644
3645 Attribute* UniqueElementData::attributeItem(unsigned index) 3645 Attribute* UniqueElementData::attributeItem(unsigned index)
3646 { 3646 {
3647 ASSERT_WITH_SECURITY_IMPLICATION(index < length()); 3647 ASSERT_WITH_SECURITY_IMPLICATION(index < length());
3648 return &m_attributeVector.at(index); 3648 return &m_attributeVector.at(index);
3649 } 3649 }
3650 3650
3651 } // namespace WebCore 3651 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/RenderBox.h » ('j') | Source/core/rendering/RenderBox.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698