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

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

Issue 217563003: Turn styleWillChange |newStyle| into a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
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 | 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 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 269
270 if (UNLIKELY(gDelayedUpdateScrollInfoSet != 0)) 270 if (UNLIKELY(gDelayedUpdateScrollInfoSet != 0))
271 gDelayedUpdateScrollInfoSet->remove(this); 271 gDelayedUpdateScrollInfoSet->remove(this);
272 272
273 if (FastTextAutosizer* textAutosizer = document().fastTextAutosizer()) 273 if (FastTextAutosizer* textAutosizer = document().fastTextAutosizer())
274 textAutosizer->destroy(this); 274 textAutosizer->destroy(this);
275 275
276 RenderBox::willBeDestroyed(); 276 RenderBox::willBeDestroyed();
277 } 277 }
278 278
279 void RenderBlock::styleWillChange(StyleDifference diff, const RenderStyle* newSt yle) 279 void RenderBlock::styleWillChange(StyleDifference diff, const RenderStyle& newSt yle)
280 { 280 {
281 RenderStyle* oldStyle = style(); 281 RenderStyle* oldStyle = style();
282 282
283 setReplaced(newStyle->isDisplayInlineType()); 283 setReplaced(newStyle.isDisplayInlineType());
284 284
285 if (oldStyle && parent() && diff == StyleDifferenceLayout && oldStyle->posit ion() != newStyle->position()) { 285 if (oldStyle && parent() && diff == StyleDifferenceLayout && oldStyle->posit ion() != newStyle.position()) {
286 if (newStyle->position() == StaticPosition) 286 if (newStyle.position() == StaticPosition)
287 // Clear our positioned objects list. Our absolutely positioned desc endants will be 287 // Clear our positioned objects list. Our absolutely positioned desc endants will be
288 // inserted into our containing block's positioned objects list duri ng layout. 288 // inserted into our containing block's positioned objects list duri ng layout.
289 removePositionedObjects(0, NewContainingBlock); 289 removePositionedObjects(0, NewContainingBlock);
290 else if (oldStyle->position() == StaticPosition) { 290 else if (oldStyle->position() == StaticPosition) {
291 // Remove our absolutely positioned descendants from their current c ontaining block. 291 // Remove our absolutely positioned descendants from their current c ontaining block.
292 // They will be inserted into our positioned objects list during lay out. 292 // They will be inserted into our positioned objects list during lay out.
293 RenderObject* cb = parent(); 293 RenderObject* cb = parent();
294 while (cb && (cb->style()->position() == StaticPosition || (cb->isIn line() && !cb->isReplaced())) && !cb->isRenderView()) { 294 while (cb && (cb->style()->position() == StaticPosition || (cb->isIn line() && !cb->isReplaced())) && !cb->isRenderView()) {
295 if (cb->style()->position() == RelativePosition && cb->isInline( ) && !cb->isReplaced()) { 295 if (cb->style()->position() == RelativePosition && cb->isInline( ) && !cb->isReplaced()) {
296 cb = cb->containingBlock(); 296 cb = cb->containingBlock();
(...skipping 4607 matching lines...) Expand 10 before | Expand all | Expand 10 after
4904 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 4904 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
4905 { 4905 {
4906 showRenderObject(); 4906 showRenderObject();
4907 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 4907 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
4908 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 4908 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
4909 } 4909 }
4910 4910
4911 #endif 4911 #endif
4912 4912
4913 } // namespace WebCore 4913 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698