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

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

Issue 2644243002: Move ScrollableArea timer to TaskRunnerTimer. (Closed)
Patch Set: use derived class in unique_ptr Created 3 years, 11 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 574 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 MapCoordinatesFlags flags) const { 585 MapCoordinatesFlags flags) const {
586 LayoutBox* box = layoutBox(); 586 LayoutBox* box = layoutBox();
587 if (!box) 587 if (!box)
588 return quad; 588 return quad;
589 DCHECK(localObject); 589 DCHECK(localObject);
590 FloatQuad result = localObject->localToAncestorQuad(quad, box, flags); 590 FloatQuad result = localObject->localToAncestorQuad(quad, box, flags);
591 result.move(-getScrollOffset()); 591 result.move(-getScrollOffset());
592 return result; 592 return result;
593 } 593 }
594 594
595 RefPtr<WebTaskRunner> FrameView::getTimerTaskRunner() const {
596 return TaskRunnerHelper::get(TaskType::UnspecedTimer, m_frame.get());
597 }
598
595 void FrameView::setCanHaveScrollbars(bool canHaveScrollbars) { 599 void FrameView::setCanHaveScrollbars(bool canHaveScrollbars) {
596 m_canHaveScrollbars = canHaveScrollbars; 600 m_canHaveScrollbars = canHaveScrollbars;
597 601
598 ScrollbarMode newVerticalMode = m_verticalScrollbarMode; 602 ScrollbarMode newVerticalMode = m_verticalScrollbarMode;
599 if (canHaveScrollbars && m_verticalScrollbarMode == ScrollbarAlwaysOff) 603 if (canHaveScrollbars && m_verticalScrollbarMode == ScrollbarAlwaysOff)
600 newVerticalMode = ScrollbarAuto; 604 newVerticalMode = ScrollbarAuto;
601 else if (!canHaveScrollbars) 605 else if (!canHaveScrollbars)
602 newVerticalMode = ScrollbarAlwaysOff; 606 newVerticalMode = ScrollbarAlwaysOff;
603 607
604 ScrollbarMode newHorizontalMode = m_horizontalScrollbarMode; 608 ScrollbarMode newHorizontalMode = m_horizontalScrollbarMode;
(...skipping 4384 matching lines...) Expand 10 before | Expand all | Expand 10 after
4989 // This is the top-level frame, so no mapping necessary. 4993 // This is the top-level frame, so no mapping necessary.
4990 if (m_frame->isMainFrame()) 4994 if (m_frame->isMainFrame())
4991 return; 4995 return;
4992 4996
4993 LayoutRect viewportIntersectionRect(remoteViewportIntersection()); 4997 LayoutRect viewportIntersectionRect(remoteViewportIntersection());
4994 transformState.move( 4998 transformState.move(
4995 LayoutSize(-viewportIntersectionRect.x(), -viewportIntersectionRect.y())); 4999 LayoutSize(-viewportIntersectionRect.x(), -viewportIntersectionRect.y()));
4996 } 5000 }
4997 5001
4998 } // namespace blink 5002 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.h ('k') | third_party/WebKit/Source/core/frame/RootFrameViewport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698