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

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

Issue 2874553002: [SPv2] Fix layout test crashes about raster invalidation (Closed)
Patch Set: - Created 3 years, 7 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
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 3726 matching lines...) Expand 10 before | Expand all | Expand 10 after
3737 for (Frame* frame = &frame_->Tree().Top(); frame; 3737 for (Frame* frame = &frame_->Tree().Top(); frame;
3738 frame = frame->Tree().TraverseNext()) { 3738 frame = frame->Tree().TraverseNext()) {
3739 if (!frame->IsLocalFrame()) 3739 if (!frame->IsLocalFrame())
3740 continue; 3740 continue;
3741 if (LayoutViewItem layout_view = ToLocalFrame(frame)->ContentLayoutItem()) { 3741 if (LayoutViewItem layout_view = ToLocalFrame(frame)->ContentLayoutItem()) {
3742 layout_view.GetFrameView()->tracked_object_paint_invalidations_ = 3742 layout_view.GetFrameView()->tracked_object_paint_invalidations_ =
3743 WTF::WrapUnique(track_paint_invalidations 3743 WTF::WrapUnique(track_paint_invalidations
3744 ? new Vector<ObjectPaintInvalidation> 3744 ? new Vector<ObjectPaintInvalidation>
3745 : nullptr); 3745 : nullptr);
3746 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { 3746 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
3747 if (!paint_controller_)
3748 paint_controller_ = PaintController::Create();
3747 paint_controller_->SetTracksRasterInvalidations( 3749 paint_controller_->SetTracksRasterInvalidations(
3748 track_paint_invalidations); 3750 track_paint_invalidations);
3749 paint_artifact_compositor_->SetTracksRasterInvalidations( 3751 if (paint_artifact_compositor_)
3750 track_paint_invalidations); 3752 paint_artifact_compositor_->ResetTrackedRasterInvalidations();
3751 } else { 3753 } else {
3752 layout_view.Compositor()->SetTracksRasterInvalidations( 3754 layout_view.Compositor()->SetTracksRasterInvalidations(
3753 track_paint_invalidations); 3755 track_paint_invalidations);
3754 } 3756 }
3755 } 3757 }
3756 } 3758 }
3757 3759
3758 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), 3760 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"),
3759 "FrameView::setTracksPaintInvalidations", 3761 "FrameView::setTracksPaintInvalidations",
3760 TRACE_EVENT_SCOPE_GLOBAL, "enabled", 3762 TRACE_EVENT_SCOPE_GLOBAL, "enabled",
(...skipping 1627 matching lines...) Expand 10 before | Expand all | Expand 10 after
5388 void FrameView::SetAnimationHost( 5390 void FrameView::SetAnimationHost(
5389 std::unique_ptr<CompositorAnimationHost> host) { 5391 std::unique_ptr<CompositorAnimationHost> host) {
5390 animation_host_ = std::move(host); 5392 animation_host_ = std::move(host);
5391 } 5393 }
5392 5394
5393 LayoutUnit FrameView::CaretWidth() const { 5395 LayoutUnit FrameView::CaretWidth() const {
5394 return LayoutUnit(GetChromeClient()->WindowToViewportScalar(1)); 5396 return LayoutUnit(GetChromeClient()->WindowToViewportScalar(1));
5395 } 5397 }
5396 5398
5397 } // namespace blink 5399 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698