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

Side by Side Diff: Source/core/layout/LayoutObject.cpp

Issue 1164723004: Remove block continuation support. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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/layout/LayoutObject.h ('k') | no next file » | 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 1072 matching lines...) Expand 10 before | Expand all | Expand 10 after
1083 return layoutView; 1083 return layoutView;
1084 } 1084 }
1085 1085
1086 String LayoutObject::decoratedName() const 1086 String LayoutObject::decoratedName() const
1087 { 1087 {
1088 StringBuilder name; 1088 StringBuilder name;
1089 name.append(this->name()); 1089 name.append(this->name());
1090 1090
1091 if (isAnonymous()) 1091 if (isAnonymous())
1092 name.append(" (anonymous)"); 1092 name.append(" (anonymous)");
1093 if (style()) {
1094 if (isAnonymousColumnsBlock())
1095 name.append(" (anonymous multi-column)");
1096 if (isAnonymousColumnSpanBlock())
1097 name.append(" (anonymous multi-column span)");
1098 }
1099 if (isOutOfFlowPositioned()) 1093 if (isOutOfFlowPositioned())
1100 name.append(" (positioned)"); 1094 name.append(" (positioned)");
1101 if (isRelPositioned()) 1095 if (isRelPositioned())
1102 name.append(" (relative positioned)"); 1096 name.append(" (relative positioned)");
1103 if (isFloating()) 1097 if (isFloating())
1104 name.append(" (floating)"); 1098 name.append(" (floating)");
1105 1099
1106 return name.toString(); 1100 return name.toString();
1107 } 1101 }
1108 1102
(...skipping 1443 matching lines...) Expand 10 before | Expand all | Expand 10 after
2552 } 2546 }
2553 2547
2554 LayoutObject* destroyRoot = this; 2548 LayoutObject* destroyRoot = this;
2555 for (LayoutObject* destroyRootParent = destroyRoot->parent(); destroyRootPar ent && destroyRootParent->isAnonymous(); destroyRoot = destroyRootParent, destro yRootParent = destroyRootParent->parent()) { 2549 for (LayoutObject* destroyRootParent = destroyRoot->parent(); destroyRootPar ent && destroyRootParent->isAnonymous(); destroyRoot = destroyRootParent, destro yRootParent = destroyRootParent->parent()) {
2556 // Anonymous block continuations are tracked and destroyed elsewhere (se e the bottom of LayoutBlock::removeChild) 2550 // Anonymous block continuations are tracked and destroyed elsewhere (se e the bottom of LayoutBlock::removeChild)
2557 if (destroyRootParent->isLayoutBlock() && toLayoutBlock(destroyRootParen t)->isAnonymousBlockContinuation()) 2551 if (destroyRootParent->isLayoutBlock() && toLayoutBlock(destroyRootParen t)->isAnonymousBlockContinuation())
2558 break; 2552 break;
2559 // A flow thread is tracked by its containing block. Whether its childre n are removed or not is irrelevant. 2553 // A flow thread is tracked by its containing block. Whether its childre n are removed or not is irrelevant.
2560 if (destroyRootParent->isLayoutFlowThread()) 2554 if (destroyRootParent->isLayoutFlowThread())
2561 break; 2555 break;
2562 // Column spans are tracked elsewhere.
2563 if (destroyRootParent->isAnonymousColumnSpanBlock())
2564 break;
2565 2556
2566 if (destroyRootParent->slowFirstChild() != destroyRoot || destroyRootPar ent->slowLastChild() != destroyRoot) 2557 if (destroyRootParent->slowFirstChild() != destroyRoot || destroyRootPar ent->slowLastChild() != destroyRoot)
2567 break; // Need to keep the anonymous parent, since it won't become e mpty by the removal of this layoutObject. 2558 break; // Need to keep the anonymous parent, since it won't become e mpty by the removal of this layoutObject.
2568 } 2559 }
2569 2560
2570 destroyRoot->destroy(); 2561 destroyRoot->destroy();
2571 2562
2572 // WARNING: |this| is deleted here. 2563 // WARNING: |this| is deleted here.
2573 } 2564 }
2574 2565
(...skipping 725 matching lines...) Expand 10 before | Expand all | Expand 10 after
3300 const blink::LayoutObject* root = object1; 3291 const blink::LayoutObject* root = object1;
3301 while (root->parent()) 3292 while (root->parent())
3302 root = root->parent(); 3293 root = root->parent();
3303 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3294 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3304 } else { 3295 } else {
3305 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n"); 3296 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n");
3306 } 3297 }
3307 } 3298 }
3308 3299
3309 #endif 3300 #endif
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutObject.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698