| 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 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 389 if (o->needsLayout()) | 389 if (o->needsLayout()) |
| 390 ++needsLayoutObjects; | 390 ++needsLayoutObjects; |
| 391 } | 391 } |
| 392 } | 392 } |
| 393 | 393 |
| 394 String LocalFrame::layerTreeAsText(unsigned flags) const | 394 String LocalFrame::layerTreeAsText(unsigned flags) const |
| 395 { | 395 { |
| 396 if (!contentRenderer()) | 396 if (!contentRenderer()) |
| 397 return String(); | 397 return String(); |
| 398 | 398 |
| 399 ASSERT(document()->lifecycle().state() >= DocumentLifecycle::CompositingClea
n); | |
| 400 | |
| 401 return contentRenderer()->compositor()->layerTreeAsText(static_cast<LayerTre
eFlags>(flags)); | 399 return contentRenderer()->compositor()->layerTreeAsText(static_cast<LayerTre
eFlags>(flags)); |
| 402 } | 400 } |
| 403 | 401 |
| 404 String LocalFrame::trackedRepaintRectsAsText() const | 402 String LocalFrame::trackedRepaintRectsAsText() const |
| 405 { | 403 { |
| 406 if (!m_view) | 404 if (!m_view) |
| 407 return String(); | 405 return String(); |
| 408 return m_view->trackedRepaintRectsAsText(); | 406 return m_view->trackedRepaintRectsAsText(); |
| 409 } | 407 } |
| 410 | 408 |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 597 { | 595 { |
| 598 if (!m_host) | 596 if (!m_host) |
| 599 return 0; | 597 return 0; |
| 600 | 598 |
| 601 double ratio = m_host->deviceScaleFactor(); | 599 double ratio = m_host->deviceScaleFactor(); |
| 602 ratio *= pageZoomFactor(); | 600 ratio *= pageZoomFactor(); |
| 603 return ratio; | 601 return ratio; |
| 604 } | 602 } |
| 605 | 603 |
| 606 } // namespace WebCore | 604 } // namespace WebCore |
| OLD | NEW |