| 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 762 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 773 | 773 |
| 774 String LocalFrame::layerTreeAsText(unsigned flags) const | 774 String LocalFrame::layerTreeAsText(unsigned flags) const |
| 775 { | 775 { |
| 776 if (contentLayoutItem().isNull()) | 776 if (contentLayoutItem().isNull()) |
| 777 return String(); | 777 return String(); |
| 778 | 778 |
| 779 RefPtr<JSONObject> layerTree = contentLayoutItem().compositor()->layerTreeAs
JSON(static_cast<LayerTreeFlags>(flags)); | 779 RefPtr<JSONObject> layerTree = contentLayoutItem().compositor()->layerTreeAs
JSON(static_cast<LayerTreeFlags>(flags)); |
| 780 | 780 |
| 781 if (flags & LayerTreeIncludesPaintInvalidations) { | 781 if (flags & LayerTreeIncludesPaintInvalidations) { |
| 782 RefPtr<JSONArray> objectPaintInvalidations = m_view->trackedObjectPaintI
nvalidationsAsJSON(); | 782 RefPtr<JSONArray> objectPaintInvalidations = m_view->trackedObjectPaintI
nvalidationsAsJSON(); |
| 783 if (objectPaintInvalidations) { | 783 if (objectPaintInvalidations && objectPaintInvalidations->length()) { |
| 784 if (!layerTree) | 784 if (!layerTree) |
| 785 layerTree = JSONObject::create(); | 785 layerTree = JSONObject::create(); |
| 786 layerTree->setArray("objectPaintInvalidations", objectPaintInvalidat
ions); | 786 layerTree->setArray("objectPaintInvalidations", objectPaintInvalidat
ions); |
| 787 } | 787 } |
| 788 } | 788 } |
| 789 | 789 |
| 790 return layerTree ? layerTree->toPrettyJSONString() : String(); | 790 return layerTree ? layerTree->toPrettyJSONString() : String(); |
| 791 } | 791 } |
| 792 | 792 |
| 793 bool LocalFrame::shouldThrottleRendering() const | 793 bool LocalFrame::shouldThrottleRendering() const |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 866 m_frame->client()->frameBlameContext()->Enter(); | 866 m_frame->client()->frameBlameContext()->Enter(); |
| 867 } | 867 } |
| 868 | 868 |
| 869 ScopedFrameBlamer::~ScopedFrameBlamer() | 869 ScopedFrameBlamer::~ScopedFrameBlamer() |
| 870 { | 870 { |
| 871 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 871 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 872 m_frame->client()->frameBlameContext()->Leave(); | 872 m_frame->client()->frameBlameContext()->Leave(); |
| 873 } | 873 } |
| 874 | 874 |
| 875 } // namespace blink | 875 } // namespace blink |
| OLD | NEW |