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

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

Issue 184023003: Make InlineBox::renderer() and related subclass methods return reference. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Updated by review comments. Created 6 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
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, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights 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 1199 matching lines...) Expand 10 before | Expand all | Expand 10 after
1210 void setShouldRepaintOverflowIfNeeded(bool b) { m_bitfields.setShouldRepaint OverflowIfNeeded(b); } 1210 void setShouldRepaintOverflowIfNeeded(bool b) { m_bitfields.setShouldRepaint OverflowIfNeeded(b); }
1211 1211
1212 private: 1212 private:
1213 // Store state between styleWillChange and styleDidChange 1213 // Store state between styleWillChange and styleDidChange
1214 static bool s_affectsParentBlock; 1214 static bool s_affectsParentBlock;
1215 1215
1216 LayoutRect m_oldRepaintRect; 1216 LayoutRect m_oldRepaintRect;
1217 LayoutRect m_newRepaintRect; 1217 LayoutRect m_newRepaintRect;
1218 }; 1218 };
1219 1219
1220 // Allow equality comparisons of RenderObject's by reference or pointer, interch angeably.
1221 inline bool operator==(const RenderObject& a, const RenderObject& b) { return &a == &b; }
1222 inline bool operator==(const RenderObject& a, const RenderObject* b) { return &a == b; }
1223 inline bool operator==(const RenderObject* a, const RenderObject& b) { return a == &b; }
1224 inline bool operator!=(const RenderObject& a, const RenderObject& b) { return !( a == b); }
1225 inline bool operator!=(const RenderObject& a, const RenderObject* b) { return !( a == b); }
1226 inline bool operator!=(const RenderObject* a, const RenderObject& b) { return !( a == b); }
1227 inline bool operator==(const PassRefPtr<RenderObject>& a, const RenderObject& b) { return a.get() == &b; }
Inactive 2014/02/28 14:16:42 Are the ones taking PassRefPtrs really needed righ
ostap 2014/02/28 15:37:23 Done.
1228 inline bool operator==(const RenderObject& a, const PassRefPtr<RenderObject>& b) { return &a == b.get(); }
1229 inline bool operator!=(const PassRefPtr<RenderObject>& a, const RenderObject& b) { return !(a == b); }
1230 inline bool operator!=(const RenderObject& a, const PassRefPtr<RenderObject>& b) { return !(a == b); }
1231
1220 inline bool RenderObject::documentBeingDestroyed() const 1232 inline bool RenderObject::documentBeingDestroyed() const
1221 { 1233 {
1222 return !document().renderer(); 1234 return !document().renderer();
1223 } 1235 }
1224 1236
1225 inline bool RenderObject::isBeforeContent() const 1237 inline bool RenderObject::isBeforeContent() const
1226 { 1238 {
1227 if (style()->styleType() != BEFORE) 1239 if (style()->styleType() != BEFORE)
1228 return false; 1240 return false;
1229 // Text nodes don't have their own styles, so ignore the style on a text nod e. 1241 // Text nodes don't have their own styles, so ignore the style on a text nod e.
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
1410 void showTree(const WebCore::RenderObject*); 1422 void showTree(const WebCore::RenderObject*);
1411 void showLineTree(const WebCore::RenderObject*); 1423 void showLineTree(const WebCore::RenderObject*);
1412 void showRenderTree(const WebCore::RenderObject* object1); 1424 void showRenderTree(const WebCore::RenderObject* object1);
1413 // We don't make object2 an optional parameter so that showRenderTree 1425 // We don't make object2 an optional parameter so that showRenderTree
1414 // can be called from gdb easily. 1426 // can be called from gdb easily.
1415 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2); 1427 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2);
1416 1428
1417 #endif 1429 #endif
1418 1430
1419 #endif // RenderObject_h 1431 #endif // RenderObject_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698