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

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

Issue 226203010: [CSS Shapes] shape-outside from image doesn't load properly (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: corrected a flaw in clearShapeOutside that cropped up in webkit_unit_test Created 6 years, 8 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/RenderBlock.cpp ('k') | Source/core/rendering/RenderBox.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 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 } 617 }
618 618
619 void markShapeOutsideDependentsForLayout() 619 void markShapeOutsideDependentsForLayout()
620 { 620 {
621 if (isFloating()) 621 if (isFloating())
622 removeFloatingOrPositionedChildFromBlockLists(); 622 removeFloatingOrPositionedChildFromBlockLists();
623 } 623 }
624 624
625 protected: 625 protected:
626 virtual void willBeDestroyed() OVERRIDE; 626 virtual void willBeDestroyed() OVERRIDE;
627 void clearShapeOutside();
627 628
628 virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) O VERRIDE; 629 virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) O VERRIDE;
629 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE; 630 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE;
630 virtual void updateFromStyle() OVERRIDE; 631 virtual void updateFromStyle() OVERRIDE;
631 632
632 // Returns false if it could not cheaply compute the extent (e.g. fixed back ground), in which case the returned rect may be incorrect. 633 // Returns false if it could not cheaply compute the extent (e.g. fixed back ground), in which case the returned rect may be incorrect.
633 bool getBackgroundPaintedExtent(LayoutRect&) const; 634 bool getBackgroundPaintedExtent(LayoutRect&) const;
634 virtual bool foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, unsigned maxDepthToTest) const; 635 virtual bool foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, unsigned maxDepthToTest) const;
635 virtual bool computeBackgroundIsKnownToBeObscured() OVERRIDE; 636 virtual bool computeBackgroundIsKnownToBeObscured() OVERRIDE;
636 637
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
777 if (UNLIKELY(inlineBoxWrapper() != 0)) 778 if (UNLIKELY(inlineBoxWrapper() != 0))
778 deleteLineBoxWrapper(); 779 deleteLineBoxWrapper();
779 } 780 }
780 781
781 ensureRareData().m_inlineBoxWrapper = boxWrapper; 782 ensureRareData().m_inlineBoxWrapper = boxWrapper;
782 } 783 }
783 784
784 } // namespace WebCore 785 } // namespace WebCore
785 786
786 #endif // RenderBox_h 787 #endif // RenderBox_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698