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

Side by Side Diff: sky/engine/core/rendering/RenderBlock.h

Issue 700703002: Remove more float machinery. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « sky/engine/core/rendering/InlineIterator.h ('k') | sky/engine/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 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 Node* nodeForHitTest() const; 321 Node* nodeForHitTest() const;
322 322
323 // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to Rend erBlockFlow 323 // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to Rend erBlockFlow
324 virtual void paintFloats(PaintInfo&, const LayoutPoint&, bool) { } 324 virtual void paintFloats(PaintInfo&, const LayoutPoint&, bool) { }
325 void paintContents(PaintInfo&, const LayoutPoint&); 325 void paintContents(PaintInfo&, const LayoutPoint&);
326 void paintSelection(PaintInfo&, const LayoutPoint&); 326 void paintSelection(PaintInfo&, const LayoutPoint&);
327 void paintCarets(PaintInfo&, const LayoutPoint&); 327 void paintCarets(PaintInfo&, const LayoutPoint&);
328 328
329 bool hasCaret() const; 329 bool hasCaret() const;
330 330
331 virtual bool avoidsFloats() const override { return true; }
332
333 bool hitTestContents(const HitTestRequest&, HitTestResult&, const HitTestLoc ation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) ; 331 bool hitTestContents(const HitTestRequest&, HitTestResult&, const HitTestLoc ation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) ;
334 // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to Rend erBlockFlow 332 // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to Rend erBlockFlow
335 virtual bool hitTestFloats(const HitTestRequest&, HitTestResult&, const HitT estLocation&, const LayoutPoint&) { return false; } 333 virtual bool hitTestFloats(const HitTestRequest&, HitTestResult&, const HitT estLocation&, const LayoutPoint&) { return false; }
336 334
337 virtual bool isPointInOverflowControl(HitTestResult&, const LayoutPoint& loc ationInContainer, const LayoutPoint& accumulatedOffset); 335 virtual bool isPointInOverflowControl(HitTestResult&, const LayoutPoint& loc ationInContainer, const LayoutPoint& accumulatedOffset);
338 336
339 void computeBlockPreferredLogicalWidths(LayoutUnit& minLogicalWidth, LayoutU nit& maxLogicalWidth) const; 337 void computeBlockPreferredLogicalWidths(LayoutUnit& minLogicalWidth, LayoutU nit& maxLogicalWidth) const;
340 338
341 // Obtains the nearest enclosing block (including this block) that contribut es a first-line style to our inline 339 // Obtains the nearest enclosing block (including this block) that contribut es a first-line style to our inline
342 // children. 340 // children.
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 RenderLineBoxList m_lineBoxes; // All of the root line boxes created for t his block flow. For example, <div>Hello<br>world.</div> will have two total lin es for the <div>. 396 RenderLineBoxList m_lineBoxes; // All of the root line boxes created for t his block flow. For example, <div>Hello<br>world.</div> will have two total lin es for the <div>.
399 397
400 LayoutUnit m_pageLogicalOffset; 398 LayoutUnit m_pageLogicalOffset;
401 399
402 unsigned m_hasMarginBeforeQuirk : 1; // Note these quirk values can't be put in RenderBlockRareData since they are set too frequently. 400 unsigned m_hasMarginBeforeQuirk : 1; // Note these quirk values can't be put in RenderBlockRareData since they are set too frequently.
403 unsigned m_hasMarginAfterQuirk : 1; 401 unsigned m_hasMarginAfterQuirk : 1;
404 unsigned m_beingDestroyed : 1; 402 unsigned m_beingDestroyed : 1;
405 unsigned m_hasMarkupTruncation : 1; 403 unsigned m_hasMarkupTruncation : 1;
406 unsigned m_hasBorderOrPaddingLogicalWidthChanged : 1; 404 unsigned m_hasBorderOrPaddingLogicalWidthChanged : 1;
407 mutable unsigned m_hasOnlySelfCollapsingChildren : 1; 405 mutable unsigned m_hasOnlySelfCollapsingChildren : 1;
408 mutable unsigned m_descendantsWithFloatsMarkedForLayout : 1;
409 406
410 // FIXME-BLOCKFLOW: Remove this when the line layout stuff has all moved out of RenderBlock 407 // FIXME-BLOCKFLOW: Remove this when the line layout stuff has all moved out of RenderBlock
411 friend class LineBreaker; 408 friend class LineBreaker;
412 409
413 // FIXME: This is temporary as we move code that accesses block flow 410 // FIXME: This is temporary as we move code that accesses block flow
414 // member variables out of RenderBlock and into RenderBlockFlow. 411 // member variables out of RenderBlock and into RenderBlockFlow.
415 friend class RenderBlockFlow; 412 friend class RenderBlockFlow;
416 }; 413 };
417 414
418 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); 415 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock());
419 416
420 } // namespace blink 417 } // namespace blink
421 418
422 #endif // RenderBlock_h 419 #endif // RenderBlock_h
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/InlineIterator.h ('k') | sky/engine/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698