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

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

Issue 197213011: Selectively disable rubber banding on mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 9 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) 1997 Martin Jones (mjones@kde.org) 2 Copyright (C) 1997 Martin Jones (mjones@kde.org)
3 (C) 1998 Waldo Bastian (bastian@kde.org) 3 (C) 1998 Waldo Bastian (bastian@kde.org)
4 (C) 1998, 1999 Torben Weis (weis@kde.org) 4 (C) 1998, 1999 Torben Weis (weis@kde.org)
5 (C) 1999 Lars Knoll (knoll@kde.org) 5 (C) 1999 Lars Knoll (knoll@kde.org)
6 (C) 1999 Antti Koivisto (koivisto@kde.org) 6 (C) 1999 Antti Koivisto (koivisto@kde.org)
7 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 7 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
8 8
9 This library is free software; you can redistribute it and/or 9 This library is free software; you can redistribute it and/or
10 modify it under the terms of the GNU Library General Public 10 modify it under the terms of the GNU Library General Public
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 // right of the object. We keep track of these resizer areas for checking if touches 275 // right of the object. We keep track of these resizer areas for checking if touches
276 // (implemented using Scroll gesture) are targeting the resizer. 276 // (implemented using Scroll gesture) are targeting the resizer.
277 typedef HashSet<RenderBox*> ResizerAreaSet; 277 typedef HashSet<RenderBox*> ResizerAreaSet;
278 void addResizerArea(RenderBox*); 278 void addResizerArea(RenderBox*);
279 void removeResizerArea(RenderBox*); 279 void removeResizerArea(RenderBox*);
280 const ResizerAreaSet* resizerAreas() const { return m_resizerAreas.get(); } 280 const ResizerAreaSet* resizerAreas() const { return m_resizerAreas.get(); }
281 281
282 virtual void removeChild(Widget*) OVERRIDE; 282 virtual void removeChild(Widget*) OVERRIDE;
283 283
284 // This function exists for ports that need to handle wheel events manually. 284 // This function exists for ports that need to handle wheel events manually.
285 // On Mac WebKit1 the underlying NSScrollView just does the scrolling, but o n most other platforms 285 // On Mac WebKit1 the underlying NSScrollView just does the scrolling, but o n most other platforms
Nico 2014/03/14 17:51:46 (this comment can mostly go away)
erikchen 2014/03/20 18:04:26 After following asvitkine's suggestion, I am no lo
286 // we need this function in order to do the scroll ourselves. 286 // we need this function in order to do the scroll ourselves.
287 bool wheelEvent(const PlatformWheelEvent&); 287 bool wheelEvent(const PlatformWheelEvent&, bool canRubberbandLeft, bool canR ubberbandRight);
288 288
289 bool inProgrammaticScroll() const { return m_inProgrammaticScroll; } 289 bool inProgrammaticScroll() const { return m_inProgrammaticScroll; }
290 void setInProgrammaticScroll(bool programmaticScroll) { m_inProgrammaticScro ll = programmaticScroll; } 290 void setInProgrammaticScroll(bool programmaticScroll) { m_inProgrammaticScro ll = programmaticScroll; }
291 291
292 void setHasSoftwareFilters(bool hasSoftwareFilters) { m_hasSoftwareFilters = hasSoftwareFilters; } 292 void setHasSoftwareFilters(bool hasSoftwareFilters) { m_hasSoftwareFilters = hasSoftwareFilters; }
293 bool hasSoftwareFilters() const { return m_hasSoftwareFilters; } 293 bool hasSoftwareFilters() const { return m_hasSoftwareFilters; }
294 294
295 virtual bool isActive() const OVERRIDE; 295 virtual bool isActive() const OVERRIDE;
296 296
297 // DEPRECATED: Use viewportConstrainedVisibleContentRect() instead. 297 // DEPRECATED: Use viewportConstrainedVisibleContentRect() instead.
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 m_view->setCanRepaintDuringPerformLayout(m_originalValue); 547 m_view->setCanRepaintDuringPerformLayout(m_originalValue);
548 } 548 }
549 private: 549 private:
550 FrameView* m_view; 550 FrameView* m_view;
551 bool m_originalValue; 551 bool m_originalValue;
552 }; 552 };
553 553
554 } // namespace WebCore 554 } // namespace WebCore
555 555
556 #endif // FrameView_h 556 #endif // FrameView_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/frame/FrameView.cpp » ('j') | Source/platform/mac/ScrollElasticityController.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698