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

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: rebased to latest 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/core/dom/Element.cpp ('k') | Source/core/frame/LocalFrame.h » ('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) 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 2913 matching lines...) Expand 10 before | Expand all | Expand 10 after
2924 if (child->isFrameView()) 2924 if (child->isFrameView())
2925 removeScrollableArea(toFrameView(child)); 2925 removeScrollableArea(toFrameView(child));
2926 2926
2927 child->setParent(0); 2927 child->setParent(0);
2928 m_children.remove(child); 2928 m_children.remove(child);
2929 } 2929 }
2930 2930
2931 ScrollResult FrameView::wheelEvent(const PlatformWheelEvent& wheelEvent) 2931 ScrollResult FrameView::wheelEvent(const PlatformWheelEvent& wheelEvent)
2932 { 2932 {
2933 if (!isScrollable()) 2933 if (!isScrollable())
2934 return ScrollResult(false); 2934 return ScrollResult();
2935 2935
2936 if (m_frame->settings()->rootLayerScrolls()) 2936 if (m_frame->settings()->rootLayerScrolls())
2937 return ScrollResult(false); 2937 return ScrollResult();
2938 2938
2939 return ScrollableArea::handleWheel(wheelEvent); 2939 return ScrollableArea::handleWheel(wheelEvent);
2940 } 2940 }
2941 2941
2942 bool FrameView::isVerticalDocument() const 2942 bool FrameView::isVerticalDocument() const
2943 { 2943 {
2944 LayoutView* layoutView = this->layoutView(); 2944 LayoutView* layoutView = this->layoutView();
2945 if (!layoutView) 2945 if (!layoutView)
2946 return true; 2946 return true;
2947 2947
(...skipping 1058 matching lines...) Expand 10 before | Expand all | Expand 10 after
4006 4006
4007 if (!graphicsLayer) 4007 if (!graphicsLayer)
4008 return; 4008 return;
4009 4009
4010 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect); 4010 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect);
4011 4011
4012 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect))); 4012 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect)));
4013 } 4013 }
4014 4014
4015 } // namespace blink 4015 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/dom/Element.cpp ('k') | Source/core/frame/LocalFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698