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

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

Issue 1056983004: OverscrollGlow for mainThread-{BLINK CHANGES} (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: No Overscroll on non-scrollable axes 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
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 2949 matching lines...) Expand 10 before | Expand all | Expand 10 after
2960 if (child->isFrameView()) 2960 if (child->isFrameView())
2961 removeScrollableArea(toFrameView(child)); 2961 removeScrollableArea(toFrameView(child));
2962 2962
2963 child->setParent(0); 2963 child->setParent(0);
2964 m_children.remove(child); 2964 m_children.remove(child);
2965 } 2965 }
2966 2966
2967 ScrollResult FrameView::wheelEvent(const PlatformWheelEvent& wheelEvent) 2967 ScrollResult FrameView::wheelEvent(const PlatformWheelEvent& wheelEvent)
2968 { 2968 {
2969 if (!isScrollable()) 2969 if (!isScrollable())
2970 return ScrollResult(false); 2970 return ScrollResult();
2971 2971
2972 if (m_frame->settings()->rootLayerScrolls()) 2972 if (m_frame->settings()->rootLayerScrolls())
2973 return ScrollResult(false); 2973 return ScrollResult();
2974 2974
2975 return ScrollableArea::handleWheel(wheelEvent); 2975 return ScrollableArea::handleWheel(wheelEvent);
2976 } 2976 }
2977 2977
2978 bool FrameView::isVerticalDocument() const 2978 bool FrameView::isVerticalDocument() const
2979 { 2979 {
2980 LayoutView* layoutView = this->layoutView(); 2980 LayoutView* layoutView = this->layoutView();
2981 if (!layoutView) 2981 if (!layoutView)
2982 return true; 2982 return true;
2983 2983
(...skipping 1064 matching lines...) Expand 10 before | Expand all | Expand 10 after
4048 4048
4049 if (!graphicsLayer) 4049 if (!graphicsLayer)
4050 return; 4050 return;
4051 4051
4052 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect); 4052 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect);
4053 4053
4054 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect))); 4054 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect)));
4055 } 4055 }
4056 4056
4057 } // namespace blink 4057 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698