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

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

Issue 148523010: Remove call to ResourceLoadPriorityOptimizer from RenderBlock Destructor (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 9 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
« 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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 } 210 }
211 if (blockStyle.boxReflect()) 211 if (blockStyle.boxReflect())
212 appendImageIfNotNull(images, blockStyle.boxReflect()->mask().image()); 212 appendImageIfNotNull(images, blockStyle.boxReflect()->mask().image());
213 appendImageIfNotNull(images, blockStyle.listStyleImage()); 213 appendImageIfNotNull(images, blockStyle.listStyleImage());
214 appendImageIfNotNull(images, blockStyle.borderImageSource()); 214 appendImageIfNotNull(images, blockStyle.borderImageSource());
215 appendImageIfNotNull(images, blockStyle.maskBoxImageSource()); 215 appendImageIfNotNull(images, blockStyle.maskBoxImageSource());
216 } 216 }
217 217
218 RenderBlock::~RenderBlock() 218 RenderBlock::~RenderBlock()
219 { 219 {
220 ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->removeRender Object(this);
221 if (hasColumns()) 220 if (hasColumns())
222 gColumnInfoMap->take(this); 221 gColumnInfoMap->take(this);
223 if (gPercentHeightDescendantsMap) 222 if (gPercentHeightDescendantsMap)
224 removeBlockFromDescendantAndContainerMaps(this, gPercentHeightDescendant sMap, gPercentHeightContainerMap); 223 removeBlockFromDescendantAndContainerMaps(this, gPercentHeightDescendant sMap, gPercentHeightContainerMap);
225 if (gPositionedDescendantsMap) 224 if (gPositionedDescendantsMap)
226 removeBlockFromDescendantAndContainerMaps(this, gPositionedDescendantsMa p, gPositionedContainerMap); 225 removeBlockFromDescendantAndContainerMaps(this, gPositionedDescendantsMa p, gPositionedContainerMap);
227 } 226 }
228 227
229 void RenderBlock::willBeDestroyed() 228 void RenderBlock::willBeDestroyed()
230 { 229 {
(...skipping 5210 matching lines...) Expand 10 before | Expand all | Expand 10 after
5441 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 5440 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
5442 { 5441 {
5443 showRenderObject(); 5442 showRenderObject();
5444 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 5443 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
5445 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 5444 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
5446 } 5445 }
5447 5446
5448 #endif 5447 #endif
5449 5448
5450 } // namespace WebCore 5449 } // 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