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

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

Issue 10264007: Merge 113252 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 7 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/RenderButton.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 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 214
215 // Obtains the nearest enclosing block (including this block) that contribut es a first-line style to our inline 215 // Obtains the nearest enclosing block (including this block) that contribut es a first-line style to our inline
216 // children. 216 // children.
217 virtual RenderBlock* firstLineBlock() const; 217 virtual RenderBlock* firstLineBlock() const;
218 218
219 // Called when an object that was floating or positioned becomes a normal fl ow object 219 // Called when an object that was floating or positioned becomes a normal fl ow object
220 // again. We have to make sure the render tree updates as needed to accommo date the new 220 // again. We have to make sure the render tree updates as needed to accommo date the new
221 // normal flow object. 221 // normal flow object.
222 void handleDynamicFloatPositionChange(); 222 void handleDynamicFloatPositionChange();
223 223
224 RenderTable* createAnonymousTable() const;
225
226 // RenderObject tree manipulation 224 // RenderObject tree manipulation
227 ////////////////////////////////////////// 225 //////////////////////////////////////////
228 virtual bool canHaveChildren() const { return virtualChildren(); } 226 virtual bool canHaveChildren() const { return virtualChildren(); }
229 virtual bool isChildAllowed(RenderObject*, RenderStyle*) const { return true ; } 227 virtual bool isChildAllowed(RenderObject*, RenderStyle*) const { return true ; }
230 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) ; 228 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) ;
231 virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObje ct* beforeChild = 0) { return addChild(newChild, beforeChild); } 229 virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObje ct* beforeChild = 0) { return addChild(newChild, beforeChild); }
232 virtual void removeChild(RenderObject*); 230 virtual void removeChild(RenderObject*);
233 virtual bool createsAnonymousWrapper() const { return false; } 231 virtual bool createsAnonymousWrapper() const { return false; }
234 ////////////////////////////////////////// 232 //////////////////////////////////////////
235 233
(...skipping 944 matching lines...) Expand 10 before | Expand all | Expand 10 after
1180 // Outside the WebCore namespace for ease of invocation from gdb. 1178 // Outside the WebCore namespace for ease of invocation from gdb.
1181 void showTree(const WebCore::RenderObject*); 1179 void showTree(const WebCore::RenderObject*);
1182 void showLineTree(const WebCore::RenderObject*); 1180 void showLineTree(const WebCore::RenderObject*);
1183 void showRenderTree(const WebCore::RenderObject* object1); 1181 void showRenderTree(const WebCore::RenderObject* object1);
1184 // We don't make object2 an optional parameter so that showRenderTree 1182 // We don't make object2 an optional parameter so that showRenderTree
1185 // can be called from gdb easily. 1183 // can be called from gdb easily.
1186 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2); 1184 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2);
1187 #endif 1185 #endif
1188 1186
1189 #endif // RenderObject_h 1187 #endif // RenderObject_h
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderButton.cpp ('k') | Source/WebCore/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698