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

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

Issue 2886893008: [DMC #8] Rename DocumentMarkerController::RenderedRectsForMarkers() (Closed)
Patch Set: Reformat FrameView 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 2663 matching lines...) Expand 10 before | Expand all | Expand 10 after
2674 return page && page->GetFocusController().IsActive(); 2674 return page && page->GetFocusController().IsActive();
2675 } 2675 }
2676 2676
2677 void FrameView::InvalidatePaintForTickmarks() { 2677 void FrameView::InvalidatePaintForTickmarks() {
2678 if (Scrollbar* scrollbar = VerticalScrollbar()) 2678 if (Scrollbar* scrollbar = VerticalScrollbar())
2679 scrollbar->SetNeedsPaintInvalidation( 2679 scrollbar->SetNeedsPaintInvalidation(
2680 static_cast<ScrollbarPart>(~kThumbPart)); 2680 static_cast<ScrollbarPart>(~kThumbPart));
2681 } 2681 }
2682 2682
2683 void FrameView::GetTickmarks(Vector<IntRect>& tickmarks) const { 2683 void FrameView::GetTickmarks(Vector<IntRect>& tickmarks) const {
2684 if (!tickmarks_.IsEmpty()) 2684 if (!tickmarks_.IsEmpty()) {
2685 tickmarks = tickmarks_; 2685 tickmarks = tickmarks_;
2686 else 2686 return;
2687 tickmarks = GetFrame().GetDocument()->Markers().RenderedRectsForMarkers( 2687 }
2688 DocumentMarker::kTextMatch); 2688 tickmarks =
2689 GetFrame().GetDocument()->Markers().RenderedRectsForTextMatchMarkers();
2689 } 2690 }
2690 2691
2691 void FrameView::SetInputEventsTransformForEmulation( 2692 void FrameView::SetInputEventsTransformForEmulation(
2692 const IntSize& offset, 2693 const IntSize& offset,
2693 float content_scale_factor) { 2694 float content_scale_factor) {
2694 input_events_offset_for_emulation_ = offset; 2695 input_events_offset_for_emulation_ = offset;
2695 input_events_scale_factor_for_emulation_ = content_scale_factor; 2696 input_events_scale_factor_for_emulation_ = content_scale_factor;
2696 } 2697 }
2697 2698
2698 IntSize FrameView::InputEventsOffsetForEmulation() const { 2699 IntSize FrameView::InputEventsOffsetForEmulation() const {
(...skipping 2721 matching lines...) Expand 10 before | Expand all | Expand 10 after
5420 void FrameView::SetAnimationHost( 5421 void FrameView::SetAnimationHost(
5421 std::unique_ptr<CompositorAnimationHost> host) { 5422 std::unique_ptr<CompositorAnimationHost> host) {
5422 animation_host_ = std::move(host); 5423 animation_host_ = std::move(host);
5423 } 5424 }
5424 5425
5425 LayoutUnit FrameView::CaretWidth() const { 5426 LayoutUnit FrameView::CaretWidth() const {
5426 return LayoutUnit(GetChromeClient()->WindowToViewportScalar(1)); 5427 return LayoutUnit(GetChromeClient()->WindowToViewportScalar(1));
5427 } 5428 }
5428 5429
5429 } // namespace blink 5430 } // 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