OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
10 * | 10 * |
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
257 if (needsLayout()) | 257 if (needsLayout()) |
258 layout(); | 258 layout(); |
259 } | 259 } |
260 } | 260 } |
261 | 261 |
262 void FrameView::layout(bool allowSubtree) | 262 void FrameView::layout(bool allowSubtree) |
263 { | 263 { |
264 // We should never layout a Document which is not in a LocalFrame. | 264 // We should never layout a Document which is not in a LocalFrame. |
265 ASSERT(m_frame); | 265 ASSERT(m_frame); |
266 ASSERT(m_frame->view() == this); | 266 ASSERT(m_frame->view() == this); |
267 ASSERT(m_frame->page()); | 267 //ASSERT(m_frame->page()); |
Hixie
2015/05/26 18:07:16
why just commented out?
eseidel
2015/05/26 19:13:05
Probably could be removed now.
| |
268 | 268 |
269 ScriptForbiddenScope forbidScript; | 269 ScriptForbiddenScope forbidScript; |
270 | 270 |
271 if (isInPerformLayout() || !m_frame->document()->isActive()) | 271 if (isInPerformLayout() || !m_frame->document()->isActive()) |
272 return; | 272 return; |
273 | 273 |
274 TRACE_EVENT0("blink", "FrameView::layout"); | 274 TRACE_EVENT0("blink", "FrameView::layout"); |
275 TRACE_EVENT_SCOPED_SAMPLING_STATE("blink", "Layout"); | 275 TRACE_EVENT_SCOPED_SAMPLING_STATE("blink", "Layout"); |
276 | 276 |
277 // Protect the view from being deleted during layout (in recalcStyle) | 277 // Protect the view from being deleted during layout (in recalcStyle) |
(...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
770 totalObjects = 0; | 770 totalObjects = 0; |
771 | 771 |
772 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) { | 772 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) { |
773 ++totalObjects; | 773 ++totalObjects; |
774 if (o->needsLayout()) | 774 if (o->needsLayout()) |
775 ++needsLayoutObjects; | 775 ++needsLayoutObjects; |
776 } | 776 } |
777 } | 777 } |
778 | 778 |
779 } // namespace blink | 779 } // namespace blink |
OLD | NEW |