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

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

Issue 688703003: [New Multicolumn] Add RenderMultiColumnSpannerSet. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: There won't ever be any intervening non-multicol fragmentation contexts. Created 6 years, 1 month 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
« no previous file with comments | « Source/core/rendering/RenderObject.h ('k') | Source/core/rendering/RenderPagedFlowThread.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 2384 matching lines...) Expand 10 before | Expand all | Expand 10 after
2395 // that needs to be drawn and layer visibility optimization can't be used 2395 // that needs to be drawn and layer visibility optimization can't be used
2396 if (parent()->style()->visibility() != VISIBLE && style()->visibility() == V ISIBLE && !hasLayer()) { 2396 if (parent()->style()->visibility() != VISIBLE && style()->visibility() == V ISIBLE && !hasLayer()) {
2397 if (!layer) 2397 if (!layer)
2398 layer = parent()->enclosingLayer(); 2398 layer = parent()->enclosingLayer();
2399 if (layer) 2399 if (layer)
2400 layer->dirtyVisibleContentStatus(); 2400 layer->dirtyVisibleContentStatus();
2401 } 2401 }
2402 2402
2403 if (!isFloating() && parent()->childrenInline()) 2403 if (!isFloating() && parent()->childrenInline())
2404 parent()->dirtyLinesFromChangedChild(this); 2404 parent()->dirtyLinesFromChangedChild(this);
2405
2406 if (RenderFlowThread* flowThread = parent()->flowThreadContainingBlock())
2407 flowThread->flowThreadDescendantWasInserted(this);
2405 } 2408 }
2406 2409
2407 void RenderObject::willBeRemovedFromTree() 2410 void RenderObject::willBeRemovedFromTree()
2408 { 2411 {
2409 // FIXME: We should ASSERT(isRooted()) but we have some out-of-order removal s which would need to be fixed first. 2412 // FIXME: We should ASSERT(isRooted()) but we have some out-of-order removal s which would need to be fixed first.
2410 2413
2411 // If we remove a visible child from an invisible parent, we don't know the layer visibility any more. 2414 // If we remove a visible child from an invisible parent, we don't know the layer visibility any more.
2412 RenderLayer* layer = 0; 2415 RenderLayer* layer = 0;
2413 if (parent()->style()->visibility() != VISIBLE && style()->visibility() == V ISIBLE && !hasLayer()) { 2416 if (parent()->style()->visibility() != VISIBLE && style()->visibility() == V ISIBLE && !hasLayer()) {
2414 layer = parent()->enclosingLayer(); 2417 layer = parent()->enclosingLayer();
(...skipping 29 matching lines...) Expand all
2444 // Pass in the flow thread so that we don't have to look it up for all the c hildren. 2447 // Pass in the flow thread so that we don't have to look it up for all the c hildren.
2445 removeFromRenderFlowThreadRecursive(flowThreadContainingBlock()); 2448 removeFromRenderFlowThreadRecursive(flowThreadContainingBlock());
2446 } 2449 }
2447 2450
2448 void RenderObject::removeFromRenderFlowThreadRecursive(RenderFlowThread* renderF lowThread) 2451 void RenderObject::removeFromRenderFlowThreadRecursive(RenderFlowThread* renderF lowThread)
2449 { 2452 {
2450 if (const RenderObjectChildList* children = virtualChildren()) { 2453 if (const RenderObjectChildList* children = virtualChildren()) {
2451 for (RenderObject* child = children->firstChild(); child; child = child- >nextSibling()) 2454 for (RenderObject* child = children->firstChild(); child; child = child- >nextSibling())
2452 child->removeFromRenderFlowThreadRecursive(renderFlowThread); 2455 child->removeFromRenderFlowThreadRecursive(renderFlowThread);
2453 } 2456 }
2454
2455 setFlowThreadState(NotInsideFlowThread); 2457 setFlowThreadState(NotInsideFlowThread);
2456 } 2458 }
2457 2459
2458 void RenderObject::destroyAndCleanupAnonymousWrappers() 2460 void RenderObject::destroyAndCleanupAnonymousWrappers()
2459 { 2461 {
2460 // If the tree is destroyed, there is no need for a clean-up phase. 2462 // If the tree is destroyed, there is no need for a clean-up phase.
2461 if (documentBeingDestroyed()) { 2463 if (documentBeingDestroyed()) {
2462 destroy(); 2464 destroy();
2463 return; 2465 return;
2464 } 2466 }
(...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after
3185 { 3187 {
3186 if (object1) { 3188 if (object1) {
3187 const blink::RenderObject* root = object1; 3189 const blink::RenderObject* root = object1;
3188 while (root->parent()) 3190 while (root->parent())
3189 root = root->parent(); 3191 root = root->parent();
3190 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3192 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3191 } 3193 }
3192 } 3194 }
3193 3195
3194 #endif 3196 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderObject.h ('k') | Source/core/rendering/RenderPagedFlowThread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698