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

Side by Side Diff: sky/engine/core/rendering/RenderObject.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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 // This function is kept in sync with anonymous block creation condition s in 403 // This function is kept in sync with anonymous block creation condition s in
404 // RenderBlock::createAnonymousBlock(). This includes creating an anonym ous 404 // RenderBlock::createAnonymousBlock(). This includes creating an anonym ous
405 // RenderBlock having a BLOCK or BOX display. See https://bugs.webkit.or g/show_bug.cgi?id=56709. 405 // RenderBlock having a BLOCK or BOX display. See https://bugs.webkit.or g/show_bug.cgi?id=56709.
406 return isAnonymous() && style()->display() == BLOCK && style()->styleTyp e() == NOPSEUDO && isRenderBlock(); 406 return isAnonymous() && style()->display() == BLOCK && style()->styleTyp e() == NOPSEUDO && isRenderBlock();
407 } 407 }
408 408
409 bool isElementContinuation() const { return node() && node()->renderer() != this; } 409 bool isElementContinuation() const { return node() && node()->renderer() != this; }
410 bool isInlineElementContinuation() const { return isElementContinuation() && isInline(); } 410 bool isInlineElementContinuation() const { return isElementContinuation() && isInline(); }
411 virtual RenderBoxModelObject* virtualContinuation() const { return 0; } 411 virtual RenderBoxModelObject* virtualContinuation() const { return 0; }
412 412
413 bool isFloating() const { return m_bitfields.floating(); }
414
415 bool isOutOfFlowPositioned() const { return m_bitfields.isOutOfFlowPositione d(); } // absolute or fixed positioning 413 bool isOutOfFlowPositioned() const { return m_bitfields.isOutOfFlowPositione d(); } // absolute or fixed positioning
416 bool isRelPositioned() const { return m_bitfields.isRelPositioned(); } // re lative positioning 414 bool isRelPositioned() const { return m_bitfields.isRelPositioned(); } // re lative positioning
417 bool isPositioned() const { return m_bitfields.isPositioned(); } 415 bool isPositioned() const { return m_bitfields.isPositioned(); }
418 416
419 bool isText() const { return m_bitfields.isText(); } 417 bool isText() const { return m_bitfields.isText(); }
420 bool isBox() const { return m_bitfields.isBox(); } 418 bool isBox() const { return m_bitfields.isBox(); }
421 bool isInline() const { return m_bitfields.isInline(); } // inline object 419 bool isInline() const { return m_bitfields.isInline(); } // inline object
422 bool isDragging() const { return m_bitfields.isDragging(); } 420 bool isDragging() const { return m_bitfields.isDragging(); }
423 bool isReplaced() const { return m_bitfields.isReplaced(); } // a "replaced" element (see CSS) 421 bool isReplaced() const { return m_bitfields.isReplaced(); } // a "replaced" element (see CSS)
424 422
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 setPreferredLogicalWidthsDirty(); 537 setPreferredLogicalWidthsDirty();
540 } 538 }
541 539
542 void setPositionState(EPosition position) 540 void setPositionState(EPosition position)
543 { 541 {
544 ASSERT(position != AbsolutePosition || isBox()); 542 ASSERT(position != AbsolutePosition || isBox());
545 m_bitfields.setPositionedState(position); 543 m_bitfields.setPositionedState(position);
546 } 544 }
547 void clearPositionedState() { m_bitfields.clearPositionedState(); } 545 void clearPositionedState() { m_bitfields.clearPositionedState(); }
548 546
549 void setFloating(bool isFloating) { m_bitfields.setFloating(isFloating); }
550 void setInline(bool isInline) { m_bitfields.setIsInline(isInline); } 547 void setInline(bool isInline) { m_bitfields.setIsInline(isInline); }
551 548
552 void setHasBoxDecorationBackground(bool); 549 void setHasBoxDecorationBackground(bool);
553 void invalidateBackgroundObscurationStatus(); 550 void invalidateBackgroundObscurationStatus();
554 virtual bool computeBackgroundIsKnownToBeObscured() { return false; } 551 virtual bool computeBackgroundIsKnownToBeObscured() { return false; }
555 552
556 void setIsText() { m_bitfields.setIsText(true); } 553 void setIsText() { m_bitfields.setIsText(true); }
557 void setIsBox() { m_bitfields.setIsBox(true); } 554 void setIsBox() { m_bitfields.setIsBox(true); }
558 void setReplaced(bool isReplaced) { m_bitfields.setIsReplaced(isReplaced); } 555 void setReplaced(bool isReplaced) { m_bitfields.setIsReplaced(isReplaced); }
559 void setHasOverflowClip(bool hasOverflowClip) { m_bitfields.setHasOverflowCl ip(hasOverflowClip); } 556 void setHasOverflowClip(bool hasOverflowClip) { m_bitfields.setHasOverflowCl ip(hasOverflowClip); }
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
726 virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayer ModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) cons t; 723 virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayer ModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) cons t;
727 virtual LayoutRect rectWithOutlineForPaintInvalidation(const RenderLayerMode lObject* paintInvalidationContainer, LayoutUnit outlineWidth, const PaintInvalid ationState* = 0) const; 724 virtual LayoutRect rectWithOutlineForPaintInvalidation(const RenderLayerMode lObject* paintInvalidationContainer, LayoutUnit outlineWidth, const PaintInvalid ationState* = 0) const;
728 725
729 // Given a rect in the object's coordinate space, compute a rect suitable fo r invalidating paints of 726 // Given a rect in the object's coordinate space, compute a rect suitable fo r invalidating paints of
730 // that rect in the coordinate space of paintInvalidationContainer. 727 // that rect in the coordinate space of paintInvalidationContainer.
731 virtual void mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect&, const PaintInvalidationState*) const; 728 virtual void mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect&, const PaintInvalidationState*) const;
732 virtual void computeFloatRectForPaintInvalidation(const RenderLayerModelObje ct* paintInvalidationContainer, FloatRect& paintInvalidationRect, const PaintInv alidationState*) const; 729 virtual void computeFloatRectForPaintInvalidation(const RenderLayerModelObje ct* paintInvalidationContainer, FloatRect& paintInvalidationRect, const PaintInv alidationState*) const;
733 730
734 virtual unsigned length() const { return 1; } 731 virtual unsigned length() const { return 1; }
735 732
736 bool isFloatingOrOutOfFlowPositioned() const { return (isFloating() || isOut OfFlowPositioned()); } 733 // FIXME(sky): Remove
734 bool isFloatingOrOutOfFlowPositioned() const { return isOutOfFlowPositioned( ); }
737 735
738 bool isTransparent() const { return style()->hasOpacity(); } 736 bool isTransparent() const { return style()->hasOpacity(); }
739 float opacity() const { return style()->opacity(); } 737 float opacity() const { return style()->opacity(); }
740 738
741 enum SelectionState { 739 enum SelectionState {
742 SelectionNone, // The object is not selected. 740 SelectionNone, // The object is not selected.
743 SelectionStart, // The object either contains the start of a selection r un or is the start of a run 741 SelectionStart, // The object either contains the start of a selection r un or is the start of a run
744 SelectionInside, // The object is fully encompassed by a selection run 742 SelectionInside, // The object is fully encompassed by a selection run
745 SelectionEnd, // The object either contains the end of a selection run o r is the end of a run 743 SelectionEnd, // The object either contains the end of a selection run o r is the end of a run
746 SelectionBoth // The object contains an entire run or is the sole select ed object in that run 744 SelectionBoth // The object contains an entire run or is the sole select ed object in that run
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
1330 void showTree(const blink::RenderObject*); 1328 void showTree(const blink::RenderObject*);
1331 void showLineTree(const blink::RenderObject*); 1329 void showLineTree(const blink::RenderObject*);
1332 void showRenderTree(const blink::RenderObject* object1); 1330 void showRenderTree(const blink::RenderObject* object1);
1333 // We don't make object2 an optional parameter so that showRenderTree 1331 // We don't make object2 an optional parameter so that showRenderTree
1334 // can be called from gdb easily. 1332 // can be called from gdb easily.
1335 void showRenderTree(const blink::RenderObject* object1, const blink::RenderObjec t* object2); 1333 void showRenderTree(const blink::RenderObject* object1, const blink::RenderObjec t* object2);
1336 1334
1337 #endif 1335 #endif
1338 1336
1339 #endif // RenderObject_h 1337 #endif // RenderObject_h
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderLayerModelObject.cpp ('k') | sky/engine/core/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698