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

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

Issue 137313006: Fix uninitialized m_hasOnlySelfCollapsingChildren in RenderBlock (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 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 | « no previous file | 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) 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 }; 152 };
153 153
154 RenderBlock::RenderBlock(ContainerNode* node) 154 RenderBlock::RenderBlock(ContainerNode* node)
155 : RenderBox(node) 155 : RenderBox(node)
156 , m_lineHeight(-1) 156 , m_lineHeight(-1)
157 , m_hasMarginBeforeQuirk(false) 157 , m_hasMarginBeforeQuirk(false)
158 , m_hasMarginAfterQuirk(false) 158 , m_hasMarginAfterQuirk(false)
159 , m_beingDestroyed(false) 159 , m_beingDestroyed(false)
160 , m_hasMarkupTruncation(false) 160 , m_hasMarkupTruncation(false)
161 , m_hasBorderOrPaddingLogicalWidthChanged(false) 161 , m_hasBorderOrPaddingLogicalWidthChanged(false)
162 , m_hasOnlySelfCollapsingChildren(false)
162 { 163 {
163 setChildrenInline(true); 164 setChildrenInline(true);
164 } 165 }
165 166
166 static void removeBlockFromDescendantAndContainerMaps(RenderBlock* block, Tracke dDescendantsMap*& descendantMap, TrackedContainerMap*& containerMap) 167 static void removeBlockFromDescendantAndContainerMaps(RenderBlock* block, Tracke dDescendantsMap*& descendantMap, TrackedContainerMap*& containerMap)
167 { 168 {
168 if (OwnPtr<TrackedRendererListHashSet> descendantSet = descendantMap->take(b lock)) { 169 if (OwnPtr<TrackedRendererListHashSet> descendantSet = descendantMap->take(b lock)) {
169 TrackedRendererListHashSet::iterator end = descendantSet->end(); 170 TrackedRendererListHashSet::iterator end = descendantSet->end();
170 for (TrackedRendererListHashSet::iterator descendant = descendantSet->be gin(); descendant != end; ++descendant) { 171 for (TrackedRendererListHashSet::iterator descendant = descendantSet->be gin(); descendant != end; ++descendant) {
171 TrackedContainerMap::iterator it = containerMap->find(*descendant); 172 TrackedContainerMap::iterator it = containerMap->find(*descendant);
(...skipping 5498 matching lines...) Expand 10 before | Expand all | Expand 10 after
5670 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 5671 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
5671 { 5672 {
5672 showRenderObject(); 5673 showRenderObject();
5673 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 5674 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
5674 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 5675 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
5675 } 5676 }
5676 5677
5677 #endif 5678 #endif
5678 5679
5679 } // namespace WebCore 5680 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698