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

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

Issue 7946014: Merge 95461 - Child not placed correctly when beforeChild (table part) (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 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
« no previous file with comments | « Source/WebCore/rendering/RenderBlock.cpp ('k') | Source/WebCore/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 Apple Inc. All rights reserved. 6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights 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 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 330
331 bool isHTMLMarquee() const; 331 bool isHTMLMarquee() const;
332 332
333 inline bool isBeforeContent() const; 333 inline bool isBeforeContent() const;
334 inline bool isAfterContent() const; 334 inline bool isAfterContent() const;
335 inline bool isBeforeOrAfterContent() const; 335 inline bool isBeforeOrAfterContent() const;
336 static inline bool isBeforeContent(const RenderObject* obj) { return obj && obj->isBeforeContent(); } 336 static inline bool isBeforeContent(const RenderObject* obj) { return obj && obj->isBeforeContent(); }
337 static inline bool isAfterContent(const RenderObject* obj) { return obj && o bj->isAfterContent(); } 337 static inline bool isAfterContent(const RenderObject* obj) { return obj && o bj->isAfterContent(); }
338 static inline bool isBeforeOrAfterContent(const RenderObject* obj) { return obj && obj->isBeforeOrAfterContent(); } 338 static inline bool isBeforeOrAfterContent(const RenderObject* obj) { return obj && obj->isBeforeOrAfterContent(); }
339 339
340 inline RenderObject* findBeforeContentRenderer() const
341 {
342 RenderObject* renderer = beforePseudoElementRenderer();
343 return isBeforeContent(renderer) ? renderer : 0;
344 }
345
346 inline RenderObject* findAfterContentRenderer() const
347 {
348 RenderObject* renderer = afterPseudoElementRenderer();
349 return isAfterContent(renderer) ? renderer : 0;
350 }
351
352 inline RenderObject* anonymousContainer(RenderObject* child)
353 {
354 RenderObject* container = child;
355 while (container->parent() != this)
356 container = container->parent();
357
358 ASSERT(container->isAnonymous());
359 return container;
360 }
361
340 bool childrenInline() const { return m_childrenInline; } 362 bool childrenInline() const { return m_childrenInline; }
341 void setChildrenInline(bool b = true) { m_childrenInline = b; } 363 void setChildrenInline(bool b = true) { m_childrenInline = b; }
342 bool hasColumns() const { return m_hasColumns; } 364 bool hasColumns() const { return m_hasColumns; }
343 void setHasColumns(bool b = true) { m_hasColumns = b; } 365 void setHasColumns(bool b = true) { m_hasColumns = b; }
344 366
345 virtual bool requiresForcedStyleRecalcPropagation() const { return false; } 367 virtual bool requiresForcedStyleRecalcPropagation() const { return false; }
346 368
347 #if ENABLE(MATHML) 369 #if ENABLE(MATHML)
348 virtual bool isRenderMathMLBlock() const { return false; } 370 virtual bool isRenderMathMLBlock() const { return false; }
349 #endif // ENABLE(MATHML) 371 #endif // ENABLE(MATHML)
(...skipping 758 matching lines...) Expand 10 before | Expand all | Expand 10 after
1108 // Outside the WebCore namespace for ease of invocation from gdb. 1130 // Outside the WebCore namespace for ease of invocation from gdb.
1109 void showTree(const WebCore::RenderObject*); 1131 void showTree(const WebCore::RenderObject*);
1110 void showLineTree(const WebCore::RenderObject*); 1132 void showLineTree(const WebCore::RenderObject*);
1111 void showRenderTree(const WebCore::RenderObject* object1); 1133 void showRenderTree(const WebCore::RenderObject* object1);
1112 // We don't make object2 an optional parameter so that showRenderTree 1134 // We don't make object2 an optional parameter so that showRenderTree
1113 // can be called from gdb easily. 1135 // can be called from gdb easily.
1114 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2); 1136 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2);
1115 #endif 1137 #endif
1116 1138
1117 #endif // RenderObject_h 1139 #endif // RenderObject_h
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderBlock.cpp ('k') | Source/WebCore/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698