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

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

Issue 678193005: Remove more frame-level scrolling machinery. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « no previous file | 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 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 // FIXME(sky): remove 212 // FIXME(sky): remove
213 IntRect contentsToScreen(const IntRect& rect) const; 213 IntRect contentsToScreen(const IntRect& rect) const;
214 IntPoint contentsToRootView(const IntPoint& contentsPoint) const { return co nvertToRootView(contentsPoint); } 214 IntPoint contentsToRootView(const IntPoint& contentsPoint) const { return co nvertToRootView(contentsPoint); }
215 IntRect contentsToRootView(const IntRect& contentsRect) const { return conve rtToRootView(contentsRect); } 215 IntRect contentsToRootView(const IntRect& contentsRect) const { return conve rtToRootView(contentsRect); }
216 IntRect rootViewToContents(const IntRect& rootViewRect) const { return conve rtFromRootView(rootViewRect); } 216 IntRect rootViewToContents(const IntRect& rootViewRect) const { return conve rtFromRootView(rootViewRect); }
217 IntPoint windowToContents(const IntPoint& windowPoint) const { return conver tFromContainingWindow(windowPoint); } 217 IntPoint windowToContents(const IntPoint& windowPoint) const { return conver tFromContainingWindow(windowPoint); }
218 FloatPoint windowToContents(const FloatPoint& windowPoint) const { return co nvertFromContainingWindow(windowPoint); } 218 FloatPoint windowToContents(const FloatPoint& windowPoint) const { return co nvertFromContainingWindow(windowPoint); }
219 IntPoint contentsToWindow(const IntPoint& contentsPoint) const { return cont entsToWindow(contentsPoint); } 219 IntPoint contentsToWindow(const IntPoint& contentsPoint) const { return cont entsToWindow(contentsPoint); }
220 IntRect windowToContents(const IntRect& windowRect) const { return convertFr omContainingWindow(windowRect); } 220 IntRect windowToContents(const IntRect& windowRect) const { return convertFr omContainingWindow(windowRect); }
221 IntRect contentsToWindow(const IntRect& contentsRect) const { return content sToWindow(contentsRect); } 221 IntRect contentsToWindow(const IntRect& contentsRect) const { return content sToWindow(contentsRect); }
222 IntSize scrollOffset() const { return IntSize(); }
223 IntPoint minimumScrollPosition() const { return IntPoint(); }
224 IntPoint maximumScrollPosition() const { return IntPoint(); }
225 IntPoint scrollPosition() const { return IntPoint(); }
226 bool scheduleAnimation(); 222 bool scheduleAnimation();
227 IntRect visibleContentRect(IncludeScrollbarsInRect = ExcludeScrollbars) cons t { return IntRect(IntPoint(), expandedIntSize(frameRect().size())); } 223 IntRect visibleContentRect(IncludeScrollbarsInRect = ExcludeScrollbars) cons t { return IntRect(IntPoint(), expandedIntSize(frameRect().size())); }
228 IntSize unscaledVisibleContentSize(IncludeScrollbarsInRect = ExcludeScrollba rs) const { return frameRect().size(); } 224 IntSize unscaledVisibleContentSize(IncludeScrollbarsInRect = ExcludeScrollba rs) const { return frameRect().size(); }
229 // FIXME(sky): Not clear what values these should return. This is just what they happen to be 225 // FIXME(sky): Not clear what values these should return. This is just what they happen to be
230 // returning today. 226 // returning today.
231 bool paintsEntireContents() const { return false; } 227 bool paintsEntireContents() const { return false; }
232 bool clipsPaintInvalidations() const { return true; } 228 bool clipsPaintInvalidations() const { return true; }
233 229
234 protected: 230 protected:
235 bool isVerticalDocument() const; 231 bool isVerticalDocument() const;
(...skipping 28 matching lines...) Expand all
264 // Override ScrollView methods to do point conversion via renderers, in orde r to 260 // Override ScrollView methods to do point conversion via renderers, in orde r to
265 // take transforms into account. 261 // take transforms into account.
266 virtual IntRect convertToContainingView(const IntRect&) const override; 262 virtual IntRect convertToContainingView(const IntRect&) const override;
267 virtual IntRect convertFromContainingView(const IntRect&) const override; 263 virtual IntRect convertFromContainingView(const IntRect&) const override;
268 virtual IntPoint convertToContainingView(const IntPoint&) const override; 264 virtual IntPoint convertToContainingView(const IntPoint&) const override;
269 virtual IntPoint convertFromContainingView(const IntPoint&) const override; 265 virtual IntPoint convertFromContainingView(const IntPoint&) const override;
270 266
271 bool wasViewportResized(); 267 bool wasViewportResized();
272 void sendResizeEventIfNeeded(); 268 void sendResizeEventIfNeeded();
273 269
274 void scrollPositionChanged();
275 void didScrollTimerFired(Timer<FrameView>*);
276
277 void updateCompositedSelectionBoundsIfNeeded(); 270 void updateCompositedSelectionBoundsIfNeeded();
278 271
279 void setLayoutSizeInternal(const IntSize&); 272 void setLayoutSizeInternal(const IntSize&);
280 273
281 bool paintInvalidationIsAllowed() const 274 bool paintInvalidationIsAllowed() const
282 { 275 {
283 return !isInPerformLayout() || canInvalidatePaintDuringPerformLayout(); 276 return !isInPerformLayout() || canInvalidatePaintDuringPerformLayout();
284 } 277 }
285 278
286 static double s_currentFrameTimeStamp; // used for detecting decoded resourc e thrash in the cache 279 static double s_currentFrameTimeStamp; // used for detecting decoded resourc e thrash in the cache
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 327
335 bool m_hasSoftwareFilters; 328 bool m_hasSoftwareFilters;
336 329
337 float m_visibleContentScaleFactor; 330 float m_visibleContentScaleFactor;
338 IntSize m_inputEventsOffsetForEmulation; 331 IntSize m_inputEventsOffsetForEmulation;
339 float m_inputEventsScaleFactorForEmulation; 332 float m_inputEventsScaleFactorForEmulation;
340 333
341 IntSize m_layoutSize; 334 IntSize m_layoutSize;
342 bool m_layoutSizeFixedToFrameSize; 335 bool m_layoutSizeFixedToFrameSize;
343 336
344 Timer<FrameView> m_didScrollTimer;
345
346 Vector<IntRect> m_tickmarks; 337 Vector<IntRect> m_tickmarks;
347 }; 338 };
348 339
349 DEFINE_TYPE_CASTS(FrameView, Widget, widget, widget->isFrameView(), widget.isFra meView()); 340 DEFINE_TYPE_CASTS(FrameView, Widget, widget, widget->isFrameView(), widget.isFra meView());
350 341
351 class AllowPaintInvalidationScope { 342 class AllowPaintInvalidationScope {
352 public: 343 public:
353 explicit AllowPaintInvalidationScope(FrameView* view) 344 explicit AllowPaintInvalidationScope(FrameView* view)
354 : m_view(view) 345 : m_view(view)
355 , m_originalValue(view ? view->canInvalidatePaintDuringPerformLayout() : false) 346 , m_originalValue(view ? view->canInvalidatePaintDuringPerformLayout() : false)
(...skipping 12 matching lines...) Expand all
368 m_view->setCanInvalidatePaintDuringPerformLayout(m_originalValue); 359 m_view->setCanInvalidatePaintDuringPerformLayout(m_originalValue);
369 } 360 }
370 private: 361 private:
371 FrameView* m_view; 362 FrameView* m_view;
372 bool m_originalValue; 363 bool m_originalValue;
373 }; 364 };
374 365
375 } // namespace blink 366 } // namespace blink
376 367
377 #endif // FrameView_h 368 #endif // FrameView_h
OLDNEW
« no previous file with comments | « no previous file | sky/engine/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698