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

Side by Side Diff: Source/web/WebLocalFrameImpl.cpp

Issue 1173053003: Remove ScrollableArea::notifyScrollPositionChanged and cleanup scroll animators. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase + remove updateScrollbars from FrameView::setScrollPosition Created 5 years, 6 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 | « Source/platform/scroll/ScrollableAreaTest.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | 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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 677 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 { 688 {
689 FrameView* view = frameView(); 689 FrameView* view = frameView();
690 if (!view) 690 if (!view)
691 return WebSize(); 691 return WebSize();
692 return toIntSize(view->maximumScrollPosition()); 692 return toIntSize(view->maximumScrollPosition());
693 } 693 }
694 694
695 void WebLocalFrameImpl::setScrollOffset(const WebSize& offset) 695 void WebLocalFrameImpl::setScrollOffset(const WebSize& offset)
696 { 696 {
697 if (FrameView* view = frameView()) 697 if (FrameView* view = frameView())
698 view->notifyScrollPositionChanged(IntPoint(offset.width, offset.height)) ; 698 view->setScrollPosition(IntPoint(offset.width, offset.height), Programma ticScroll);
699 } 699 }
700 700
701 WebSize WebLocalFrameImpl::contentsSize() const 701 WebSize WebLocalFrameImpl::contentsSize() const
702 { 702 {
703 if (FrameView* view = frameView()) 703 if (FrameView* view = frameView())
704 return view->contentsSize(); 704 return view->contentsSize();
705 return WebSize(); 705 return WebSize();
706 } 706 }
707 707
708 bool WebLocalFrameImpl::hasVisibleContent() const 708 bool WebLocalFrameImpl::hasVisibleContent() const
(...skipping 1455 matching lines...) Expand 10 before | Expand all | Expand 10 after
2164 { 2164 {
2165 m_frameWidget = frameWidget; 2165 m_frameWidget = frameWidget;
2166 } 2166 }
2167 2167
2168 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const 2168 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const
2169 { 2169 {
2170 return m_frameWidget; 2170 return m_frameWidget;
2171 } 2171 }
2172 2172
2173 } // namespace blink 2173 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/scroll/ScrollableAreaTest.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698