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

Side by Side Diff: Source/core/layout/LayoutBlock.h

Issue 1154493002: Cleanup: Get rid of LayoutBlock::offsetFromLogicalTopOfFirstPage(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 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
« no previous file with comments | « no previous file | Source/core/layout/LayoutBlock.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 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 442
443 // Adjust from painting offsets to the local coords of this layoutObject 443 // Adjust from painting offsets to the local coords of this layoutObject
444 void offsetForContents(LayoutPoint&) const; 444 void offsetForContents(LayoutPoint&) const;
445 445
446 bool requiresColumns(int desiredColumnCount) const; 446 bool requiresColumns(int desiredColumnCount) const;
447 447
448 virtual bool updateLogicalWidthAndColumnWidth(); 448 virtual bool updateLogicalWidthAndColumnWidth();
449 449
450 virtual bool canCollapseAnonymousBlockChild() const { return true; } 450 virtual bool canCollapseAnonymousBlockChild() const { return true; }
451 451
452 public:
453 virtual LayoutUnit offsetFromLogicalTopOfFirstPage() const override final;
454
455 protected:
456 LayoutObjectChildList m_children; 452 LayoutObjectChildList m_children;
457 LineBoxList m_lineBoxes; // All of the root line boxes created for this bloc k flow. For example, <div>Hello<br>world.</div> will have two total lines for t he <div>. 453 LineBoxList m_lineBoxes; // All of the root line boxes created for this bloc k flow. For example, <div>Hello<br>world.</div> will have two total lines for t he <div>.
458 454
459 LayoutUnit m_pageLogicalOffset; 455 LayoutUnit m_pageLogicalOffset;
460 456
461 unsigned m_hasMarginBeforeQuirk : 1; // Note these quirk values can't be put in LayoutBlockRareData since they are set too frequently. 457 unsigned m_hasMarginBeforeQuirk : 1; // Note these quirk values can't be put in LayoutBlockRareData since they are set too frequently.
462 unsigned m_hasMarginAfterQuirk : 1; 458 unsigned m_hasMarginAfterQuirk : 1;
463 unsigned m_beingDestroyed : 1; 459 unsigned m_beingDestroyed : 1;
464 unsigned m_hasMarkupTruncation : 1; 460 unsigned m_hasMarkupTruncation : 1;
465 unsigned m_widthAvailableToChildrenChanged : 1; 461 unsigned m_widthAvailableToChildrenChanged : 1;
466 mutable unsigned m_hasOnlySelfCollapsingChildren : 1; 462 mutable unsigned m_hasOnlySelfCollapsingChildren : 1;
467 mutable unsigned m_descendantsWithFloatsMarkedForLayout : 1; 463 mutable unsigned m_descendantsWithFloatsMarkedForLayout : 1;
468 464
469 // LayoutRubyBase objects need to be able to split and merge, moving their c hildren around 465 // LayoutRubyBase objects need to be able to split and merge, moving their c hildren around
470 // (calling moveChildTo, moveAllChildrenTo, and makeChildrenNonInline). 466 // (calling moveChildTo, moveAllChildrenTo, and makeChildrenNonInline).
471 friend class LayoutRubyBase; 467 friend class LayoutRubyBase;
472 // FIXME-BLOCKFLOW: Remove this when the line layout stuff has all moved out of LayoutBlock 468 // FIXME-BLOCKFLOW: Remove this when the line layout stuff has all moved out of LayoutBlock
473 friend class LineBreaker; 469 friend class LineBreaker;
474 470
475 // FIXME: This is temporary as we move code that accesses block flow 471 // FIXME: This is temporary as we move code that accesses block flow
476 // member variables out of LayoutBlock and into LayoutBlockFlow. 472 // member variables out of LayoutBlock and into LayoutBlockFlow.
477 friend class LayoutBlockFlow; 473 friend class LayoutBlockFlow;
478 }; 474 };
479 475
480 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock()); 476 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock());
481 477
482 } // namespace blink 478 } // namespace blink
483 479
484 #endif // LayoutBlock_h 480 #endif // LayoutBlock_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/layout/LayoutBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698