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

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

Issue 2763893002: [WIP] Clean up DocumentMarkerController API (Closed)
Patch Set: Move CompositionMarkerList::at() into previous CL Created 3 years, 8 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 2570 matching lines...) Expand 10 before | Expand all | Expand 10 after
2581 return page && page->focusController().isActive(); 2581 return page && page->focusController().isActive();
2582 } 2582 }
2583 2583
2584 void FrameView::invalidatePaintForTickmarks() { 2584 void FrameView::invalidatePaintForTickmarks() {
2585 if (Scrollbar* scrollbar = verticalScrollbar()) 2585 if (Scrollbar* scrollbar = verticalScrollbar())
2586 scrollbar->setNeedsPaintInvalidation( 2586 scrollbar->setNeedsPaintInvalidation(
2587 static_cast<ScrollbarPart>(~ThumbPart)); 2587 static_cast<ScrollbarPart>(~ThumbPart));
2588 } 2588 }
2589 2589
2590 void FrameView::getTickmarks(Vector<IntRect>& tickmarks) const { 2590 void FrameView::getTickmarks(Vector<IntRect>& tickmarks) const {
2591 if (!m_tickmarks.isEmpty()) 2591 if (!m_tickmarks.isEmpty()) {
2592 tickmarks = m_tickmarks; 2592 tickmarks = m_tickmarks;
2593 else 2593 } else {
2594 tickmarks = frame().document()->markers().renderedRectsForMarkers( 2594 tickmarks =
2595 DocumentMarker::TextMatch); 2595 frame().document()->markers().renderedRectsForTextMatchMarkers();
2596 }
2596 } 2597 }
2597 2598
2598 void FrameView::setInputEventsTransformForEmulation(const IntSize& offset, 2599 void FrameView::setInputEventsTransformForEmulation(const IntSize& offset,
2599 float contentScaleFactor) { 2600 float contentScaleFactor) {
2600 m_inputEventsOffsetForEmulation = offset; 2601 m_inputEventsOffsetForEmulation = offset;
2601 m_inputEventsScaleFactorForEmulation = contentScaleFactor; 2602 m_inputEventsScaleFactorForEmulation = contentScaleFactor;
2602 } 2603 }
2603 2604
2604 IntSize FrameView::inputEventsOffsetForEmulation() const { 2605 IntSize FrameView::inputEventsOffsetForEmulation() const {
2605 return m_inputEventsOffsetForEmulation; 2606 return m_inputEventsOffsetForEmulation;
(...skipping 2645 matching lines...) Expand 10 before | Expand all | Expand 10 after
5251 void FrameView::setAnimationHost( 5252 void FrameView::setAnimationHost(
5252 std::unique_ptr<CompositorAnimationHost> host) { 5253 std::unique_ptr<CompositorAnimationHost> host) {
5253 m_animationHost = std::move(host); 5254 m_animationHost = std::move(host);
5254 } 5255 }
5255 5256
5256 LayoutUnit FrameView::caretWidth() const { 5257 LayoutUnit FrameView::caretWidth() const {
5257 return LayoutUnit(getHostWindow()->windowToViewportScalar(1)); 5258 return LayoutUnit(getHostWindow()->windowToViewportScalar(1));
5258 } 5259 }
5259 5260
5260 } // namespace blink 5261 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698