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

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

Issue 10412039: Merge 116551 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
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 | « LayoutTests/fast/block/line-layout/line-break-removal-near-textarea-crash-expected.txt ('k') | no next file » | 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 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 bool hasColumns() const { return m_bitfields.hasColumns(); } 382 bool hasColumns() const { return m_bitfields.hasColumns(); }
383 void setHasColumns(bool b = true) { m_bitfields.setHasColumns(b); } 383 void setHasColumns(bool b = true) { m_bitfields.setHasColumns(b); }
384 384
385 bool ancestorLineBoxDirty() const { return s_ancestorLineboxDirtySet && s_an cestorLineboxDirtySet->contains(this); } 385 bool ancestorLineBoxDirty() const { return s_ancestorLineboxDirtySet && s_an cestorLineboxDirtySet->contains(this); }
386 void setAncestorLineBoxDirty(bool b = true) 386 void setAncestorLineBoxDirty(bool b = true)
387 { 387 {
388 if (b) { 388 if (b) {
389 if (!s_ancestorLineboxDirtySet) 389 if (!s_ancestorLineboxDirtySet)
390 s_ancestorLineboxDirtySet = new RenderObjectAncestorLineboxDirty Set; 390 s_ancestorLineboxDirtySet = new RenderObjectAncestorLineboxDirty Set;
391 s_ancestorLineboxDirtySet->add(this); 391 s_ancestorLineboxDirtySet->add(this);
392 setNeedsLayout(true);
392 } else if (s_ancestorLineboxDirtySet) { 393 } else if (s_ancestorLineboxDirtySet) {
393 s_ancestorLineboxDirtySet->remove(this); 394 s_ancestorLineboxDirtySet->remove(this);
394 if (s_ancestorLineboxDirtySet->isEmpty()) { 395 if (s_ancestorLineboxDirtySet->isEmpty()) {
395 delete s_ancestorLineboxDirtySet; 396 delete s_ancestorLineboxDirtySet;
396 s_ancestorLineboxDirtySet = 0; 397 s_ancestorLineboxDirtySet = 0;
397 } 398 }
398 } 399 }
399 } 400 }
400 401
401 bool inRenderFlowThread() const { return m_bitfields.inRenderFlowThread(); } 402 bool inRenderFlowThread() const { return m_bitfields.inRenderFlowThread(); }
(...skipping 808 matching lines...) Expand 10 before | Expand all | Expand 10 after
1210 // Outside the WebCore namespace for ease of invocation from gdb. 1211 // Outside the WebCore namespace for ease of invocation from gdb.
1211 void showTree(const WebCore::RenderObject*); 1212 void showTree(const WebCore::RenderObject*);
1212 void showLineTree(const WebCore::RenderObject*); 1213 void showLineTree(const WebCore::RenderObject*);
1213 void showRenderTree(const WebCore::RenderObject* object1); 1214 void showRenderTree(const WebCore::RenderObject* object1);
1214 // We don't make object2 an optional parameter so that showRenderTree 1215 // We don't make object2 an optional parameter so that showRenderTree
1215 // can be called from gdb easily. 1216 // can be called from gdb easily.
1216 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2); 1217 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2);
1217 #endif 1218 #endif
1218 1219
1219 #endif // RenderObject_h 1220 #endif // RenderObject_h
OLDNEW
« no previous file with comments | « LayoutTests/fast/block/line-layout/line-break-removal-near-textarea-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698