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

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

Issue 9566030: Merge 108606 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 years, 9 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') | no next file » | 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 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 355
356 bool isTablePart() const { return isTableCell() || isTableCol() || isTableCa ption() || isTableRow() || isTableSection(); } 356 bool isTablePart() const { return isTableCell() || isTableCol() || isTableCa ption() || isTableRow() || isTableSection(); }
357 357
358 inline bool isBeforeContent() const; 358 inline bool isBeforeContent() const;
359 inline bool isAfterContent() const; 359 inline bool isAfterContent() const;
360 inline bool isBeforeOrAfterContent() const; 360 inline bool isBeforeOrAfterContent() const;
361 static inline bool isBeforeContent(const RenderObject* obj) { return obj && obj->isBeforeContent(); } 361 static inline bool isBeforeContent(const RenderObject* obj) { return obj && obj->isBeforeContent(); }
362 static inline bool isAfterContent(const RenderObject* obj) { return obj && o bj->isAfterContent(); } 362 static inline bool isAfterContent(const RenderObject* obj) { return obj && o bj->isAfterContent(); }
363 static inline bool isBeforeOrAfterContent(const RenderObject* obj) { return obj && obj->isBeforeOrAfterContent(); } 363 static inline bool isBeforeOrAfterContent(const RenderObject* obj) { return obj && obj->isBeforeOrAfterContent(); }
364 364
365 inline RenderObject* anonymousContainer(RenderObject* child)
366 {
367 RenderObject* container = child;
368 while (container->parent() != this)
369 container = container->parent();
370
371 ASSERT(container->isAnonymous());
372 return container;
373 }
374
375 bool childrenInline() const { return m_childrenInline; } 365 bool childrenInline() const { return m_childrenInline; }
376 void setChildrenInline(bool b) { m_childrenInline = b; } 366 void setChildrenInline(bool b) { m_childrenInline = b; }
377 bool hasColumns() const { return m_hasColumns; } 367 bool hasColumns() const { return m_hasColumns; }
378 void setHasColumns(bool b = true) { m_hasColumns = b; } 368 void setHasColumns(bool b = true) { m_hasColumns = b; }
379 369
380 bool inRenderFlowThread() const { return m_inRenderFlowThread; } 370 bool inRenderFlowThread() const { return m_inRenderFlowThread; }
381 void setInRenderFlowThread(bool b = true) { m_inRenderFlowThread = b; } 371 void setInRenderFlowThread(bool b = true) { m_inRenderFlowThread = b; }
382 372
383 virtual bool requiresForcedStyleRecalcPropagation() const { return false; } 373 virtual bool requiresForcedStyleRecalcPropagation() const { return false; }
384 374
(...skipping 698 matching lines...) Expand 10 before | Expand all | Expand 10 after
1083 // Outside the WebCore namespace for ease of invocation from gdb. 1073 // Outside the WebCore namespace for ease of invocation from gdb.
1084 void showTree(const WebCore::RenderObject*); 1074 void showTree(const WebCore::RenderObject*);
1085 void showLineTree(const WebCore::RenderObject*); 1075 void showLineTree(const WebCore::RenderObject*);
1086 void showRenderTree(const WebCore::RenderObject* object1); 1076 void showRenderTree(const WebCore::RenderObject* object1);
1087 // We don't make object2 an optional parameter so that showRenderTree 1077 // We don't make object2 an optional parameter so that showRenderTree
1088 // can be called from gdb easily. 1078 // can be called from gdb easily.
1089 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2); 1079 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2);
1090 #endif 1080 #endif
1091 1081
1092 #endif // RenderObject_h 1082 #endif // RenderObject_h
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderBlock.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698