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

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

Issue 212163006: Revert of Preserve autosizing multiplier on style recalc. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Reverting auto-sizing three patches 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 | « Source/core/rendering/RenderBlock.h ('k') | Source/web/WebViewImpl.cpp » ('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 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 currCont->setContinuation(0); 336 currCont->setContinuation(0);
337 currCont->setStyle(newStyle); 337 currCont->setStyle(newStyle);
338 currCont->setContinuation(nextCont); 338 currCont->setContinuation(nextCont);
339 } 339 }
340 } 340 }
341 341
342 if (FastTextAutosizer* textAutosizer = document().fastTextAutosizer()) 342 if (FastTextAutosizer* textAutosizer = document().fastTextAutosizer())
343 textAutosizer->record(this); 343 textAutosizer->record(this);
344 344
345 propagateStyleToAnonymousChildren(true); 345 propagateStyleToAnonymousChildren(true);
346 invalidateLineHeight(); 346 m_lineHeight = -1;
347 347
348 // It's possible for our border/padding to change, but for the overall logic al width of the block to 348 // It's possible for our border/padding to change, but for the overall logic al width of the block to
349 // end up being the same. We keep track of this change so in layoutBlock, we can know to set relayoutChildren=true. 349 // end up being the same. We keep track of this change so in layoutBlock, we can know to set relayoutChildren=true.
350 m_hasBorderOrPaddingLogicalWidthChanged = oldStyle && diff == StyleDifferenc eLayout && needsLayout() && borderOrPaddingLogicalWidthChanged(oldStyle, newStyl e); 350 m_hasBorderOrPaddingLogicalWidthChanged = oldStyle && diff == StyleDifferenc eLayout && needsLayout() && borderOrPaddingLogicalWidthChanged(oldStyle, newStyl e);
351 351
352 // If the style has unloaded images, want to notify the ResourceLoadPriority Optimizer so that 352 // If the style has unloaded images, want to notify the ResourceLoadPriority Optimizer so that
353 // network priorities can be set. 353 // network priorities can be set.
354 Vector<ImageResource*> images; 354 Vector<ImageResource*> images;
355 appendImagesFromStyle(images, *newStyle); 355 appendImagesFromStyle(images, *newStyle);
356 if (images.isEmpty()) 356 if (images.isEmpty())
(...skipping 4668 matching lines...) Expand 10 before | Expand all | Expand 10 after
5025 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 5025 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
5026 { 5026 {
5027 showRenderObject(); 5027 showRenderObject();
5028 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 5028 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
5029 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 5029 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
5030 } 5030 }
5031 5031
5032 #endif 5032 #endif
5033 5033
5034 } // namespace WebCore 5034 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlock.h ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698