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

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

Issue 23866007: Fix painting order for floats with shape-outside (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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 | « Source/core/rendering/RenderBox.h ('k') | Source/core/rendering/shapes/ShapeOutsideInfo.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) 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 828 matching lines...) Expand 10 before | Expand all | Expand 10 after
839 LayoutSize offsetForColumns(const LayoutPoint& point) const 839 LayoutSize offsetForColumns(const LayoutPoint& point) const
840 { 840 {
841 LayoutSize offset; 841 LayoutSize offset;
842 adjustForColumns(offset, point); 842 adjustForColumns(offset, point);
843 return offset; 843 return offset;
844 } 844 }
845 845
846 virtual unsigned int length() const { return 1; } 846 virtual unsigned int length() const { return 1; }
847 847
848 bool isFloatingOrOutOfFlowPositioned() const { return (isFloating() || isOut OfFlowPositioned()); } 848 bool isFloatingOrOutOfFlowPositioned() const { return (isFloating() || isOut OfFlowPositioned()); }
849 bool isFloatingWithShapeOutside() const { return isBox() && isFloating() && style()->shapeOutside(); }
850 849
851 bool isTransparent() const { return style()->opacity() < 1.0f; } 850 bool isTransparent() const { return style()->opacity() < 1.0f; }
852 float opacity() const { return style()->opacity(); } 851 float opacity() const { return style()->opacity(); }
853 852
854 bool hasReflection() const { return m_bitfields.hasReflection(); } 853 bool hasReflection() const { return m_bitfields.hasReflection(); }
855 854
856 // Applied as a "slop" to dirty rect checks during the outline painting phas e's dirty-rect checks. 855 // Applied as a "slop" to dirty rect checks during the outline painting phas e's dirty-rect checks.
857 int maximalOutlineSize(PaintPhase) const; 856 int maximalOutlineSize(PaintPhase) const;
858 857
859 enum SelectionState { 858 enum SelectionState {
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
1357 // Outside the WebCore namespace for ease of invocation from gdb. 1356 // Outside the WebCore namespace for ease of invocation from gdb.
1358 void showTree(const WebCore::RenderObject*); 1357 void showTree(const WebCore::RenderObject*);
1359 void showLineTree(const WebCore::RenderObject*); 1358 void showLineTree(const WebCore::RenderObject*);
1360 void showRenderTree(const WebCore::RenderObject* object1); 1359 void showRenderTree(const WebCore::RenderObject* object1);
1361 // We don't make object2 an optional parameter so that showRenderTree 1360 // We don't make object2 an optional parameter so that showRenderTree
1362 // can be called from gdb easily. 1361 // can be called from gdb easily.
1363 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2); 1362 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2);
1364 #endif 1363 #endif
1365 1364
1366 #endif // RenderObject_h 1365 #endif // RenderObject_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBox.h ('k') | Source/core/rendering/shapes/ShapeOutsideInfo.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698