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

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

Issue 225303014: [Pinch-to-zoom] Moved scale factor into PinchViewport (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed layout test breakage Created 6 years, 8 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/core/frame/FrameHost.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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 65
66 Settings& settings() const; 66 Settings& settings() const;
67 Chrome& chrome() const; 67 Chrome& chrome() const;
68 UseCounter& useCounter() const; 68 UseCounter& useCounter() const;
69 69
70 // Corresponds to pixel density of the device where this Page is 70 // Corresponds to pixel density of the device where this Page is
71 // being displayed. In multi-monitor setups this can vary between pages. 71 // being displayed. In multi-monitor setups this can vary between pages.
72 // This value does not account for Page zoom, use LocalFrame::devicePixelRat io instead. 72 // This value does not account for Page zoom, use LocalFrame::devicePixelRat io instead.
73 float deviceScaleFactor() const; 73 float deviceScaleFactor() const;
74 74
75 PinchViewport& pinchViewport(); 75 PinchViewport& pinchViewport() const;
76 76
77 private: 77 private:
78 explicit FrameHost(Page&); 78 explicit FrameHost(Page&);
79 79
80 Page& m_page; 80 Page& m_page;
81 PinchViewport m_pinchViewport; 81 const OwnPtr<PinchViewport> m_pinchViewport;
82 }; 82 };
83 83
84 } 84 }
85 85
86 #endif // FrameHost_h 86 #endif // FrameHost_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/frame/FrameHost.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698