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

Side by Side Diff: sky/engine/core/frame/FrameView.h

Issue 677223002: Remove some more frame-level scrolling machinery. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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 | « sky/engine/core/events/MouseRelatedEvent.cpp ('k') | sky/engine/core/frame/FrameView.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) 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 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 270
271 // Sets the tickmarks for the FrameView, overriding the default behavior 271 // Sets the tickmarks for the FrameView, overriding the default behavior
272 // which is to display the tickmarks corresponding to find results. 272 // which is to display the tickmarks corresponding to find results.
273 // If |m_tickmarks| is empty, the default behavior is restored. 273 // If |m_tickmarks| is empty, the default behavior is restored.
274 void setTickmarks(const Vector<IntRect>& tickmarks) { m_tickmarks = tickmark s; } 274 void setTickmarks(const Vector<IntRect>& tickmarks) { m_tickmarks = tickmark s; }
275 275
276 // ScrollableArea interface 276 // ScrollableArea interface
277 // FIXME(sky): Remove 277 // FIXME(sky): Remove
278 void invalidateScrollbarRect(Scrollbar*, const IntRect&); 278 void invalidateScrollbarRect(Scrollbar*, const IntRect&);
279 void getTickmarks(Vector<IntRect>&) const; 279 void getTickmarks(Vector<IntRect>&) const;
280 void scrollTo(const IntSize&);
281 IntRect scrollableAreaBoundingBox() const; 280 IntRect scrollableAreaBoundingBox() const;
282 bool scrollAnimatorEnabled() const; 281 bool scrollAnimatorEnabled() const;
283 bool usesCompositedScrolling() const; 282 bool usesCompositedScrolling() const;
284 GraphicsLayer* layerForScrolling() const; 283 GraphicsLayer* layerForScrolling() const;
285 GraphicsLayer* layerForHorizontalScrollbar() const; 284 GraphicsLayer* layerForHorizontalScrollbar() const;
286 GraphicsLayer* layerForVerticalScrollbar() const; 285 GraphicsLayer* layerForVerticalScrollbar() const;
287 GraphicsLayer* layerForScrollCorner() const; 286 GraphicsLayer* layerForScrollCorner() const;
288 287
289 // FIXME(sky): remove 288 // FIXME(sky): remove
290 IntRect contentsToScreen(const IntRect& rect) const; 289 IntRect contentsToScreen(const IntRect& rect) const;
291 IntPoint contentsToRootView(const IntPoint& contentsPoint) const { return co nvertToRootView(contentsPoint); } 290 IntPoint contentsToRootView(const IntPoint& contentsPoint) const { return co nvertToRootView(contentsPoint); }
292 IntRect contentsToRootView(const IntRect& contentsRect) const { return conve rtToRootView(contentsRect); } 291 IntRect contentsToRootView(const IntRect& contentsRect) const { return conve rtToRootView(contentsRect); }
293 IntRect rootViewToContents(const IntRect& rootViewRect) const { return conve rtFromRootView(rootViewRect); } 292 IntRect rootViewToContents(const IntRect& rootViewRect) const { return conve rtFromRootView(rootViewRect); }
294 IntPoint windowToContents(const IntPoint& windowPoint) const { return conver tFromContainingWindow(windowPoint); } 293 IntPoint windowToContents(const IntPoint& windowPoint) const { return conver tFromContainingWindow(windowPoint); }
295 FloatPoint windowToContents(const FloatPoint& windowPoint) const { return co nvertFromContainingWindow(windowPoint); } 294 FloatPoint windowToContents(const FloatPoint& windowPoint) const { return co nvertFromContainingWindow(windowPoint); }
296 IntPoint contentsToWindow(const IntPoint& contentsPoint) const { return cont entsToWindow(contentsPoint); } 295 IntPoint contentsToWindow(const IntPoint& contentsPoint) const { return cont entsToWindow(contentsPoint); }
297 IntRect windowToContents(const IntRect& windowRect) const { return convertFr omContainingWindow(windowRect); } 296 IntRect windowToContents(const IntRect& windowRect) const { return convertFr omContainingWindow(windowRect); }
298 IntRect contentsToWindow(const IntRect& contentsRect) const { return content sToWindow(contentsRect); } 297 IntRect contentsToWindow(const IntRect& contentsRect) const { return content sToWindow(contentsRect); }
299 IntSize scrollOffset() const { return IntSize(); } 298 IntSize scrollOffset() const { return IntSize(); }
300 IntPoint minimumScrollPosition() const { return IntPoint(); } 299 IntPoint minimumScrollPosition() const { return IntPoint(); }
301 IntPoint maximumScrollPosition() const { return IntPoint(); } 300 IntPoint maximumScrollPosition() const { return IntPoint(); }
302 IntPoint scrollPosition() const { return IntPoint(); } 301 IntPoint scrollPosition() const { return IntPoint(); }
303 bool scheduleAnimation(); 302 bool scheduleAnimation();
304 int scrollX() const { return 0; }
305 int scrollY() const { return 0; }
306 void scrollBy(const IntSize& s, ScrollBehavior behavior = ScrollBehaviorInst ant) {}
307 void setScrollOffset(const IntPoint&) {}
308 // Scrollbar* horizontalScrollbar() const { return 0; }
309 // Scrollbar* verticalScrollbar() const { return 0; }
310 IntRect visibleContentRect(IncludeScrollbarsInRect = ExcludeScrollbars) cons t { return IntRect(IntPoint(), expandedIntSize(frameRect().size())); } 303 IntRect visibleContentRect(IncludeScrollbarsInRect = ExcludeScrollbars) cons t { return IntRect(IntPoint(), expandedIntSize(frameRect().size())); }
311 IntSize unscaledVisibleContentSize(IncludeScrollbarsInRect = ExcludeScrollba rs) const { return frameRect().size(); } 304 IntSize unscaledVisibleContentSize(IncludeScrollbarsInRect = ExcludeScrollba rs) const { return frameRect().size(); }
312 IntPoint clampScrollPosition(const IntPoint& scrollPosition) const { return scrollPosition; } 305 IntPoint clampScrollPosition(const IntPoint& scrollPosition) const { return scrollPosition; }
313 const IntPoint scrollOrigin() const { return IntPoint(); } 306 const IntPoint scrollOrigin() const { return IntPoint(); }
314 // FIXME(sky): Not clear what values these should return. This is just what they happen to be 307 // FIXME(sky): Not clear what values these should return. This is just what they happen to be
315 // returning today. 308 // returning today.
316 bool paintsEntireContents() const { return false; } 309 bool paintsEntireContents() const { return false; }
317 bool clipsPaintInvalidations() const { return true; } 310 bool clipsPaintInvalidations() const { return true; }
318 311
319 protected: 312 protected:
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 m_view->setCanInvalidatePaintDuringPerformLayout(m_originalValue); 475 m_view->setCanInvalidatePaintDuringPerformLayout(m_originalValue);
483 } 476 }
484 private: 477 private:
485 FrameView* m_view; 478 FrameView* m_view;
486 bool m_originalValue; 479 bool m_originalValue;
487 }; 480 };
488 481
489 } // namespace blink 482 } // namespace blink
490 483
491 #endif // FrameView_h 484 #endif // FrameView_h
OLDNEW
« no previous file with comments | « sky/engine/core/events/MouseRelatedEvent.cpp ('k') | sky/engine/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698