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

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: Fix release compile, minor cleanups Created 7 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) 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 732 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 } 743 }
744 744
745 #ifndef NDEBUG 745 #ifndef NDEBUG
746 void RenderObject::checkBlockPositionedObjectsNeedLayout() 746 void RenderObject::checkBlockPositionedObjectsNeedLayout()
747 { 747 {
748 ASSERT(!needsLayout()); 748 ASSERT(!needsLayout());
749 749
750 if (isRenderBlock()) 750 if (isRenderBlock())
751 toRenderBlock(this)->checkPositionedObjectsNeedLayout(); 751 toRenderBlock(this)->checkPositionedObjectsNeedLayout();
752 } 752 }
753
754 void RenderObject::checkNotInPartialLayout()
755 {
756 if (frame()) {
757 if (FrameView* view = frame()->view()) {
758 // During partial layout, setNeedsLayout(true or false) should not b e called.
759 ASSERT(!view->shouldStopPartialLayout());
760 }
761 }
762 }
753 #endif 763 #endif
754 764
755 void RenderObject::setPreferredLogicalWidthsDirty(bool shouldBeDirty, MarkingBeh avior markParents) 765 void RenderObject::setPreferredLogicalWidthsDirty(bool shouldBeDirty, MarkingBeh avior markParents)
756 { 766 {
757 bool alreadyDirty = preferredLogicalWidthsDirty(); 767 bool alreadyDirty = preferredLogicalWidthsDirty();
758 m_bitfields.setPreferredLogicalWidthsDirty(shouldBeDirty); 768 m_bitfields.setPreferredLogicalWidthsDirty(shouldBeDirty);
759 if (shouldBeDirty && !alreadyDirty && markParents == MarkContainingBlockChai n && (isText() || !style()->hasOutOfFlowPosition())) 769 if (shouldBeDirty && !alreadyDirty && markParents == MarkContainingBlockChai n && (isText() || !style()->hasOutOfFlowPosition()))
760 invalidateContainerPreferredLogicalWidths(); 770 invalidateContainerPreferredLogicalWidths();
761 } 771 }
762 772
(...skipping 2575 matching lines...) Expand 10 before | Expand all | Expand 10 after
3338 { 3348 {
3339 if (object1) { 3349 if (object1) {
3340 const WebCore::RenderObject* root = object1; 3350 const WebCore::RenderObject* root = object1;
3341 while (root->parent()) 3351 while (root->parent())
3342 root = root->parent(); 3352 root = root->parent();
3343 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3353 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3344 } 3354 }
3345 } 3355 }
3346 3356
3347 #endif 3357 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698