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

Side by Side Diff: Source/core/page/scrolling/ScrollingCoordinator.cpp

Issue 171333003: Pass implementation object to supplemental classes by reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 10 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 781 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 792
793 accumulateDocumentTouchEventTargetRects(rects, document); 793 accumulateDocumentTouchEventTargetRects(rects, document);
794 } 794 }
795 795
796 unsigned ScrollingCoordinator::computeCurrentWheelEventHandlerCount() 796 unsigned ScrollingCoordinator::computeCurrentWheelEventHandlerCount()
797 { 797 {
798 unsigned wheelEventHandlerCount = 0; 798 unsigned wheelEventHandlerCount = 0;
799 799
800 for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traver seNext()) { 800 for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traver seNext()) {
801 if (frame->document()) 801 if (frame->document())
802 wheelEventHandlerCount += WheelController::from(frame->document())-> wheelEventHandlerCount(); 802 wheelEventHandlerCount += WheelController::from(*frame->document())- >wheelEventHandlerCount();
803 } 803 }
804 804
805 return wheelEventHandlerCount; 805 return wheelEventHandlerCount;
806 } 806 }
807 807
808 void ScrollingCoordinator::frameViewWheelEventHandlerCountChanged(FrameView* fra meView) 808 void ScrollingCoordinator::frameViewWheelEventHandlerCountChanged(FrameView* fra meView)
809 { 809 {
810 ASSERT(isMainThread()); 810 ASSERT(isMainThread());
811 ASSERT(m_page); 811 ASSERT(m_page);
812 812
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
966 bool frameIsScrollable = frameView && frameView->isScrollable(); 966 bool frameIsScrollable = frameView && frameView->isScrollable();
967 if (frameIsScrollable != m_wasFrameScrollable) 967 if (frameIsScrollable != m_wasFrameScrollable)
968 return true; 968 return true;
969 969
970 if (WebLayer* scrollLayer = frameView ? scrollingWebLayerForScrollableArea(f rameView) : 0) 970 if (WebLayer* scrollLayer = frameView ? scrollingWebLayerForScrollableArea(f rameView) : 0)
971 return blink::WebSize(frameView->contentsSize()) != scrollLayer->bounds( ); 971 return blink::WebSize(frameView->contentsSize()) != scrollLayer->bounds( );
972 return false; 972 return false;
973 } 973 }
974 974
975 } // namespace WebCore 975 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698