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

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

Issue 662393003: Revert 183623 "Fix fullscreen elements in pinch viewport mode." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/2194/
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 | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/page/scrolling/ScrollingCoordinator.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) 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 72
73 void attachToLayerTree(GraphicsLayer*, GraphicsLayerFactory*); 73 void attachToLayerTree(GraphicsLayer*, GraphicsLayerFactory*);
74 GraphicsLayer* rootGraphicsLayer() 74 GraphicsLayer* rootGraphicsLayer()
75 { 75 {
76 return m_rootTransformLayer.get(); 76 return m_rootTransformLayer.get();
77 } 77 }
78 GraphicsLayer* containerLayer() 78 GraphicsLayer* containerLayer()
79 { 79 {
80 return m_innerViewportContainerLayer.get(); 80 return m_innerViewportContainerLayer.get();
81 } 81 }
82 GraphicsLayer* scrollLayer()
83 {
84 return m_innerViewportScrollLayer.get();
85 }
86 82
87 // Sets the location of the inner viewport relative to the outer viewport. T he 83 // Sets the location of the inner viewport relative to the outer viewport. T he
88 // coordinates are in partial CSS pixels. 84 // coordinates are in partial CSS pixels.
89 void setLocation(const FloatPoint&); 85 void setLocation(const FloatPoint&);
90 void move(const FloatPoint&); 86 void move(const FloatPoint&);
91 FloatPoint location() const { return m_offset; } 87 FloatPoint location() const { return m_offset; }
92 88
93 // Sets the size of the inner viewport when unscaled in CSS pixels. 89 // Sets the size of the inner viewport when unscaled in CSS pixels.
94 void setSize(const IntSize&); 90 void setSize(const IntSize&);
95 IntSize size() const { return m_size; } 91 IntSize size() const { return m_size; }
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 // Offset of the pinch viewport from the main frame's origin, in CSS pixels. 185 // Offset of the pinch viewport from the main frame's origin, in CSS pixels.
190 FloatPoint m_offset; 186 FloatPoint m_offset;
191 float m_scale; 187 float m_scale;
192 IntSize m_size; 188 IntSize m_size;
193 float m_topControlsAdjustment; 189 float m_topControlsAdjustment;
194 }; 190 };
195 191
196 } // namespace blink 192 } // namespace blink
197 193
198 #endif // PinchViewport_h 194 #endif // PinchViewport_h
OLDNEW
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/page/scrolling/ScrollingCoordinator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698