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

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

Issue 269433002: Revert of isActiveFocus() is a more meaningful name (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 7 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/frame/FrameView.cpp ('k') | Source/core/rendering/RenderLayerScrollableArea.h » ('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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 void setScale(float); 88 void setScale(float);
89 float scale() const { return m_scale; } 89 float scale() const { return m_scale; }
90 90
91 void registerLayersWithTreeView(blink::WebLayerTreeView*) const; 91 void registerLayersWithTreeView(blink::WebLayerTreeView*) const;
92 void clearLayersForTreeView(blink::WebLayerTreeView*) const; 92 void clearLayersForTreeView(blink::WebLayerTreeView*) const;
93 93
94 // The portion of the unzoomed frame visible in the inner "pinch" viewport, in partial CSS pixels. 94 // The portion of the unzoomed frame visible in the inner "pinch" viewport, in partial CSS pixels.
95 FloatRect visibleRect() const; 95 FloatRect visibleRect() const;
96 private: 96 private:
97 // ScrollableArea implementation 97 // ScrollableArea implementation
98 virtual bool isActiveFocus() const OVERRIDE { return false; } 98 virtual bool isActive() const OVERRIDE { return false; }
99 virtual int scrollSize(ScrollbarOrientation) const OVERRIDE; 99 virtual int scrollSize(ScrollbarOrientation) const OVERRIDE;
100 virtual bool isScrollCornerVisible() const OVERRIDE { return false; } 100 virtual bool isScrollCornerVisible() const OVERRIDE { return false; }
101 virtual IntRect scrollCornerRect() const OVERRIDE { return IntRect(); } 101 virtual IntRect scrollCornerRect() const OVERRIDE { return IntRect(); }
102 virtual IntPoint scrollPosition() const OVERRIDE { return flooredIntPoint(m_ offset); } 102 virtual IntPoint scrollPosition() const OVERRIDE { return flooredIntPoint(m_ offset); }
103 virtual IntPoint minimumScrollPosition() const OVERRIDE; 103 virtual IntPoint minimumScrollPosition() const OVERRIDE;
104 virtual IntPoint maximumScrollPosition() const OVERRIDE; 104 virtual IntPoint maximumScrollPosition() const OVERRIDE;
105 virtual int visibleHeight() const OVERRIDE { return visibleRect().height(); }; 105 virtual int visibleHeight() const OVERRIDE { return visibleRect().height(); };
106 virtual int visibleWidth() const OVERRIDE { return visibleRect().width(); }; 106 virtual int visibleWidth() const OVERRIDE { return visibleRect().width(); };
107 virtual IntSize contentsSize() const OVERRIDE; 107 virtual IntSize contentsSize() const OVERRIDE;
108 virtual bool scrollbarsCanBeActive() const OVERRIDE { return false; } 108 virtual bool scrollbarsCanBeActive() const OVERRIDE { return false; }
(...skipping 30 matching lines...) Expand all
139 139
140 // Offset of the pinch viewport from the main frame's origin, in CSS pixels. 140 // Offset of the pinch viewport from the main frame's origin, in CSS pixels.
141 FloatPoint m_offset; 141 FloatPoint m_offset;
142 float m_scale; 142 float m_scale;
143 IntSize m_size; 143 IntSize m_size;
144 }; 144 };
145 145
146 } // namespace WebCore 146 } // namespace WebCore
147 147
148 #endif // PinchViewport_h 148 #endif // PinchViewport_h
OLDNEW
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/rendering/RenderLayerScrollableArea.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698