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 Simon Hausmann <hausmann@kde.org> | 5 * 2000 Simon Hausmann <hausmann@kde.org> |
6 * 2000 Stefan Schimanski <1Stein@gmx.de> | 6 * 2000 Stefan Schimanski <1Stein@gmx.de> |
7 * 2001 George Staikos <staikos@kde.org> | 7 * 2001 George Staikos <staikos@kde.org> |
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. | 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. |
9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> | 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> |
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
416 needsLayoutObjects = 0; | 416 needsLayoutObjects = 0; |
417 totalObjects = 0; | 417 totalObjects = 0; |
418 | 418 |
419 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) { | 419 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) { |
420 ++totalObjects; | 420 ++totalObjects; |
421 if (o->needsLayout()) | 421 if (o->needsLayout()) |
422 ++needsLayoutObjects; | 422 ++needsLayoutObjects; |
423 } | 423 } |
424 } | 424 } |
425 | 425 |
426 String LocalFrame::layerTreeAsText(unsigned flags) const | 426 String LocalFrame::layerTreeAsText(unsigned flags) const |
eseidel
2014/03/18 21:14:35
Should this ASSERT that it's up to date?
ojan
2014/03/19 17:29:41
The layerTreeAsText call on line 431 asserts this.
| |
427 { | 427 { |
428 document()->updateLayout(); | |
429 | |
430 if (!contentRenderer()) | 428 if (!contentRenderer()) |
431 return String(); | 429 return String(); |
432 | 430 |
433 return contentRenderer()->compositor()->layerTreeAsText(static_cast<LayerTre eFlags>(flags)); | 431 return contentRenderer()->compositor()->layerTreeAsText(static_cast<LayerTre eFlags>(flags)); |
434 } | 432 } |
435 | 433 |
436 String LocalFrame::trackedRepaintRectsAsText() const | 434 String LocalFrame::trackedRepaintRectsAsText() const |
437 { | 435 { |
438 if (!m_view) | 436 if (!m_view) |
439 return String(); | 437 return String(); |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
632 { | 630 { |
633 if (!m_host) | 631 if (!m_host) |
634 return 0; | 632 return 0; |
635 | 633 |
636 double ratio = m_host->deviceScaleFactor(); | 634 double ratio = m_host->deviceScaleFactor(); |
637 ratio *= pageZoomFactor(); | 635 ratio *= pageZoomFactor(); |
638 return ratio; | 636 return ratio; |
639 } | 637 } |
640 | 638 |
641 } // namespace WebCore | 639 } // namespace WebCore |
OLD | NEW |