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

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

Issue 2886893008: [DMC #8] Rename DocumentMarkerController::RenderedRectsForMarkers() (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
« no previous file with comments | « third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp ('k') | 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 2665 matching lines...) Expand 10 before | Expand all | Expand 10 after
2676 return page && page->GetFocusController().IsActive(); 2676 return page && page->GetFocusController().IsActive();
2677 } 2677 }
2678 2678
2679 void FrameView::InvalidatePaintForTickmarks() { 2679 void FrameView::InvalidatePaintForTickmarks() {
2680 if (Scrollbar* scrollbar = VerticalScrollbar()) 2680 if (Scrollbar* scrollbar = VerticalScrollbar())
2681 scrollbar->SetNeedsPaintInvalidation( 2681 scrollbar->SetNeedsPaintInvalidation(
2682 static_cast<ScrollbarPart>(~kThumbPart)); 2682 static_cast<ScrollbarPart>(~kThumbPart));
2683 } 2683 }
2684 2684
2685 void FrameView::GetTickmarks(Vector<IntRect>& tickmarks) const { 2685 void FrameView::GetTickmarks(Vector<IntRect>& tickmarks) const {
2686 if (!tickmarks_.IsEmpty()) 2686 if (!tickmarks_.IsEmpty()) {
yosin_UTC9 2017/05/19 06:15:59 nit: Could you use early-return style? if (!tickm
2687 tickmarks = tickmarks_; 2687 tickmarks = tickmarks_;
2688 else 2688 } else {
2689 tickmarks = GetFrame().GetDocument()->Markers().RenderedRectsForMarkers( 2689 tickmarks =
2690 DocumentMarker::kTextMatch); 2690 GetFrame().GetDocument()->Markers().RenderedRectsForTextMatchMarkers();
2691 }
2691 } 2692 }
2692 2693
2693 void FrameView::SetInputEventsTransformForEmulation( 2694 void FrameView::SetInputEventsTransformForEmulation(
2694 const IntSize& offset, 2695 const IntSize& offset,
2695 float content_scale_factor) { 2696 float content_scale_factor) {
2696 input_events_offset_for_emulation_ = offset; 2697 input_events_offset_for_emulation_ = offset;
2697 input_events_scale_factor_for_emulation_ = content_scale_factor; 2698 input_events_scale_factor_for_emulation_ = content_scale_factor;
2698 } 2699 }
2699 2700
2700 IntSize FrameView::InputEventsOffsetForEmulation() const { 2701 IntSize FrameView::InputEventsOffsetForEmulation() const {
(...skipping 2724 matching lines...) Expand 10 before | Expand all | Expand 10 after
5425 void FrameView::SetAnimationHost( 5426 void FrameView::SetAnimationHost(
5426 std::unique_ptr<CompositorAnimationHost> host) { 5427 std::unique_ptr<CompositorAnimationHost> host) {
5427 animation_host_ = std::move(host); 5428 animation_host_ = std::move(host);
5428 } 5429 }
5429 5430
5430 LayoutUnit FrameView::CaretWidth() const { 5431 LayoutUnit FrameView::CaretWidth() const {
5431 return LayoutUnit(GetChromeClient()->WindowToViewportScalar(1)); 5432 return LayoutUnit(GetChromeClient()->WindowToViewportScalar(1));
5432 } 5433 }
5433 5434
5434 } // namespace blink 5435 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698