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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutEmbeddedObject.cpp

Issue 2770123003: Replace ASSERT with DCHECK in core/layout/ excluding subdirs (Closed)
Patch Set: Split some DCHECKs and add DCHECK_ops wherever possible Created 3 years, 8 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Simon Hausmann <hausmann@kde.org> 3 * (C) 2000 Simon Hausmann <hausmann@kde.org>
4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de)
5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 EmbeddedObjectPainter(*this).paintReplaced(paintInfo, paintOffset); 117 EmbeddedObjectPainter(*this).paintReplaced(paintInfo, paintOffset);
118 } 118 }
119 119
120 PaintInvalidationReason LayoutEmbeddedObject::invalidatePaintIfNeeded( 120 PaintInvalidationReason LayoutEmbeddedObject::invalidatePaintIfNeeded(
121 const PaintInvalidatorContext& context) const { 121 const PaintInvalidatorContext& context) const {
122 return EmbeddedObjectPaintInvalidator(*this, context) 122 return EmbeddedObjectPaintInvalidator(*this, context)
123 .invalidatePaintIfNeeded(); 123 .invalidatePaintIfNeeded();
124 } 124 }
125 125
126 void LayoutEmbeddedObject::layout() { 126 void LayoutEmbeddedObject::layout() {
127 ASSERT(needsLayout()); 127 DCHECK(needsLayout());
128 LayoutAnalyzer::Scope analyzer(*this); 128 LayoutAnalyzer::Scope analyzer(*this);
129 129
130 updateLogicalWidth(); 130 updateLogicalWidth();
131 updateLogicalHeight(); 131 updateLogicalHeight();
132 132
133 m_overflow.reset(); 133 m_overflow.reset();
134 addVisualEffectOverflow(); 134 addVisualEffectOverflow();
135 135
136 updateLayerTransformAfterLayout(); 136 updateLayerTransformAfterLayout();
137 137
(...skipping 15 matching lines...) Expand all
153 return CompositingReasonNone; 153 return CompositingReasonNone;
154 } 154 }
155 155
156 LayoutReplaced* LayoutEmbeddedObject::embeddedReplacedContent() const { 156 LayoutReplaced* LayoutEmbeddedObject::embeddedReplacedContent() const {
157 if (!node() || !frameViewBase() || !frameViewBase()->isFrameView()) 157 if (!node() || !frameViewBase() || !frameViewBase()->isFrameView())
158 return nullptr; 158 return nullptr;
159 return toFrameView(frameViewBase())->embeddedReplacedContent(); 159 return toFrameView(frameViewBase())->embeddedReplacedContent();
160 } 160 }
161 161
162 } // namespace blink 162 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698