| Index: third_party/WebKit/Source/core/frame/FrameView.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| index 3cf3699fb85abee836666befe7a2a69c98a19460..db9431f8785b2e8839529075520e526f8ecb3ae9 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| @@ -1097,7 +1097,7 @@ std::unique_ptr<TracedValue> FrameView::AnalyzerCounters() {
|
| "blink,benchmark,rail," TRACE_DISABLED_BY_DEFAULT("blink.debug.layout")
|
|
|
| void FrameView::PerformLayout(bool in_subtree_layout) {
|
| - ASSERT(in_subtree_layout || layout_subtree_root_list_.IsEmpty());
|
| + DCHECK(in_subtree_layout || layout_subtree_root_list_.IsEmpty());
|
|
|
| int contents_height_before_layout =
|
| GetLayoutViewItem().DocumentRect().Height();
|
| @@ -3271,7 +3271,7 @@ void FrameView::PaintTree() {
|
| TRACE_EVENT0("blink", "FrameView::paintTree");
|
| SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.Paint.UpdateTime");
|
|
|
| - ASSERT(GetFrame() == GetPage()->MainFrame() ||
|
| + DCHECK(GetFrame() == GetPage()->MainFrame() ||
|
| (!GetFrame().Tree().Parent()->IsLocalFrame()));
|
|
|
| LayoutViewItem view = GetLayoutViewItem();
|
|
|