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

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

Issue 1077473002: Stop rendering text inside flex boxes. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: make p default to display: paragraph Created 5 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 | « sky/engine/core/rendering/RenderBlock.cpp ('k') | sky/engine/core/rendering/RenderObject.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 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 // SVG uses FloatPoint precise hit testing, and passes the point in parent 289 // SVG uses FloatPoint precise hit testing, and passes the point in parent
290 // coordinates instead of in paint invalidaiton container coordinates. Event ually the 290 // coordinates instead of in paint invalidaiton container coordinates. Event ually the
291 // rest of the rendering tree will move to a similar model. 291 // rest of the rendering tree will move to a similar model.
292 virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const F loatPoint& pointInParent); 292 virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const F loatPoint& pointInParent);
293 293
294 bool canHaveWhitespaceChildren() const 294 bool canHaveWhitespaceChildren() const
295 { 295 {
296 return !isFlexibleBox(); 296 return !isFlexibleBox();
297 } 297 }
298 298
299 bool isAnonymous() const { return m_bitfields.isAnonymous(); } 299 // FIXME(sky): Remove.
300 bool isAnonymousBlock() const 300 bool isAnonymous() const { return false; }
301 { 301 bool isAnonymousBlock() const { return false; }
302 // This function is kept in sync with anonymous block creation condition s in
303 // RenderBlock::createAnonymousBlock(). This includes creating an anonym ous
304 // RenderBlock having a BLOCK or BOX display. See https://bugs.webkit.or g/show_bug.cgi?id=56709.
305 return isAnonymous() && style()->display() == PARAGRAPH;
306 }
307 302
308 bool isOutOfFlowPositioned() const { return m_bitfields.isOutOfFlowPositione d(); } // absolute or fixed positioning 303 bool isOutOfFlowPositioned() const { return m_bitfields.isOutOfFlowPositione d(); } // absolute or fixed positioning
309 bool isPositioned() const { return m_bitfields.isPositioned(); } 304 bool isPositioned() const { return m_bitfields.isPositioned(); }
310 305
311 bool isText() const { return m_bitfields.isText(); } 306 bool isText() const { return m_bitfields.isText(); }
312 bool isBox() const { return m_bitfields.isBox(); } 307 bool isBox() const { return m_bitfields.isBox(); }
313 bool isInline() const { return m_bitfields.isInline(); } // inline object 308 bool isInline() const { return m_bitfields.isInline(); } // inline object
314 bool isDragging() const { return m_bitfields.isDragging(); } 309 bool isDragging() const { return m_bitfields.isDragging(); }
315 bool isReplaced() const { return m_bitfields.isReplaced(); } // a "replaced" element (see CSS) 310 bool isReplaced() const { return m_bitfields.isReplaced(); } // a "replaced" element (see CSS)
316 311
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 void setNeedsOverflowRecalcAfterStyleChange(); 617 void setNeedsOverflowRecalcAfterStyleChange();
623 void markContainingBlocksForOverflowRecalc(); 618 void markContainingBlocksForOverflowRecalc();
624 619
625 protected: 620 protected:
626 // Overrides should call the superclass at the end. m_style will be 0 the fi rst time 621 // Overrides should call the superclass at the end. m_style will be 0 the fi rst time
627 // this function will be called. 622 // this function will be called.
628 virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle); 623 virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle);
629 // Overrides should call the superclass at the start. |oldStyle| will be 0 t he first 624 // Overrides should call the superclass at the start. |oldStyle| will be 0 t he first
630 // time this function is called. 625 // time this function is called.
631 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle); 626 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
632 void propagateStyleToAnonymousChildren(bool blockChildrenOnly = false);
633 void updateAnonymousChildStyle(const RenderObject* child, RenderStyle* style ) const { }
634 627
635 void drawLineForBoxSide(GraphicsContext*, int x1, int y1, int x2, int y2, Bo xSide, 628 void drawLineForBoxSide(GraphicsContext*, int x1, int y1, int x2, int y2, Bo xSide,
636 Color, EBorderStyle, int adjbw1, int adjbw2, bool an tialias = false); 629 Color, EBorderStyle, int adjbw1, int adjbw2, bool an tialias = false);
637 void drawDashedOrDottedBoxSide(GraphicsContext*, int x1, int y1, int x2, int y2, 630 void drawDashedOrDottedBoxSide(GraphicsContext*, int x1, int y1, int x2, int y2,
638 BoxSide, Color, int thickness, EBorderStyle, bool antialias); 631 BoxSide, Color, int thickness, EBorderStyle, bool antialias);
639 void drawDoubleBoxSide(GraphicsContext*, int x1, int y1, int x2, int y2, 632 void drawDoubleBoxSide(GraphicsContext*, int x1, int y1, int x2, int y2,
640 int length, BoxSide, Color, int thickness, int adjacentWidth1, int adjac entWidth2, bool antialias); 633 int length, BoxSide, Color, int thickness, int adjacentWidth1, int adjac entWidth2, bool antialias);
641 void drawRidgeOrGrooveBoxSide(GraphicsContext*, int x1, int y1, int x2, int y2, 634 void drawRidgeOrGrooveBoxSide(GraphicsContext*, int x1, int y1, int x2, int y2,
642 BoxSide, Color, EBorderStyle, int adjacentWidth1, int adjacentWidth2, bo ol antialias); 635 BoxSide, Color, EBorderStyle, int adjacentWidth1, int adjacentWidth2, bo ol antialias);
643 void drawSolidBoxSide(GraphicsContext*, int x1, int y1, int x2, int y2, 636 void drawSolidBoxSide(GraphicsContext*, int x1, int y1, int x2, int y2,
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 void showTree(const blink::RenderObject*); 880 void showTree(const blink::RenderObject*);
888 void showLineTree(const blink::RenderObject*); 881 void showLineTree(const blink::RenderObject*);
889 void showRenderTree(const blink::RenderObject* object1); 882 void showRenderTree(const blink::RenderObject* object1);
890 // We don't make object2 an optional parameter so that showRenderTree 883 // We don't make object2 an optional parameter so that showRenderTree
891 // can be called from gdb easily. 884 // can be called from gdb easily.
892 void showRenderTree(const blink::RenderObject* object1, const blink::RenderObjec t* object2); 885 void showRenderTree(const blink::RenderObject* object1, const blink::RenderObjec t* object2);
893 886
894 #endif 887 #endif
895 888
896 #endif // SKY_ENGINE_CORE_RENDERING_RENDEROBJECT_H_ 889 #endif // SKY_ENGINE_CORE_RENDERING_RENDEROBJECT_H_
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderBlock.cpp ('k') | sky/engine/core/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698