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

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

Issue 1200233002: Use the baseline information exposed by C++ to pipe baseline data through RenderBox. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 6 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/dom/Element.cpp ('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 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 209
210 virtual void paint(PaintInfo&, const LayoutPoint&, Vector<RenderBox*>& layer s) override; 210 virtual void paint(PaintInfo&, const LayoutPoint&, Vector<RenderBox*>& layer s) override;
211 void paintObject(PaintInfo&, const LayoutPoint&, Vector<RenderBox*>& layers) ; 211 void paintObject(PaintInfo&, const LayoutPoint&, Vector<RenderBox*>& layers) ;
212 virtual void paintChildren(PaintInfo&, const LayoutPoint&, Vector<RenderBox* >& layers); 212 virtual void paintChildren(PaintInfo&, const LayoutPoint&, Vector<RenderBox* >& layers);
213 213
214 virtual void adjustInlineDirectionLineBounds(unsigned /* expansionOpportunit yCount */, float& /* logicalLeft */, float& /* logicalWidth */) const { } 214 virtual void adjustInlineDirectionLineBounds(unsigned /* expansionOpportunit yCount */, float& /* logicalLeft */, float& /* logicalWidth */) const { }
215 215
216 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const override; 216 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const override;
217 virtual void computePreferredLogicalWidths() override; 217 virtual void computePreferredLogicalWidths() override;
218 218
219 virtual int firstLineBoxBaseline() const override; 219 virtual int firstLineBoxBaseline(FontBaselineOrAuto baselineType) const over ride;
220 virtual int inlineBlockBaseline(LineDirectionMode) const override; 220 virtual int inlineBlockBaseline(LineDirectionMode) const override;
221 virtual int lastLineBoxBaseline(LineDirectionMode) const; 221 virtual int lastLineBoxBaseline(LineDirectionMode) const;
222 222
223 virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) overrid e; 223 virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) overrid e;
224 224
225 virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) o verride; 225 virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) o verride;
226 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ov erride; 226 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ov erride;
227 227
228 virtual bool hasLineIfEmpty() const; 228 virtual bool hasLineIfEmpty() const;
229 229
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 // FIXME: This is temporary as we move code that accesses block flow 305 // FIXME: This is temporary as we move code that accesses block flow
306 // member variables out of RenderBlock and into RenderParagraph. 306 // member variables out of RenderBlock and into RenderParagraph.
307 friend class RenderParagraph; 307 friend class RenderParagraph;
308 }; 308 };
309 309
310 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); 310 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock());
311 311
312 } // namespace blink 312 } // namespace blink
313 313
314 #endif // SKY_ENGINE_CORE_RENDERING_RENDERBLOCK_H_ 314 #endif // SKY_ENGINE_CORE_RENDERING_RENDERBLOCK_H_
OLDNEW
« no previous file with comments | « sky/engine/core/dom/Element.cpp ('k') | sky/engine/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698