Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2332973002: Fix crash of paint invalidation tracking after a new frame is created (Closed)
Patch Set: platform-neutual Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/paint/invalidation/insert-frame-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 3116 matching lines...) Expand 10 before | Expand all | Expand 10 after
3127 std::unique_ptr<JSONArray> FrameView::trackedObjectPaintInvalidationsAsJSON() co nst 3127 std::unique_ptr<JSONArray> FrameView::trackedObjectPaintInvalidationsAsJSON() co nst
3128 { 3128 {
3129 if (!m_trackedObjectPaintInvalidations) 3129 if (!m_trackedObjectPaintInvalidations)
3130 return nullptr; 3130 return nullptr;
3131 3131
3132 std::unique_ptr<JSONArray> result = JSONArray::create(); 3132 std::unique_ptr<JSONArray> result = JSONArray::create();
3133 for (Frame* frame = m_frame->tree().top(); frame; frame = frame->tree().trav erseNext()) { 3133 for (Frame* frame = m_frame->tree().top(); frame; frame = frame->tree().trav erseNext()) {
3134 if (!frame->isLocalFrame()) 3134 if (!frame->isLocalFrame())
3135 continue; 3135 continue;
3136 if (LayoutViewItem layoutView = toLocalFrame(frame)->contentLayoutItem() ) { 3136 if (LayoutViewItem layoutView = toLocalFrame(frame)->contentLayoutItem() ) {
3137 if (!layoutView.frameView()->m_trackedObjectPaintInvalidations)
3138 continue;
3137 for (const auto& item : *layoutView.frameView()->m_trackedObjectPain tInvalidations) { 3139 for (const auto& item : *layoutView.frameView()->m_trackedObjectPain tInvalidations) {
3138 std::unique_ptr<JSONObject> itemJSON = JSONObject::create(); 3140 std::unique_ptr<JSONObject> itemJSON = JSONObject::create();
3139 itemJSON->setString("object", item.name); 3141 itemJSON->setString("object", item.name);
3140 itemJSON->setString("reason", paintInvalidationReasonToString(it em.reason)); 3142 itemJSON->setString("reason", paintInvalidationReasonToString(it em.reason));
3141 result->pushObject(std::move(itemJSON)); 3143 result->pushObject(std::move(itemJSON));
3142 } 3144 }
3143 } 3145 }
3144 } 3146 }
3145 return result; 3147 return result;
3146 } 3148 }
(...skipping 1203 matching lines...) Expand 10 before | Expand all | Expand 10 after
4350 } 4352 }
4351 4353
4352 bool FrameView::canThrottleRendering() const 4354 bool FrameView::canThrottleRendering() const
4353 { 4355 {
4354 if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled()) 4356 if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled())
4355 return false; 4357 return false;
4356 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling); 4358 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling);
4357 } 4359 }
4358 4360
4359 } // namespace blink 4361 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/paint/invalidation/insert-frame-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698