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

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

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/FastTextAutosizer.cpp ('k') | Source/core/rendering/RenderBlock.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 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 bool requiresColumns(int desiredColumnCount) const; 524 bool requiresColumns(int desiredColumnCount) const;
525 525
526 virtual bool updateLogicalWidthAndColumnWidth(); 526 virtual bool updateLogicalWidthAndColumnWidth();
527 527
528 virtual bool canCollapseAnonymousBlockChild() const { return true; } 528 virtual bool canCollapseAnonymousBlockChild() const { return true; }
529 529
530 public: 530 public:
531 virtual LayoutUnit offsetFromLogicalTopOfFirstPage() const OVERRIDE FINAL; 531 virtual LayoutUnit offsetFromLogicalTopOfFirstPage() const OVERRIDE FINAL;
532 RenderRegion* regionAtBlockOffset(LayoutUnit) const; 532 RenderRegion* regionAtBlockOffset(LayoutUnit) const;
533 533
534 void invalidateLineHeight() { m_lineHeight = -1; }
535
536 public: 534 public:
537 535
538 // Allocated only when some of these fields have non-default values 536 // Allocated only when some of these fields have non-default values
539 struct RenderBlockRareData { 537 struct RenderBlockRareData {
540 WTF_MAKE_NONCOPYABLE(RenderBlockRareData); WTF_MAKE_FAST_ALLOCATED; 538 WTF_MAKE_NONCOPYABLE(RenderBlockRareData); WTF_MAKE_FAST_ALLOCATED;
541 public: 539 public:
542 RenderBlockRareData() 540 RenderBlockRareData()
543 : m_paginationStrut(0) 541 : m_paginationStrut(0)
544 , m_pageLogicalOffset(0) 542 , m_pageLogicalOffset(0)
545 , m_lineBreakToAvoidWidow(-1) 543 , m_lineBreakToAvoidWidow(-1)
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 return false; 590 return false;
593 } 591 }
594 return true; 592 return true;
595 } 593 }
596 594
597 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); 595 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock());
598 596
599 } // namespace WebCore 597 } // namespace WebCore
600 598
601 #endif // RenderBlock_h 599 #endif // RenderBlock_h
OLDNEW
« no previous file with comments | « Source/core/rendering/FastTextAutosizer.cpp ('k') | Source/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698