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

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

Issue 9568032: Merge 108127 (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') | 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 class InlineBox; 51 class InlineBox;
52 class InlineFlowBox; 52 class InlineFlowBox;
53 class OverlapTestRequestClient; 53 class OverlapTestRequestClient;
54 class Path; 54 class Path;
55 class Position; 55 class Position;
56 class RenderBoxModelObject; 56 class RenderBoxModelObject;
57 class RenderInline; 57 class RenderInline;
58 class RenderBlock; 58 class RenderBlock;
59 class RenderFlowThread; 59 class RenderFlowThread;
60 class RenderLayer; 60 class RenderLayer;
61 class RenderTable;
61 class RenderTheme; 62 class RenderTheme;
62 class TransformState; 63 class TransformState;
63 class VisiblePosition; 64 class VisiblePosition;
64 #if ENABLE(SVG) 65 #if ENABLE(SVG)
65 class RenderSVGResourceContainer; 66 class RenderSVGResourceContainer;
66 #endif 67 #endif
67 68
68 struct PaintInfo; 69 struct PaintInfo;
69 70
70 enum CursorDirective { 71 enum CursorDirective {
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 213
213 // Obtains the nearest enclosing block (including this block) that contribut es a first-line style to our inline 214 // Obtains the nearest enclosing block (including this block) that contribut es a first-line style to our inline
214 // children. 215 // children.
215 virtual RenderBlock* firstLineBlock() const; 216 virtual RenderBlock* firstLineBlock() const;
216 217
217 // Called when an object that was floating or positioned becomes a normal fl ow object 218 // Called when an object that was floating or positioned becomes a normal fl ow object
218 // again. We have to make sure the render tree updates as needed to accommo date the new 219 // again. We have to make sure the render tree updates as needed to accommo date the new
219 // normal flow object. 220 // normal flow object.
220 void handleDynamicFloatPositionChange(); 221 void handleDynamicFloatPositionChange();
221 222
223 RenderTable* createAnonymousTable() const;
224
222 // RenderObject tree manipulation 225 // RenderObject tree manipulation
223 ////////////////////////////////////////// 226 //////////////////////////////////////////
224 virtual bool canHaveChildren() const { return virtualChildren(); } 227 virtual bool canHaveChildren() const { return virtualChildren(); }
225 virtual bool isChildAllowed(RenderObject*, RenderStyle*) const { return true ; } 228 virtual bool isChildAllowed(RenderObject*, RenderStyle*) const { return true ; }
226 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) ; 229 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) ;
227 virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObje ct* beforeChild = 0) { return addChild(newChild, beforeChild); } 230 virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObje ct* beforeChild = 0) { return addChild(newChild, beforeChild); }
228 virtual void removeChild(RenderObject*); 231 virtual void removeChild(RenderObject*);
229 virtual bool createsAnonymousWrapper() const { return false; } 232 virtual bool createsAnonymousWrapper() const { return false; }
230 ////////////////////////////////////////// 233 //////////////////////////////////////////
231 234
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 346
344 virtual bool isRenderFlowThread() const { return false; } 347 virtual bool isRenderFlowThread() const { return false; }
345 348
346 bool isRoot() const { return document()->documentElement() == m_node; } 349 bool isRoot() const { return document()->documentElement() == m_node; }
347 bool isBody() const; 350 bool isBody() const;
348 bool isHR() const; 351 bool isHR() const;
349 bool isLegend() const; 352 bool isLegend() const;
350 353
351 bool isHTMLMarquee() const; 354 bool isHTMLMarquee() const;
352 355
356 bool isTablePart() const { return isTableCell() || isTableCol() || isTableCa ption() || isTableRow() || isTableSection(); }
357
353 inline bool isBeforeContent() const; 358 inline bool isBeforeContent() const;
354 inline bool isAfterContent() const; 359 inline bool isAfterContent() const;
355 inline bool isBeforeOrAfterContent() const; 360 inline bool isBeforeOrAfterContent() const;
356 static inline bool isBeforeContent(const RenderObject* obj) { return obj && obj->isBeforeContent(); } 361 static inline bool isBeforeContent(const RenderObject* obj) { return obj && obj->isBeforeContent(); }
357 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(); }
358 static inline bool isBeforeOrAfterContent(const RenderObject* obj) { return obj && obj->isBeforeOrAfterContent(); } 363 static inline bool isBeforeOrAfterContent(const RenderObject* obj) { return obj && obj->isBeforeOrAfterContent(); }
359 364
360 inline RenderObject* anonymousContainer(RenderObject* child) 365 inline RenderObject* anonymousContainer(RenderObject* child)
361 { 366 {
362 RenderObject* container = child; 367 RenderObject* container = child;
(...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after
1078 // Outside the WebCore namespace for ease of invocation from gdb. 1083 // Outside the WebCore namespace for ease of invocation from gdb.
1079 void showTree(const WebCore::RenderObject*); 1084 void showTree(const WebCore::RenderObject*);
1080 void showLineTree(const WebCore::RenderObject*); 1085 void showLineTree(const WebCore::RenderObject*);
1081 void showRenderTree(const WebCore::RenderObject* object1); 1086 void showRenderTree(const WebCore::RenderObject* object1);
1082 // We don't make object2 an optional parameter so that showRenderTree 1087 // We don't make object2 an optional parameter so that showRenderTree
1083 // can be called from gdb easily. 1088 // can be called from gdb easily.
1084 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2); 1089 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2);
1085 #endif 1090 #endif
1086 1091
1087 #endif // RenderObject_h 1092 #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