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

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

Issue 24130008: Rename ENABLE(RUBBER_BANDING) to USE(RUBBER_BANDING). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 3 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/page/FrameView.h ('k') | Source/core/platform/ScrollView.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) 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 738 matching lines...) Expand 10 before | Expand all | Expand 10 after
749 } 749 }
750 750
751 GraphicsLayer* FrameView::layerForScrollCorner() const 751 GraphicsLayer* FrameView::layerForScrollCorner() const
752 { 752 {
753 RenderView* renderView = this->renderView(); 753 RenderView* renderView = this->renderView();
754 if (!renderView) 754 if (!renderView)
755 return 0; 755 return 0;
756 return renderView->compositor()->layerForScrollCorner(); 756 return renderView->compositor()->layerForScrollCorner();
757 } 757 }
758 758
759 #if ENABLE(RUBBER_BANDING) 759 #if USE(RUBBER_BANDING)
760 GraphicsLayer* FrameView::layerForOverhangAreas() const 760 GraphicsLayer* FrameView::layerForOverhangAreas() const
761 { 761 {
762 RenderView* renderView = this->renderView(); 762 RenderView* renderView = this->renderView();
763 if (!renderView) 763 if (!renderView)
764 return 0; 764 return 0;
765 return renderView->compositor()->layerForOverhangAreas(); 765 return renderView->compositor()->layerForOverhangAreas();
766 } 766 }
767 #endif // ENABLE(RUBBER_BANDING) 767 #endif // USE(RUBBER_BANDING)
768 768
769 bool FrameView::hasCompositedContent() const 769 bool FrameView::hasCompositedContent() const
770 { 770 {
771 if (RenderView* renderView = this->renderView()) 771 if (RenderView* renderView = this->renderView())
772 return renderView->compositor()->inCompositingMode(); 772 return renderView->compositor()->inCompositingMode();
773 return false; 773 return false;
774 } 774 }
775 775
776 bool FrameView::isEnclosedInCompositingLayer() const 776 bool FrameView::isEnclosedInCompositingLayer() const
777 { 777 {
(...skipping 2583 matching lines...) Expand 10 before | Expand all | Expand 10 after
3361 if (widget->isFrameView()) 3361 if (widget->isFrameView())
3362 removeScrollableArea(toFrameView(widget)); 3362 removeScrollableArea(toFrameView(widget));
3363 3363
3364 ScrollView::removeChild(widget); 3364 ScrollView::removeChild(widget);
3365 } 3365 }
3366 3366
3367 bool FrameView::wheelEvent(const PlatformWheelEvent& wheelEvent) 3367 bool FrameView::wheelEvent(const PlatformWheelEvent& wheelEvent)
3368 { 3368 {
3369 // Note that to allow for rubber-band over-scroll behavior, even non-scrolla ble views 3369 // Note that to allow for rubber-band over-scroll behavior, even non-scrolla ble views
3370 // should handle wheel events. 3370 // should handle wheel events.
3371 #if !ENABLE(RUBBER_BANDING) 3371 #if !USE(RUBBER_BANDING)
3372 if (!isScrollable()) 3372 if (!isScrollable())
3373 return false; 3373 return false;
3374 #endif 3374 #endif
3375 3375
3376 // We don't allow mouse wheeling to happen in a ScrollView that has had its scrollbars explicitly disabled. 3376 // We don't allow mouse wheeling to happen in a ScrollView that has had its scrollbars explicitly disabled.
3377 if (!canHaveScrollbars()) 3377 if (!canHaveScrollbars())
3378 return false; 3378 return false;
3379 3379
3380 return ScrollableArea::handleWheelEvent(wheelEvent); 3380 return ScrollableArea::handleWheelEvent(wheelEvent);
3381 } 3381 }
(...skipping 22 matching lines...) Expand all
3404 return frame().document()->existingAXObjectCache(); 3404 return frame().document()->existingAXObjectCache();
3405 return 0; 3405 return 0;
3406 } 3406 }
3407 3407
3408 bool FrameView::isMainFrame() const 3408 bool FrameView::isMainFrame() const
3409 { 3409 {
3410 return m_frame->page() && m_frame->page()->mainFrame() == m_frame; 3410 return m_frame->page() && m_frame->page()->mainFrame() == m_frame;
3411 } 3411 }
3412 3412
3413 } // namespace WebCore 3413 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/page/FrameView.h ('k') | Source/core/platform/ScrollView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698