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

Unified Diff: third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp

Issue 2258033002: Replace ASSERT()s with DCHECK*() in core/html/*.{cpp,h}. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Replace ASSERT()s with DCHECK*() in core/html/*.{cpp,h}. Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp
index 8bb239a4934d10afccc22cda07aa4e49deaa820a..f48c327d1759bc01c79c10820b3bea924ce6eae8 100644
--- a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp
@@ -112,7 +112,7 @@ void HTMLFrameOwnerElement::UpdateSuspendScope::performDeferredWidgetTreeOperati
HTMLFrameOwnerElement::UpdateSuspendScope::~UpdateSuspendScope()
{
- ASSERT(s_updateSuspendCount > 0);
+ DCHECK_GT(s_updateSuspendCount, 0u);
if (s_updateSuspendCount == 1)
performDeferredWidgetTreeOperations();
--s_updateSuspendCount;
@@ -163,9 +163,9 @@ LayoutPart* HTMLFrameOwnerElement::layoutPart() const
void HTMLFrameOwnerElement::setContentFrame(Frame& frame)
{
// Make sure we will not end up with two frames referencing the same owner element.
- ASSERT(!m_contentFrame || m_contentFrame->owner() != this);
+ DCHECK(!m_contentFrame || m_contentFrame->owner() != this);
// Disconnected frames should not be allowed to load.
- ASSERT(isConnected());
+ DCHECK(isConnected());
m_contentFrame = &frame;
for (ContainerNode* node = this; node; node = node->parentOrShadowHostNode())
@@ -177,7 +177,7 @@ void HTMLFrameOwnerElement::clearContentFrame()
if (!m_contentFrame)
return;
- ASSERT(m_contentFrame->owner() == this);
+ DCHECK_EQ(m_contentFrame->owner(), this);
m_contentFrame = nullptr;
for (ContainerNode* node = this; node; node = node->parentOrShadowHostNode())
@@ -199,7 +199,7 @@ HTMLFrameOwnerElement::~HTMLFrameOwnerElement()
{
// An owner must by now have been informed of detachment
// when the frame was closed.
- ASSERT(!m_contentFrame);
+ DCHECK(!m_contentFrame);
}
Document* HTMLFrameOwnerElement::contentDocument() const
@@ -275,8 +275,8 @@ void HTMLFrameOwnerElement::setWidget(Widget* widget)
if (m_widget) {
layoutPartItem.updateOnWidgetChange();
- ASSERT(document().view() == layoutPartItem.frameView());
- ASSERT(layoutPartItem.frameView());
+ DCHECK_EQ(document().view(), layoutPartItem.frameView());
+ DCHECK(layoutPartItem.frameView());
moveWidgetToParentSoon(m_widget.get(), layoutPartItem.frameView());
}
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLFormElement.cpp ('k') | third_party/WebKit/Source/core/html/HTMLImageElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698