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

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

Issue 8666016: Merge 100630 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/912/
Patch Set: Created 9 years, 1 month 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 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 344
345 bool isHTMLMarquee() const; 345 bool isHTMLMarquee() const;
346 346
347 inline bool isBeforeContent() const; 347 inline bool isBeforeContent() const;
348 inline bool isAfterContent() const; 348 inline bool isAfterContent() const;
349 inline bool isBeforeOrAfterContent() const; 349 inline bool isBeforeOrAfterContent() const;
350 static inline bool isBeforeContent(const RenderObject* obj) { return obj && obj->isBeforeContent(); } 350 static inline bool isBeforeContent(const RenderObject* obj) { return obj && obj->isBeforeContent(); }
351 static inline bool isAfterContent(const RenderObject* obj) { return obj && o bj->isAfterContent(); } 351 static inline bool isAfterContent(const RenderObject* obj) { return obj && o bj->isAfterContent(); }
352 static inline bool isBeforeOrAfterContent(const RenderObject* obj) { return obj && obj->isBeforeOrAfterContent(); } 352 static inline bool isBeforeOrAfterContent(const RenderObject* obj) { return obj && obj->isBeforeOrAfterContent(); }
353 353
354 inline RenderObject* findBeforeContentRenderer() const
355 {
356 RenderObject* renderer = beforePseudoElementRenderer();
357 return isBeforeContent(renderer) ? renderer : 0;
358 }
359
360 inline RenderObject* findAfterContentRenderer() const
361 {
362 RenderObject* renderer = afterPseudoElementRenderer();
363 return isAfterContent(renderer) ? renderer : 0;
364 }
365
366 inline RenderObject* anonymousContainer(RenderObject* child) 354 inline RenderObject* anonymousContainer(RenderObject* child)
367 { 355 {
368 RenderObject* container = child; 356 RenderObject* container = child;
369 while (container->parent() != this) 357 while (container->parent() != this)
370 container = container->parent(); 358 container = container->parent();
371 359
372 ASSERT(container->isAnonymous()); 360 ASSERT(container->isAnonymous());
373 return container; 361 return container;
374 } 362 }
375 363
(...skipping 705 matching lines...) Expand 10 before | Expand all | Expand 10 after
1081 // Outside the WebCore namespace for ease of invocation from gdb. 1069 // Outside the WebCore namespace for ease of invocation from gdb.
1082 void showTree(const WebCore::RenderObject*); 1070 void showTree(const WebCore::RenderObject*);
1083 void showLineTree(const WebCore::RenderObject*); 1071 void showLineTree(const WebCore::RenderObject*);
1084 void showRenderTree(const WebCore::RenderObject* object1); 1072 void showRenderTree(const WebCore::RenderObject* object1);
1085 // We don't make object2 an optional parameter so that showRenderTree 1073 // We don't make object2 an optional parameter so that showRenderTree
1086 // can be called from gdb easily. 1074 // can be called from gdb easily.
1087 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2); 1075 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2);
1088 #endif 1076 #endif
1089 1077
1090 #endif // RenderObject_h 1078 #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