diff options
author | John Reck <jreck@google.com> | 2011-10-21 10:06:58 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-21 10:06:58 -0700 |
commit | 5dee9ed228c914254062b62ae459884e3060a2ae (patch) | |
tree | 46f9b25e485470b1d7d1dd23d06ca4b26ae47e22 /Source/WebCore/rendering/RenderObject.h | |
parent | 5236e6a2f70997cf9dec9e93261867dd79b21738 (diff) | |
parent | 9a26d18f4c7e98b479be700575d003f873214550 (diff) | |
download | external_webkit-5dee9ed228c914254062b62ae459884e3060a2ae.zip external_webkit-5dee9ed228c914254062b62ae459884e3060a2ae.tar.gz external_webkit-5dee9ed228c914254062b62ae459884e3060a2ae.tar.bz2 |
Merge "Cherry pick 97075" into ics-mr0
Diffstat (limited to 'Source/WebCore/rendering/RenderObject.h')
-rw-r--r-- | Source/WebCore/rendering/RenderObject.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/rendering/RenderObject.h b/Source/WebCore/rendering/RenderObject.h index 14a40e9..005c453 100644 --- a/Source/WebCore/rendering/RenderObject.h +++ b/Source/WebCore/rendering/RenderObject.h @@ -158,9 +158,9 @@ public: virtual const RenderObjectChildList* virtualChildren() const { return 0; } RenderObject* nextInPreOrder() const; - RenderObject* nextInPreOrder(RenderObject* stayWithin) const; + RenderObject* nextInPreOrder(const RenderObject* stayWithin) const; RenderObject* nextInPreOrderAfterChildren() const; - RenderObject* nextInPreOrderAfterChildren(RenderObject* stayWithin) const; + RenderObject* nextInPreOrderAfterChildren(const RenderObject* stayWithin) const; RenderObject* previousInPreOrder() const; RenderObject* childAt(unsigned) const; |