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

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

Issue 195363007: Avoid unnecessary descents into nested boxes with floats. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated Created 6 years, 8 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) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 154
155 RenderBlock::RenderBlock(ContainerNode* node) 155 RenderBlock::RenderBlock(ContainerNode* node)
156 : RenderBox(node) 156 : RenderBox(node)
157 , m_lineHeight(-1) 157 , m_lineHeight(-1)
158 , m_hasMarginBeforeQuirk(false) 158 , m_hasMarginBeforeQuirk(false)
159 , m_hasMarginAfterQuirk(false) 159 , m_hasMarginAfterQuirk(false)
160 , m_beingDestroyed(false) 160 , m_beingDestroyed(false)
161 , m_hasMarkupTruncation(false) 161 , m_hasMarkupTruncation(false)
162 , m_hasBorderOrPaddingLogicalWidthChanged(false) 162 , m_hasBorderOrPaddingLogicalWidthChanged(false)
163 , m_hasOnlySelfCollapsingChildren(false) 163 , m_hasOnlySelfCollapsingChildren(false)
164 , m_descendantsWithFloatsMarkedForLayout(false)
164 { 165 {
165 setChildrenInline(true); 166 setChildrenInline(true);
166 } 167 }
167 168
168 static void removeBlockFromDescendantAndContainerMaps(RenderBlock* block, Tracke dDescendantsMap*& descendantMap, TrackedContainerMap*& containerMap) 169 static void removeBlockFromDescendantAndContainerMaps(RenderBlock* block, Tracke dDescendantsMap*& descendantMap, TrackedContainerMap*& containerMap)
169 { 170 {
170 if (OwnPtr<TrackedRendererListHashSet> descendantSet = descendantMap->take(b lock)) { 171 if (OwnPtr<TrackedRendererListHashSet> descendantSet = descendantMap->take(b lock)) {
171 TrackedRendererListHashSet::iterator end = descendantSet->end(); 172 TrackedRendererListHashSet::iterator end = descendantSet->end();
172 for (TrackedRendererListHashSet::iterator descendant = descendantSet->be gin(); descendant != end; ++descendant) { 173 for (TrackedRendererListHashSet::iterator descendant = descendantSet->be gin(); descendant != end; ++descendant) {
173 TrackedContainerMap::iterator it = containerMap->find(*descendant); 174 TrackedContainerMap::iterator it = containerMap->find(*descendant);
(...skipping 4780 matching lines...) Expand 10 before | Expand all | Expand 10 after
4954 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 4955 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
4955 { 4956 {
4956 showRenderObject(); 4957 showRenderObject();
4957 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 4958 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
4958 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 4959 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
4959 } 4960 }
4960 4961
4961 #endif 4962 #endif
4962 4963
4963 } // namespace WebCore 4964 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698