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

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

Issue 215503003: Reland text autosizing changes. (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
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
534 public: 536 public:
535 537
536 // Allocated only when some of these fields have non-default values 538 // Allocated only when some of these fields have non-default values
537 struct RenderBlockRareData { 539 struct RenderBlockRareData {
538 WTF_MAKE_NONCOPYABLE(RenderBlockRareData); WTF_MAKE_FAST_ALLOCATED; 540 WTF_MAKE_NONCOPYABLE(RenderBlockRareData); WTF_MAKE_FAST_ALLOCATED;
539 public: 541 public:
540 RenderBlockRareData() 542 RenderBlockRareData()
541 : m_paginationStrut(0) 543 : m_paginationStrut(0)
542 , m_pageLogicalOffset(0) 544 , m_pageLogicalOffset(0)
543 , m_lineBreakToAvoidWidow(-1) 545 , m_lineBreakToAvoidWidow(-1)
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 return false; 593 return false;
592 } 594 }
593 return true; 595 return true;
594 } 596 }
595 597
596 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); 598 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock());
597 599
598 } // namespace WebCore 600 } // namespace WebCore
599 601
600 #endif // RenderBlock_h 602 #endif // RenderBlock_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698