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

Side by Side Diff: Source/WebCore/page/FrameView.h

Issue 12279017: Revert 140571 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 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
« no previous file with comments | « no previous file | Source/WebCore/page/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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 185
186 virtual float visibleContentScaleFactor() const OVERRIDE; 186 virtual float visibleContentScaleFactor() const OVERRIDE;
187 187
188 virtual void setFixedVisibleContentRect(const IntRect&) OVERRIDE; 188 virtual void setFixedVisibleContentRect(const IntRect&) OVERRIDE;
189 virtual void setScrollPosition(const IntPoint&) OVERRIDE; 189 virtual void setScrollPosition(const IntPoint&) OVERRIDE;
190 void scrollPositionChangedViaPlatformWidget(); 190 void scrollPositionChangedViaPlatformWidget();
191 virtual void repaintFixedElementsAfterScrolling(); 191 virtual void repaintFixedElementsAfterScrolling();
192 virtual void updateFixedElementsAfterScrolling(); 192 virtual void updateFixedElementsAfterScrolling();
193 virtual bool shouldRubberBandInDirection(ScrollDirection) const; 193 virtual bool shouldRubberBandInDirection(ScrollDirection) const;
194 virtual bool requestScrollPositionUpdate(const IntPoint&) OVERRIDE; 194 virtual bool requestScrollPositionUpdate(const IntPoint&) OVERRIDE;
195 virtual bool isRubberBandInProgress() const OVERRIDE;
196 195
197 // This is different than visibleContentRect() in that it ignores negative ( or overly positive) 196 // This is different than visibleContentRect() in that it ignores negative ( or overly positive)
198 // offsets from rubber-banding, and it takes zooming into account. 197 // offsets from rubber-banding, and it takes zooming into account.
199 LayoutRect viewportConstrainedVisibleContentRect() const; 198 LayoutRect viewportConstrainedVisibleContentRect() const;
200 199
201 String mediaType() const; 200 String mediaType() const;
202 void setMediaType(const String&); 201 void setMediaType(const String&);
203 void adjustMediaTypeForPrinting(bool printing); 202 void adjustMediaTypeForPrinting(bool printing);
204 203
205 void setCannotBlitToWindow(); 204 void setCannotBlitToWindow();
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 } 629 }
631 630
632 inline LayoutUnit FrameView::mapFromCSSToLayoutUnits(int value) 631 inline LayoutUnit FrameView::mapFromCSSToLayoutUnits(int value)
633 { 632 {
634 return value * m_frame->pageZoomFactor() * m_frame->frameScaleFactor(); 633 return value * m_frame->pageZoomFactor() * m_frame->frameScaleFactor();
635 } 634 }
636 635
637 } // namespace WebCore 636 } // namespace WebCore
638 637
639 #endif // FrameView_h 638 #endif // FrameView_h
OLDNEW
« no previous file with comments | « no previous file | Source/WebCore/page/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698