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

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

Issue 2846273002: Replace ASSERT_NOT_REACHED with NOTREACHED in core/frame (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 4096 matching lines...) Expand 10 before | Expand all | Expand 10 after
4107 } 4107 }
4108 4108
4109 void FrameView::UpdateScrollOffset(const ScrollOffset& offset, 4109 void FrameView::UpdateScrollOffset(const ScrollOffset& offset,
4110 ScrollType scroll_type) { 4110 ScrollType scroll_type) {
4111 ScrollOffset scroll_delta = offset - scroll_offset_; 4111 ScrollOffset scroll_delta = offset - scroll_offset_;
4112 if (scroll_delta.IsZero()) 4112 if (scroll_delta.IsZero())
4113 return; 4113 return;
4114 4114
4115 if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) { 4115 if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
4116 // Don't scroll the FrameView! 4116 // Don't scroll the FrameView!
4117 ASSERT_NOT_REACHED(); 4117 NOTREACHED();
4118 } 4118 }
4119 4119
4120 scroll_offset_ = offset; 4120 scroll_offset_ = offset;
4121 4121
4122 if (!ScrollbarsSuppressed()) 4122 if (!ScrollbarsSuppressed())
4123 pending_scroll_delta_ += scroll_delta; 4123 pending_scroll_delta_ += scroll_delta;
4124 4124
4125 UpdateLayersAndCompositingAfterScrollIfNeeded(); 4125 UpdateLayersAndCompositingAfterScrollIfNeeded();
4126 4126
4127 Document* document = frame_->GetDocument(); 4127 Document* document = frame_->GetDocument();
(...skipping 1260 matching lines...) Expand 10 before | Expand all | Expand 10 after
5388 void FrameView::SetAnimationHost( 5388 void FrameView::SetAnimationHost(
5389 std::unique_ptr<CompositorAnimationHost> host) { 5389 std::unique_ptr<CompositorAnimationHost> host) {
5390 animation_host_ = std::move(host); 5390 animation_host_ = std::move(host);
5391 } 5391 }
5392 5392
5393 LayoutUnit FrameView::CaretWidth() const { 5393 LayoutUnit FrameView::CaretWidth() const {
5394 return LayoutUnit(GetChromeClient()->WindowToViewportScalar(1)); 5394 return LayoutUnit(GetChromeClient()->WindowToViewportScalar(1));
5395 } 5395 }
5396 5396
5397 } // namespace blink 5397 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698