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

Side by Side Diff: sky/engine/core/rendering/RenderBlock.cpp

Issue 723253004: Remove tons of OILPAN. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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 | « sky/engine/core/rendering/RenderBlock.h ('k') | sky/engine/core/rendering/RenderInline.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) 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 , m_hasMarginBeforeQuirk(false) 84 , m_hasMarginBeforeQuirk(false)
85 , m_hasMarginAfterQuirk(false) 85 , m_hasMarginAfterQuirk(false)
86 , m_beingDestroyed(false) 86 , m_beingDestroyed(false)
87 , m_hasMarkupTruncation(false) 87 , m_hasMarkupTruncation(false)
88 , m_hasBorderOrPaddingLogicalWidthChanged(false) 88 , m_hasBorderOrPaddingLogicalWidthChanged(false)
89 { 89 {
90 // RenderBlockFlow calls setChildrenInline(true). 90 // RenderBlockFlow calls setChildrenInline(true).
91 // By default, subclasses do not have inline children. 91 // By default, subclasses do not have inline children.
92 } 92 }
93 93
94 void RenderBlock::trace(Visitor* visitor)
95 {
96 visitor->trace(m_children);
97 RenderBox::trace(visitor);
98 }
99
100 static void removeBlockFromDescendantAndContainerMaps(RenderBlock* block, Tracke dDescendantsMap*& descendantMap, TrackedContainerMap*& containerMap) 94 static void removeBlockFromDescendantAndContainerMaps(RenderBlock* block, Tracke dDescendantsMap*& descendantMap, TrackedContainerMap*& containerMap)
101 { 95 {
102 if (OwnPtr<TrackedRendererListHashSet> descendantSet = descendantMap->take(b lock)) { 96 if (OwnPtr<TrackedRendererListHashSet> descendantSet = descendantMap->take(b lock)) {
103 TrackedRendererListHashSet::iterator end = descendantSet->end(); 97 TrackedRendererListHashSet::iterator end = descendantSet->end();
104 for (TrackedRendererListHashSet::iterator descendant = descendantSet->be gin(); descendant != end; ++descendant) { 98 for (TrackedRendererListHashSet::iterator descendant = descendantSet->be gin(); descendant != end; ++descendant) {
105 TrackedContainerMap::iterator it = containerMap->find(*descendant); 99 TrackedContainerMap::iterator it = containerMap->find(*descendant);
106 ASSERT(it != containerMap->end()); 100 ASSERT(it != containerMap->end());
107 if (it == containerMap->end()) 101 if (it == containerMap->end())
108 continue; 102 continue;
109 HashSet<RenderBlock*>* containerSet = it->value.get(); 103 HashSet<RenderBlock*>* containerSet = it->value.get();
(...skipping 2741 matching lines...) Expand 10 before | Expand all | Expand 10 after
2851 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 2845 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
2852 { 2846 {
2853 showRenderObject(); 2847 showRenderObject();
2854 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 2848 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
2855 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 2849 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
2856 } 2850 }
2857 2851
2858 #endif 2852 #endif
2859 2853
2860 } // namespace blink 2854 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderBlock.h ('k') | sky/engine/core/rendering/RenderInline.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698