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

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: 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') | Source/web/WebInputEventConversion.cpp » ('J')
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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 Settings& settings() const; 67 Settings& settings() const;
68 Chrome& chrome() const; 68 Chrome& chrome() const;
69 PageConsole& console() const; 69 PageConsole& console() const;
70 UseCounter& useCounter() const; 70 UseCounter& useCounter() const;
71 71
72 // Corresponds to pixel density of the device where this Page is 72 // Corresponds to pixel density of the device where this Page is
73 // being displayed. In multi-monitor setups this can vary between pages. 73 // being displayed. In multi-monitor setups this can vary between pages.
74 // This value does not account for Page zoom, use LocalFrame::devicePixelRat io instead. 74 // This value does not account for Page zoom, use LocalFrame::devicePixelRat io instead.
75 float deviceScaleFactor() const; 75 float deviceScaleFactor() const;
76 76
77 PinchViewport& pinchViewport(); 77 PinchViewport& pinchViewport() const;
78 78
79 private: 79 private:
80 explicit FrameHost(Page&); 80 explicit FrameHost(Page&);
81 81
82 Page& m_page; 82 Page& m_page;
83 const OwnPtr<PageConsole> m_console; 83 const OwnPtr<PageConsole> m_console;
84 PinchViewport m_pinchViewport; 84 const OwnPtr<PinchViewport> m_pinchViewport;
85 }; 85 };
86 86
87 } 87 }
88 88
89 #endif // FrameHost_h 89 #endif // FrameHost_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/frame/FrameHost.cpp » ('j') | Source/web/WebInputEventConversion.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698