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

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

Issue 8216022: Merge 97075 - Style for updated due to inability to locate (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 2 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 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) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 o = parent(); 374 o = parent();
375 while (o && !o->nextSibling()) 375 while (o && !o->nextSibling())
376 o = o->parent(); 376 o = o->parent();
377 if (o) 377 if (o)
378 o = o->nextSibling(); 378 o = o->nextSibling();
379 } 379 }
380 380
381 return o; 381 return o;
382 } 382 }
383 383
384 RenderObject* RenderObject::nextInPreOrder(RenderObject* stayWithin) const 384 RenderObject* RenderObject::nextInPreOrder(const RenderObject* stayWithin) const
385 { 385 {
386 if (RenderObject* o = firstChild()) 386 if (RenderObject* o = firstChild())
387 return o; 387 return o;
388 388
389 return nextInPreOrderAfterChildren(stayWithin); 389 return nextInPreOrderAfterChildren(stayWithin);
390 } 390 }
391 391
392 RenderObject* RenderObject::nextInPreOrderAfterChildren(RenderObject* stayWithin ) const 392 RenderObject* RenderObject::nextInPreOrderAfterChildren(const RenderObject* stay Within) const
393 { 393 {
394 if (this == stayWithin) 394 if (this == stayWithin)
395 return 0; 395 return 0;
396 396
397 const RenderObject* current = this; 397 const RenderObject* current = this;
398 RenderObject* next; 398 RenderObject* next;
399 while (!(next = current->nextSibling())) { 399 while (!(next = current->nextSibling())) {
400 current = current->parent(); 400 current = current->parent();
401 if (!current || current == stayWithin) 401 if (!current || current == stayWithin)
402 return 0; 402 return 0;
(...skipping 2313 matching lines...) Expand 10 before | Expand all | Expand 10 after
2716 { 2716 {
2717 if (object1) { 2717 if (object1) {
2718 const WebCore::RenderObject* root = object1; 2718 const WebCore::RenderObject* root = object1;
2719 while (root->parent()) 2719 while (root->parent())
2720 root = root->parent(); 2720 root = root->parent();
2721 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 2721 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
2722 } 2722 }
2723 } 2723 }
2724 2724
2725 #endif 2725 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderObject.h ('k') | Source/WebCore/rendering/RenderObjectChildList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698