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

Unified Diff: sky/engine/core/rendering/RenderBox.h

Issue 703563002: Remove shape-outside. (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/rendering/RenderBlock.cpp ('k') | sky/engine/core/rendering/RenderBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderBox.h
diff --git a/sky/engine/core/rendering/RenderBox.h b/sky/engine/core/rendering/RenderBox.h
index 5c852bcdba4258f70676466c2f128b95b4aea773..44393f422e03d414883d8075d8e3d2b14bdd2f80 100644
--- a/sky/engine/core/rendering/RenderBox.h
+++ b/sky/engine/core/rendering/RenderBox.h
@@ -25,12 +25,12 @@
#include "core/rendering/RenderBoxModelObject.h"
#include "core/rendering/RenderOverflow.h"
-#include "core/rendering/shapes/ShapeOutsideInfo.h"
#include "platform/scroll/ScrollTypes.h"
namespace blink {
struct PaintInfo;
+class RenderBlockFlow;
class RenderLayerScrollableArea;
enum SizeType { MainOrPreferredSize, MinSize, MaxSize };
@@ -562,11 +562,6 @@ public:
bool hasSameDirectionAs(const RenderBox* object) const { return style()->direction() == object->style()->direction(); }
- ShapeOutsideInfo* shapeOutsideInfo() const
- {
- return ShapeOutsideInfo::isEnabledFor(*this) ? ShapeOutsideInfo::info(*this) : 0;
- }
-
protected:
virtual void willBeDestroyed() override;
@@ -629,8 +624,6 @@ protected:
#endif
private:
- void updateShapeOutsideInfoAfterStyleChange(const RenderStyle&, const RenderStyle* oldStyle);
-
void shrinkToFitWidth(const LayoutUnit availableSpace, const LayoutUnit logicalLeftValue, const LayoutUnit bordersPlusPadding, LogicalExtentComputedValues&) const;
// Returns true if we queued up a paint invalidation.
« no previous file with comments | « sky/engine/core/rendering/RenderBlock.cpp ('k') | sky/engine/core/rendering/RenderBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698