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

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

Issue 953673002: Delete RenderLayerModelObject. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | « sky/engine/core/rendering/PaintInfo.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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 232
233 bool simplifiedLayout(); 233 bool simplifiedLayout();
234 virtual void simplifiedNormalFlowLayout(); 234 virtual void simplifiedNormalFlowLayout();
235 235
236 public: 236 public:
237 virtual void computeOverflow(LayoutUnit oldClientAfterEdge, bool = false); 237 virtual void computeOverflow(LayoutUnit oldClientAfterEdge, bool = false);
238 protected: 238 protected:
239 virtual void addOverflowFromChildren(); 239 virtual void addOverflowFromChildren();
240 void addOverflowFromPositionedObjects(); 240 void addOverflowFromPositionedObjects();
241 241
242 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& addition alOffset, const RenderLayerModelObject* paintContainer = 0) const override; 242 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& addition alOffset, const RenderBox* paintContainer = 0) const override;
243 243
244 void updateBlockChildDirtyBitsBeforeLayout(bool relayoutChildren, RenderBox* ); 244 void updateBlockChildDirtyBitsBeforeLayout(bool relayoutChildren, RenderBox* );
245 245
246 virtual bool isInlineBlock() const override final { return isInline() && isR eplaced(); } 246 virtual bool isInlineBlock() const override final { return isInline() && isR eplaced(); }
247 247
248 virtual bool hitTestContents(const HitTestRequest&, HitTestResult&, const Hi tTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset); 248 virtual bool hitTestContents(const HitTestRequest&, HitTestResult&, const Hi tTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset);
249 249
250 private: 250 private:
251 virtual RenderObjectChildList* virtualChildren() override final { return chi ldren(); } 251 virtual RenderObjectChildList* virtualChildren() override final { return chi ldren(); }
252 virtual const RenderObjectChildList* virtualChildren() const override final { return children(); } 252 virtual const RenderObjectChildList* virtualChildren() const override final { return children(); }
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 // member variables out of RenderBlock and into RenderBlockFlow. 311 // member variables out of RenderBlock and into RenderBlockFlow.
312 friend class RenderBlockFlow; 312 friend class RenderBlockFlow;
313 friend class RenderParagraph; 313 friend class RenderParagraph;
314 }; 314 };
315 315
316 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); 316 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock());
317 317
318 } // namespace blink 318 } // namespace blink
319 319
320 #endif // SKY_ENGINE_CORE_RENDERING_RENDERBLOCK_H_ 320 #endif // SKY_ENGINE_CORE_RENDERING_RENDERBLOCK_H_
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/PaintInfo.h ('k') | sky/engine/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698