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

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

Issue 10411077: Merge 116551 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
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 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 bool hasColumns() const { return m_bitfields.hasColumns(); } 372 bool hasColumns() const { return m_bitfields.hasColumns(); }
373 void setHasColumns(bool b = true) { m_bitfields.setHasColumns(b); } 373 void setHasColumns(bool b = true) { m_bitfields.setHasColumns(b); }
374 374
375 bool ancestorLineBoxDirty() const { return s_ancestorLineboxDirtySet && s_an cestorLineboxDirtySet->contains(this); } 375 bool ancestorLineBoxDirty() const { return s_ancestorLineboxDirtySet && s_an cestorLineboxDirtySet->contains(this); }
376 void setAncestorLineBoxDirty(bool b = true) 376 void setAncestorLineBoxDirty(bool b = true)
377 { 377 {
378 if (b) { 378 if (b) {
379 if (!s_ancestorLineboxDirtySet) 379 if (!s_ancestorLineboxDirtySet)
380 s_ancestorLineboxDirtySet = new RenderObjectAncestorLineboxDirty Set; 380 s_ancestorLineboxDirtySet = new RenderObjectAncestorLineboxDirty Set;
381 s_ancestorLineboxDirtySet->add(this); 381 s_ancestorLineboxDirtySet->add(this);
382 setNeedsLayout(true);
382 } else if (s_ancestorLineboxDirtySet) { 383 } else if (s_ancestorLineboxDirtySet) {
383 s_ancestorLineboxDirtySet->remove(this); 384 s_ancestorLineboxDirtySet->remove(this);
384 if (s_ancestorLineboxDirtySet->isEmpty()) { 385 if (s_ancestorLineboxDirtySet->isEmpty()) {
385 delete s_ancestorLineboxDirtySet; 386 delete s_ancestorLineboxDirtySet;
386 s_ancestorLineboxDirtySet = 0; 387 s_ancestorLineboxDirtySet = 0;
387 } 388 }
388 } 389 }
389 } 390 }
390 391
391 bool inRenderFlowThread() const { return m_bitfields.inRenderFlowThread(); } 392 bool inRenderFlowThread() const { return m_bitfields.inRenderFlowThread(); }
(...skipping 808 matching lines...) Expand 10 before | Expand all | Expand 10 after
1200 // Outside the WebCore namespace for ease of invocation from gdb. 1201 // Outside the WebCore namespace for ease of invocation from gdb.
1201 void showTree(const WebCore::RenderObject*); 1202 void showTree(const WebCore::RenderObject*);
1202 void showLineTree(const WebCore::RenderObject*); 1203 void showLineTree(const WebCore::RenderObject*);
1203 void showRenderTree(const WebCore::RenderObject* object1); 1204 void showRenderTree(const WebCore::RenderObject* object1);
1204 // We don't make object2 an optional parameter so that showRenderTree 1205 // We don't make object2 an optional parameter so that showRenderTree
1205 // can be called from gdb easily. 1206 // can be called from gdb easily.
1206 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2); 1207 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2);
1207 #endif 1208 #endif
1208 1209
1209 #endif // RenderObject_h 1210 #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