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

Side by Side Diff: Source/core/rendering/RenderObject.cpp

Issue 18601002: Add infrastructure for partial layouts (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: define RenderObject::frameView in the header Created 7 years, 3 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/rendering/RenderObject.h ('k') | Source/core/rendering/RenderProgress.h » ('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) 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. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
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 715 matching lines...) Expand 10 before | Expand all | Expand 10 after
726 } 726 }
727 727
728 #ifndef NDEBUG 728 #ifndef NDEBUG
729 void RenderObject::checkBlockPositionedObjectsNeedLayout() 729 void RenderObject::checkBlockPositionedObjectsNeedLayout()
730 { 730 {
731 ASSERT(!needsLayout()); 731 ASSERT(!needsLayout());
732 732
733 if (isRenderBlock()) 733 if (isRenderBlock())
734 toRenderBlock(this)->checkPositionedObjectsNeedLayout(); 734 toRenderBlock(this)->checkPositionedObjectsNeedLayout();
735 } 735 }
736
737 void RenderObject::checkNotInPartialLayout()
738 {
739 // During partial layout, setNeedsLayout(true or false) should not be called .
740 ASSERT(!frameView()->partialLayout().isStopping());
741 }
736 #endif 742 #endif
737 743
738 void RenderObject::setPreferredLogicalWidthsDirty(MarkingBehavior markParents) 744 void RenderObject::setPreferredLogicalWidthsDirty(MarkingBehavior markParents)
739 { 745 {
740 bool alreadyDirty = preferredLogicalWidthsDirty(); 746 bool alreadyDirty = preferredLogicalWidthsDirty();
741 m_bitfields.setPreferredLogicalWidthsDirty(true); 747 m_bitfields.setPreferredLogicalWidthsDirty(true);
742 if (!alreadyDirty && markParents == MarkContainingBlockChain && (isText() || !style()->hasOutOfFlowPosition())) 748 if (!alreadyDirty && markParents == MarkContainingBlockChain && (isText() || !style()->hasOutOfFlowPosition()))
743 invalidateContainerPreferredLogicalWidths(); 749 invalidateContainerPreferredLogicalWidths();
744 } 750 }
745 751
(...skipping 2564 matching lines...) Expand 10 before | Expand all | Expand 10 after
3310 { 3316 {
3311 if (object1) { 3317 if (object1) {
3312 const WebCore::RenderObject* root = object1; 3318 const WebCore::RenderObject* root = object1;
3313 while (root->parent()) 3319 while (root->parent())
3314 root = root->parent(); 3320 root = root->parent();
3315 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3321 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3316 } 3322 }
3317 } 3323 }
3318 3324
3319 #endif 3325 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderObject.h ('k') | Source/core/rendering/RenderProgress.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698