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

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

Issue 2749023004: Replace SPv2 check with DCHECK when it is always false (Closed)
Patch Set: Add DCHECK Created 3 years, 9 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 | « no previous file | 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 3216 matching lines...) Expand 10 before | Expand all | Expand 10 after
3227 3227
3228 forAllNonThrottledFrameViews([](FrameView& frameView) { 3228 forAllNonThrottledFrameViews([](FrameView& frameView) {
3229 frameView.lifecycle().advanceTo(DocumentLifecycle::PaintClean); 3229 frameView.lifecycle().advanceTo(DocumentLifecycle::PaintClean);
3230 LayoutViewItem layoutViewItem = frameView.layoutViewItem(); 3230 LayoutViewItem layoutViewItem = frameView.layoutViewItem();
3231 if (!layoutViewItem.isNull()) 3231 if (!layoutViewItem.isNull())
3232 layoutViewItem.layer()->clearNeedsRepaintRecursively(); 3232 layoutViewItem.layer()->clearNeedsRepaintRecursively();
3233 }); 3233 });
3234 } 3234 }
3235 3235
3236 void FrameView::paintGraphicsLayerRecursively(GraphicsLayer* graphicsLayer) { 3236 void FrameView::paintGraphicsLayerRecursively(GraphicsLayer* graphicsLayer) {
3237 DCHECK(!RuntimeEnabledFeatures::slimmingPaintV2Enabled());
3237 if (graphicsLayer->drawsContent()) { 3238 if (graphicsLayer->drawsContent()) {
3238 graphicsLayer->paint(nullptr); 3239 graphicsLayer->paint(nullptr);
3239 notifyPaint(graphicsLayer->getPaintController()); 3240 notifyPaint(graphicsLayer->getPaintController());
3240 } 3241 }
3241 3242
3242 if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { 3243 if (GraphicsLayer* maskLayer = graphicsLayer->maskLayer())
3243 if (GraphicsLayer* maskLayer = graphicsLayer->maskLayer()) 3244 paintGraphicsLayerRecursively(maskLayer);
3244 paintGraphicsLayerRecursively(maskLayer); 3245 if (GraphicsLayer* contentsClippingMaskLayer =
3245 if (GraphicsLayer* contentsClippingMaskLayer = 3246 graphicsLayer->contentsClippingMaskLayer())
3246 graphicsLayer->contentsClippingMaskLayer()) 3247 paintGraphicsLayerRecursively(contentsClippingMaskLayer);
3247 paintGraphicsLayerRecursively(contentsClippingMaskLayer);
3248 }
3249 3248
3250 for (auto& child : graphicsLayer->children()) 3249 for (auto& child : graphicsLayer->children())
3251 paintGraphicsLayerRecursively(child); 3250 paintGraphicsLayerRecursively(child);
3252 } 3251 }
3253 3252
3254 void FrameView::pushPaintArtifactToCompositor() { 3253 void FrameView::pushPaintArtifactToCompositor() {
3255 TRACE_EVENT0("blink", "FrameView::pushPaintArtifactToCompositor"); 3254 TRACE_EVENT0("blink", "FrameView::pushPaintArtifactToCompositor");
3256 3255
3257 DCHECK(RuntimeEnabledFeatures::slimmingPaintV2Enabled()); 3256 DCHECK(RuntimeEnabledFeatures::slimmingPaintV2Enabled());
3258 3257
(...skipping 2003 matching lines...) Expand 10 before | Expand all | Expand 10 after
5262 void FrameView::setAnimationHost( 5261 void FrameView::setAnimationHost(
5263 std::unique_ptr<CompositorAnimationHost> host) { 5262 std::unique_ptr<CompositorAnimationHost> host) {
5264 m_animationHost = std::move(host); 5263 m_animationHost = std::move(host);
5265 } 5264 }
5266 5265
5267 LayoutUnit FrameView::caretWidth() const { 5266 LayoutUnit FrameView::caretWidth() const {
5268 return LayoutUnit(getHostWindow()->windowToViewportScalar(1)); 5267 return LayoutUnit(getHostWindow()->windowToViewportScalar(1));
5269 } 5268 }
5270 5269
5271 } // namespace blink 5270 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698