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

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

Issue 211773002: Rename updateStyle to updateRenderTree (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix tracing test Created 6 years, 9 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 | « Source/core/dom/Document.cpp ('k') | Source/core/dom/FullscreenElementStack.cpp » ('j') | 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) 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 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 int Element::offsetTop() 578 int Element::offsetTop()
579 { 579 {
580 document().updateLayoutIgnorePendingStylesheets(); 580 document().updateLayoutIgnorePendingStylesheets();
581 if (RenderBoxModelObject* renderer = renderBoxModelObject()) 581 if (RenderBoxModelObject* renderer = renderBoxModelObject())
582 return adjustForLocalZoom(renderer->pixelSnappedOffsetTop(), *renderer); 582 return adjustForLocalZoom(renderer->pixelSnappedOffsetTop(), *renderer);
583 return 0; 583 return 0;
584 } 584 }
585 585
586 int Element::offsetWidth() 586 int Element::offsetWidth()
587 { 587 {
588 document().updateStyleForNodeIfNeeded(this); 588 document().updateRenderTreeForNodeIfNeeded(this);
589 589
590 if (RenderBox* renderer = renderBox()) { 590 if (RenderBox* renderer = renderBox()) {
591 if (renderer->canDetermineWidthWithoutLayout()) 591 if (renderer->canDetermineWidthWithoutLayout())
592 return adjustLayoutUnitForAbsoluteZoom(renderer->fixedOffsetWidth(), *renderer).round(); 592 return adjustLayoutUnitForAbsoluteZoom(renderer->fixedOffsetWidth(), *renderer).round();
593 } 593 }
594 594
595 document().updateLayoutIgnorePendingStylesheets(); 595 document().updateLayoutIgnorePendingStylesheets();
596 if (RenderBoxModelObject* renderer = renderBoxModelObject()) 596 if (RenderBoxModelObject* renderer = renderBoxModelObject())
597 return adjustLayoutUnitForAbsoluteZoom(renderer->pixelSnappedOffsetWidth (), *renderer).round(); 597 return adjustLayoutUnitForAbsoluteZoom(renderer->pixelSnappedOffsetWidth (), *renderer).round();
598 return 0; 598 return 0;
(...skipping 2806 matching lines...) Expand 10 before | Expand all | Expand 10 after
3405 // Before doing so, we need to resolve issues in HTMLSelectElement::recalcLi stItems 3405 // Before doing so, we need to resolve issues in HTMLSelectElement::recalcLi stItems
3406 // and RenderMenuList::setText. See also https://bugs.webkit.org/show_bug.cg i?id=88405 3406 // and RenderMenuList::setText. See also https://bugs.webkit.org/show_bug.cg i?id=88405
3407 if (isHTMLOptionElement(*this) || isHTMLOptGroupElement(*this)) 3407 if (isHTMLOptionElement(*this) || isHTMLOptGroupElement(*this))
3408 return false; 3408 return false;
3409 if (FullscreenElementStack::isActiveFullScreenElement(this)) 3409 if (FullscreenElementStack::isActiveFullScreenElement(this))
3410 return false; 3410 return false;
3411 return true; 3411 return true;
3412 } 3412 }
3413 3413
3414 } // namespace WebCore 3414 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/dom/FullscreenElementStack.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698