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

Side by Side Diff: third_party/WebKit/Source/core/frame/DOMVisualViewport.cpp

Issue 2105473002: Rename visualViewport.pageScale to visualViewport.scale (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix broken tests Created 4 years, 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2016 Google Inc. All rights reserved. 2 * Copyright (C) 2016 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * * Redistributions of source code must retain the above copyright 7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright 9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 FloatSize viewportSize = m_window->getViewportSize(ExcludeScrollbars); 115 FloatSize viewportSize = m_window->getViewportSize(ExcludeScrollbars);
116 return adjustForAbsoluteZoom(expandedIntSize(viewportSize).height(), fra me->pageZoomFactor()); 116 return adjustForAbsoluteZoom(expandedIntSize(viewportSize).height(), fra me->pageZoomFactor());
117 } 117 }
118 118
119 if (FrameHost* host = frame->host()) 119 if (FrameHost* host = frame->host())
120 return host->visualViewport().clientHeight(); 120 return host->visualViewport().clientHeight();
121 121
122 return 0; 122 return 0;
123 } 123 }
124 124
125 double DOMVisualViewport::pageScale() 125 double DOMVisualViewport::scale()
126 { 126 {
127 LocalFrame* frame = m_window->frame(); 127 LocalFrame* frame = m_window->frame();
128 if (!frame) 128 if (!frame)
129 return 0; 129 return 0;
130 130
131 if (!frame->isMainFrame()) 131 if (!frame->isMainFrame())
132 return 1; 132 return 1;
133 133
134 if (FrameHost* host = m_window->frame()->host()) 134 if (FrameHost* host = m_window->frame()->host())
135 return host->visualViewport().pageScale(); 135 return host->visualViewport().pageScale();
136 136
137 return 0; 137 return 0;
138 } 138 }
139 139
140 } // namespace blink 140 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/DOMVisualViewport.h ('k') | third_party/WebKit/Source/core/frame/VisualViewport.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698