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 760 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
771 void LocalFrame::removeSpellingMarkersUnderWords(const Vector<String>& words) | 771 void LocalFrame::removeSpellingMarkersUnderWords(const Vector<String>& words) |
772 { | 772 { |
773 spellChecker().removeSpellingMarkersUnderWords(words); | 773 spellChecker().removeSpellingMarkersUnderWords(words); |
774 } | 774 } |
775 | 775 |
776 String LocalFrame::layerTreeAsText(unsigned flags) const | 776 String LocalFrame::layerTreeAsText(unsigned flags) const |
777 { | 777 { |
778 if (contentLayoutItem().isNull()) | 778 if (contentLayoutItem().isNull()) |
779 return String(); | 779 return String(); |
780 | 780 |
781 std::unique_ptr<JSONObject> layerTree = contentLayoutItem().compositor()->la
yerTreeAsJSON(static_cast<LayerTreeFlags>(flags)); | 781 std::unique_ptr<JSONObject> layers; |
| 782 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) |
| 783 layers = view()->compositedLayersAsJSON(static_cast<LayerTreeFlags>(flag
s)); |
| 784 else |
| 785 layers = contentLayoutItem().compositor()->layerTreeAsJSON(static_cast<L
ayerTreeFlags>(flags)); |
782 | 786 |
783 if (flags & LayerTreeIncludesPaintInvalidations) { | 787 if (flags & LayerTreeIncludesPaintInvalidations) { |
784 std::unique_ptr<JSONArray> objectPaintInvalidations = m_view->trackedObj
ectPaintInvalidationsAsJSON(); | 788 std::unique_ptr<JSONArray> objectPaintInvalidations = m_view->trackedObj
ectPaintInvalidationsAsJSON(); |
785 if (objectPaintInvalidations && objectPaintInvalidations->size()) { | 789 if (objectPaintInvalidations && objectPaintInvalidations->size()) { |
786 if (!layerTree) | 790 if (!layers) |
787 layerTree = JSONObject::create(); | 791 layers = JSONObject::create(); |
788 layerTree->setArray("objectPaintInvalidations", std::move(objectPain
tInvalidations)); | 792 layers->setArray("objectPaintInvalidations", std::move(objectPaintIn
validations)); |
789 } | 793 } |
790 } | 794 } |
791 | 795 |
792 return layerTree ? layerTree->toPrettyJSONString() : String(); | 796 return layers ? layers->toPrettyJSONString() : String(); |
793 } | 797 } |
794 | 798 |
795 bool LocalFrame::shouldThrottleRendering() const | 799 bool LocalFrame::shouldThrottleRendering() const |
796 { | 800 { |
797 return view() && view()->shouldThrottleRendering(); | 801 return view() && view()->shouldThrottleRendering(); |
798 } | 802 } |
799 | 803 |
800 inline LocalFrame::LocalFrame(FrameLoaderClient* client, FrameHost* host, FrameO
wner* owner, InterfaceProvider* interfaceProvider) | 804 inline LocalFrame::LocalFrame(FrameLoaderClient* client, FrameHost* host, FrameO
wner* owner, InterfaceProvider* interfaceProvider) |
801 : Frame(client, host, owner) | 805 : Frame(client, host, owner) |
802 , m_frameScheduler(page()->chromeClient().createFrameScheduler(client->frame
BlameContext())) | 806 , m_frameScheduler(page()->chromeClient().createFrameScheduler(client->frame
BlameContext())) |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
865 m_frame->client()->frameBlameContext()->Enter(); | 869 m_frame->client()->frameBlameContext()->Enter(); |
866 } | 870 } |
867 | 871 |
868 ScopedFrameBlamer::~ScopedFrameBlamer() | 872 ScopedFrameBlamer::~ScopedFrameBlamer() |
869 { | 873 { |
870 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 874 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
871 m_frame->client()->frameBlameContext()->Leave(); | 875 m_frame->client()->frameBlameContext()->Leave(); |
872 } | 876 } |
873 | 877 |
874 } // namespace blink | 878 } // namespace blink |
OLD | NEW |