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

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

Issue 1056983004: OverscrollGlow for mainThread-{BLINK CHANGES} (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Tests !!! Created 5 years, 7 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 Simon Hausmann <hausmann@kde.org> 5 * 2000 Simon Hausmann <hausmann@kde.org>
6 * 2000 Stefan Schimanski <1Stein@gmx.de> 6 * 2000 Stefan Schimanski <1Stein@gmx.de>
7 * 2001 George Staikos <staikos@kde.org> 7 * 2001 George Staikos <staikos@kde.org>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after
713 return loader().stateMachine()->isDisplayingInitialEmptyDocument() && docume nt()->isSecureTransitionTo(url); 713 return loader().stateMachine()->isDisplayingInitialEmptyDocument() && docume nt()->isSecureTransitionTo(url);
714 } 714 }
715 715
716 void LocalFrame::removeSpellingMarkersUnderWords(const Vector<String>& words) 716 void LocalFrame::removeSpellingMarkersUnderWords(const Vector<String>& words)
717 { 717 {
718 spellChecker().removeSpellingMarkersUnderWords(words); 718 spellChecker().removeSpellingMarkersUnderWords(words);
719 } 719 }
720 720
721 static bool scrollAreaOnBothAxes(const FloatSize& delta, ScrollableArea& view) 721 static bool scrollAreaOnBothAxes(const FloatSize& delta, ScrollableArea& view)
722 { 722 {
723 bool scrolledHorizontal = view.scroll(ScrollLeft, ScrollByPrecisePixel, delt a.width()); 723 bool scrolledHorizontal = view.scroll(ScrollLeft, ScrollByPrecisePixel, delt a.width()).didScroll;
724 bool scrolledVertical = view.scroll(ScrollUp, ScrollByPrecisePixel, delta.he ight()); 724 bool scrolledVertical = view.scroll(ScrollUp, ScrollByPrecisePixel, delta.he ight()).didScroll;
725 return scrolledHorizontal || scrolledVertical; 725 return scrolledHorizontal || scrolledVertical;
726 } 726 }
727 727
728 // Returns true if a scroll occurred. 728 // Returns true if a scroll occurred.
729 bool LocalFrame::applyScrollDelta(const FloatSize& delta, bool isScrollBegin) 729 bool LocalFrame::applyScrollDelta(const FloatSize& delta, bool isScrollBegin)
730 { 730 {
731 if (isScrollBegin) 731 if (isScrollBegin)
732 host()->topControls().scrollBegin(); 732 host()->topControls().scrollBegin();
733 733
734 if (!view() || delta.isZero()) 734 if (!view() || delta.isZero())
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
824 , m_textZoomFactor(parentTextZoomFactor(this)) 824 , m_textZoomFactor(parentTextZoomFactor(this))
825 , m_inViewSourceMode(false) 825 , m_inViewSourceMode(false)
826 { 826 {
827 if (isLocalRoot()) 827 if (isLocalRoot())
828 m_instrumentingAgents = InstrumentingAgents::create(); 828 m_instrumentingAgents = InstrumentingAgents::create();
829 else 829 else
830 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; 830 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents;
831 } 831 }
832 832
833 } // namespace blink 833 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698